Skip to content

Commit c2a5265

Browse files
authored
Merging internal commits for release/8.0.4xx (#20333)
2 parents a0d2c91 + ddc45b1 commit c2a5265

4 files changed

+97
-119
lines changed

NuGet.config

+10-33
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,22 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-emsdk -->
10-
<add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
12-
<add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-emsdk-b767aab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba/nuget/v3/index.json" />
1411
<!-- End: Package sources from dotnet-emsdk -->
1512
<!-- Begin: Package sources from dotnet-aspnetcore -->
16-
<add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
2014
<!-- End: Package sources from dotnet-aspnetcore -->
2115
<!-- Begin: Package sources from dotnet-windowsdesktop -->
22-
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
24-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
2617
<!-- End: Package sources from dotnet-windowsdesktop -->
2718
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
28-
<add key="darc-pub-DotNet-msbuild-Trusted-a69bbaa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a69bbaaf/nuget/v3/index.json" />
19+
<add key="darc-pub-DotNet-msbuild-Trusted-17752ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-17752ceb/nuget/v3/index.json" />
2920
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3021
<!-- Begin: Package sources from dotnet-runtime -->
31-
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
32-
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
3323
<!-- End: Package sources from dotnet-runtime -->
3424
<!-- Begin: Package sources from dotnet-sdk -->
35-
<add key="darc-int-dotnet-sdk-f6ad34c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-3/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-2/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-1/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-sdk-a9b0f54" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a9b0f54c/nuget/v3/index.json" />
3926
<!-- End: Package sources from dotnet-sdk -->
4027
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4128
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -54,26 +41,16 @@
5441
<disabledPackageSources>
5542
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
5643
<!-- Begin: Package sources from dotnet-aspnetcore -->
57-
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
58-
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
59-
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
60-
<add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
44+
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
6145
<!-- End: Package sources from dotnet-aspnetcore -->
6246
<!-- Begin: Package sources from dotnet-runtime -->
63-
<add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
64-
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
47+
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
6548
<!-- End: Package sources from dotnet-runtime -->
6649
<!-- Begin: Package sources from dotnet-sdk -->
67-
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="true" />
68-
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="true" />
69-
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="true" />
70-
<add key="darc-int-dotnet-sdk-f6ad34c" value="true" />
50+
<add key="darc-int-dotnet-sdk-a9b0f54" value="true" />
7151
<!-- End: Package sources from dotnet-sdk -->
7252
<!-- Begin: Package sources from dotnet-windowsdesktop -->
73-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
74-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
75-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
76-
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
53+
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
7754
<!-- End: Package sources from dotnet-windowsdesktop -->
7855
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
7956
</disabledPackageSources>

eng/SourceBuildPrebuiltBaseline.xml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*8.0.0*" />
2727
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*8.0.0*" />
28+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
2829
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
2930
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
3031
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />

0 commit comments

Comments
 (0)