Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/3.1] code-merge, baseline/SDK update #32583

Merged
merged 14 commits into from May 11, 2021
Merged

[release/3.1] code-merge, baseline/SDK update #32583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
639a606
Merge in 'release/3.1' changes
dotnet-bot Apr 7, 2021
41531ab
Merge in 'release/3.1' changes
dotnet-bot Apr 7, 2021
51f863a
Merge in 'release/3.1' changes
dotnet-bot Apr 9, 2021
65f78c0
Merge in 'release/3.1' changes
dotnet-bot Apr 12, 2021
fc284ae
Merge in 'release/3.1' changes
dotnet-bot Apr 12, 2021
1deebca
Merge in 'release/3.1' changes
dotnet-bot Apr 13, 2021
4c00455
Merge in 'release/3.1' changes
dotnet-bot Apr 13, 2021
c6516ad
Merge in 'release/3.1' changes
dotnet-bot Apr 14, 2021
e4704f7
Merged PR 14006: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Apr 15, 2021
c5665ed
Merged PR 14041: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Apr 15, 2021
b467b1f
Merged PR 14341: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Apr 15, 2021
8ca3954
[internal/release/3.1] Update dependencies from dnceng/internal/dotne…
dotnet-bot Apr 15, 2021
b71cfb5
Merge commit '8ca3954ca335343ce6dd1d14d8d1c6c3369710b7' into wtgodbe/…
wtgodbe May 11, 2021
68e6e22
Internal->public code merge, update baseline & SDK
wtgodbe May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
99 changes: 9 additions & 90 deletions NuGet.config
View file
Open in desktop
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>