Skip to content

Code merge, Baseline and SDK updates #31774

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

Merged
merged 14 commits into from
Apr 13, 2021
Merged

Code merge, Baseline and SDK updates #31774

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
0685b96
Merge in 'release/3.1' changes
dotnet-bot Feb 25, 2021
825c3e6
Merge in 'release/3.1' changes
dotnet-bot Mar 3, 2021
45d882e
Merge in 'release/3.1' changes
dotnet-bot Mar 3, 2021
af0f484
Merged PR 13281: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Mar 3, 2021
8ac6252
Merged PR 13278: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Mar 3, 2021
4358594
Merge in 'release/3.1' changes
dotnet-bot Mar 4, 2021
025640c
Merge from github
wtgodbe Mar 12, 2021
e5d700a
Merged PR 13554: Merge from github
wtgodbe Mar 12, 2021
ad5e0c2
Merged PR 13460: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Mar 16, 2021
88e2770
Merged PR 13461: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Mar 16, 2021
8616aa9
Merged PR 13662: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Mar 16, 2021
440dadc
Set cab name for TargetingPack.wixproj
wtgodbe Mar 16, 2021
05ae5de
Merge tag 'v3.1.14' into johluo/3.1
Apr 13, 2021
cc50f38
Code merge, Baseline and SDK updates
Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@
<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" />
<!-- 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" />
<!-- 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" />
<!-- 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" />
<!-- 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 @@ -24,27 +29,96 @@
<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" />
<!-- 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" />
<!-- 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" />
<!-- 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" />
<!-- 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" />
Expand Down
Loading