Skip to content

Commit 8fe1052

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into darc-release/8.0.4xx-e28635e8-b7c6-4ac7-b0bc-985494e2d6a1
2 parents 8be0606 + 3ad01de commit 8fe1052

File tree

18 files changed

+318
-160
lines changed

18 files changed

+318
-160
lines changed

NuGet.config

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
7-
<add key="darc-pub-dotnet-emsdk-a64772f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-emsdk-a64772f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-5/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-emsdk-a64772f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-3/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-emsdk-a64772f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-2/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-emsdk-a64772f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-1/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-e92f92e-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-9/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-e92f92e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-8/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-emsdk-e92f92e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-7/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-emsdk-e92f92e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-6/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-e92f92e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-5/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-e92f92e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-4/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-e92f92e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-3/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-emsdk-e92f92e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-2/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-e92f92e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-1/nuget/v3/index.json" />
1217
<!-- End: Package sources from dotnet-emsdk -->
1318
<!-- Begin: Package sources from dotnet-format -->
1419
<add key="darc-pub-dotnet-format-7bb270d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0/nuget/v3/index.json" />
@@ -23,11 +28,8 @@
2328
<add key="darc-pub-dotnet-format-7bb270d-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-1/nuget/v3/index.json" />
2429
<!-- End: Package sources from dotnet-format -->
2530
<!-- Begin: Package sources from dotnet-aspnetcore -->
26-
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-5/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-3/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-2/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-1/nuget/v3/index.json" />
31+
<add key="darc-int-dotnet-aspnetcore-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
3133
<!-- End: Package sources from dotnet-aspnetcore -->
3234
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3335
<add key="darc-pub-DotNet-msbuild-Trusted-37eb419" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-37eb419a/nuget/v3/index.json" />
@@ -45,16 +47,22 @@
4547
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
4648
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
4749
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
50+
<add key="darc-int-dotnet-runtime-08338fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-08338fca/nuget/v3/index.json" />
4851
<!-- End: Package sources from dotnet-runtime -->
4952
<!-- Begin: Package sources from dotnet-templating -->
50-
<add key="darc-pub-dotnet-templating-78746ac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-78746ace/nuget/v3/index.json" />
53+
<add key="darc-pub-dotnet-templating-9a6e3e8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9a6e3e8a/nuget/v3/index.json" />
5154
<!-- End: Package sources from dotnet-templating -->
5255
<!-- Begin: Package sources from dotnet-windowsdesktop -->
53-
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc/nuget/v3/index.json" />
54-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-5/nuget/v3/index.json" />
55-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-3/nuget/v3/index.json" />
56-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-2/nuget/v3/index.json" />
57-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-1/nuget/v3/index.json" />
56+
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4/nuget/v3/index.json" />
57+
<add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-9/nuget/v3/index.json" />
58+
<add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-8/nuget/v3/index.json" />
59+
<add key="darc-int-dotnet-windowsdesktop-1526afd-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-7/nuget/v3/index.json" />
60+
<add key="darc-int-dotnet-windowsdesktop-1526afd-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-6/nuget/v3/index.json" />
61+
<add key="darc-int-dotnet-windowsdesktop-1526afd-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-5/nuget/v3/index.json" />
62+
<add key="darc-int-dotnet-windowsdesktop-1526afd-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-4/nuget/v3/index.json" />
63+
<add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-3/nuget/v3/index.json" />
64+
<add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-2/nuget/v3/index.json" />
65+
<add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-1/nuget/v3/index.json" />
5866
<!-- End: Package sources from dotnet-windowsdesktop -->
5967
<!-- Begin: Package sources from dotnet-winforms -->
6068
<add key="darc-int-dotnet-winforms-fdc2007" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074/nuget/v3/index.json" />
@@ -86,15 +94,13 @@
8694
<!-- Begin: Package sources from dotnet-templating -->
8795
<!-- End: Package sources from dotnet-templating -->
8896
<!-- Begin: Package sources from dotnet-aspnetcore -->
89-
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="true" />
90-
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="true" />
91-
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="true" />
92-
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="true" />
93-
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="true" />
97+
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
98+
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
9499
<!-- Begin: Package sources from dotnet-format -->
95100
<!-- End: Package sources from dotnet-format -->
96101
<!-- End: Package sources from dotnet-aspnetcore -->
97102
<!-- Begin: Package sources from dotnet-runtime -->
103+
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
98104
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
99105
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
100106
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
@@ -107,11 +113,16 @@
107113
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
108114
<!-- End: Package sources from dotnet-runtime -->
109115
<!-- Begin: Package sources from dotnet-windowsdesktop -->
110-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="true" />
111-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="true" />
112-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="true" />
113-
<add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="true" />
114-
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="true" />
116+
<add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="true" />
117+
<add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="true" />
118+
<add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="true" />
119+
<add key="darc-int-dotnet-windowsdesktop-1526afd-4" value="true" />
120+
<add key="darc-int-dotnet-windowsdesktop-1526afd-5" value="true" />
121+
<add key="darc-int-dotnet-windowsdesktop-1526afd-6" value="true" />
122+
<add key="darc-int-dotnet-windowsdesktop-1526afd-7" value="true" />
123+
<add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="true" />
124+
<add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="true" />
125+
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="true" />
115126
<!-- Begin: Package sources from dotnet-winforms -->
116127
<add key="darc-int-dotnet-winforms-fdc2007-1" value="true" />
117128
<add key="darc-int-dotnet-winforms-fdc2007-2" value="true" />

0 commit comments

Comments
 (0)