diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41b14fcc2..69f60b878 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + 931abe3925027a098bddb6174e05e1d9ea6322a4 https://github.com/dotnet/test-templates @@ -103,49 +103,49 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + efe49defc553aeb1df2d487d2f2cffea7218d5af - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + efe49defc553aeb1df2d487d2f2cffea7218d5af - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + efe49defc553aeb1df2d487d2f2cffea7218d5af - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + efe49defc553aeb1df2d487d2f2cffea7218d5af - + https://github.com/dotnet/winforms - a332a1fec8ddac6172ac149ff46c085cf2beeb43 + 993983be2ce14ca67f7ff09b8b04e9b8391b3339 - + https://github.com/dotnet/wpf - c9a6d9f821616f6f119088d50da6d0d0ce4891d5 + a956caa0747c27f0b0776d845fafe0b05b2c7337 - + https://github.com/dotnet/fsharp - 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 + 7669e0a6dbeb872512c073c49c7661a71cfb6e07 - + https://github.com/dotnet/fsharp - 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 + 7669e0a6dbeb872512c073c49c7661a71cfb6e07 - + https://github.com/microsoft/vstest - 3c560f92eb7832d353f9cbeaa120b234e02ef027 + 576a7cc1b259976393cf576a6a9c5df967bb2b7d - + https://github.com/dotnet/linker - 5f9bfd94d9c687207872ae03f751ea19704381c0 + 219e84c88def8276179f66282b2f7cb5f1d0d126 linker @@ -154,27 +154,27 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 48ab5664b8734afdf4aedba5f72a0663435eef16 + fcc47893800b67cb43c1bd53771426e701505abf - + https://github.com/nuget/nuget.client - abaa72f3390fba4bb65fb3c700f22104682bfae9 + cf1e6b6fd314fc510d1b64feed6b10515c202bec https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 77c2667993976295017e2759f075550bcf606fc1 - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 77c2667993976295017e2759f075550bcf606fc1 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 0b9237f44..3faec6e24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rc.2.22431.7 + 7.0.0-rtm.22476.8 - 7.0.0-rc.2.22431.6 + 7.0.0-rtm.22476.6 @@ -50,46 +50,46 @@ - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 0.2.0 - 7.0.100-rtm.22469.9 - 7.0.100-rtm.22469.9 - 7.0.100-rtm.22469.9 + 7.0.100-rtm.22477.12 + 7.0.100-rtm.22477.12 + 7.0.100-rtm.22477.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22466.6 + 7.0.0-rtm.22476.12 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 2.1.0 - 7.0.0-rtm.22464.4 - 7.0.0-rtm.22464.4 - 7.0.0-rtm.22464.4 - 7.0.0-rtm.22464.4 + 7.0.0-rtm.22476.10 + 7.0.0-rtm.22476.10 + 7.0.0-rtm.22476.10 + 7.0.0-rtm.22476.10 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220915-01 + 17.4.0-release-20220926-01 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.2.22459.3 - 7.0.0-rc.2.22459.3 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch b/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch deleted file mode 100644 index d9bae526a..000000000 --- a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 12 Aug 2022 20:58:39 +0000 -Subject: [PATCH] Update ILLink.RoslynAnalyzer Microsoft.CodeAnalysis.CSharp - reference for source-build - -backport: https://github.com/dotnet/linker/pull/3045 ---- - src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj b/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj -index cafde32b..a5f450a3 100644 ---- a/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj -+++ b/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj -@@ -17,7 +17,8 @@ - - - -- -+ -+ - - all - contentfiles 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/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch b/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch deleted file mode 100644 index f88b9fdf3..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Thu, 14 Jul 2022 14:53:35 -0700 -Subject: [PATCH 3/5] Fully qualify conflicting runtime and roslyn APIs - ---- - .../System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs | 2 +- - .../System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs -index 43a498b589a..1bad8f3753c 100644 ---- a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs -+++ b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs -@@ -15,7 +15,7 @@ namespace Generators - { - public partial class EventSourceGenerator - { -- private static EventSourceClass? GetSemanticTargetForGeneration(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) -+ private static EventSourceClass? GetSemanticTargetForGeneration(Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) - { - const string EventSourceAttribute = "System.Diagnostics.Tracing.EventSourceAttribute"; - -diff --git a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs -index 7a472a994c9..36dc7500bea 100644 ---- a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs -+++ b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs -@@ -20,7 +20,7 @@ public partial class RegexGenerator - - // Returns null if nothing to do, Diagnostic if there's an error to report, or RegexType if the type was analyzed successfully. - private static object? GetSemanticTargetForGeneration( -- GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) -+ Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) - { - var methodSyntax = (MethodDeclarationSyntax)context.TargetNode; - SemanticModel sm = context.SemanticModel;