Update to 5.0 GA (#1845)

* Update to 5.0.100-rtm.20521.5, BAR Build ID 68494

* Update previously source-built to N-1

* Reconcile patches

Note: Removed aspnetcore version number patch because it is set to
a stable 5.0 version.
Note: Removed roslyn Humanizer removal patch because there is now
more usage of Humanizer in the code base.  May need to redo this
patch or add Humanizer.  (See #1767)

* Update to 5.0.100-rtm.20522.4, BAR Build ID 68583

* Update commits in Version.Details.xml and reconcile patches

* Remove temporary RC1 fix in aspnetcore

* Install built runtime for usage by aspnetcore

* Update roslyn to build CodeStyle packages

* Update / add installer patches

* Fix broken patch

* Update prevSourceBuilt to GA version

* Pin System.Security.Cryptography.Cng version in runtime build

* Update path to sdk installation

* Update smoke test nuget.config entries

* Update online prebuilt baseline

* Update package name for aspnetcore reference

* Add runtime feed to smoke-testNuGet.Config

* Update runtime config entry

* Update to 20201026.5, BAR Build ID 68880

* Set UseStableVersions flag

* Update online baseline

* Update offline prebuilt baseline

* Include patch from #1850

Include patch to remove import of restore/harvestPackages.targets
in runtime libraries build to fix issue with portable build

* Re-add portable build only prebuilts

Directory.Build.props

@@ -20,7 +20,7 @@
     <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
 
-    <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
+    <UseStableVersions Condition="'$(UseStableVersions)' == ''">true</UseStableVersions>
 
     <!-- new supported portable/nonportable options.  These control whether to build portable runtime
          or portable SDK.  The PortableBuild flag is only set in runtime-portable.proj and should

NuGet.config

@@ -2,6 +2,12 @@
 <configuration>
   <packageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <add key="darc-pub-dotnet-templating-3198063" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-31980633/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-cf258a1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cf258a14-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-msbuild-126527f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-126527ff/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-aspnetcore-371a26f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-371a26f0/nuget/v3/index.json" />
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />

eng/Version.Details.xml

@@ -22,20 +22,20 @@
       <Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
       <RepoName>aspnet-xdt</RepoName>
     </Dependency>
-    <Dependency Name="ILLink.Tasks" Version="5.0.0-rc.1.20431.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20513.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>863b5502cc43b1c75b5a93ac395899f8d8b5f0a4</Sha>
+      <Sha>e792d61a0ead2f6422b4c9af651c1128d978d454</Sha>
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20451.14">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
+      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
       <RepoName>runtime</RepoName>
       <RepoName>runtime-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.1.20431.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>da62f3656cac0ac4bfb6b012bc072b3499f78e6c</Sha>
+      <Sha>31980633108a1bef00c798136fcd30a873c90fa3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.20407.5">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -46,22 +46,22 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>afd010ba8cb3cbd714c734465d1a5de1ee133e2d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Compilers" Version="3.8.0-3.20452.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.Compilers" Version="3.8.0-5.20519.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>90e570d763637c4d0d30524674a64b07bb885994</Sha>
+      <Sha>4c195c3ac1974edcefa76774d7a59a2350ec55fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="16.8.0-preview-20414-02" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
-      <Uri>https://github.com/microsoft/msbuild</Uri>
-      <Sha>a55ce4fbb09e1ff104c815ab5b5c7609c4251e81</Sha>
+    <Dependency Name="Microsoft.Build" Version="16.8.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>126527ff107ae93fed10af675506c56d046aa5a3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.8.0-preview.3.6783" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6930" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
-      <Sha>3501ddedc274ac10d4b135856b7593a6bb8a72f1</Sha>
+      <Sha>830c8be45dbbccd411ecf6080abff0c2c98079cf</Sha>
       <RepoName>nuget-client</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.1.20452.20" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rtm.20526.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>394fae2553937858c8f05a6158613dcc7f821fba</Sha>
+      <Sha>0cdbf80b4176ba4b979bdfc7b630b884f656072f</Sha>
       <RepoName>sdk</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -79,22 +79,22 @@
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
       <Sha>a52f3d7fb58470749ee4035fbbcb7e63c78b0459</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
+      <Sha>371a26f07b23ad77c636332c2dfc0cbd1d8137ba</Sha>
       <RepoName>aspnetcore</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="37.0.0-beta.20428.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>068ebd3c599bc5a47163a18b8b90d2fe5517186e</Sha>
+      <Sha>da6be68280c89131cdba2045525b80890401defd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TestPlatform.Build" Version="16.8.0-preview-20200812-03" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.TestPlatform.Build" Version="16.8.0-release-20201022-02" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>0c0fafa64de5c73981e7c40a99d7363f57635f60</Sha>
+      <Sha>b195e2589980861425b331e73a859252c3f2b71a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.100-rc.1.20452.10">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.100-rtm.20526.5">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>473d1b592e8c281f03dcc4024c04c7c188e99c03</Sha>
+      <Sha>5044b938294b7b920a5a4393a5f0f8b7b1750548</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">
       <Uri>https://github.com/dotnet/diagnostics</Uri>

eng/Versions.props

@@ -8,6 +8,6 @@
   <!-- Production Dependencies -->
   <PropertyGroup>
     <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20521.1</PrivateSourceBuildReferencePackagesPackageVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-bootstrap.12</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-bootstrap.13</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
 </Project>

patches/aspnetcore/0004-Exclude-some-projects-from-source-build.patch

@@ -12,17 +12,17 @@ index 86dbc3c929..908fa251c7 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
 @@ -16,9 +16,11 @@
-     <IsUnitTestProject>false</IsUnitTestProject>
+     <IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject>
      <IsUnitTestProject Condition="'$(IsSpecificationTestProject)' != 'true' and ( $(MSBuildProjectName.EndsWith('Tests')) or $(MSBuildProjectName.EndsWith('.Test')) or $(MSBuildProjectName.EndsWith('.FunctionalTest')) )">true</IsUnitTestProject>
      <IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
 +    <IsOtherTestProject Condition="$(MSBuildProjectName.Contains('IntegrationTesting')) or $(MSBuildProjectName.Contains('TestCommon'))">true</IsOtherTestProject>
      <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
      <IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
      <IsShipping Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true'">false</IsShipping>
 +    <ExcludeFromSourceBuild Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true' or '$(IsSpecificationTestProject)' == 'true' or '$(IsOtherTestProject)' == 'true'">true</ExcludeFromSourceBuild>
- 
+
      <!--
        Following logic mimics core-setup approach as well as
--- 
+--
 2.18.2
 

patches/aspnetcore/0006-Remove-Yarn-dependency-not-used-in-source-build.patch

@@ -33,8 +33,8 @@ index 6496dffe47..561d2c585c 100644
    },
    "msbuild-sdks": {
 -    "Yarn.MSBuild": "1.15.2",
-     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.1",
-     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.1"
+     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20510.1",
+     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20510.1"
    }
 diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
 index 4b27caa77b..f6b1a7c4aa 100644

patches/aspnetcore/0009-Support-global.json-on-arm64-as-well.patch

@@ -24,7 +24,7 @@ index 561d2c585c..494e0e8e07 100644
 +++ b/global.json
 @@ -5,13 +5,10 @@
    "tools": {
-     "dotnet": "5.0.100-rc.1.20379.10",
+     "dotnet": "5.0.100-rc.2.20479.15",
      "runtimes": {
 -      "dotnet/x64": [
 +      "dotnet": [

patches/aspnetcore/0012-Don-t-build-for-full-fx.patch

@@ -13,7 +13,7 @@ index adf7330a3f..a18704d0a8 100644
 --- a/src/Components/WebAssembly/Sdk/src/Microsoft.NET.Sdk.BlazorWebAssembly.csproj
 +++ b/src/Components/WebAssembly/Sdk/src/Microsoft.NET.Sdk.BlazorWebAssembly.csproj
 @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
+ <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
      <Description>MSBuild support for building Blazor WebAssembly apps.</Description>
 -    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net46</TargetFrameworks>

patches/aspnetcore/0013-Fix-a-couple-issues.patch

@@ -28,19 +28,19 @@ diff --git a/src/Components/Components.slnf b/src/Components/Components.slnf
 index 637ec1a384..9bb64a3495 100644
 --- a/src/Components/Components.slnf
 +++ b/src/Components/Components.slnf
-@@ -98,7 +98,6 @@
-       "src\\Components\\Ignitor\\src\\Ignitor.csproj",
+@@ -99,7 +99,6 @@
        "src\\Components\\Ignitor\\test\\Ignitor.Test.csproj",
        "src\\Components\\test\\testassets\\ComponentsApp.Server\\ComponentsApp.Server.csproj",
+       "src\\Components\\test\\testassets\\GlobalizationWasmApp\\GlobalizationWasmApp.csproj",
 -      "src\\Components\\benchmarkapps\\Wasm.Performance\\Driver\\Wasm.Performance.Driver.csproj",
        "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj",
-       "src\\Components\\Web.Extensions\\src\\Microsoft.AspNetCore.Components.Web.Extensions.csproj",
        "src\\Components\\WebAssembly\\Server\\test\\Microsoft.AspNetCore.Components.WebAssembly.Server.Tests.csproj",
+       "src\\Components\\WebAssembly\\Authentication.Msal\\src\\Microsoft.Authentication.WebAssembly.Msal.csproj",
 diff --git a/src/Components/ComponentsNoDeps.slnf b/src/Components/ComponentsNoDeps.slnf
 index dd08970d02..34e5619a94 100644
 --- a/src/Components/ComponentsNoDeps.slnf
 +++ b/src/Components/ComponentsNoDeps.slnf
-@@ -39,7 +39,6 @@
+@@ -38,7 +38,6 @@
        "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
        "src\\Components\\Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj",
        "src\\Components\\benchmarkapps\\Wasm.Performance\\ConsoleHost\\Wasm.Performance.ConsoleHost.csproj",

patches/installer/0004-ExcludeFromSourceBuild-not-working-again.patch

@@ -6,8 +6,8 @@ Subject: [PATCH 4/4] ExcludeFromSourceBuild not working again
 ---
  Microsoft.DotNet.Cli.sln           |  7 ------
  src/SdkResolver/SdkResolver.csproj | 39 ------------------------------
- src/redist/redist.csproj           |  2 +-
- 3 files changed, 1 insertion(+), 47 deletions(-)
+ src/redist/redist.csproj           |  4 ++--
+ 3 files changed, 2 insertion(+), 48 deletions(-)
  delete mode 100644 src/SdkResolver/SdkResolver.csproj
 
 diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
@@ -91,15 +91,16 @@ diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
 index 35c3d4ad9..15601e98f 100644
 --- a/src/redist/redist.csproj
 +++ b/src/redist/redist.csproj
-@@ -11,7 +11,7 @@
+@@ -12,7 +12,7 @@
                          RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
                          />
 
 -    <ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
 +    <ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+-    <ProjectReference Include="..\VSTemplateLocator\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" />
++    <ProjectReference Include="..\VSTemplateLocator\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildFromSource)' != 'true'" />
    </ItemGroup>
 
-   <ItemGroup>
 -- 
 2.18.0
 

patches/installer/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch

@@ -0,0 +1,28 @@
+From 992512755a9df08ccfd531f7507c298aa5b22112 Mon Sep 17 00:00:00 2001
+From: dseefeld <dseefeld@microsoft.com>
+Date: Thu, 29 Oct 2020 16:01:59 +0000
+Subject: [PATCH] Update blob versions to use ref pkg versions to track stable
+ versions
+
+---
+ src/redist/targets/GenerateLayout.targets | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
+index 9e7249d..f1b11d4 100644
+--- a/src/redist/targets/GenerateLayout.targets
++++ b/src/redist/targets/GenerateLayout.targets
+@@ -11,8 +11,8 @@
+
+   <PropertyGroup>
+     <!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
+-    <AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion)</AspNetCoreBlobVersion>
+-    <CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
++    <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetCoreBlobVersion>
++    <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRefPackageVersion)</CoreSetupBlobVersion>
+     <WindowsDesktopBlobVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</WindowsDesktopBlobVersion>
+
+     <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
+-- 
+1.8.3.1
+

patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch

@@ -14,11 +14,11 @@ index a5fa8b5f6..7ceec6b95 100644
 @@ -1,7 +1,7 @@
  <Project>
      <PropertyGroup>
-         <MicrosoftBuildPackageVersion Condition="'$(MicrosoftBuildPackageVersion)' == ''">16.5.0-preview-19606-01</MicrosoftBuildPackageVersion>
+         <MicrosoftBuildPackageVersion Condition="'$(MicrosoftBuildPackageVersion)' == ''">16.6.0</MicrosoftBuildPackageVersion>
 -        <NewtonsoftJsonPackageVersion Condition="$(NewtonsoftJsonPackageVersion) == ''">9.0.1</NewtonsoftJsonPackageVersion>
 +        <NewtonsoftJsonPackageVersion>9.0.1</NewtonsoftJsonPackageVersion>
          <SystemPackagesVersion>4.3.0</SystemPackagesVersion>
-         <VSComponentsVersion>16.4.280</VSComponentsVersion>
+         <VSComponentsVersion>16.6.255</VSComponentsVersion>
          <VSFrameworkVersion>16.6.30107.105</VSFrameworkVersion>
 -- 
 2.18.0

patches/nuget-client/0005-Remove-unneeded-feeds.patch

@@ -11,16 +11,16 @@ diff --git a/NuGet.Config b/NuGet.Config
 index fed206f92..245eea2b9 100644
 --- a/NuGet.Config
 +++ b/NuGet.Config
-@@ -7,9 +7,7 @@
+@@ -4,9 +4,7 @@
+     <clear />
+     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+     <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
+-    <add key="vside_vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
+-    <add key="vside_vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
      <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-     <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
+
+     <!-- Microsoft.VisualStudio.ProjectSystem.Managed* from roslyn. moving to vs-impl with new versions soon.  -->
      <add key="dotnet-roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
--    <add key="vside" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
-     <add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
--    <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
-   </packageSources>
-   <disabledPackageSources>
-     <clear />
 -- 
 2.18.0