diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b36b53473..92ca0b1c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - ff6716c6fcaad5bf160d269b01d683e23ac1a761 + 5b16adb424d1209ea4d901bdf00c032caa3856fd - + https://github.com/dotnet/windowsdesktop - ff6716c6fcaad5bf160d269b01d683e23ac1a761 + 5b16adb424d1209ea4d901bdf00c032caa3856fd - + https://github.com/dotnet/windowsdesktop - ff6716c6fcaad5bf160d269b01d683e23ac1a761 + 5b16adb424d1209ea4d901bdf00c032caa3856fd - + https://github.com/dotnet/windowsdesktop - ff6716c6fcaad5bf160d269b01d683e23ac1a761 + 5b16adb424d1209ea4d901bdf00c032caa3856fd https://github.com/dotnet/llvm-project 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/runtime - 2f3fcca06499725469b6ae021be960e08d808c75 + b0920912512aa7e205363b046a1911e6a97df31f - + https://github.com/dotnet/runtime - 2f3fcca06499725469b6ae021be960e08d808c75 + b0920912512aa7e205363b046a1911e6a97df31f - + https://github.com/dotnet/runtime - 2f3fcca06499725469b6ae021be960e08d808c75 + b0920912512aa7e205363b046a1911e6a97df31f - + https://github.com/dotnet/runtime - 2f3fcca06499725469b6ae021be960e08d808c75 + b0920912512aa7e205363b046a1911e6a97df31f - + https://github.com/dotnet/runtime - 2f3fcca06499725469b6ae021be960e08d808c75 + b0920912512aa7e205363b046a1911e6a97df31f - + https://github.com/dotnet/runtime - 2f3fcca06499725469b6ae021be960e08d808c75 + b0920912512aa7e205363b046a1911e6a97df31f @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2f3fcca06499725469b6ae021be960e08d808c75 + b0920912512aa7e205363b046a1911e6a97df31f - + https://github.com/dotnet/aspnetcore - 35d2746b41e4f365180b87156b706a9e041d937f + 41bed3fc073a11f91db34ca16ea42570ff2c5a78 - + https://github.com/dotnet/aspnetcore - 35d2746b41e4f365180b87156b706a9e041d937f + 41bed3fc073a11f91db34ca16ea42570ff2c5a78 - + https://github.com/dotnet/aspnetcore - 35d2746b41e4f365180b87156b706a9e041d937f + 41bed3fc073a11f91db34ca16ea42570ff2c5a78 - + https://github.com/dotnet/aspnetcore - 35d2746b41e4f365180b87156b706a9e041d937f + 41bed3fc073a11f91db34ca16ea42570ff2c5a78 - + https://github.com/dotnet/aspnetcore - 35d2746b41e4f365180b87156b706a9e041d937f + 41bed3fc073a11f91db34ca16ea42570ff2c5a78 - + https://github.com/dotnet/aspnetcore - 35d2746b41e4f365180b87156b706a9e041d937f + 41bed3fc073a11f91db34ca16ea42570ff2c5a78 - + https://github.com/dotnet/aspnetcore - 35d2746b41e4f365180b87156b706a9e041d937f + 41bed3fc073a11f91db34ca16ea42570ff2c5a78 https://github.com/dotnet/test-templates @@ -103,49 +103,49 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 07970b8ce016ce6d6ba4dd1104b97bc4424d7fe4 + ac415a053522786ccb54154fc47289dba1b64329 - + https://github.com/dotnet/sdk - 07970b8ce016ce6d6ba4dd1104b97bc4424d7fe4 + ac415a053522786ccb54154fc47289dba1b64329 - + https://github.com/dotnet/sdk - 07970b8ce016ce6d6ba4dd1104b97bc4424d7fe4 + ac415a053522786ccb54154fc47289dba1b64329 - + https://github.com/dotnet/sdk - 07970b8ce016ce6d6ba4dd1104b97bc4424d7fe4 + ac415a053522786ccb54154fc47289dba1b64329 - + https://github.com/dotnet/winforms - 1b17d5b15bebc394af0a697c3ee0dffe285ae3b5 + 778f2768702a9cf093699b3b9711014cdb17c973 - + https://github.com/dotnet/wpf - 29264ce9f09846bb0d7a403b6a005c7bd7187597 + 03a85c0a3a35d22fdff9cb31bc40a41eb91e5af6 - + https://github.com/dotnet/fsharp - 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 + d8e171de6783cedf9503e46f9cad53068ebb9815 - + https://github.com/dotnet/fsharp - 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 + d8e171de6783cedf9503e46f9cad53068ebb9815 - + https://github.com/microsoft/vstest - 5b435bbae49213062ebd2c0be0394af23474d91c + 8ba41305f294f756bfff69e2bc2f1ff6a1ec787b - + https://github.com/dotnet/linker - fda9d062dea827a19f1eae5cb2a0adbc63cba483 + a1207be89c9f9a1a3eec7f8c27cf2ce29fbab226 linker @@ -154,14 +154,14 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 48ab5664b8734afdf4aedba5f72a0663435eef16 + c7d758591e31a066212058d589759c580336deff - + https://github.com/nuget/nuget.client - abaa72f3390fba4bb65fb3c700f22104682bfae9 + cf1e6b6fd314fc510d1b64feed6b10515c202bec diff --git a/eng/Versions.props b/eng/Versions.props index 511fa7925..1a082601d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.22468.2 + 8.0.0-alpha.1.22474.1 - 8.0.0-alpha.1.22468.2 + 8.0.0-alpha.1.22474.2 @@ -53,46 +53,46 @@ - 8.0.0-alpha.1.22470.6 - 8.0.0-alpha.1.22470.6 - 8.0.0-alpha.1.22470.6 - 8.0.0-alpha.1.22470.6 - 8.0.0-alpha.1.22470.6 - 8.0.0-alpha.1.22470.6 - 8.0.0-alpha.1.22470.6 + 8.0.0-alpha.1.22476.10 + 8.0.0-alpha.1.22476.10 + 8.0.0-alpha.1.22476.10 + 8.0.0-alpha.1.22476.10 + 8.0.0-alpha.1.22476.10 + 8.0.0-alpha.1.22476.10 + 8.0.0-alpha.1.22476.10 0.2.0 - 8.0.100-alpha.1.22470.21 - 8.0.100-alpha.1.22470.21 - 8.0.100-alpha.1.22470.21 + 8.0.100-alpha.1.22476.37 + 8.0.100-alpha.1.22476.37 + 8.0.100-alpha.1.22476.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22468.3 + 8.0.0-alpha.1.22475.4 - 8.0.0-alpha.1.22468.3 - 8.0.0-alpha.1.22468.3 - 8.0.0-alpha.1.22468.3 - 8.0.0-alpha.1.22468.3 - 8.0.0-alpha.1.22468.3 - 8.0.0-alpha.1.22468.3 + 8.0.0-alpha.1.22475.4 + 8.0.0-alpha.1.22475.4 + 8.0.0-alpha.1.22475.4 + 8.0.0-alpha.1.22475.4 + 8.0.0-alpha.1.22475.4 + 8.0.0-alpha.1.22475.4 2.1.0 - 8.0.0-alpha.1.22468.1 - 8.0.0-alpha.1.22468.1 - 8.0.0-alpha.1.22468.1 - 8.0.0-alpha.1.22468.1 + 8.0.0-alpha.1.22474.3 + 8.0.0-alpha.1.22474.3 + 8.0.0-alpha.1.22474.3 + 8.0.0-alpha.1.22474.3 @@ -185,7 +185,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20220919-05 + 17.5.0-preview-20220923-02 7.0.0-rc.1.22426.10. diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch deleted file mode 100644 index 660d2c914..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch +++ /dev/null @@ -1,313 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ben Villalobos <4691428+BenVillalobos@users.noreply.github.com> -Date: Tue, 5 Jul 2022 16:33:56 -0500 -Subject: [PATCH] Change TargetFramework to net7.0 - -Add nowarn for SYSLIB warnings -Resolve CS8981: lowercase preserved types - -Backport PR: https://github.com/dotnet/msbuild/pull/7790 ---- - Directory.Build.props | 2 +- - eng/BootStrapMSBuild.targets | 2 +- - eng/cibuild_bootstrapped_msbuild.ps1 | 2 +- - eng/cibuild_bootstrapped_msbuild.sh | 2 +- - global.json | 2 +- - scripts/Deploy-MSBuild.ps1 | 2 +- - .../RemoteProjectsProviderMock/CollectionsHelpers.cs | 8 ++++---- - .../Microsoft.Build.Engine.UnitTests.csproj | 4 ++-- - src/Build/Definition/ToolsetReader.cs | 4 ++-- - src/Build/Microsoft.Build.csproj | 2 +- - src/Directory.BeforeCommon.targets | 2 +- - src/Directory.Build.props | 6 +++--- - src/Framework/README.md | 2 +- - src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj | 2 +- - src/Package/Localization/Localization.csproj | 2 +- - src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj | 4 ++-- - src/Tasks/Microsoft.Build.Tasks.csproj | 2 +- - src/Utilities/README.md | 2 +- - 18 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 0df28a5b8..3a959f894 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -38,7 +38,7 @@ - SYSLIB0011: Removing binary formatter will happen as part of a larger .NET-wide effort. - --> - -- $(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011 -+ $(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011;SYSLIB0037;SYSLIB0044 - - - -diff --git a/eng/BootStrapMSBuild.targets b/eng/BootStrapMSBuild.targets -index 288c062da..4ba21444d 100644 ---- a/eng/BootStrapMSBuild.targets -+++ b/eng/BootStrapMSBuild.targets -@@ -210,7 +210,7 @@ - Copy it from "next to MSBuild" in the pre-bootstrap SDK to our little weirdo bootstrap - layout next to the SDK tasks, so it can get loaded by the SDK tasks that need it. --> - -+ DestinationFolder="$(BootstrapDestination)Sdks\Microsoft.NET.Sdk\tools\net7.0" /> - - -diff --git a/eng/cibuild_bootstrapped_msbuild.ps1 b/eng/cibuild_bootstrapped_msbuild.ps1 -index b9c1cf4fe..906a33dc1 100644 ---- a/eng/cibuild_bootstrapped_msbuild.ps1 -+++ b/eng/cibuild_bootstrapped_msbuild.ps1 -@@ -91,7 +91,7 @@ try { - else - { - $buildToolPath = $dotnetExePath -- $buildToolCommand = Join-Path $bootstrapRoot "net6.0\MSBuild\MSBuild.dll" -+ $buildToolCommand = Join-Path $bootstrapRoot "net7.0\MSBuild\MSBuild.dll" - $buildToolFramework = "netcoreapp3.1" - } - -diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh -index e5425507f..b4404b7e4 100755 ---- a/eng/cibuild_bootstrapped_msbuild.sh -+++ b/eng/cibuild_bootstrapped_msbuild.sh -@@ -63,7 +63,7 @@ bootstrapRoot="$Stage1Dir/bin/bootstrap" - if [ $host_type = "core" ] - then - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" -- _InitializeBuildToolCommand="$bootstrapRoot/net6.0/MSBuild/MSBuild.dll" -+ _InitializeBuildToolCommand="$bootstrapRoot/net7.0/MSBuild/MSBuild.dll" - _InitializeBuildToolFramework="netcoreapp3.1" - elif [ $host_type = "mono" ] - then -diff --git a/global.json b/global.json -index 471f88dbc..efd25efd1 100644 ---- a/global.json -+++ b/global.json -@@ -3,7 +3,7 @@ - "allowPrerelease": true - }, - "tools": { -- "dotnet": "6.0.401", -+ "dotnet": "7.0.100-preview.5.22307.18", - "vs": { - "version": "17.2.1" - }, -diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1 -index ef1959fc3..8cfecb6a0 100644 ---- a/scripts/Deploy-MSBuild.ps1 -+++ b/scripts/Deploy-MSBuild.ps1 -@@ -69,7 +69,7 @@ else { - if ($runtime -eq "Desktop") { - $targetFramework = "net472" - } else { -- $targetFramework = "net6.0" -+ $targetFramework = "net7.0" - } - - $bootstrapBinDirectory = "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework" -diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs -index b6d935f41..83035cd50 100644 ---- a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs -+++ b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs -@@ -85,13 +85,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting - } - - -- public static IDictionary ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) -+ public static IDictionary ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) - where T : class - where RMock : MockLinkRemoter, new() - { - if (source == null) return null; - // Just copy ... -- Dictionary result = new Dictionary(); -+ Dictionary result = new Dictionary(); - foreach (var sRemoter in source) - { - var value = importer.Import(sRemoter.Value); -@@ -101,13 +101,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting - return result; - } - -- public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) -+ public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) - where T : class - where RMock : MockLinkRemoter, new() - { - if (source == null) return null; - // Just copy ... -- Dictionary result = new Dictionary(); -+ Dictionary result = new Dictionary(); - foreach (var s in source) - { - var valueRemoter = exporter.Export(s.Value); -diff --git a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj -index 8ddca6108..83a4382d8 100644 ---- a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj -+++ b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj -@@ -36,14 +36,14 @@ - - TargetFramework=$(FullFrameworkTFM) - TargetFramework=$(FullFrameworkTFM) -- TargetFramework=net6.0 -+ TargetFramework=net7.0 - - - - - TargetFramework=$(FullFrameworkTFM) - TargetFramework=$(FullFrameworkTFM) -- TargetFramework=net6.0 -+ TargetFramework=net7.0 - - - -diff --git a/src/Build/Definition/ToolsetReader.cs b/src/Build/Definition/ToolsetReader.cs -index 8887b9cca..ddb164cb7 100644 ---- a/src/Build/Definition/ToolsetReader.cs -+++ b/src/Build/Definition/ToolsetReader.cs -@@ -12,7 +12,7 @@ using Microsoft.Build.Execution; - using Microsoft.Build.Framework; - using Microsoft.Build.Internal; - using Microsoft.Build.Shared.FileSystem; --using error = Microsoft.Build.Shared.ErrorUtilities; -+using ErrorUtils = Microsoft.Build.Shared.ErrorUtilities; - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; - using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; - using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -@@ -366,7 +366,7 @@ namespace Microsoft.Build.Evaluation - out string defaultOverrideToolsVersion - ) - { -- error.VerifyThrowArgumentNull(toolsets, "Toolsets"); -+ ErrorUtils.VerifyThrowArgumentNull(toolsets, "Toolsets"); - - ReadEachToolset(toolsets, globalProperties, initialProperties, accumulateProperties); - -diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj -index 309d14bdc..c4eb0bce6 100644 ---- a/src/Build/Microsoft.Build.csproj -+++ b/src/Build/Microsoft.Build.csproj -@@ -4,7 +4,7 @@ - - - -- $(FullFrameworkTFM);net6.0 -+ $(FullFrameworkTFM);net7.0 - $(RuntimeOutputTargetFrameworks) - Microsoft.Build - Microsoft.Build -diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets -index 6696e3861..40bc57ecb 100644 ---- a/src/Directory.BeforeCommon.targets -+++ b/src/Directory.BeforeCommon.targets -@@ -92,7 +92,7 @@ - $(DefineConstants);FEATURE_SYMLINK_TARGET - - -- -+ - $(DefineConstants);FEATURE_PIPEOPTIONS_CURRENTUSERONLY - $(DefineConstants);FEATURE_NODE_REUSE - -diff --git a/src/Directory.Build.props b/src/Directory.Build.props -index ccffd9b5c..6e12f1557 100644 ---- a/src/Directory.Build.props -+++ b/src/Directory.Build.props -@@ -30,13 +30,13 @@ - AnyCPU;x64;arm64 - - -- $(FullFrameworkTFM);net6.0;netstandard2.0 -- net6.0;netstandard2.0 -+ $(FullFrameworkTFM);net7.0;netstandard2.0 -+ net7.0;netstandard2.0 - $(FullFrameworkTFM);netstandard2.0 - AnyCPU - - -- net6.0 -+ net7.0 - $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) - $(FullFrameworkTFM) - -diff --git a/src/Framework/README.md b/src/Framework/README.md -index 1b72454f5..8a86bc21c 100644 ---- a/src/Framework/README.md -+++ b/src/Framework/README.md -@@ -6,6 +6,6 @@ The items in this namespace are primarily base-level classes and interfaces shar - [`ITask`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.itask), and [`ILogger`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.ilogger). - - ### netstandard2.0 target --The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios. -+The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios. - - For context, see https://github.com/dotnet/msbuild/pull/6148 -\ No newline at end of file -diff --git a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj -index 9bb2da049..4766c0418 100644 ---- a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj -+++ b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj -@@ -43,7 +43,7 @@ - - - -- -+ - - - -diff --git a/src/Package/Localization/Localization.csproj b/src/Package/Localization/Localization.csproj -index e15af6ed0..e6c8a82ee 100644 ---- a/src/Package/Localization/Localization.csproj -+++ b/src/Package/Localization/Localization.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ net7.0 - net472 - Microsoft.Build.Localization.nuspec - false -diff --git a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj -index 6972b5e9a..0e37d41d9 100644 ---- a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj -+++ b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj -@@ -4,8 +4,8 @@ - false - false - -- net6.0 -- $(FullFrameworkTFM);net6.0 -+ net7.0 -+ $(FullFrameworkTFM);net7.0 - $(RuntimeOutputTargetFrameworks) - - -diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj -index 5bd98bfbe..547075939 100644 ---- a/src/Tasks/Microsoft.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.Build.Tasks.csproj -@@ -1013,7 +1013,7 @@ - - - -- -+ - - - -diff --git a/src/Utilities/README.md b/src/Utilities/README.md -index a85d56e11..99a1651b5 100644 ---- a/src/Utilities/README.md -+++ b/src/Utilities/README.md -@@ -7,6 +7,6 @@ This package contains `Microsoft.Build.Utilities.Core.dll`, which defines helper - * [`Logger`](https://docs.microsoft.com/dotnet/api/microsoft.build.utilities.logger), a base class for custom logging functionality. - - ### netstandard2.0 target --The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios. -+The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios. - - For context, see https://github.com/dotnet/msbuild/pull/6148 -\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch index 9b223b21b..03487aec8 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch @@ -13,9 +13,9 @@ index 1353696a29..4e7463a453 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,9 +14,11 @@ - net7.0 - $(SdkTargetFramework) - + + $(SdkTargetFramework) + - - $(NoWarn);NU1701 diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch deleted file mode 100644 index 16c50a9a1..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Fri, 22 Jul 2022 15:10:08 -0700 -Subject: [PATCH] Change TargetFramework to net7.0 - ---- - .../Microsoft.DotNet.ApiCompat.Task.csproj | 2 +- - .../build/Microsoft.DotNet.ApiCompat.Task.targets | 2 +- - .../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 +- - .../Microsoft.DotNet.ApiCompatibility.csproj | 2 +- - .../Microsoft.DotNet.PackageValidation.csproj | 2 +- - .../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +- - .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - 8 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj -index e56cd66fa1..0330085999 100644 ---- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj -+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0;net472 -+ net7.0;net472 - true - true - Open -diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets -index fb49a12fb4..2ce737c75d 100644 ---- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets -+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets -@@ -2,7 +2,7 @@ - - - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.Task.dll -- $(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.DotNet.ApiCompat.Task.dll -+ $(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.ApiCompat.Task.dll - true - - true -diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -index 4d148d1360..8e2f52a7ac 100644 ---- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ net7.0 - Exe - enable - true -diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -index 4ee0173f24..c72ac850d1 100644 ---- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0;net472 -+ net7.0;net472 - Open - enable - -diff --git a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -index aa6de655f5..fca12f7f67 100644 ---- a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -+++ b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0;net472 -+ net7.0;net472 - Open - enable - -diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj -index 40927ae1f2..3c2236e38d 100644 ---- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj -+++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0 -+ net7.0 - MicrosoftAspNetCore - - false -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 03ea923734..3246138cf9 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -22,7 +22,7 @@ - - - -- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll -+ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll - - -