Merge pull request #3865 from dotnet/johluo/3.1-b

Code merge, baseline and SDK update
dotnet · Apr 13, 2021 · 6c4b0d8 · 6c4b0d8
2 parents 8eb32cc + 6d0190a
commit 6c4b0d8
Show file tree

Hide file tree

Showing 6 changed files with 313 additions and 314 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -4,8 +4,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-corefx -->
+    <add key="darc-int-dotnet-corefx-6e37696" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-6e37696a/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-corefx -->
     <!--  Begin: Package sources from dotnet-core-setup -->
+    <add key="darc-int-dotnet-core-setup-826c2c2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-826c2c2f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-core-setup -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
@@ -17,11 +19,17 @@
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-core-setup -->
+    <add key="darc-int-dotnet-core-setup-826c2c2" value="true" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
     <add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  Begin: Package sources from dotnet-corefx -->
+    <add key="darc-int-dotnet-corefx-6e37696" value="true" />
+    <add key="darc-int-dotnet-corefx-9f21c83" value="true" />
+    <add key="darc-int-dotnet-corefx-9f21c83" value="true" />
+    <add key="darc-int-dotnet-corefx-f12876b" value="true" />
+    <add key="darc-int-dotnet-corefx-9299d90" value="true" />
     <add key="darc-int-dotnet-corefx-9299d90" value="true" />
     <add key="darc-int-dotnet-corefx-50a99d5" value="true" />
     <add key="darc-int-dotnet-corefx-50a99d5" value="true" />