Skip to content

Commit 092ac81

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into merge/release/8.0.3xx-to-release/8.0.4xx
2 parents d20e125 + a98d46b commit 092ac81

File tree

293 files changed

+8907
-2188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+8907
-2188
lines changed

‎.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33
branches:
44
include:
55
- main
6-
- release/8.0.3xx
6+
- release/8.0.4xx
77
- internal/release/*
88
- exp/*
99

‎.vsts-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33
branches:
44
include:
55
- main
6-
- release/8.0.3xx
6+
- release/8.0.4xx
77
- internal/release/*
88
- exp/*
99

‎Directory.Packages.props

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,7 @@
1010
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
1111
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
1212
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)"/>
13-
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
14-
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
15-
<PackageVersion Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
16-
<PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
1713
<PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
18-
<PackageVersion Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
19-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildPackageVersion)" />
20-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
2114
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
2215
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
2316
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion)" />
@@ -43,7 +36,6 @@
4336
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
4437
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
4538
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
46-
<PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftNETStringToolsPackageVersion)" />
4739
<PackageVersion Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
4840
<PackageVersion Include="Microsoft.NETCore.Targets" Version="2.1.0" />
4941
<PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="$(MicrosoftTemplateEngineAuthoringTemplateVerifierVersion)" />
@@ -113,4 +105,36 @@
113105
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
114106
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)"/>
115107
</ItemGroup>
108+
109+
<!-- Use different versions of Microsoft.Build.* depending on whether the output will be used in
110+
.NET Framework (VS) or only in the .NET SDK.
111+
112+
Note: This is not abstracted in Versions.props because source-only
113+
modes will import a version override file after Versions.props. -->
114+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(TargetFramework)' != 'net472'">
115+
<!-- MSBuild-y stuff that runs in the CLI can always reference the latest MSBuild since
116+
that is what will be packaged with the .NET SDK. -->
117+
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
118+
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" />
119+
<!-- Localization is the same between source-only and regular modes. Always taken from latest. Duplicated between the itemgroups for clarity. -->
120+
<PackageVersion Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
121+
<PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
122+
<PackageVersion Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildPackageVersion)" />
123+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildPackageVersion)" />
124+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" />
125+
<PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftBuildPackageVersion)" />
126+
</ItemGroup>
127+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
128+
<!-- MSBuild-y stuff that runs in VS/MSBuild.exe should reference the lagging minimum version so
129+
it works in that slightly-older Visual Studio. -->
130+
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildMinimumVersion)" />
131+
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildMinimumVersion)" />
132+
<!-- Localization is the same between source-only and regular modes. Always taken from latest. Duplicated between the itemgroups for clarity. -->
133+
<PackageVersion Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
134+
<PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
135+
<PackageVersion Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildMinimumVersion)" />
136+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildMinimumVersion)" />
137+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildMinimumVersion)" />
138+
<PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftNETStringToolsPackageVersion)" />
139+
</ItemGroup>
116140
</Project>

‎NuGet.config

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<add key="darc-pub-dotnet-emsdk-adc0d6e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7-1/nuget/v3/index.json" />
1515
<!-- End: Package sources from dotnet-emsdk -->
1616
<!-- Begin: Package sources from dotnet-format -->
17-
<add key="darc-pub-dotnet-format-c61d046" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a/nuget/v3/index.json" />
18-
<add key="darc-pub-dotnet-format-c61d046-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-7/nuget/v3/index.json" />
19-
<add key="darc-pub-dotnet-format-c61d046-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-6/nuget/v3/index.json" />
20-
<add key="darc-pub-dotnet-format-c61d046-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-5/nuget/v3/index.json" />
21-
<add key="darc-pub-dotnet-format-c61d046-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-4/nuget/v3/index.json" />
22-
<add key="darc-pub-dotnet-format-c61d046-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a-3/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-format-59e6d3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-format-59e6d3d-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2-7/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-format-59e6d3d-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2-6/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-format-59e6d3d-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2-5/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-format-59e6d3d-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2-4/nuget/v3/index.json" />
22+
<add key="darc-pub-dotnet-format-59e6d3d-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2-3/nuget/v3/index.json" />
2323
<!-- End: Package sources from dotnet-format -->
2424
<!-- Begin: Package sources from dotnet-aspnetcore -->
2525
<add key="darc-int-dotnet-aspnetcore-4ae1269" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b/nuget/v3/index.json" />
@@ -29,7 +29,12 @@
2929
<add key="darc-int-dotnet-aspnetcore-4ae1269-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b-4/nuget/v3/index.json" />
3030
<!-- End: Package sources from dotnet-aspnetcore -->
3131
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
32-
<add key="darc-pub-DotNet-msbuild-Trusted-323d4b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-323d4b37/nuget/v3/index.json" />
32+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3/nuget/v3/index.json" />
33+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3-7/nuget/v3/index.json" />
34+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3-6/nuget/v3/index.json" />
35+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3-5/nuget/v3/index.json" />
36+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3-4/nuget/v3/index.json" />
37+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3-3/nuget/v3/index.json" />
3338
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3439
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3540
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -41,7 +46,7 @@
4146
<add key="darc-int-dotnet-runtime-efd5742-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b-4/nuget/v3/index.json" />
4247
<!-- End: Package sources from dotnet-runtime -->
4348
<!-- Begin: Package sources from dotnet-templating -->
44-
<add key="darc-pub-dotnet-templating-d8a5bd5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d8a5bd5b/nuget/v3/index.json" />
49+
<add key="darc-pub-dotnet-templating-6102dd7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6102dd73/nuget/v3/index.json" />
4550
<!-- End: Package sources from dotnet-templating -->
4651
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4752
<add key="darc-int-dotnet-windowsdesktop-cda1f82" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825/nuget/v3/index.json" />
@@ -80,8 +85,14 @@
8085
<add key="darc-int-dotnet-aspnetcore-4ae1269-6" value="true" />
8186
<add key="darc-int-dotnet-aspnetcore-4ae1269-7" value="true" />
8287
<add key="darc-int-dotnet-aspnetcore-4ae1269" value="true" />
83-
<!-- Begin: Package sources from dotnet-emsdk -->
84-
<!-- End: Package sources from dotnet-emsdk -->
88+
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
89+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-3" value="true" />
90+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-4" value="true" />
91+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-5" value="true" />
92+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-6" value="true" />
93+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e-7" value="true" />
94+
<add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="true" />
95+
<!-- End: Package sources from DotNet-msbuild-Trusted -->
8596
<!-- Begin: Package sources from dotnet-format -->
8697
<!-- End: Package sources from dotnet-format -->
8798
<!-- End: Package sources from dotnet-aspnetcore -->

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
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*" />
39+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
3840
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
3941
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
4042
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />
@@ -46,5 +48,8 @@
4648
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
4749
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
4850
<UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
51+
52+
<!-- Transitive dependencies from roslyn -->
53+
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
4954
</IgnorePatterns>
5055
</UsageData>

0 commit comments

Comments
 (0)