Skip to content

Commit 5bc6473

Browse files
nagilsonnagilson
committed
Merge remote-tracking branch 'origin/release/8.0.4xx' into merge/release/8.0.3xx-to-release/8.0.4xx
2 parents 6fd9501 + 4683364 commit 5bc6473

File tree

249 files changed

+4533
-1648
lines changed

Some content is hidden

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

249 files changed

+4533
-1648
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: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<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" />
1414
<!-- End: Package sources from dotnet-aspnetcore -->
1515
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
16+
<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" />
1617
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1718
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1819
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -30,12 +31,17 @@
3031
<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" />
3132
<!-- End: Package sources from dotnet-runtime -->
3233
<!-- Begin: Package sources from dotnet-templating -->
33-
<add key="darc-pub-dotnet-templating-e211ed4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e211ed40/nuget/v3/index.json" />
34+
<add key="darc-pub-dotnet-templating-045cb44" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-045cb44b/nuget/v3/index.json" />
3435
<!-- End: Package sources from dotnet-templating -->
3536
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3637
<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" />
3738
<!-- End: Package sources from dotnet-windowsdesktop -->
3839
<!-- Begin: Package sources from dotnet-winforms -->
40+
<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" />
41+
<add key="darc-int-dotnet-winforms-fdc2007-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-5/nuget/v3/index.json" />
42+
<add key="darc-int-dotnet-winforms-fdc2007-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-3/nuget/v3/index.json" />
43+
<add key="darc-int-dotnet-winforms-fdc2007-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-2/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-winforms-fdc2007-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-fdc20074-1/nuget/v3/index.json" />
3945
<!-- End: Package sources from dotnet-winforms -->
4046
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4147
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -61,8 +67,6 @@
6167
<!-- End: Package sources from dotnet-templating -->
6268
<!-- Begin: Package sources from dotnet-aspnetcore -->
6369
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
64-
<!-- Begin: Package sources from dotnet-emsdk -->
65-
<!-- End: Package sources from dotnet-emsdk -->
6670
<!-- Begin: Package sources from dotnet-format -->
6771
<add key="darc-int-dotnet-format-86f5186" value="true" />
6872
<!-- End: Package sources from dotnet-format -->
@@ -83,6 +87,11 @@
8387
<!-- Begin: Package sources from dotnet-windowsdesktop -->
8488
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
8589
<!-- Begin: Package sources from dotnet-winforms -->
90+
<add key="darc-int-dotnet-winforms-fdc2007-1" value="true" />
91+
<add key="darc-int-dotnet-winforms-fdc2007-2" value="true" />
92+
<add key="darc-int-dotnet-winforms-fdc2007-3" value="true" />
93+
<add key="darc-int-dotnet-winforms-fdc2007-5" value="true" />
94+
<add key="darc-int-dotnet-winforms-fdc2007" value="true" />
8695
<!-- End: Package sources from dotnet-winforms -->
8796
<!-- End: Package sources from dotnet-windowsdesktop -->
8897
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎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)