Skip to content

Commit 36e90b7

Browse files
mmitchemmitche
authored
Merging internal commits for release/8.0.1xx (#43982)
2 parents f0a51e6 + 391c0f2 commit 36e90b7

File tree

4 files changed

+159
-190
lines changed

4 files changed

+159
-190
lines changed

‎Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
9090
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
9191
<PackageVersion Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
92+
<PackageVersion Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
9293
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
9394
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
9495
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->

‎NuGet.config

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,13 @@
33
<clear />
44
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
55
<!-- Begin: Package sources from dotnet-emsdk -->
6-
<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" />
7-
<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" />
8-
<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" />
9-
<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" />
10-
<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" />
11-
<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" />
12-
<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" />
13-
<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" />
14-
<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" />
15-
<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" />
6+
<add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
167
<!-- End: Package sources from dotnet-emsdk -->
178
<!-- Begin: Package sources from dotnet-format -->
18-
<add key="darc-pub-dotnet-format-b252c60" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608/nuget/v3/index.json" />
19-
<add key="darc-pub-dotnet-format-b252c60-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-9/nuget/v3/index.json" />
20-
<add key="darc-pub-dotnet-format-b252c60-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-8/nuget/v3/index.json" />
21-
<add key="darc-pub-dotnet-format-b252c60-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-7/nuget/v3/index.json" />
22-
<add key="darc-pub-dotnet-format-b252c60-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-6/nuget/v3/index.json" />
23-
<add key="darc-pub-dotnet-format-b252c60-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-5/nuget/v3/index.json" />
24-
<add key="darc-pub-dotnet-format-b252c60-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-4/nuget/v3/index.json" />
25-
<add key="darc-pub-dotnet-format-b252c60-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-3/nuget/v3/index.json" />
26-
<add key="darc-pub-dotnet-format-b252c60-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-2/nuget/v3/index.json" />
27-
<add key="darc-pub-dotnet-format-b252c60-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-1/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656/nuget/v3/index.json" />
2810
<!-- End: Package sources from dotnet-format -->
2911
<!-- Begin: Package sources from dotnet-aspnetcore -->
30-
<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" />
31-
<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" />
12+
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298/nuget/v3/index.json" />
3213
<!-- End: Package sources from dotnet-aspnetcore -->
3314
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3415
<add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
@@ -41,27 +22,18 @@
4122
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
4223
<add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
4324
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-runtime-81cabf2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28/nuget/v3/index.json" />
4426
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
4527
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
4628
<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" />
4729
<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" />
4830
<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" />
49-
<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" />
5031
<!-- End: Package sources from dotnet-runtime -->
5132
<!-- Begin: Package sources from dotnet-templating -->
5233
<add key="darc-pub-dotnet-templating-3a8381b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3a8381be/nuget/v3/index.json" />
5334
<!-- End: Package sources from dotnet-templating -->
5435
<!-- Begin: Package sources from dotnet-windowsdesktop -->
55-
<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" />
56-
<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" />
57-
<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" />
58-
<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" />
59-
<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" />
60-
<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" />
61-
<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" />
62-
<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" />
63-
<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" />
64-
<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" />
36+
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd/nuget/v3/index.json" />
6537
<!-- End: Package sources from dotnet-windowsdesktop -->
6638
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6739
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -86,36 +58,27 @@
8658
<!-- Begin: Package sources from dotnet-templating -->
8759
<!-- End: Package sources from dotnet-templating -->
8860
<!-- Begin: Package sources from dotnet-aspnetcore -->
89-
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
90-
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
61+
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
9162
<!-- End: Package sources from dotnet-aspnetcore -->
9263
<!-- Begin: Package sources from dotnet-format -->
64+
<add key="darc-int-dotnet-format-27f1865" value="true" />
9365
<!-- End: Package sources from dotnet-format -->
9466
<!-- End: Package sources from dotnet-aspnetcore -->
9567
<!-- Begin: Package sources from dotnet-runtime -->
96-
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
9768
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
9869
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
9970
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
10071
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
10172
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
73+
<add key="darc-int-dotnet-runtime-81cabf2" value="true" />
10274
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
10375
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
10476
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
10577
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
10678
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
10779
<!-- End: Package sources from dotnet-runtime -->
10880
<!-- Begin: Package sources from dotnet-windowsdesktop -->
109-
<add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="true" />
110-
<add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="true" />
111-
<add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="true" />
112-
<add key="darc-int-dotnet-windowsdesktop-1526afd-4" value="true" />
113-
<add key="darc-int-dotnet-windowsdesktop-1526afd-5" value="true" />
114-
<add key="darc-int-dotnet-windowsdesktop-1526afd-6" value="true" />
115-
<add key="darc-int-dotnet-windowsdesktop-1526afd-7" value="true" />
116-
<add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="true" />
117-
<add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="true" />
118-
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="true" />
81+
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
11982
<!-- End: Package sources from dotnet-windowsdesktop -->
12083
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
12184
</disabledPackageSources>

0 commit comments

Comments
 (0)