Rollout/2024 09 05 (#3924)

dotnet · Sep 4, 2024 · 54e19ab · 54e19ab
2 parents 0728989 + 5fab7b4
commit 54e19ab
Show file tree

Hide file tree

Showing 228 changed files with 16,822 additions and 758 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dnceng.secretmanager": {
-      "version": "1.1.0-beta.24413.3",
+      "version": "1.1.0-beta.24420.1",
       "commands": [
         "secret-manager"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dnceng.configuration.bootstrap": {
-      "version": "1.1.0-beta.24413.3",
+      "version": "1.1.0-beta.24420.1",
       "commands": [
         "bootstrap-dnceng-configuration"
       ]

diff --git a/.vault-config/maestrolocal.yaml b/.vault-config/maestrolocal.yaml
@@ -18,13 +18,3 @@ secrets:
       hasPrivateKey: true
       hasWebhookSecret: false
       hasOAuthSecret: true
-
-  dn-bot-dnceng-build-rw-code-rw-release-rw:
-    type: azure-devops-access-token
-    parameters:
-      domainAccountName: dn-bot
-      domainAccountSecret:
-        location: helixkv
-        name: dn-bot-account-redmond
-      organizations: dnceng
-      scopes: build_execute code_write release_execute
diff --git a/.vault-config/shared/maestro-secrets.yaml b/.vault-config/shared/maestro-secrets.yaml
@@ -4,13 +4,3 @@ github:
     hasPrivateKey: true
     hasWebhookSecret: true
     hasOAuthSecret: true
-
-dn-bot-dnceng-build-rw-code-rw-release-rw:
-  type: azure-devops-access-token
-  parameters:
-    domainAccountName: dn-bot
-    domainAccountSecret:
-      location: helixkv
-      name: dn-bot-account-redmond
-    organizations: dnceng
-    scopes: build_execute code_write release_execute
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
     <AspNetAzureVersion>3.1.24</AspNetAzureVersion>
     <AspNetCoreVersion>6.0.26</AspNetCoreVersion>
     <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
-    <AspireVersion>8.1.0</AspireVersion>
+    <AspireVersion>8.2.0</AspireVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
@@ -18,7 +18,7 @@
     <PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.Redis" Version="$(AspireVersion)" />
-    <PackageVersion Include="Azure.Core" Version="1.41.0" />
+    <PackageVersion Include="Azure.Core" Version="1.42.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.3" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
@@ -150,6 +150,6 @@
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="Verify.NUnit" Version="19.6" />
-    <PackageVersion Include="YamlDotNet" Version="15.1.2" />
+    <PackageVersion Include="YamlDotNet" Version="16.0.0" />
   </ItemGroup>
 </Project>
diff --git a/arcade-services.sln b/arcade-services.sln
@@ -136,6 +136,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.DependencyFlow", "src\ProductConstructionService\ProductConstructionService.DependencyFlow\ProductConstructionService.DependencyFlow.csproj", "{E312686C-A134-486F-9F62-89CE6CA34702}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.DependencyFlow.Tests", "test\ProductConstructionService.DependencyFlow.Tests\ProductConstructionService.DependencyFlow.Tests.csproj", "{045BBB97-5A75-443A-8447-2035CBC0549A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.FeedCleaner", "src\ProductConstructionService\ProductConstructionService.FeedCleaner\ProductConstructionService.FeedCleaner.csproj", "{B5833185-DD07-4C64-A4DA-D8290294F7E7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.FeedCleaner.Tests", "test\ProductConstructionService.FeedCleaner.Tests\ProductConstructionService.FeedCleaner.Tests.csproj", "{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.ScenarioTests", "test\ProductConstructionService.ScenarioTests\ProductConstructionService.ScenarioTests.csproj", "{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -651,6 +659,54 @@ Global
 		{E312686C-A134-486F-9F62-89CE6CA34702}.Release|x64.Build.0 = Release|Any CPU
 		{E312686C-A134-486F-9F62-89CE6CA34702}.Release|x86.ActiveCfg = Release|Any CPU
 		{E312686C-A134-486F-9F62-89CE6CA34702}.Release|x86.Build.0 = Release|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Debug|x64.Build.0 = Debug|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Debug|x86.Build.0 = Debug|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Release|x64.ActiveCfg = Release|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Release|x64.Build.0 = Release|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Release|x86.ActiveCfg = Release|Any CPU
+		{045BBB97-5A75-443A-8447-2035CBC0549A}.Release|x86.Build.0 = Release|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Release|x64.Build.0 = Release|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7}.Release|x86.Build.0 = Release|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Debug|x64.Build.0 = Debug|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Debug|x86.Build.0 = Debug|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Release|x64.ActiveCfg = Release|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Release|x64.Build.0 = Release|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Release|x86.ActiveCfg = Release|Any CPU
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93}.Release|x86.Build.0 = Release|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Debug|x64.Build.0 = Debug|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Debug|x86.Build.0 = Debug|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|x64.ActiveCfg = Release|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|x64.Build.0 = Release|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|x86.ActiveCfg = Release|Any CPU
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -702,6 +758,10 @@ Global
 		{90C7747B-EBEF-4CF5-92A7-7856A3A13CAA} = {243A4561-BF35-405A-AF12-AC57BB27796D}
 		{29A75658-2DC4-4E85-8A53-97198F00F28D} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
 		{E312686C-A134-486F-9F62-89CE6CA34702} = {243A4561-BF35-405A-AF12-AC57BB27796D}
+		{045BBB97-5A75-443A-8447-2035CBC0549A} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
+		{B5833185-DD07-4C64-A4DA-D8290294F7E7} = {243A4561-BF35-405A-AF12-AC57BB27796D}
+		{D94319F8-FCA0-495B-8B6E-190B4EEBEF93} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
+		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32B9C883-432E-4FC8-A1BF-090EB033DD5B}

diff --git a/azure-pipelines-product-construction-service.yml b/azure-pipelines-product-construction-service.yml
@@ -2,6 +2,7 @@
 name: $(Date:yyyyMMdd)$(Rev:r)
 
 trigger:
+  batch: true
   branches:
     include:
       - main
@@ -12,6 +13,7 @@ pr:
       - main
 
 variables:
+# https://dev.azure.com/dnceng/internal/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=189
 - group: Publish-Build-Assets
 - name: resourceGroupName
   value: product-construction-service
@@ -20,15 +22,18 @@ variables:
 - name: diffFolder
   value: $(Build.ArtifactStagingDirectory)/diff
 - ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/production') }}:
-  # https://dev.azure.com/dnceng/internal/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=189
+  - name: subscriptionId
+    value: e6b5f9f5-0ca4-4351-879b-014d78400ec2
   - name: containerappName
     value: product-construction-int
   - name: containerjobNames
-    value: sub-triggerer-twicedaily-int,sub-triggerer-daily-int,sub-triggerer-weekly-int,longest-path-updater-job-int
+    value: sub-triggerer-twicedaily-int,sub-triggerer-daily-int,sub-triggerer-weekly-int,longest-path-updater-job-int,feed-cleaner-int
   - name: containerRegistryName
     value: productconstructionint
   - name: containerappEnvironmentName
     value: product-construction-service-env-int
+  - name: containerappWorkspaceName
+    value: product-construction-service-workspace-int
   - name: dockerRegistryUrl
     value: productconstructionint.azurecr.io
   - name: serviceConnectionName
@@ -65,6 +70,17 @@ stages:
 
     - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
       - ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/production') }}:
+        - task: AzureCLI@2
+          inputs:
+            azureSubscription: $(serviceConnectionName)
+            scriptType: pscore
+            scriptLocation: inlineScript
+            inlineScript: |
+              New-Item -ItemType Directory -Path $(diffFolder)
+              $before = az containerapp show --name $(containerappName) -g $(resourceGroupName) --output json
+              Set-Content -Path $(diffFolder)/before.json -Value $before
+          displayName: Snapshot configuration (before)
+
         - task: AzureCLI@2
           name: GetAuthInfo
           displayName: Get PCS Token
@@ -85,8 +101,10 @@ stages:
             scriptLocation: scriptPath
             scriptPath: $(Build.SourcesDirectory)/eng/deployment/product-construction-service-deploy.ps1
             arguments: >
+              -subscriptionId $(subscriptionId)
               -resourceGroupName $(resourceGroupName)
               -containerappName $(containerappName)
+              -workspaceName $(containerappWorkspaceName)
               -newImageTag $(DockerTag.newDockerImageTag)
               -containerRegistryName $(containerRegistryName)
               -imageName $(containerName)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -91,37 +91,37 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24426.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24426.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24426.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24426.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.24426.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.24413.2">
+    <Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.24426.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
+      <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24413.3">
+    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24420.1">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>a06a815e1a599e209b49b37667074e3504810e67</Sha>
+      <Sha>a0d339b12f248ca5b42d3a53a49c6b09ef1db579</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24413.3">
+    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24420.1">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>a06a815e1a599e209b49b37667074e3504810e67</Sha>
+      <Sha>a0d339b12f248ca5b42d3a53a49c6b09ef1db579</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -9,11 +9,11 @@
     <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
     <MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-preview.1</MicrosoftNetFrameworkReferenceAssembliesVersion>
     <!-- Libs -->
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.24413.2</MicrosoftDotNetSignToolVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24413.2</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.24413.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
-    <MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24413.2</MicrosoftDotNetGitIssueManagerVersion>
-    <MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24413.2</MicrosoftDotNetVersionToolsVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.24426.2</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24426.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.24426.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
+    <MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24426.2</MicrosoftDotNetGitIssueManagerVersion>
+    <MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24426.2</MicrosoftDotNetVersionToolsVersion>
     <MicrosoftNetTestSdkVersion>17.4.1</MicrosoftNetTestSdkVersion>
     <MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalLoggingVersion>
     <MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.24376.1</MicrosoftAspNetCoreApiPaginationVersion>
@@ -37,8 +37,8 @@
     <MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24376.1</MicrosoftDotNetWebAuthenticationVersion>
     <ServiceFabricMocksVersion>1.1.0-beta.24376.1</ServiceFabricMocksVersion>
     <CoreHealthMonitorVersion>1.1.0-beta.24376.1</CoreHealthMonitorVersion>
-    <MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24413.3</MicrosoftDncEngSecretManagerVersion>
-    <MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24413.3</MicrosoftDncEngConfigurationBootstrapVersion>
+    <MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24420.1</MicrosoftDncEngSecretManagerVersion>
+    <MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24420.1</MicrosoftDncEngConfigurationBootstrapVersion>
   </PropertyGroup>
   <!--Package names-->
   <PropertyGroup>

diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml
@@ -8,7 +8,7 @@ parameters:
 
 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     inputs:
       azureSubscription: 'HelixProd_KeyVault'
       KeyVaultName: HelixProdKV