Skip to content

Commit

Permalink
Merge pull request #32583 from dotnet/wtgodbe/3116Merge
Browse files Browse the repository at this point in the history 
[release/3.1] code-merge, baseline/SDK update
  • Loading branch information
@wtgodbe
wtgodbe committed May 11, 2021
2 parents 9041b5d + 68e6e22 commit dbdec83
Show file tree
Hide file tree
Showing 8 changed files with 519 additions and 598 deletions.
99 changes: 9 additions & 90 deletions NuGet.config
View file
Expand Up @@ -4,19 +4,18 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
<add key="darc-int-dotnet-aspnetcore-tooling-aec2954" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-aec2954c/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-tooling-b4f2d74" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-b4f2d743/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
<!-- 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" />
<add key="darc-int-dotnet-core-setup-dc339bd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-dc339bd0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-986705d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-986705d0/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-f270203" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-f2702030/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-1c79cde" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-1c79cde9/nuget/v3/index.json" />
<add key="darc-int-dotnet-extensions-194782e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-194782ed/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-extensions -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
Expand All @@ -29,99 +28,19 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-1c79cde" value="true" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
<add key="darc-int-dotnet-extensions-194782e" value="true" />
<!-- End: Package sources from dotnet-extensions -->
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
<add key="darc-int-dotnet-aspnetcore-tooling-aec2954" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-8d3c2f0" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-46eb078" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-bcc2619" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-814651c" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-a2af81e" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-7f55323" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-c493ee9" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" />
<add key="darc-int-dotnet-aspnetcore-tooling-b4f2d74" value="true" />
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-986705d" value="true" />
<add key="darc-int-dotnet-efcore-cc1281b" value="true" />
<add key="darc-int-dotnet-efcore-bc70740" value="true" />
<add key="darc-int-dotnet-efcore-7dc9391" value="true" />
<add key="darc-int-dotnet-efcore-57a08da" value="true" />
<add key="darc-int-dotnet-efcore-716b9a3" value="true" />
<add key="darc-int-dotnet-efcore-21ecf99" value="true" />
<add key="darc-int-dotnet-efcore-21ecf99" value="true" />
<add key="darc-int-dotnet-efcore-21ecf99" value="true" />
<add key="darc-int-dotnet-efcore-251e53f" value="true" />
<add key="darc-int-dotnet-efcore-0538c82" value="true" />
<add key="darc-int-dotnet-efcore-f67b6e3" value="true" />
<add key="darc-int-dotnet-efcore-591ae9d" value="true" />
<add key="darc-int-dotnet-efcore-c5fbb99" value="true" />
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
<add key="darc-int-dotnet-efcore-d078590" value="true" />
<add key="darc-int-dotnet-efcore-d078590" value="true" />
<add key="darc-int-dotnet-efcore-f270203" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-826c2c2" value="true" />
<add key="darc-int-dotnet-core-setup-d0e340e" value="true" />
<add key="darc-int-dotnet-core-setup-d0e340e" value="true" />
<add key="darc-int-dotnet-core-setup-d0e340e" value="true" />
<add key="darc-int-dotnet-core-setup-c256022" value="true" />
<add key="darc-int-dotnet-core-setup-8463a94" value="true" />
<add key="darc-int-dotnet-core-setup-9f34d80" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
<add key="darc-int-dotnet-core-setup-dc339bd" 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-9299d90" 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-9299d90" 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-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" />
<!-- End: Package sources from dotnet-corefx -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
</configuration>

0 comments on commit dbdec83

Please sign in to comment.