Skip to content

Commit 7c0d324

Browse files
mmitchemmitche
authored
Merging internal commits for release/8.0.4xx (#43985)
2 parents 12a8fab + e168014 commit 7c0d324

File tree

5 files changed

+161
-190
lines changed

5 files changed

+161
-190
lines changed

‎Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
8484
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
8585
<PackageVersion Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
86+
<PackageVersion Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
8687
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
8788
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
8889
<!-- 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
<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" />
@@ -42,12 +23,12 @@
4223
<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" />
4324
<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" />
4425
<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" />
26+
<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" />
4527
<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" />
4628
<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" />
4729
<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" />
4830
<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" />
4931
<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" />
5132
<!-- End: Package sources from dotnet-runtime -->
5233
<!-- Begin: Package sources from dotnet-templating -->
5334
<add key="darc-pub-dotnet-templating-edd31f7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-edd31f7a/nuget/v3/index.json" />
@@ -61,16 +42,7 @@
6142
<add key="darc-pub-dotnet-templating-edd31f7-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-edd31f7a-1/nuget/v3/index.json" />
6243
<!-- End: Package sources from dotnet-templating -->
6344
<!-- Begin: Package sources from dotnet-windowsdesktop -->
64-
<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" />
65-
<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" />
66-
<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" />
67-
<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" />
68-
<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" />
69-
<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" />
70-
<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" />
71-
<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" />
72-
<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" />
73-
<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" />
45+
<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" />
7446
<!-- End: Package sources from dotnet-windowsdesktop -->
7547
<!-- Begin: Package sources from dotnet-winforms -->
7648
<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" />
@@ -102,35 +74,26 @@
10274
<!-- Begin: Package sources from dotnet-templating -->
10375
<!-- End: Package sources from dotnet-templating -->
10476
<!-- Begin: Package sources from dotnet-aspnetcore -->
105-
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
106-
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
77+
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
10778
<!-- Begin: Package sources from dotnet-format -->
79+
<add key="darc-int-dotnet-format-86f5186" value="true" />
10880
<!-- End: Package sources from dotnet-format -->
10981
<!-- End: Package sources from dotnet-aspnetcore -->
11082
<!-- Begin: Package sources from dotnet-runtime -->
111-
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
11283
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
11384
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
11485
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
11586
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
11687
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
88+
<add key="darc-int-dotnet-runtime-81cabf2" value="true" />
11789
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
11890
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
11991
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
12092
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
12193
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
12294
<!-- End: Package sources from dotnet-runtime -->
12395
<!-- Begin: Package sources from dotnet-windowsdesktop -->
124-
<add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="true" />
125-
<add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="true" />
126-
<add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="true" />
127-
<add key="darc-int-dotnet-windowsdesktop-1526afd-4" value="true" />
128-
<add key="darc-int-dotnet-windowsdesktop-1526afd-5" value="true" />
129-
<add key="darc-int-dotnet-windowsdesktop-1526afd-6" value="true" />
130-
<add key="darc-int-dotnet-windowsdesktop-1526afd-7" value="true" />
131-
<add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="true" />
132-
<add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="true" />
133-
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="true" />
96+
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
13497
<!-- Begin: Package sources from dotnet-winforms -->
13598
<add key="darc-int-dotnet-winforms-fdc2007-1" value="true" />
13699
<add key="darc-int-dotnet-winforms-fdc2007-2" value="true" />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
<!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
3737
is only applicable to 8.0.1xx. -->
38+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*8.0.0*" />
3839
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
3940
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
4041
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
@@ -44,6 +45,7 @@
4445
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Utils/8.0.*" />
4546
<UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
4647
<UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
48+
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
4749
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
4850
<UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
4951

0 commit comments

Comments
 (0)