Merge branch 'release/2.1' into 2.1.521

dotnet · Feb 10, 2021 · 426a726 · 426a726
2 parents 1d3cf73 + afadaea
commit 426a726
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -3,7 +3,6 @@
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/ProdConFeed.txt b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210119-03/final/index.json
+https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json
diff --git a/init-tools.sh b/init-tools.sh
@@ -187,7 +187,7 @@ ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x
 
 # Get BuildTools crossgen dependencies from a better place. The script that's
 # automatically downloaded points at MyGet, which doesn't have recent packages.
-export BUILDTOOLS_CROSSGEN_FEED=https://api.nuget.org/v3/index.json
+export BUILDTOOLS_CROSSGEN_FEED=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json
 "$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools"
 
 

diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config
@@ -4,9 +4,6 @@
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet/feed/dotnet-core" value="https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="ProdCon" value="PRODUCT_CONTRUCTION_PACKAGES" />
-    <add key="smoke-test feed" value="SMOKE_TEST_PACKAGE_FEED" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
   </packageSources>
 </configuration>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210119-03/final/index.json
		https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json