diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54cf36a1e..cdcb49652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -196,33 +196,33 @@ - + https://github.com/dotnet/arcade - eaa4673f2a82355f7cd2f1c1243578be2e961d0f + a264eb13fea14125f3ef8d4056586cd66fa55309 - + https://github.com/dotnet/arcade - eaa4673f2a82355f7cd2f1c1243578be2e961d0f + a264eb13fea14125f3ef8d4056586cd66fa55309 - + https://github.com/dotnet/arcade - eaa4673f2a82355f7cd2f1c1243578be2e961d0f + a264eb13fea14125f3ef8d4056586cd66fa55309 https://github.com/dotnet/source-build-reference-packages 993b067a1849e4884360b4548cbf74f0bfaa2f35 - + https://github.com/dotnet/sourcelink - 9dd9f81089f875d2452db9d6c8397a8e0b19d688 + bef48cb62fb4341d5dcdc29d2d75b598cad389fd - + https://github.com/dotnet/xliff-tasks - 6f4bd1389b461c56a4188d72c05144f52d30781f + 351ae3d0bc892fe4cdbab6f5f60052216514f935 diff --git a/eng/Versions.props b/eng/Versions.props index bdb8d20a4..98d31b36a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22322.3 + 7.0.0-beta.22327.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 423bd962e..395b43eeb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -573,7 +573,7 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' } + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 17f0a3658..c110d0ed4 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -312,7 +312,7 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="netcoreapp3.1" + _InitializeBuildToolFramework="net7.0" } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 1a65b52e0..b05d836e3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22322.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22322.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22327.2" } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 90d655d52..6ccdf4f8a 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -2,6 +2,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyz Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/Microsoft.AspNetCore.OutputCaching.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml diff --git a/src/SourceBuild/tarball/patches/arcade/0001-Retarget-arcade-projects-to-net7.0.patch b/src/SourceBuild/tarball/patches/arcade/0001-Retarget-arcade-projects-to-net7.0.patch deleted file mode 100644 index 314d8871b..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0001-Retarget-arcade-projects-to-net7.0.patch +++ /dev/null @@ -1,1139 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 19 Apr 2022 14:29:27 -0700 -Subject: [PATCH] Retarget arcade projects to net7.0 - -Backport: https://github.com/dotnet/arcade/pull/9127 ---- - eng/SourceBuild.props | 35 ------------------- - eng/TargetFrameworkDefaults.props | 7 +--- - eng/common/tools.ps1 | 2 +- - eng/common/tools.sh | 2 +- - .../Microsoft.Arcade.Common.Tests.csproj | 2 +- - .../Microsoft.Arcade.Common.csproj | 1 - - .../Microsoft.Arcade.Test.Common.csproj | 2 +- - .../Microsoft.DotNet.ApiCompat.Core.csproj | 2 +- - .../src/Microsoft.DotNet.ApiCompat.csproj | 4 +-- - .../build/Microsoft.DotNet.ApiCompat.targets | 2 +- - .../Microsoft.DotNet.ApiCompat.Tests.csproj | 2 +- - .../Microsoft.DotNet.Arcade.Sdk.Tests.csproj | 2 +- - .../Microsoft.DotNet.Arcade.Sdk.csproj | 1 - - .../tools/BuildReleasePackages.targets | 2 +- - .../tools/BuildTasks.props | 2 +- - .../SdkTasks/PublishArtifactsInManifest.proj | 2 +- - .../tools/SdkTasks/PublishBuildAssets.proj | 2 +- - .../tools/SdkTasks/PublishSignedAssets.proj | 2 +- - .../SdkTasks/PublishToSymbolServers.proj | 2 +- - .../tools/SdkTasks/SigningValidation.proj | 2 +- - .../Microsoft.DotNet.AsmDiff.csproj | 2 +- - ...crosoft.DotNet.Build.Tasks.Archives.csproj | 2 +- - ...osoft.DotNet.Build.Tasks.Feed.Tests.csproj | 2 +- - .../Microsoft.DotNet.Build.Tasks.Feed.csproj | 4 +-- - .../Microsoft.DotNet.Build.Tasks.Feed.targets | 2 +- - ...osoft.DotNet.Build.Tasks.Installers.csproj | 1 - - ...rosoft.DotNet.Build.Tasks.Installers.props | 2 +- - ...rosoft.DotNet.Build.Tasks.Packaging.csproj | 3 +- - .../src/build/Packaging.common.targets | 2 +- - .../src/build/Packaging.targets | 4 +++ - ....DotNet.Build.Tasks.Packaging.Tests.csproj | 2 +- - ....DotNet.Build.Tasks.TargetFramework.csproj | 3 +- - ...t.DotNet.Build.Tasks.TargetFramework.props | 2 +- - ...DotNet.Build.Tasks.Templating.Tests.csproj | 2 +- - ....DotNet.Build.Tasks.Workloads.Tests.csproj | 2 +- - ...rosoft.DotNet.Build.Tasks.Workloads.csproj | 9 +++-- - ...osoft.DotNet.Deployment.Tasks.Links.csproj | 3 +- - ...rosoft.DotNet.Deployment.Tasks.Links.props | 2 +- - .../Microsoft.DotNet.GenAPI.csproj | 2 +- - .../build/Microsoft.DotNet.GenAPI.targets | 2 +- - .../Microsoft.DotNet.GenFacades.csproj | 1 - - .../build/Microsoft.DotNet.GenFacades.targets | 2 +- - .../Microsoft.DotNet.Git.IssueManager.csproj | 2 +- - ...rosoft.DotNet.GitSync.CommitManager.csproj | 2 +- - ...rosoft.DotNet.Helix.JobSender.Tests.csproj | 2 +- - .../Microsoft.DotNet.Helix.Sdk.Tests.csproj | 2 +- - .../Sdk/Microsoft.DotNet.Helix.Sdk.csproj | 2 +- - .../tools/Microsoft.DotNet.Helix.Sdk.props | 2 +- - .../tools/xunit-runner/XUnitRunner.targets | 2 +- - ...nternal.DependencyInjection.Testing.csproj | 2 +- - .../Microsoft.DotNet.NuGetRepack.Tasks.csproj | 3 +- - .../Microsoft.DotNet.NuGetRepack.Tests.csproj | 2 +- - ...crosoft.DotNet.PackageTesting.Tests.csproj | 2 +- - .../Microsoft.DotNet.PackageTesting.csproj | 3 +- - .../Microsoft.DotNet.PackageTesting.props | 2 +- - .../Microsoft.DotNet.RemoteExecutor.csproj | 2 +- - ...crosoft.DotNet.RemoteExecutor.Tests.csproj | 2 +- - ...icrosoft.DotNet.SharedFramework.Sdk.csproj | 3 +- - .../sdk/Sdk.props | 4 +-- - .../Microsoft.DotNet.SignTool.Tests.csproj | 2 +- - .../Microsoft.DotNet.SignTool.csproj | 3 +- - .../build/Microsoft.DotNet.SignTool.props | 2 +- - .../Microsoft.DotNet.SourceBuild.Tasks.csproj | 1 - - .../Microsoft.DotNet.SourceBuild.Tasks.props | 2 +- - ...soft.DotNet.SourceBuild.Tasks.Tests.csproj | 2 +- - ...oft.DotNet.SwaggerGenerator.CmdLine.csproj | 2 +- - ...oft.DotNet.SwaggerGenerator.MSBuild.csproj | 2 +- - ...soft.DotNet.SwaggerGenerator.MSBuild.props | 2 +- - ...oft.DotNet.VersionTools.Tasks.Tests.csproj | 2 +- - ...Microsoft.DotNet.VersionTools.Tasks.csproj | 3 +- - .../Microsoft.DotNet.VersionTools.Tasks.props | 2 +- - ...Microsoft.DotNet.VersionTools.Tests.csproj | 2 +- - ...Microsoft.DotNet.XUnitConsoleRunner.csproj | 2 +- - .../Microsoft.DotNet.XUnitConsoleRunner.props | 2 +- - ...rosoft.DotNet.XUnitExtensions.Tests.csproj | 2 +- - tests/UnitTests.proj | 2 +- - tests/XHarness.Tests.Common.props | 2 +- - 77 files changed, 82 insertions(+), 128 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index ace72e8e..2058dc05 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -5,39 +5,4 @@ - true - - -- -- -- -- -- -- -- -- -- -- -- - -diff --git a/eng/TargetFrameworkDefaults.props b/eng/TargetFrameworkDefaults.props -index ca3546e8..37172165 100644 ---- a/eng/TargetFrameworkDefaults.props -+++ b/eng/TargetFrameworkDefaults.props -@@ -1,12 +1,7 @@ - - -- - -- netcoreapp3.1 -- net6.0 -+ net7.0 - - - -diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 -index 423bd962..395b43ee 100644 ---- a/eng/common/tools.ps1 -+++ b/eng/common/tools.ps1 -@@ -573,7 +573,7 @@ function InitializeBuildTool() { - ExitWithExitCode 1 - } - $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') -- $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' } -+ $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' } - } elseif ($msbuildEngine -eq "vs") { - try { - $msbuildPath = InitializeVisualStudioMSBuild -install:$restore -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a365..c110d0ed 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -312,7 +312,7 @@ function InitializeBuildTool { - # return values - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" - _InitializeBuildToolCommand="msbuild" -- _InitializeBuildToolFramework="netcoreapp3.1" -+ _InitializeBuildToolFramework="net7.0" - } - - # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 -diff --git a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj -index 98b20958..d1450847 100644 ---- a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj -+++ b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - enable - true - -diff --git a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj -index 9d2a939d..5c38d0c9 100644 ---- a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj -+++ b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj -@@ -2,7 +2,6 @@ - - - net472;netstandard2.0 -- netstandard2.0 - true - - -diff --git a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj -index bcc3d717..53b29706 100644 ---- a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj -+++ b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - true - true - -diff --git a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj -index cf860a80..552ab4b9 100644 ---- a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj -+++ b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj -@@ -1,7 +1,7 @@ - - - -- net472;netcoreapp3.1 -+ net472;$(TargetFrameworkForNETSDK) - true - - -diff --git a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj -index 816d9f71..320db7ef 100644 ---- a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj -+++ b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj -@@ -2,8 +2,8 @@ - - - Exe -- net472;netcoreapp3.1 -- true -+ net472;$(TargetFrameworkForNETSDK) -+ true - true - false - MSBuildSdk -diff --git a/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets b/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets -index 995a91be..c04dc48a 100644 ---- a/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets -+++ b/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets -@@ -1,7 +1,7 @@ - - - -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.ApiCompat.dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.ApiCompat.dll - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.exe - - -diff --git a/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj b/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj -index 2ad82dac..8f2516f8 100644 ---- a/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj -+++ b/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - Latest - false - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj b/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj -index 2f24126a..fec8a74d 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj -+++ b/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - $(DefaultItemExcludes);testassets\**\* - - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj -index 4cd7d4b2..0c0d467a 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj -+++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj -@@ -2,7 +2,6 @@ - - - net472;$(TargetFrameworkForNETSDK) -- $(TargetFrameworkForNETSDK) - preview - true - false -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets -index f6edc662..3874a091 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets -@@ -2,7 +2,7 @@ - - - <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net472\Microsoft.DotNet.NuGetRepack.Tasks.dll -- <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\netcoreapp3.1\Microsoft.DotNet.NuGetRepack.Tasks.dll -+ <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net7.0\Microsoft.DotNet.NuGetRepack.Tasks.dll - - - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props -index 4e94d2f2..14916241 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props -@@ -3,6 +3,6 @@ - - - $(MSBuildThisFileDirectory)net472\Microsoft.DotNet.Arcade.Sdk.dll -- $(MSBuildThisFileDirectory)netcoreapp3.1\Microsoft.DotNet.Arcade.Sdk.dll -+ $(MSBuildThisFileDirectory)net7.0\Microsoft.DotNet.Arcade.Sdk.dll - - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj -index 01180a60..ee6e08c4 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj -@@ -74,7 +74,7 @@ - --> - - -- netcoreapp3.1 -+ net7.0 - Publish - - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj -index 674a6086..23b7c797 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj -@@ -30,7 +30,7 @@ - - <_MicrosoftDotNetMaestroTasksBaseDir>$(NuGetPackageRoot)microsoft.dotnet.maestro.tasks\$(MicrosoftDotNetMaestroTasksVersion)\tools\ - <_MicrosoftDotNetMaestroTasksDir>$(_MicrosoftDotNetMaestroTasksBaseDir)net472 -- <_MicrosoftDotNetMaestroTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_MicrosoftDotNetMaestroTasksBaseDir)netcoreapp3.1 -+ <_MicrosoftDotNetMaestroTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_MicrosoftDotNetMaestroTasksBaseDir)net7.0 - - - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj -index 3f880d46..d9a8e411 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj -@@ -3,7 +3,7 @@ - - - Publish -- netcoreapp3.1 -+ net7.0 - - - - - -- netcoreapp3.1 -+ net7.0 - Publish - - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj -index ddcf2292..f4b8e8b4 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj -@@ -18,7 +18,7 @@ - - - -- netcoreapp3.1 -+ net7.0 - Build - $(NuGetPackageRoot)Microsoft.DotNet.SignCheck\$(MicrosoftDotNetSignCheckVersion)\tools\Microsoft.DotNet.SignCheck.exe - -diff --git a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj -index 84cc31bf..2653ea7e 100644 ---- a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj -+++ b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj -@@ -4,7 +4,7 @@ - - - Exe -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - true - true - dotnet-asmdiff -diff --git a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj -index c09d7762..8dce0a84 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj -@@ -1,7 +1,7 @@ -  - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - false - - true -diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj -index d782557c..c87e22e8 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj -index 0c344554..29c0b3b0 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj -@@ -2,14 +2,14 @@ - - - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - true - - This package provides support for publishing assets to a NuGet protocol based feed. - true - MSBuildSdk - true -- <_ExcludeNuGetAssembliesTargetFramework>netcoreapp3.1 -+ <_ExcludeNuGetAssembliesTargetFramework>$(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets b/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets -index 70f60526..9b2a41ee 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets -+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets -@@ -43,7 +43,7 @@ - - - <_MicrosoftDotNetBuildTasksFeedTaskDir>$(MSBuildThisFileDirectory)../tools/net472/ -- <_MicrosoftDotNetBuildTasksFeedTaskDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)../tools/netcoreapp3.1/ -+ <_MicrosoftDotNetBuildTasksFeedTaskDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)../tools/net7.0/ - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj b/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj -index 45eb895e..65df12fe 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj -@@ -2,7 +2,6 @@ - - - net472;$(TargetFrameworkForNETSDK) -- $(TargetFrameworkForNETSDK) - true - Latest - true -diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props -index ee0dd7fe..8bbe982a 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props -+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props -@@ -1,6 +1,6 @@ - - -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.Installers.dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.Build.Tasks.Installers.dll - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll - $(MSBuildThisFileDirectory) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj -index 57f5cfb9..fcb773c8 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj -@@ -2,8 +2,7 @@ - - - net472;$(TargetFrameworkForNETSDK) -- $(TargetFrameworkForNETSDK) -- true -+ true - MSBuildSdk - false - true -diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets -index c9a95a0a..7f864d4e 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets -+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets -@@ -5,7 +5,7 @@ - - - -- $(MSBuildThisFileDirectory)../tools/netcoreapp3.1/ -+ $(MSBuildThisFileDirectory)../tools/net7.0/ - $(MSBuildThisFileDirectory)../tools/net472/ - $(MSBuildThisFileDirectory)runtime.json - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets -index 8d8af6a6..d79e49bf 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets -+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets -@@ -941,6 +941,10 @@ - - @(NETCoreApp60RIDs) - -+ -+ -+ @(NETCoreApp70RIDs) -+ - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj -index 59733ff3..185c1e52 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - Latest - false - xUnit2013 -diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj -index 6c1a34e1..5f4eb837 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj -@@ -2,8 +2,7 @@ - - - net472;$(TargetFrameworkForNETSDK) -- $(TargetFrameworkForNETSDK) -- true -+ true - false - true - Configuration system for cross-targeting projects. -diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props -index 9c24e29b..5e8b8680 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props -+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props -@@ -1,7 +1,7 @@ - - - -- ..\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.TargetFramework.dll -+ ..\tools\net7.0\Microsoft.DotNet.Build.Tasks.TargetFramework.dll - ..\tools\net472\Microsoft.DotNet.Build.Tasks.TargetFramework.dll - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj -index 6d74739e..b2efa392 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net472;netcoreapp3.1 -+ net472;$(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj -index 7126eb86..5fe0d0a0 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj -@@ -1,7 +1,7 @@ -  - - -- net472;netcoreapp3.1 -+ net472;$(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -index 205b66bf..4a25c6a4 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -@@ -1,8 +1,13 @@ -  - - -- net472;netcoreapp3.1 -- net6.0 -+ net472;$(TargetFrameworkForNETSDK) -+ -+ $(TargetFrameworkForNETSDK) - true - true - Workload pack installer generation task package -diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj -index 84b29562..e1a84b2f 100644 ---- a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj -+++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj -@@ -2,8 +2,7 @@ - - - -- netcoreapp3.1;net472 -- net6.0 -+ $(TargetFrameworkForNETSDK);net472 - - true - Aka.ms link manager -diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props b/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props -index df3b1fab..90c26a97 100644 ---- a/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props -+++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props -@@ -1,6 +1,6 @@ - - -- $(MSBuildThisFileDirectory)netcoreapp3.1\Microsoft.DotNet.Deployment.Tasks.Links.dll -+ $(MSBuildThisFileDirectory)net7.0\Microsoft.DotNet.Deployment.Tasks.Links.dll - $(MSBuildThisFileDirectory)net472\Microsoft.DotNet.Deployment.Tasks.Links.dll - - -diff --git a/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj b/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj -index f1c5c0e5..480d88cf 100644 ---- a/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj -+++ b/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - true - MSBuildSdk - true -diff --git a/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets b/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets -index 65ef0192..48d329cc 100644 ---- a/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets -+++ b/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets -@@ -2,7 +2,7 @@ - - - -- $(MSBuildThisFileDirectory)\..\tools\netcoreapp3.1\Microsoft.DotNet.GenAPI.dll -+ $(MSBuildThisFileDirectory)\..\tools\net7.0\Microsoft.DotNet.GenAPI.dll - $(MSBuildThisFileDirectory)\..\tools\net472\Microsoft.DotNet.GenAPI.exe - - -diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj -index bca9958d..db51ae17 100644 ---- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj -+++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj -@@ -2,7 +2,6 @@ - - - $(TargetFrameworkForNETSDK);net472 -- $(TargetFrameworkForNETSDK) - MSBuildSdk - false - true -diff --git a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets -index 9a6f0fee..482f1c6f 100644 ---- a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets -+++ b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets -@@ -2,7 +2,7 @@ - - - -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.GenFacades.dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.GenFacades.dll - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.GenFacades.dll - - -diff --git a/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj b/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj -index e7f51186..10bdd3b3 100644 ---- a/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj -+++ b/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj -@@ -1,7 +1,7 @@ - - - -- net472;netcoreapp3.1 -+ net472;$(TargetFrameworkForNETSDK) - false - true - true -diff --git a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj -index f7ffd938..b23966b4 100644 ---- a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj -+++ b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj -@@ -2,7 +2,7 @@ - - - Exe -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - latest - true - -diff --git a/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj b/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj -index a1d83530..a47be434 100644 ---- a/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj -+++ b/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj -index 269bfc77..a84f46cb 100644 ---- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj -+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj -index 8f8e8303..4382966a 100644 ---- a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj -+++ b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj -@@ -1,7 +1,7 @@ - - - -- net472;netcoreapp3.1 -+ net472;$(TargetFrameworkForNETSDK) - MSBuildSdk - latest - **/*.Desktop.* -diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props -index 902a74f8..441fcc7d 100644 ---- a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props -+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props -@@ -4,7 +4,7 @@ - - - -- $(MSBuildThisFileDirectory)netcoreapp3.1/Microsoft.DotNet.Helix.Sdk.dll -+ $(MSBuildThisFileDirectory)net7.0/Microsoft.DotNet.Helix.Sdk.dll - $(MSBuildThisFileDirectory)net472/Microsoft.DotNet.Helix.Sdk.dll - - -diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets -index c188051b..b0525e08 100644 ---- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets -+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets -@@ -1,6 +1,6 @@ - - -- netcoreapp3.1 -+ net7.0 - netcoreapp2.0 - - 2.4.2-pre.9 -diff --git a/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj b/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj -index b7b9c46b..341f28fb 100644 ---- a/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj -+++ b/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj -index d00c49a4..06bdd87a 100644 ---- a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj -+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj -@@ -1,8 +1,7 @@ - - - -- net472;netcoreapp3.1 -- net6.0 -+ net472;$(TargetFrameworkForNETSDK) - - true - MSBuildSdk -diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj -index ad1d93e7..a79696bd 100644 ---- a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj -+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj -index 6fde42f0..2030f2df 100644 ---- a/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj -+++ b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - false - - -diff --git a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj -index 824dc8b6..39e78efa 100644 ---- a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj -+++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj -@@ -1,8 +1,7 @@ - - - -- netcoreapp3.1;net472 -- net6.0 -+ $(TargetFrameworkForNETSDK);net472 - MSBuildSdk - false - true -diff --git a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props -index 95155e2c..b031565c 100644 ---- a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props -+++ b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props -@@ -1,7 +1,7 @@ - - - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageTesting.dll -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.PackageTesting.dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.PackageTesting.dll - - - -diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj -index 8da0c48f..9f2d2c9c 100644 ---- a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj -+++ b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj -@@ -4,7 +4,7 @@ - - Exe - -- netcoreapp3.1;net461 -+ $(TargetFrameworkForNETSDK);net461 - This package provides support for running tests out-of-process. - true - true -diff --git a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj -index 207a4635..443f35db 100644 ---- a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj -+++ b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj -@@ -1,6 +1,6 @@ - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - Latest - false - True -diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj -index 9627a033..185c968f 100644 ---- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj -+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj -@@ -1,8 +1,7 @@ - - - -- net472;netcoreapp3.1 -- net6.0 -+ net472;$(TargetFrameworkForNETSDK) - preview - false - -diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -index deee11c0..0b1ef5fe 100644 ---- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -@@ -8,9 +8,7 @@ - --> - - -- -- $(MSBuildThisFileDirectory)../tools/net6.0/ -- $(MSBuildThisFileDirectory)../tools/netcoreapp3.1/ -+ $(MSBuildThisFileDirectory)../tools/net7.0/ - $(MSBuildThisFileDirectory)../tools/net472/ - - -diff --git a/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj b/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj -index 5892d29c..fa510120 100644 ---- a/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj -+++ b/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net472;netcoreapp3.1 -+ net472;$(TargetFrameworkForNETSDK) - Latest - - -diff --git a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj -index 7a89dfe9..4ca226fa 100644 ---- a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj -+++ b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj -@@ -1,8 +1,7 @@ - - - -- net472;netcoreapp3.1 -- net6.0 -+ net472;$(TargetFrameworkForNETSDK) - true - Latest - true -diff --git a/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props b/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props -index e2fa1875..c24ab6a4 100644 ---- a/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props -+++ b/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props -@@ -1,6 +1,6 @@ - - -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.SignTool.dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.SignTool.dll - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.SignTool.dll - - -diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj b/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj -index 19338cd0..3b902162 100644 ---- a/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj -+++ b/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj -@@ -2,7 +2,6 @@ - - - net472;$(TargetFrameworkForNETSDK) -- $(TargetFrameworkForNETSDK) - MSBuildSdk - - -diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props b/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props -index 388b641b..ac8d88cb 100644 ---- a/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props -+++ b/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props -@@ -1,7 +1,7 @@ - - - -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\$(MSBuildThisFileName).dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\$(MSBuildThisFileName).dll - $(MSBuildThisFileDirectory)..\tools\net472\$(MSBuildThisFileName).dll - - -diff --git a/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj b/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj -index 585f9b6c..73b4bc7a 100644 ---- a/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj -+++ b/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - Latest - false - -diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj -index 040681f0..6e2dfb91 100644 ---- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj -+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj -@@ -2,7 +2,7 @@ - - - Exe -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - latest - true - true -diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -index d9c92072..0fd303ac 100644 ---- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - - true - This package provides support for generating client library code from a swagger document. -diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props -index 07c403ff..6242369f 100644 ---- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props -+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props -@@ -1,6 +1,6 @@ - - -- $(MSBuildThisFileDirectory)../tools/netcoreapp3.1/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll -+ $(MSBuildThisFileDirectory)../tools/net7.0/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll - $(MSBuildThisFileDirectory)../tools/net472/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll - - -diff --git a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj -index 8486e254..df3652e6 100644 ---- a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj -+++ b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj -index 2dfa124f..0834f939 100644 ---- a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj -+++ b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj -@@ -1,8 +1,7 @@ -  - - -- net472;netcoreapp3.1 -- net6.0 -+ net472;$(TargetFrameworkForNETSDK) - MSBuildSdk - - -diff --git a/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props b/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props -index 02b8ca19..80b27d2a 100644 ---- a/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props -+++ b/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props -@@ -2,7 +2,7 @@ - - - -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\$(MSBuildThisFileName).dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\$(MSBuildThisFileName).dll - $(MSBuildThisFileDirectory)..\tools\net472\$(MSBuildThisFileName).dll - - -diff --git a/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj b/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj -index 98a49f74..9163fe16 100644 ---- a/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj -+++ b/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj -index 78a8ff69..b06bf3de 100644 ---- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj -+++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj -@@ -6,7 +6,7 @@ - true - Exe - Xunit.ConsoleClient -- netcoreapp3.1 -+ $(TargetFrameworkForNETSDK) - true - 2.5.1 - true -diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props b/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props -index 323fc650..ff3eb99a 100644 ---- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props -+++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props -@@ -1,7 +1,7 @@ - - - -- $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\xunit.console.dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\xunit.console.dll - - - -diff --git a/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj b/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj -index 6e75bc52..65e4fcc9 100644 ---- a/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj -+++ b/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- netcoreapp3.1;net472 -+ $(TargetFrameworkForNETSDK);net472 - false - - -diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj -index b200bcfd..4309c560 100644 ---- a/tests/UnitTests.proj -+++ b/tests/UnitTests.proj -@@ -3,7 +3,7 @@ - - - -- $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll -+ $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net7.0/publish/Microsoft.DotNet.Helix.Sdk.dll - $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll - - -diff --git a/tests/XHarness.Tests.Common.props b/tests/XHarness.Tests.Common.props -index 616bc559..77fcf978 100644 ---- a/tests/XHarness.Tests.Common.props -+++ b/tests/XHarness.Tests.Common.props -@@ -7,7 +7,7 @@ - --> - - -- $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll -+ $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net7.0/publish/Microsoft.DotNet.Helix.Sdk.dll - $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll - - diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Update-System.Memory-to-4.5.5.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Update-System.Memory-to-4.5.5.patch new file mode 100644 index 000000000..592117745 --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0001-Update-System.Memory-to-4.5.5.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Fri, 24 Jun 2022 14:57:53 -0700 +Subject: [PATCH] Update System.Memory to 4.5.5 + +Prevents package downgrade error. + +Backport: https://github.com/dotnet/fsharp/pull/13394 +--- + eng/Versions.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 6571c5fb2..aa3b4e11f 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -93,7 +93,7 @@ + 4.3.0 + 4.3.0 + 4.3.0 +- 4.5.4 ++ 4.5.5 + 4.3.0 + 4.3.1 + 4.3.0 diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch b/src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch new file mode 100644 index 000000000..acf938090 --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 27 Jun 2022 11:42:04 -0700 +Subject: [PATCH] Don't directly reference SCI and SCM 5.0.0 + +Backport: https://github.com/dotnet/sdk/pull/26289 +--- + .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +index 69e4b02162..f6991efb5f 100644 +--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj ++++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +@@ -61,7 +61,7 @@ + + + +- ++ +