Skip to content

Commit f0b0912

Browse files
mmitchemmitche
authored
Merging internal commits for release/8.0.3xx (#43983)
2 parents 2711b98 + 7e83e06 commit f0b0912

File tree

5 files changed

+160
-190
lines changed

5 files changed

+160
-190
lines changed

‎Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
9292
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
9393
<PackageVersion Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
94+
<PackageVersion Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
9495
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
9596
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
9697
<!-- 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
@@ -4,32 +4,13 @@
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-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" />
7+
<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" />
178
<!-- End: Package sources from dotnet-emsdk -->
189
<!-- Begin: Package sources from dotnet-format -->
19-
<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" />
20-
<add key="darc-pub-dotnet-format-7bb270d-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-9/nuget/v3/index.json" />
21-
<add key="darc-pub-dotnet-format-7bb270d-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-8/nuget/v3/index.json" />
22-
<add key="darc-pub-dotnet-format-7bb270d-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-7/nuget/v3/index.json" />
23-
<add key="darc-pub-dotnet-format-7bb270d-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-6/nuget/v3/index.json" />
24-
<add key="darc-pub-dotnet-format-7bb270d-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-5/nuget/v3/index.json" />
25-
<add key="darc-pub-dotnet-format-7bb270d-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-4/nuget/v3/index.json" />
26-
<add key="darc-pub-dotnet-format-7bb270d-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-3/nuget/v3/index.json" />
27-
<add key="darc-pub-dotnet-format-7bb270d-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-7bb270d0-2/nuget/v3/index.json" />
28-
<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" />
10+
<add key="darc-int-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d/nuget/v3/index.json" />
2911
<!-- End: Package sources from dotnet-format -->
3012
<!-- Begin: Package sources from dotnet-aspnetcore -->
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" />
13+
<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" />
3314
<!-- End: Package sources from dotnet-aspnetcore -->
3415
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3516
<!-- End: Package sources from DotNet-msbuild-Trusted -->
@@ -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-23f53d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-23f53d9c/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
<!-- Begin: Package sources from dotnet-winforms -->
6739
<!-- End: Package sources from dotnet-winforms -->
@@ -88,37 +60,28 @@
8860
<!-- Begin: Package sources from dotnet-templating -->
8961
<!-- End: Package sources from dotnet-templating -->
9062
<!-- Begin: Package sources from dotnet-aspnetcore -->
91-
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
92-
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
63+
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
9364
<!-- Begin: Package sources from dotnet-emsdk -->
9465
<!-- End: Package sources from dotnet-emsdk -->
9566
<!-- Begin: Package sources from dotnet-format -->
67+
<add key="darc-int-dotnet-format-86f5186" value="true" />
9668
<!-- End: Package sources from dotnet-format -->
9769
<!-- End: Package sources from dotnet-aspnetcore -->
9870
<!-- Begin: Package sources from dotnet-runtime -->
99-
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
10071
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
10172
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
10273
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
10374
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
10475
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
76+
<add key="darc-int-dotnet-runtime-81cabf2" value="true" />
10577
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
10678
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
10779
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
10880
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
10981
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
11082
<!-- End: Package sources from dotnet-runtime -->
11183
<!-- Begin: Package sources from dotnet-windowsdesktop -->
112-
<add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="true" />
113-
<add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="true" />
114-
<add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="true" />
115-
<add key="darc-int-dotnet-windowsdesktop-1526afd-4" value="true" />
116-
<add key="darc-int-dotnet-windowsdesktop-1526afd-5" value="true" />
117-
<add key="darc-int-dotnet-windowsdesktop-1526afd-6" value="true" />
118-
<add key="darc-int-dotnet-windowsdesktop-1526afd-7" value="true" />
119-
<add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="true" />
120-
<add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="true" />
121-
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="true" />
84+
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
12285
<!-- Begin: Package sources from dotnet-winforms -->
12386
<!-- End: Package sources from dotnet-winforms -->
12487
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Utils/8.0.*" />
4444
<UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
4545
<UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
46+
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
4647
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
4748
<UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
4849
</IgnorePatterns>

0 commit comments

Comments
 (0)