diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d379c5ddf40d..d280e16ca0e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 505ab025f90aeb293625a32ac47ea59dad3f9c17 - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 505ab025f90aeb293625a32ac47ea59dad3f9c17 - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 505ab025f90aeb293625a32ac47ea59dad3f9c17 - + https://github.com/dotnet/windowsdesktop - 706393353488ce178488e8de342599414c29d8c7 + 505ab025f90aeb293625a32ac47ea59dad3f9c17 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 5cdbfc137861196cf6e02130ea50403c13c8a01b - + https://github.com/dotnet/aspnetcore - 5c3a312e6c8798efb62b9b5ccd0ea8620be11118 + 5cdbfc137861196cf6e02130ea50403c13c8a01b https://github.com/dotnet/test-templates @@ -98,66 +98,66 @@ 9c5549788cda5238a0e65466cbde9eb4ed42b695 - + https://github.com/dotnet/templating - 0b9b0b4e7abc5d41b6308f91101981b0b21d90f2 + 4065aa33c051bfd06543992c7058e8fdb8ac0f1a - + https://github.com/dotnet/templating - 0b9b0b4e7abc5d41b6308f91101981b0b21d90f2 + 4065aa33c051bfd06543992c7058e8fdb8ac0f1a - + https://github.com/dotnet/sdk - 3d459093b37956d9c28be26c0ea9bd181d5dd454 + f7d1f3967f65f59fbb792c49a55a09975c6e6524 - + https://github.com/dotnet/sdk - 3d459093b37956d9c28be26c0ea9bd181d5dd454 + f7d1f3967f65f59fbb792c49a55a09975c6e6524 - + https://github.com/dotnet/winforms - 5972c29ef057fe95563646f2810735795c899a4f + d2b2f809703f0dbcda70ff110c64c5de06da9680 - + https://github.com/dotnet/wpf - 52db6defd3dc565232e29dc5eb8b8772bd06f175 + 8c40233a57cf1151424df37b827eafcde8b9288c - + https://github.com/dotnet/fsharp - 702b8e77f5fbfe21e6743324c1750503e02f182d + 91ee836a7850f7629825e3d6e13f49cb809c0123 - + https://github.com/dotnet/fsharp - 702b8e77f5fbfe21e6743324c1750503e02f182d + 91ee836a7850f7629825e3d6e13f49cb809c0123 - + https://github.com/microsoft/vstest - b1452a516a80672fa814f4ebdf2151c0875d0b20 + b2e2126f1aa7e5753cafe9515563c99ade6a59ce - + https://github.com/dotnet/linker - ef2d0f25b72469b55925251a79f12bcbf98644bf + 33a76b856466b96dd3d179e599a7fc0118389641 linker - + https://github.com/dotnet/roslyn - 76aec58b9f6e82be2f7285c488dbb29554c625b1 + 7569242c5af0ad4f0b6d566559d39722851fcd7d - + https://github.com/dotnet/msbuild - 94c28cca4cdb22f2cac279e3fd8d86aa4d061848 + c8492483ad668b0bb8467d27ae34259f201594b6 - + https://github.com/nuget/nuget.client - 3dd86e0c670862f76351c87ca7dc3454d0faf8d6 + 222ff7a5329be15520034b76fa1a84098d2ae9fd @@ -170,9 +170,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 40e7c6226711ec616ee07e725563eda708630fe1 + 7d277787570614a3dd99e1d6022375d9ae43e6af https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 23b98ae60eeb..ac60a05770a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.7.22355.1 + 7.0.0-preview.7.22369.6 - 7.0.0-preview.7.22355.1 + 7.0.0-preview.7.22369.6 - 7.0.100-preview.7.22329.2 + 7.0.100-preview.7.22369.4 @@ -52,45 +52,45 @@ - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 - 7.0.0-preview.7.22356.9 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 + 7.0.0-preview.7.22369.8 0.2.0 - 7.0.100-preview.7.22358.1 - 7.0.100-preview.7.22358.1 + 7.0.100-preview.7.22370.2 + 7.0.100-preview.7.22370.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.6.22356.1 + 7.0.0-preview.7.22369.4 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 - 7.0.0-preview.6.22356.1 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 + 7.0.0-preview.7.22369.4 2.1.0 - 7.0.0-preview.7.22355.1 - 7.0.0-preview.7.22355.1 - 7.0.0-preview.7.22355.1 - 7.0.0-preview.7.22355.1 + 7.0.0-preview.7.22369.18 + 7.0.0-preview.7.22369.18 + 7.0.0-preview.7.22369.18 + 7.0.0-preview.7.22369.18 @@ -168,7 +168,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220702-01 + 17.4.0-preview-20220711-01 @@ -201,7 +201,7 @@ 12.3.303 15.4.303 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-preview.7.22330.1 + 7.0.0-preview.7.22361.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Revert-Infrastructure-Update-SDK-version-42571.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Revert-Infrastructure-Update-SDK-version-42571.patch new file mode 100644 index 000000000000..cd7ba85349ed --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0003-Revert-Infrastructure-Update-SDK-version-42571.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Tue, 12 Jul 2022 13:50:55 -0700 +Subject: [PATCH] Revert "[Infrastructure] Update SDK version (#42571)" + +Temporarily rollback https://github.com/dotnet/aspnetcore/pull/42571 +(aefef28a51afd41d358eb0573e10cd858dcdc3e3) because source-build is still using an older +toolset. This will be addressed by @crummel in https://github.com/dotnet/installer/pull/14089. +--- + src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs +index 63fc8668d6..5e18ba0861 100644 +--- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs ++++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs +@@ -313,7 +313,7 @@ public class HttpParser : IHttpParser where TR + } + + SequencePosition lineEnd; +- scoped ReadOnlySpan headerSpan; ++ ReadOnlySpan headerSpan; + if (currentSlice.Slice(reader.Position, lineEndPosition.Value).Length == currentSlice.Length - 1) + { + // No enough data, so CRLF can't currently be there. +@@ -321,8 +321,7 @@ public class HttpParser : IHttpParser where TR + + // Advance 1 to include CR/LF in lineEnd + lineEnd = currentSlice.GetPosition(1, lineEndPosition.Value); +- var header = currentSlice.Slice(reader.Position, lineEnd); +- headerSpan = header.IsSingleSegment ? header.FirstSpan : header.ToArray(); ++ headerSpan = currentSlice.Slice(reader.Position, lineEnd).ToSpan(); + if (headerSpan[^1] != ByteCR) + { + RejectRequestHeader(headerSpan); diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0004-Apply-lifetime-scoped-to-API.patch b/src/SourceBuild/tarball/patches/aspnetcore/0004-Apply-lifetime-scoped-to-API.patch new file mode 100644 index 000000000000..e66986a24293 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0004-Apply-lifetime-scoped-to-API.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aaron Robinson +Date: Wed, 29 Jun 2022 17:15:09 -0700 +Subject: [PATCH] Apply lifetime scoped to API. + +--- + src/Shared/ServerInfrastructure/BufferExtensions.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Shared/ServerInfrastructure/BufferExtensions.cs b/src/Shared/ServerInfrastructure/BufferExtensions.cs +index d68ccc1145..305ddbdd8f 100644 +--- a/src/Shared/ServerInfrastructure/BufferExtensions.cs ++++ b/src/Shared/ServerInfrastructure/BufferExtensions.cs +@@ -19,7 +19,7 @@ internal static class BufferExtensions + private static byte[]? _numericBytesScratch; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] +- public static ReadOnlySpan ToSpan(in this ReadOnlySequence buffer) ++ public static ReadOnlySpan ToSpan(scoped in this ReadOnlySequence buffer) + { + if (buffer.IsSingleSegment) + { diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch deleted file mode 100644 index f13e9de9f83a..000000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0001-Upgrade-Microsoft.Win32.Registry-reference-to-5.0.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 3 May 2022 18:50:25 +0000 -Subject: [PATCH] Upgrade Microsoft.Win32.Registry reference to 5.0.0 - -Backport: https://github.com/dotnet/fsharp/pull/13091 ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index afefd9501..ff4d8ac89 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -208,7 +208,7 @@ - 5.0.0-preview.7.20364.11 - 5.0.0-preview.7.20364.11 - 16.11.0 -- 4.3.0 -+ 5.0.0 - 13.0.1 - 3.13.2 - 4.1.0 diff --git a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch b/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch deleted file mode 100644 index 71917a22ab61..000000000000 --- a/src/SourceBuild/tarball/patches/fsharp/0002-fix-13174.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kevin Ransom -Date: Thu, 2 Jun 2022 17:09:16 -0700 -Subject: [PATCH] fix 13174 - -Backport: https://github.com/dotnet/fsharp/pull/13239 ---- - eng/Build.ps1 | 4 ++- - eng/SourceBuild.props | 2 +- - src/fsharp/FSharp.Build/FSharp.Build.fsproj | 3 +- - .../Microsoft.FSharp.Compiler.csproj | 32 ++++++++++++++++++- - src/fsharp/Microsoft.FSharp.Compiler/Program.cs | 2 +- - .../VisualFSharp.Core.targets | 2 +- - 6 files changed, 38 insertions(+), 7 deletions(-) - -diff --git a/eng/Build.ps1 b/eng/Build.ps1 -index 424cbe6c5..ce23ae7da 100644 ---- a/eng/Build.ps1 -+++ b/eng/Build.ps1 -@@ -61,6 +61,7 @@ param ( - [string]$officialSkipTests = "false", - [switch]$noVisualStudio, - [switch]$sourceBuild, -+ [switch]$skipBuild, - - [parameter(ValueFromRemainingArguments = $true)][string[]]$properties) - -@@ -114,6 +115,7 @@ function Print-Usage() { - Write-Host " -useGlobalNuGetCache Use global NuGet cache." - Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported." - Write-Host " -sourceBuild Simulate building for source-build." -+ Write-Host " -skipbuild Skip building product" - Write-Host "" - Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild." - } -@@ -458,7 +460,7 @@ try { - } - - $script:BuildMessage = "Failure building product" -- if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish) { -+ if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild) { - if ($noVisualStudio) { - BuildSolution "FSharp.sln" - } -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 903ee00d3..86c24c1b4 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -26,7 +26,7 @@ - --> - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln" -+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln" - - - -diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj -index f293b92a0..b87e2def5 100644 ---- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj -+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj -@@ -4,8 +4,7 @@ - - - Library -- netstandard2.0 -- netstandard2.0 -+ netstandard2.0 - FSharp.Build - $(NoWarn);75 - true -diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -index eaeac80f3..e078498d7 100644 ---- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -@@ -9,8 +9,12 @@ - .NET Core compatible version of the F# compiler fsc.exe. - /blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion) - true -+ $(NuGetPackageRoot)microsoft.dotnet.arcade.sdk\$(ArcadeSdkVersion)\ -+ <_BuildReleasePackagesTargets>$(ArcadeSdkDir)tools\BuildReleasePackages.targets - - -+ -+ - - - -@@ -19,6 +23,33 @@ - - - -- -+ -+ -+ TargetFrameworks=netstandard2.1;netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ TargetFrameworks=netstandard2.0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs -index c52f10378..0be8ed50b 100644 ---- a/src/fsharp/Microsoft.FSharp.Compiler/Program.cs -+++ b/src/fsharp/Microsoft.FSharp.Compiler/Program.cs -@@ -1,2 +1,2 @@ --// See https://aka.ms/new-console-template for more information -+// See https://aka.ms/new-console-template for more information - return 0; -\ No newline at end of file -diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets -index 966cffad5..9b932e87e 100644 ---- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets -+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets -@@ -33,7 +33,7 @@ - All - 2 - True -- TargetFramework=$(DependencyTargetFramework) -+ TargetFramework=netstandard2.0 - - - diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index f2b0598525b7..feaf36b71f19 100644 --- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -222,6 +222,6 @@ index fe90e93ca..01b64e055 100644 net6.0 true + true - + diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch b/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch new file mode 100644 index 000000000000..ded89163a85e --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Thu, 14 Jul 2022 14:53:35 -0700 +Subject: [PATCH] Fully qualify conflicting runtime and roslyn APIs + +Runtime duplicated some Roslyn functionality because they build with an older version of Roslyn. +The methods are present in the source-build version of Roslyn, though, so we need to fully +qualify the references to GeneratorAttributeSyntaxContext to pick up the version that Runtime +expects to have. Using the Roslyn version here causes more problems so it is simpler to use +the version that Runtime expects and has tested against. + +See https://github.com/dotnet/runtime/pull/70911 + +--- + .../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 33dd18fc67f..13005b9d0a9 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;