From a2b91e0789311a1e8b2e672eee51d5871be50173 Mon Sep 17 00:00:00 2001
From: Sanan Yuzbashiyev <sayuzbas@microsoft.com>
Date: Fri, 15 Jan 2021 11:37:30 +0100
Subject: [PATCH 1/3] Fixing nugets

---
 Nuget.config                    | 13 +++----------
 scripts/toolset/packages.config |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Nuget.config b/Nuget.config
index 29365fc08f..7869f15425 100644
--- a/Nuget.config
+++ b/Nuget.config
@@ -4,21 +4,14 @@
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="api.nuget.org" value="https://api.nuget.org/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="api.nuget.org" value="https://api.nuget.org/v3/index.json" />    
     <add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-     
-
-    <add key="pdb2pdb.myget" value="https://dotnet.myget.org/F/symreader-converter/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="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="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
diff --git a/scripts/toolset/packages.config b/scripts/toolset/packages.config
index 80eecf6fa2..2d86205918 100644
--- a/scripts/toolset/packages.config
+++ b/scripts/toolset/packages.config
@@ -5,5 +5,5 @@
   <package id="fmdev.xlftool" version="0.1.3" />
   <package id="MSTest.Internal.TestFx.Localized.Documentation" version="1.0.0-build-20170420-1" />
   <package id="vswhere" version="2.0.2" />
-  <package id="Pdb2Pdb" version="1.1.0-beta1-62316-01" />
+  <package id="Microsoft.DiaSymReader" version="1.3.0" />
 </packages>
\ No newline at end of file

From 2e3767b73a151f4369ac3b9a2e9a6ac47b3ca9e4 Mon Sep 17 00:00:00 2001
From: Sanan Yuzbashiyev <sayuzbas@microsoft.com>
Date: Fri, 15 Jan 2021 14:12:32 +0100
Subject: [PATCH 2/3] fixing pdb2pdb package

---
 scripts/PortableToFullPdb.ps1   | 2 +-
 scripts/toolset/packages.config | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/PortableToFullPdb.ps1 b/scripts/PortableToFullPdb.ps1
index e62263a3b2..97b47a6cee 100644
--- a/scripts/PortableToFullPdb.ps1
+++ b/scripts/PortableToFullPdb.ps1
@@ -17,7 +17,7 @@ $TF_PACKAGES_DIR = Join-Path $TF_ROOT_DIR "packages"
 $TF_OUT_DIR = Join-Path $TF_ROOT_DIR "artifacts"
 $TF_PortablePdbs =@("PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb")
 
-$PdbConverterToolVersion = "1.1.0-beta1-62316-01"
+$PdbConverterToolVersion = "1.1.0-beta2-21064-01"
 
 function Locate-PdbConverterTool
 {
diff --git a/scripts/toolset/packages.config b/scripts/toolset/packages.config
index 2d86205918..8568b6f734 100644
--- a/scripts/toolset/packages.config
+++ b/scripts/toolset/packages.config
@@ -5,5 +5,5 @@
   <package id="fmdev.xlftool" version="0.1.3" />
   <package id="MSTest.Internal.TestFx.Localized.Documentation" version="1.0.0-build-20170420-1" />
   <package id="vswhere" version="2.0.2" />
-  <package id="Microsoft.DiaSymReader" version="1.3.0" />
+  <package id="Microsoft.DiaSymReader.Pdb2Pdb" version="1.1.0-beta2-21064-01" />
 </packages>
\ No newline at end of file

From fe86591915b30e61ef60db1c23cffbcb719c6d58 Mon Sep 17 00:00:00 2001
From: Sanan Yuzbashiyev <sayuzbas@microsoft.com>
Date: Fri, 15 Jan 2021 15:33:00 +0100
Subject: [PATCH 3/3] Fixing Microsoft.DiaSymReader.Pdb2Pdb path

---
 scripts/PortableToFullPdb.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/PortableToFullPdb.ps1 b/scripts/PortableToFullPdb.ps1
index 97b47a6cee..06f67c5bd1 100644
--- a/scripts/PortableToFullPdb.ps1
+++ b/scripts/PortableToFullPdb.ps1
@@ -21,14 +21,14 @@ $PdbConverterToolVersion = "1.1.0-beta2-21064-01"
 
 function Locate-PdbConverterTool
 {
-    $pdbConverter = Join-Path -path $TF_PACKAGES_DIR -ChildPath "Pdb2Pdb.$PdbConverterToolVersion\tools\Pdb2Pdb.exe"
+    $pdbConverter = Join-Path -path $TF_PACKAGES_DIR -ChildPath "Microsoft.DiaSymReader.Pdb2Pdb.$PdbConverterToolVersion\tools\Pdb2Pdb.exe"
 
     if (!(Test-Path -path $pdbConverter)) 
     {
-       throw "Unable to locate Pdb2Pdb converter exe in path '$pdbConverter'."
+       throw "Unable to locate Microsoft.DiaSymReader.Pdb2Pdb converter exe in path '$pdbConverter'."
     }
 
-    Write-Verbose "Pdb2Pdb converter path is : $pdbConverter"
+    Write-Verbose "Microsoft.DiaSymReader.Pdb2Pdb converter path is : $pdbConverter"
     return $pdbConverter
 
 }