Merge branch 'dev' into master

.nuget/NuGet.config

@@ -5,7 +5,7 @@
   </activePackageSource>
   <packageSources>
     <add key="nugetbuild" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
-    <add key="nuget.org" value="https://www.nuget.org/api/v2" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet.core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
   </packageSources>
   <disabledPackageSources>

.nuget/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="MicroBuild.Core" version="0.3.0" />
   <package id="xunit.runner.console" version="2.1.0" />
   <package id="xunit.runner.visualstudio" version="2.1.0" />
 </packages>

build.ps1

@@ -9,7 +9,7 @@ param (
     [string]$SemanticVersion = '1.0.0-zlocal',
     [string]$Branch = 'zlocal',
     [string]$CommitSHA,
-    [string]$BuildBranch = 'b5f9d1c89da96c462935e2195ceb00e69287b93e'
+    [string]$BuildBranch = '2d8feecabe3aeaed7f5b4d50b9be78c94faf39ec'
 )
 
 $msBuildVersion = 15;
@@ -170,6 +170,11 @@ Invoke-BuildStep 'Creating artifacts' {
     } `
     -ev +BuildErrors
 
+Invoke-BuildStep 'Signing the packages' {
+        Sign-Packages -Configuration $Configuration -BuildNumber $BuildNumber -MSBuildVersion $msBuildVersion `
+    } `
+    -ev +BuildErrors
+
 Trace-Log ('-' * 60)
 
 ## Calculating Build time

src/Gallery.CredentialExpiration/Scripts/Gallery.CredentialExpiration.cmd

@@ -7,8 +7,6 @@ cd bin
 
 	title #{Jobs.gallery.credentialexpiration.Title}
 
-	REM SmtpUri is expected to be of the format: smtps://username:password@host:port. Note that if username contains an "@", you need to URI encode it!
-
 	start /w gallery.credentialexpiration.exe -Configuration "#{Jobs.gallery.credentialexpiration.Configuration}" -InstrumentationKey "#{Jobs.gallery.credentialexpiration.InstrumentationKey}" -verbose true -Interval #{Jobs.gallery.credentialexpiration.Interval}
 
 	echo "Finished #{Jobs.gallery.credentialexpiration.Title}"

src/Gallery.CredentialExpiration/Settings/int.json

@@ -7,7 +7,6 @@
     "GalleryAccountUrl": "https://int.nugettest.org/account/ApiKeys",
     "GalleryBrand": "NuGet Gallery",
     "MailFrom": "[email protected]",
-    "SmtpUri": "#{Jobs.gallery.credentialexpiration.SmtpUri}",
     "WarnDaysBeforeExpiration": 7,
     "WhatIf": true
   },

src/Gallery.CredentialExpiration/Settings/prod.json

@@ -7,7 +7,6 @@
     "GalleryAccountUrl": "https://www.nuget.org/account/ApiKeys",
     "GalleryBrand": "NuGet Gallery",
     "MailFrom": "[email protected]",
-    "SmtpUri": "#{Jobs.gallery.credentialexpiration.SmtpUri}",
     "WarnDaysBeforeExpiration": 7,
     "WhatIf": false
   },

src/NuGet.Jobs.Common/Configuration/JobArgumentNames.cs

@@ -111,7 +111,6 @@ public static class JobArgumentNames
 
         // Arguments specific to e-mail
         public const string MailFrom = "MailFrom";
-        public const string SmtpUri = "SmtpUri";
 
         // Arguments specific to StatusAggregator
         public const string StatusStorageAccount = "StatusStorageAccount";

src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj

@@ -63,7 +63,6 @@
     <Compile Include="JsonConfigurationJob.cs" />
     <Compile Include="SecretReader\ISecretReaderFactory.cs" />
     <Compile Include="SecretReader\SecretReaderFactory.cs" />
-    <Compile Include="SmtpUri.cs" />
     <Compile Include="Configuration\JobConfigurationManager.cs" />
     <Compile Include="Extensions\DapperExtensions.cs" />
     <Compile Include="JobBase.cs" />

src/NuGet.Services.Validation.Orchestrator/settings.json

@@ -85,9 +85,6 @@
     "TopicPath": "",
     "SubscriptionName": ""
   },
-  "Smtp": {
-    "SmtpUri": ""
-  },
   "Email": {
     "GalleryOwner": "NuGet Gallery <[email protected]>",
     "GalleryNoReplyAddress": "NuGet Gallery <[email protected]>",

src/NuGet.Services.Validation.Orchestrator/symbolsettings.json

@@ -86,9 +86,6 @@
     "TopicPath": "symbol-orchestrator",
     "SubscriptionName": "orchestrator"
   },
-  "Smtp": {
-    "SmtpUri": ""
-  },
   "Email": {
     "GalleryOwner": "NuGet Gallery <[email protected]>",
     "GalleryNoReplyAddress": "NuGet Gallery <[email protected]>",

src/NuGet.SupportRequests.Notifications/JobArgumentNames.cs

@@ -10,6 +10,5 @@ internal static class JobArgumentNames
         // avoids value duplication, avoids annoying namespace conflicts in this job
         public const string InstrumentationKey = Jobs.JobArgumentNames.InstrumentationKey;
         public const string SourceDatabase = Jobs.JobArgumentNames.SourceDatabase;
-        public const string SmtpUri = Jobs.JobArgumentNames.SmtpUri;
     }
 }

src/NuGetCDNRedirect/ApplicationInsights.config

@@ -85,7 +85,7 @@
     <Add Type="Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor, Microsoft.AI.PerfCounterCollector" />
     <Add Type="Microsoft.ApplicationInsights.Extensibility.AutocollectedMetricsExtractor, Microsoft.ApplicationInsights" />
     <Add Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel">
-      <SamplingPercentage>100</SamplingPercentage>
+      <MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>
     </Add>
   </TelemetryProcessors>
   <TelemetryChannel Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.ServerTelemetryChannel, Microsoft.AI.ServerTelemetryChannel" />