From e0a9397d92bcf475f35ea402dc885949a68b6ea2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jun 2021 11:02:55 +0200
Subject: [PATCH 1/2] V9: Fix issue with recurring services that executes too
 often (#10473)

* Fix exception in ReportSiteTask.cs, when running multiple times..
Also fixes issue with how often the tasks are executed

* Fix timeout
---
 .../RecurringHostedServiceBase.cs             |  5 +++--
 .../HostedServices/ReportSiteTask.cs          | 22 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs b/src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
index 131b81322a..70dcb3a04e 100644
--- a/src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
+++ b/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);
             }
         }
 
diff --git a/src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs b/src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
index b1411270c3..6eab3a60bc 100644
--- a/src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
+++ b/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

From f2c1c30e7696f2ac531f0985dd0730feeacd729c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Jun 2021 12:07:11 +0200
Subject: [PATCH 2/2] Remove zips from azure build

---
 build/azure-pipelines.yml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 893c62509a..b2824d8237 100644
--- a/build/azure-pipelines.yml
+++ b/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: