Update rel/16.9 to latest commit pushed to VS (#2734)

* Update dependencies from https://github.com/dotnet/arcade build 20201130.3 (#2659) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.20570.10 -> To Version 1.0.0-beta.20580.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Updating Microsoft.VisualStudio.TraceDataCollector source (#2663) * Getting Microsoft.VisualStudio.TraceDataCollector from CodeCoverageExternals instead of TestPlatformExternals, * Signing TraceDataCollector from the right path, * Removing already signed dlls, * Not signing corelib.net, * Removing files from the list as they are not present, Co-authored-by: faisal <faisalhafeez@microsoft.com> * Fixed "issue" pluralization in write-release-notes.ps1 (#2665) * Fixed "issue" pluralization in write-release-notes.ps1 Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com> * Bumping Fakes TestRunnerHarness version (#2661) * Implement Workitem support in TRX logger (#2666) * Implemented Workitem support in TRX logger * Renamed Workitem to WorkItem Co-authored-by: Flepp Jann <JFlepp@Hamilton.ch> * Do not merge logs from code coverage (#2671) * Early testhost startup performance work (#2584) * Removed TypesToLoadAttribute from ObjectModel. (#2674) * Removed TypesToLoadAttribute from ObjectModel, and moved the functionallity into adapters themselves. * Attribute refactoring (#2676) * Getting TraceDataCollector from nuget (#2678) * Removing TraceDataCollector project, * Getting tracedatacollector from nuget, * Removing signing of codecoverage libs as they are already signed, updating codecoverage version, * fixing path to tracedatacollector, * Fixing acceptance tests, Co-authored-by: faisal <faisalhafeez@microsoft.com> * Adding environment variable used during build process, (#2679) * Removing TraceDataCollector project, * Getting tracedatacollector from nuget, * Removing signing of codecoverage libs as they are already signed, updating codecoverage version, * fixing path to tracedatacollector, * Fixing acceptance tests, * Setting TraceDataCollectorPackagesDir vairable which is used in pipeline, * Fixing environment variable, * Fixing path, once again, Co-authored-by: faisal <faisalhafeez@microsoft.com> * Update dependencies from https://github.com/dotnet/arcade build 20201221.2 (#2680) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.20580.3 -> To Version 1.0.0-beta.20621.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Upgrade CC and CLR IE versions (#2681) Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com> * Fixed assembly names of TestHost executables (#2682) * Upgrade fakes version (#2683) Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com> * Upgrade CC to 16.9.0-beta.20630.1 (#2684) Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com> * Loc Update (#2685) Co-authored-by: Cristiano Suzuki <crsuzuki@microsoft.com> * Create AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Delete AzureDevOps.yml * Fix nuget feed (#2697) * Removing deprecated mygets and adding new nuget sources * Upgrade CC components (#2698) * Upgrade CC components * Revert nuget changes * Refactor it Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com> * Update dependencies from https://github.com/dotnet/arcade build 20210113.4 (#2696) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.20621.2 -> To Version 1.0.0-beta.21063.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Create AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml changed to my repo * Update AzureDevOps.yml * Add integration tests for dotnet test (#2689) * Add integration tests for dotnet test * Use relative paths and correct proj * Update to latest .NET 6 * Install 5.0.1 runtime * Add parametrized project * Updated build status badge. (#2709) * Updated build status badge. * Update dependencies from https://github.com/dotnet/arcade build 20210121.4 (#2712) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.21063.4 -> To Version 1.0.0-beta.21071.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20210122.7 (#2713) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.21063.4 -> To Version 1.0.0-beta.21072.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com> * Update azure-pipelines.yml for Azure Pipelines (#2715) * Add metrics for datacollector.exe - provides information about profilers (#2705) * Initial version of metrics for DC profiling * Tests * Push fixes to make linux build * provide telemetry opted in flag * Small refactoring * Change name * Upgrade CC comp * Move to guids * Revert lang change * Fixing descriptions * Last changes Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com> * Added git branch and commit NuGet packages (#2716) * vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200) (#2606) * vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200) * Update AzureDevOps.yml * Update AzureDevOps.yml * Move FQN related code into a separate NuGet package (#2714) * Removed ManagedNameUtilities from ObjectModel in order to restore compatibility with older versions. * Added `Microsoft.TestPlatform.AdapterUtilities`. * Added `net20` and `net35` support to the code. * Including `Microsoft.TestPlatform.AdapterUtilities` in signing (#2719) * Included missing assemblies in signing. * Updating nuget Pdb2Pdb package (#2720) * Adding new Pdb2Pdb package and change to licence tag because of warning * Fixing license * Formating fixes Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: fhnaseer <fhnaseer@live.com> Co-authored-by: faisal <faisalhafeez@microsoft.com> Co-authored-by: Adam Ralph <adam@adamralph.com> Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com> Co-authored-by: Vritant Bhardwaj <vrbhardw@microsoft.com> Co-authored-by: jflepp <jflepp@users.noreply.github.com> Co-authored-by: Flepp Jann <JFlepp@Hamilton.ch> Co-authored-by: Codrin-Victor Poienaru <cvpoienaru@gmail.com> Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com> Co-authored-by: Cristiano Suzuki <cristianosuzuki77@gmail.com> Co-authored-by: Cristiano Suzuki <crsuzuki@microsoft.com> Co-authored-by: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Co-authored-by: Sanan Yuzbashiyev <Sanan07@users.noreply.github.com> Co-authored-by: Jakub Jareš <me@jakubjares.com> Co-authored-by: Tom Deseyn <tom.deseyn@gmail.com>
microsoft · Feb 5, 2021 · 73113fe · 73113fe
1 parent 0a56da6
commit 73113fe
Show file tree

Hide file tree

Showing 296 changed files with 9,293 additions and 7,924 deletions.
diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml
@@ -0,0 +1,25 @@
+name: Sync issue to Azure DevOps work item
+
+on:
+  issues:
+    types:
+      [labeled] #, opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned
+
+jobs:
+  updateAzDO:
+    if: github.event.label.name == 'sprint'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: pavelhorak/github-actions-issue-to-work-item@master
+        env:
+          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
+          github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
+          ado_organization: "${{ secrets.ADO_ORGANIZATION }}"
+          ado_project: "${{ secrets.ADO_PROJECT }}"
+          ado_area_path: "${{ secrets.ADO_AREA_PATH }}"
+          ado_iteration_path: ${{ secrets.ADO_ITERATION_PATH }}" # this doesn't work: "@CurrentIteration('[DevDiv]\\.NET DevExp Prague')"
+          ado_wit: "User Story"
+          ado_new_state: "Committed"
+          ado_active_state: "In Progress"
+          ado_close_state: "Completed"
+          ado_bypassrules: false
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ build*.log
 build*.wrn
 build*.err
 *.binlog
+*.svclog
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

diff --git a/NuGet.config b/NuGet.config
@@ -13,10 +13,9 @@
     <add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
     <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
     <add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
-    <add key="vstest.myget" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
-    <add key="mstest.myget" value="https://dotnet.myget.org/F/mstestv2/api/v3/index.json" />
-    <add key="pdb2pdb.myget" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
-    <add key="vsunittesting.myget" value="https://dotnet.myget.org/F/vsunittesting/api/v3/index.json" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
   </packageSources>
   <fallbackPackageFolders>
     <clear />

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ The Visual Studio Test Platform is an open and extensible test platform that ena
 The Test Platform currently ships as part Visual Studio 2017, and in the .NET Core Tools Preview 3.
 
 ### Build status
-[![Build Status](https://dev.azure.com/vstestplatform/TestPlatform/_apis/build/status/TestPlatform.CI?branchName=master)](https://dev.azure.com/vstestplatform/TestPlatform/_build/latest?definitionId=9&branchName=master)
+[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/vstest/microsoft.vstest.ci?branchName=master)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=935&branchName=master)
 
 ### Contributing
 There are many ways to contribute to VSTest

diff --git a/TestPlatform.sln b/TestPlatform.sln
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -33,6 +33,13 @@ jobs:
       modifyEnvironment: false
       failOnStandardError: true
 
+  - task: PublishTestResults@2
+    displayName: 'Publish Test Results **\*.trx'
+    inputs:
+      testResultsFormat: VSTest
+      testResultsFiles: '**\*.trx'
+    condition: succeededOrFailed()
+
   - task: PublishPipelineArtifact@1
     inputs:
       targetPath: '$(Build.SourcesDirectory)\artifacts'
@@ -124,16 +131,25 @@ jobs:
   steps:
   - script: ./build.sh -c $(buildConfiguration)
     displayName: 'Build'
+
   - script: ./test.sh -c $(buildConfiguration) -p Unit
     displayName: 'Unit tests'  
+
   - task: DownloadPipelineArtifact@2
     inputs:
       buildType: 'current'
       artifactName: 'testArtifacts'
       targetPath: '$(Build.SourcesDirectory)/artifacts'
+
   - script: ./tools/dotnet-linux/dotnet build -c $(buildConfiguration) ./test/TestAssets/TestAssets.sln
     displayName: 'Build test assets'
+
   - script: ./test.sh -c $(buildConfiguration) -p Acceptance
     displayName: 'Acceptance tests'   
-
-
+
+  - task: PublishTestResults@2
+    displayName: 'Publish Test Results **/*.trx'
+    inputs:
+      testResultsFormat: VSTest
+      testResultsFiles: '**/*.trx'
+    condition: succeededOrFailed()
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20570.10">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21072.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1ceac96c54fcf33eb745649c4e7b8d7507a9b730</Sha>
+      <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.20570.10">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.21072.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1ceac96c54fcf33eb745649c4e7b8d7507a9b730</Sha>
+      <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.20570.10">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.21072.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1ceac96c54fcf33eb745649c4e7b8d7507a9b730</Sha>
+      <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20570.10">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21072.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1ceac96c54fcf33eb745649c4e7b8d7507a9b730</Sha>
+      <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="1.0.0-beta.20570.10">
+    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="1.0.0-beta.21072.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1ceac96c54fcf33eb745649c4e7b8d7507a9b730</Sha>
+      <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -36,7 +36,7 @@
       <Sha>
       </Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
+    <Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-21075-01">
       <Uri>https://github.com/dotnet/symreader-converter</Uri>
       <Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
     </Dependency>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -60,8 +60,8 @@
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
     <XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.20570.10</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetSignToolVersion>1.0.0-beta.20570.10</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.21072.7</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetSignToolVersion>1.0.0-beta.21072.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
     <MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
     <MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -73,7 +73,7 @@
     <MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
     <MicrosoftDotNetMaestroClientVersion>1.1.0-beta.19556.4</MicrosoftDotNetMaestroClientVersion>
     <MicrosoftSourceLinkVersion>1.0.0-beta2-19554-01</MicrosoftSourceLinkVersion>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>1.0.0-beta.20570.10</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
+    <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>1.0.0-beta.21072.7</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
     <XliffTasksVersion>1.0.0-beta.20055.1</XliffTasksVersion>
     <!-- Roslyn -->
     <!-- WARNING: Depending on Roslyn in code that also supports unmanaged scenarios (e.g. C++,

diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/>
+  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
 </packages>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
@@ -65,7 +65,7 @@ jobs:
       continueOnError: ${{ parameters.sdlContinueOnError }}
   - ${{ if eq(parameters.overrideParameters, '') }}:
     - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-        -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1
+        -GuardianPackageName Microsoft.Guardian.Cli.0.53.3
         -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
         -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
         ${{ parameters.additionalParameters }}

diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
@@ -379,6 +379,18 @@ stages:
     shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
     symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
 
+- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+  parameters:
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    stageName: 'VS16_10_Publishing'
+    channelName: 'VS 16.10'
+    channelId: 1692
+    transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
+    shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+    symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+
 - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
   parameters:
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -176,7 +176,32 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript
+
+    $maxRetries = 5
+    $retries = 1
+
+    $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
+
+    while($true) {
+      try {
+        Write-Host "GET $uri"
+        Invoke-WebRequest $uri -OutFile $installScript
+        break
+      }
+      catch {
+        Write-Host "Failed to download '$uri'"
+        Write-Error $_.Exception.Message -ErrorAction Continue
+      }
+
+      if (++$retries -le $maxRetries) {
+        $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
+        Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
+        Start-Sleep -Seconds $delayInSeconds
+      }
+      else {
+        throw "Unable to download file in $maxRetries attempts."
+      }
+    }
   }
 
   return $installScript
@@ -366,7 +391,27 @@ function LocateVisualStudio([object]$vsRequirements = $null){
   if (!(Test-Path $vsWhereExe)) {
     Create-Directory $vsWhereDir
     Write-Host "Downloading vswhere"
-    Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
+    $maxRetries = 5
+    $retries = 1
+
+    while($true) {
+      try {
+        Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
+        break
+      }
+      catch{
+        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
+      }
+
+      if (++$retries -le $maxRetries) {
+        $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
+        Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
+        Start-Sleep -Seconds $delayInSeconds
+      }
+      else {
+        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
+      }
+    }
   }
 
   if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }

diff --git a/global.json b/global.json
@@ -1,15 +1,15 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "6.0.100-alpha.1.21067.8",
     "rollForward": "minor",
     "allowPrerelease": false,
     "architecture": "x64"
   },
   "tools": {
-    "dotnet": "5.0.100"
+    "dotnet": "6.0.100-alpha.1.21067.8"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20570.10",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20570.10"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21072.7",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21072.7"
   }
 }
diff --git a/scripts/PortableToFullPdb.ps1 b/scripts/PortableToFullPdb.ps1
@@ -16,13 +16,13 @@ $TP_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullN
 $TP_PACKAGES_DIR = Join-Path $TP_ROOT_DIR "packages"
 $TP_OUT_DIR = Join-Path $TP_ROOT_DIR "artifacts"
 
-$PdbConverterToolVersion = "1.1.0-beta1-62316-01"
+$PdbConverterToolVersion = "1.1.0-beta2-21075-01"
 
 function Locate-PdbConverterTool
 {
-    $pdbConverter = Join-Path -path $TP_PACKAGES_DIR -ChildPath "Pdb2Pdb\$PdbConverterToolVersion\tools\Pdb2Pdb.exe"
+    $pdbConverter = Join-Path -path $TP_PACKAGES_DIR -ChildPath "Microsoft.DiaSymReader.Pdb2Pdb\$PdbConverterToolVersion\tools\Pdb2Pdb.exe"
 
-       if (!(Test-Path -path $pdbConverter)) {
+    if (!(Test-Path -path $pdbConverter)) {
        throw "Unable to locate Pdb2Pdb converter exe in path '$pdbConverter'."
    }