Feed cleanup (#34044)

* Feed cleanup

Move away from blob feeds.

* Add dotnet5 feed
* Update version of System.CommandLine.Experimental
* Revert to released versions in SuperILC and R2RDump
* Don't remove public feeds for tests

diff --git a/NuGet.config b/NuGet.config
index b656e4d..13929bb 100644 (file)
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,11 +12,10 @@
     -->
     <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet-tools" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet-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="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

diff --git a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj
index 1bae5d3..fa2fc64 100644 (file)
--- a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj
+++ b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj
@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.CommandLine.Experimental">
-      <Version>0.3.0-alpha.19525.2</Version>
+      <Version>0.3.0-alpha.19577.1</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/src/installer/test/PrepareTestAssets/PrepareTestAssets.proj b/src/installer/test/PrepareTestAssets/PrepareTestAssets.proj
index 4be962c..56ae5cb 100644 (file)
--- a/src/installer/test/PrepareTestAssets/PrepareTestAssets.proj
+++ b/src/installer/test/PrepareTestAssets/PrepareTestAssets.proj
@@ -83,7 +83,7 @@
       -->
       <TestRestoreNuGetConfigContent>$([System.Text.RegularExpressions.Regex]::Replace(
         '$(TestRestoreNuGetConfigContent)',
-        '&lt;add key=".+" value="https://pkgs.dev.azure.com/dnceng/.+" /&gt;',
+        '&lt;add key=".+" value="https://pkgs.dev.azure.com/dnceng/internal/.+" /&gt;',
         ''))</TestRestoreNuGetConfigContent>
     </PropertyGroup>
 

diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
index 9f27e96..551e072 100644 (file)
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine.Experimental" Version="0.3.0-alpha.19317.1" />
+    <PackageReference Include="System.CommandLine.Experimental" Version="0.3.0-alpha.19577.1" />
     <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.4" />
   </ItemGroup>
 

diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj b/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj
index a17d82f..439b1e8 100644 (file)
--- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj
+++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj
@@ -8,7 +8,7 @@
     <Compile Include="..\..\..\..\Common\tests\System\IO\Compression\CRC.cs" Link="Utils\CRC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.CommandLine.Experimental" Version="0.3.0-alpha.19405.1" />
+    <PackageReference Include="System.CommandLine.Experimental" Version="0.3.0-alpha.19577.1" />
     <PackageReference Include="System.IO.Pipelines" Version="4.6.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file