Skip to content

Commit dbdec83

Browse files
wtgodbewtgodbe
authored
Merge pull request #32583 from dotnet/wtgodbe/3116Merge
[release/3.1] code-merge, baseline/SDK update
2 parents 9041b5d + 68e6e22 commit dbdec83

8 files changed

+519
-598
lines changed

‎NuGet.config

Lines changed: 9 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
7-
<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" />
7+
<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" />
88
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
99
<!-- Begin: Package sources from dotnet-corefx -->
10-
<add key="darc-int-dotnet-corefx-6e37696" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-6e37696a/nuget/v3/index.json" />
1110
<!-- End: Package sources from dotnet-corefx -->
1211
<!-- Begin: Package sources from dotnet-core-setup -->
13-
<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" />
12+
<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" />
1413
<!-- End: Package sources from dotnet-core-setup -->
1514
<!-- Begin: Package sources from dotnet-efcore -->
16-
<add key="darc-int-dotnet-efcore-986705d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-986705d0/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-efcore-f270203" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-f2702030/nuget/v3/index.json" />
1716
<!-- End: Package sources from dotnet-efcore -->
1817
<!-- Begin: Package sources from dotnet-extensions -->
19-
<add key="darc-int-dotnet-extensions-1c79cde" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-1c79cde9/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-extensions-194782e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-194782ed/nuget/v3/index.json" />
2019
<!-- End: Package sources from dotnet-extensions -->
2120
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2221
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
@@ -29,99 +28,19 @@
2928
<clear />
3029
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3130
<!-- Begin: Package sources from dotnet-extensions -->
32-
<add key="darc-int-dotnet-extensions-1c79cde" value="true" />
33-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
34-
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
35-
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
31+
<add key="darc-int-dotnet-extensions-194782e" value="true" />
3632
<!-- End: Package sources from dotnet-extensions -->
3733
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
38-
<add key="darc-int-dotnet-aspnetcore-tooling-aec2954" value="true" />
39-
<add key="darc-int-dotnet-aspnetcore-tooling-8d3c2f0" value="true" />
40-
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
41-
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
42-
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
43-
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
44-
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
45-
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
46-
<add key="darc-int-dotnet-aspnetcore-tooling-9876229" value="true" />
47-
<add key="darc-int-dotnet-aspnetcore-tooling-46eb078" value="true" />
48-
<add key="darc-int-dotnet-aspnetcore-tooling-bcc2619" value="true" />
49-
<add key="darc-int-dotnet-aspnetcore-tooling-814651c" value="true" />
50-
<add key="darc-int-dotnet-aspnetcore-tooling-a2af81e" value="true" />
51-
<add key="darc-int-dotnet-aspnetcore-tooling-7f55323" value="true" />
52-
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
53-
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
54-
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
55-
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
56-
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
57-
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
58-
<add key="darc-int-dotnet-aspnetcore-tooling-1756aa6" value="true" />
59-
<add key="darc-int-dotnet-aspnetcore-tooling-c493ee9" value="true" />
60-
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" />
61-
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" />
34+
<add key="darc-int-dotnet-aspnetcore-tooling-b4f2d74" value="true" />
6235
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
6336
<!-- Begin: Package sources from dotnet-efcore -->
64-
<add key="darc-int-dotnet-efcore-986705d" value="true" />
65-
<add key="darc-int-dotnet-efcore-cc1281b" value="true" />
66-
<add key="darc-int-dotnet-efcore-bc70740" value="true" />
67-
<add key="darc-int-dotnet-efcore-7dc9391" value="true" />
68-
<add key="darc-int-dotnet-efcore-57a08da" value="true" />
69-
<add key="darc-int-dotnet-efcore-716b9a3" value="true" />
70-
<add key="darc-int-dotnet-efcore-21ecf99" value="true" />
71-
<add key="darc-int-dotnet-efcore-21ecf99" value="true" />
72-
<add key="darc-int-dotnet-efcore-21ecf99" value="true" />
73-
<add key="darc-int-dotnet-efcore-251e53f" value="true" />
74-
<add key="darc-int-dotnet-efcore-0538c82" value="true" />
75-
<add key="darc-int-dotnet-efcore-f67b6e3" value="true" />
76-
<add key="darc-int-dotnet-efcore-591ae9d" value="true" />
77-
<add key="darc-int-dotnet-efcore-c5fbb99" value="true" />
78-
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
79-
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
80-
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
81-
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
82-
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
83-
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
84-
<add key="darc-int-dotnet-efcore-5b7fc58" value="true" />
85-
<add key="darc-int-dotnet-efcore-d078590" value="true" />
86-
<add key="darc-int-dotnet-efcore-d078590" value="true" />
37+
<add key="darc-int-dotnet-efcore-f270203" value="true" />
8738
<!-- End: Package sources from dotnet-efcore -->
8839
<!-- Begin: Package sources from dotnet-core-setup -->
89-
<add key="darc-int-dotnet-core-setup-826c2c2" value="true" />
90-
<add key="darc-int-dotnet-core-setup-d0e340e" value="true" />
91-
<add key="darc-int-dotnet-core-setup-d0e340e" value="true" />
92-
<add key="darc-int-dotnet-core-setup-d0e340e" value="true" />
93-
<add key="darc-int-dotnet-core-setup-c256022" value="true" />
94-
<add key="darc-int-dotnet-core-setup-8463a94" value="true" />
95-
<add key="darc-int-dotnet-core-setup-9f34d80" value="true" />
96-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
97-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
98-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
99-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
100-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
101-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
102-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
103-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
104-
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
105-
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
106-
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
40+
<add key="darc-int-dotnet-core-setup-dc339bd" value="true" />
10741
<!-- End: Package sources from dotnet-core-setup -->
10842
<!-- Begin: Package sources from dotnet-corefx -->
109-
<add key="darc-int-dotnet-corefx-6e37696" value="true" />
110-
<add key="darc-int-dotnet-corefx-9f21c83" value="true" />
111-
<add key="darc-int-dotnet-corefx-9f21c83" value="true" />
112-
<add key="darc-int-dotnet-corefx-f12876b" value="true" />
113-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
114-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
115-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
116-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
117-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
118-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
119-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
120-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
121-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
122-
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
123-
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
124-
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
12543
<!-- End: Package sources from dotnet-corefx -->
44+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
12645
</disabledPackageSources>
12746
</configuration>

0 commit comments

Comments
 (0)