Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/10438_missing_datacontract_on_FileExtensionConfigItem

build/azure-pipelines.yml

@@ -401,7 +401,7 @@ stages:
                       publishJUnitResults: true
                       testResultsFiles: '**\TESTS-*.xml'
                 - task: PowerShell@1
-                  displayName: Prepare Packages & Zip
+                  displayName: Prepare Packages
                   inputs:
                       scriptType: inlineScript
                       inlineScript: |
@@ -410,19 +410,6 @@ stages:
 
                           $ubuild.CompileUmbraco()
                           $ubuild.PreparePackages()
-                          $ubuild.PackageZip()
-                - task: CopyFiles@2
-                  displayName: Copy Zip Files to Staging
-                  inputs:
-                      SourceFolder: build.out
-                      Contents: '*.zip'
-                      TargetFolder: $(build.artifactstagingdirectory)
-                      CleanTargetFolder: true
-                - task: PublishBuildArtifacts@1
-                  displayName: Publish Zip Files
-                  inputs:
-                      PathtoPublish: $(build.artifactstagingdirectory)
-                      ArtifactName: zips
                 - task: PowerShell@1
                   displayName: Verify & Package NuGet
                   inputs:

src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs

@@ -62,8 +62,9 @@ namespace Umbraco.Cms.Infrastructure.HostedServices
             }
             finally
             {
-                // Resume now that the task is complete
-                _timer?.Change((int)_delay.TotalMilliseconds, (int)_period.TotalMilliseconds);
+                // Resume now that the task is complete - Note we use period in both because we don't want to execute again after the delay.
+                // So first execution is after _delay, and the we wait _period between each
+                _timer?.Change((int)_period.TotalMilliseconds, (int)_period.TotalMilliseconds);
             }
         }
 

src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs

@@ -52,13 +52,24 @@ namespace Umbraco.Cms.Infrastructure.HostedServices
 
             try
             {
-                // Send data to LIVE telemetry
-                s_httpClient.BaseAddress = new Uri("https://telemetry.umbraco.com/");
+
+                if (s_httpClient.BaseAddress is null)
+                {
+                    // Send data to LIVE telemetry
+                    s_httpClient.BaseAddress = new Uri("https://telemetry.umbraco.com/");
+
+                    // Set a low timeout - no need to use a larger default timeout for this POST request
+                    s_httpClient.Timeout = new TimeSpan(0, 0, 1);
 
 #if DEBUG
-                // Send data to DEBUG telemetry service
-                s_httpClient.BaseAddress = new Uri("https://telemetry.rainbowsrock.net/");
+                    // Send data to DEBUG telemetry service
+                    s_httpClient.BaseAddress = new Uri("https://telemetry.rainbowsrock.net/");
+
+
+
 #endif
+                }
+
 
                 s_httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Content-Type", "application/json");
 
@@ -67,9 +78,6 @@ namespace Umbraco.Cms.Infrastructure.HostedServices
                     var postData = new TelemetryReportData { Id = telemetrySiteIdentifier, Version = _umbracoVersion.SemanticVersion.ToSemanticStringWithoutBuild() };
                     request.Content = new StringContent(JsonConvert.SerializeObject(postData), Encoding.UTF8, "application/json"); //CONTENT-TYPE header
 
-                    // Set a low timeout - no need to use a larger default timeout for this POST request
-                    s_httpClient.Timeout = new TimeSpan(0, 0, 1);
-
                     // Make a HTTP Post to telemetry service
                     // https://telemetry.umbraco.com/installs/
                     // Fire & Forget, do not need to know if its a 200, 500 etc