Skip to content

Commit c06fe2b

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-ec9de1a0-a055-4643-b075-73193f96cb49
2 parents b61ca75 + 8b0ca53 commit c06fe2b

File tree

13 files changed

+59
-52
lines changed

13 files changed

+59
-52
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- Begin: Package sources from dotnet-aspnetcore -->
2929
<!-- End: Package sources from dotnet-aspnetcore -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-9dcc26a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-9dcc26a5/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-481b855" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-481b855f/nuget/v3/index.json" />
3232
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3333
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3434
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>b567cdb6b8b461de79f2a2536a22ca3a67f2f33e</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.41">
76+
<Dependency Name="Microsoft.Build" Version="17.12.43">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
78+
<Sha>481b855f7315f967f9c14b83d4391ae05b7be1af</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.41-preview-25359-01">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.43-preview-25404-04">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
82+
<Sha>481b855f7315f967f9c14b83d4391ae05b7be1af</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.41-preview-25359-01">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.43-preview-25404-04">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>9dcc26a5fd6a7449e6c1dc1d99c332141aeae361</Sha>
87+
<Sha>481b855f7315f967f9c14b83d4391ae05b7be1af</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25380.1">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
594+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25380.1">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
598+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25380.1">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
602+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25325.4">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25380.1">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
606+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25380.1">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
610+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25380.1">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
614+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25380.1">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
619+
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.7">
@@ -631,14 +631,14 @@
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632632
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
633633
</Dependency>
634-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25326.1">
634+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25381.1">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>
636-
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
636+
<Sha>0898abbb5899ef400b8372913c2320295798a687</Sha>
637637
</Dependency>
638638
<!-- Intermediate is necessary for source build. -->
639-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25326.1">
639+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25381.1">
640640
<Uri>https://github.com/dotnet/scenario-tests</Uri>
641-
<Sha>270606f9f338c1c2dfb255b6f18bbcb5f085a06c</Sha>
641+
<Sha>0898abbb5899ef400b8372913c2320295798a687</Sha>
642642
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
643643
</Dependency>
644644
<!--

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.41</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.41-preview-25359-01</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.43</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.43-preview-25404-04</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -261,7 +261,7 @@
261261
<PropertyGroup Label="Infrastructure and test only dependencies">
262262
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
263263
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
264-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25326.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
264+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25381.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
265265
</PropertyGroup>
266266
<PropertyGroup Label="Manually updated">
267267
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25325.4</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25325.4</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25325.4</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25380.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25380.1</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25380.1</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25380.1</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
416416

417417
# Locate Visual Studio installation or download x-copy msbuild.
418418
$vsInfo = LocateVisualStudio $vsRequirements
419-
if ($vsInfo -ne $null) {
419+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
420420
# Ensure vsInstallDir has a trailing slash
421421
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
422422
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
4343
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
4444
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)'=='net472'" />
45-
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" />
45+
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
4646
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
4747
</ItemGroup>
4848

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Copyright (c) .NET Foundation. All rights reserved.
2121
receive servicing updates and security fixes.
2222
-->
2323
<ItemGroup>
24-
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;7.0" />
24+
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;6.0;7.0" />
2525
</ItemGroup>
2626
<PropertyGroup>
27-
<_MinimumNonEolSupportedNetCoreTargetFramework>net6.0</_MinimumNonEolSupportedNetCoreTargetFramework>
27+
<_MinimumNonEolSupportedNetCoreTargetFramework>net8.0</_MinimumNonEolSupportedNetCoreTargetFramework>
2828
</PropertyGroup>
2929

3030
<Target Name="_CheckForEolTargetFrameworks" AfterTargets="_CheckForUnsupportedNETCoreVersion"

‎src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Reference Include="System.Net.Http" />
3636
<Reference Include="System.Xml" />
3737
<PackageReference Include="Microsoft.Web.Deployment" />
38-
<PackageReference Include="System.Text.Json" />
38+
<PackageReference Include="System.Text.Json" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
3939
</ItemGroup>
4040
<ItemGroup>
4141
<Compile Include="**\*.cs" />

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public GivenThatWeWantToTargetEolFrameworks(ITestOutputHelper log) : base(log)
1515
[InlineData("netcoreapp3.0")]
1616
[InlineData("netcoreapp3.1")]
1717
[InlineData("net5.0")]
18+
[InlineData("net6.0")]
1819
[InlineData("net7.0")]
1920
public void It_warns_that_framework_is_out_of_support(string targetFrameworks)
2021
{

‎test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,8 @@ public void PublishSingleFile_fails_for_unsupported_target_framework(string targ
731731
[InlineData("net6.0", false)]
732732
[InlineData("netstandard2.0;net5.0", true)] // None of these TFMs are supported for single-file
733733
[InlineData("netstandard2.0;net6.0", false)] // Net6.0 is the min TFM supported for single-file and targeting.
734-
[InlineData("netstandard2.0;net8.0", true)] // Net8.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs.
734+
[InlineData("netstandard2.0;net8.0", false)] // Net8.0 is supported for single-file
735+
[InlineData("netstandard2.0;net9.0", true)] // Net9.0 is supported for single-file, but leaves a "gap" for the supported net6./net7.0 TFMs.
735736
[InlineData("alias-ns2", true)]
736737
[InlineData("alias-n6", false)]
737738
[InlineData("alias-n6;alias-n8", false)] // If all TFMs are supported, there's no warning even though the project uses aliases.
@@ -744,18 +745,19 @@ public void EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted
744745
TargetFrameworks = targetFrameworks
745746
};
746747
testProject.AdditionalProperties["EnableSingleFileAnalyzer"] = "true";
748+
testProject.AdditionalProperties["CheckEolTargetFramework"] = "false"; // Silence warning about targeting EOL TFMs
747749
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFrameworks)
748750
.WithProjectChanges(AddTargetFrameworkAliases);
749-
751+
750752
var buildCommand = new BuildCommand(testAsset);
751-
var resultAssertion = buildCommand.Execute("/bl:my.binlog")
753+
var resultAssertion = buildCommand.Execute("/p:CheckEolTargetFramework=false")
752754
.Should().Pass();
753755
if (shouldWarn) {
754756
// Note: can't check for Strings.EnableSingleFileAnalyzerUnsupported because each line of
755757
// the message gets prefixed with a file path by MSBuild.
756758
resultAssertion
757759
.And.HaveStdOutContaining($"warning NETSDK1211")
758-
.And.HaveStdOutContaining($"<EnableSingleFileAnalyzer Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))\">true</EnableSingleFileAnalyzer>");
760+
.And.HaveStdOutContaining($"<EnableSingleFileAnalyzer Condition=\"$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))\">true</EnableSingleFileAnalyzer>");
759761
} else {
760762
resultAssertion.And.NotHaveStdOutContaining($"warning");
761763
}

0 commit comments

Comments
 (0)