From e12a4dc647f3eabfd2b1ac7412cfca2dd8186cd1 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 10 Feb 2021 15:38:28 -0800
Subject: [PATCH] Fix the nuget feed name and url for dotnet 6

---
 .../azureDevOps/templates/release-GlobalToolTest.yml   |  8 ++++----
 .../azureDevOps/templates/release-SDKTests.yml         | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index 053354d34c..25295ba7c2 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -39,11 +39,11 @@ jobs:
 
         Find-Dotnet
 
-        if(-not (Get-PackageSource -Name 'dotnet5' -ErrorAction SilentlyContinue))
+        if(-not (Get-PackageSource -Name 'dotnet' -ErrorAction SilentlyContinue))
         {
-            $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet5' } | Select-Object -ExpandProperty Value
-            Register-PackageSource -Name 'dotnet5' -Location $nugetFeed -ProviderName NuGet
-            Write-Verbose -Message "Register new package source 'dotnet5'" -verbose
+            $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet' } | Select-Object -ExpandProperty Value
+            Register-PackageSource -Name 'dotnet' -Location $nugetFeed -ProviderName NuGet
+            Write-Verbose -Message "Register new package source 'dotnet'" -verbose
         }
 
         ## Install latest version from the channel
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index acb82fbb74..5e46014714 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -47,11 +47,11 @@ jobs:
 
         Find-Dotnet
 
-        if(-not (Get-PackageSource -Name 'dotnet5' -ErrorAction SilentlyContinue))
+        if(-not (Get-PackageSource -Name 'dotnet' -ErrorAction SilentlyContinue))
         {
-            $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet5' } | Select-Object -ExpandProperty Value
-            Register-PackageSource -Name 'dotnet5' -Location $nugetFeed -ProviderName NuGet
-            Write-Verbose -Message "Register new package source 'dotnet5'" -verbose
+            $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet' } | Select-Object -ExpandProperty Value
+            Register-PackageSource -Name 'dotnet' -Location $nugetFeed -ProviderName NuGet
+            Write-Verbose -Message "Register new package source 'dotnet'" -verbose
         }
 
         ## Remove old .NET SDKs if any exists
@@ -77,7 +77,7 @@ jobs:
         $localLocation = "$(Pipeline.Workspace)/releasePipeline/finalResults"
         $xmlElement = @"
           <add key=`"local`" value=`"$localLocation`" />
-          <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
+          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
         </packageSources>
         "@