diff --git a/eng/Versions.props b/eng/Versions.props
index d423841cc0e9bca54a91352b48312218369b1f80..448ce729bf93bd11ec6cc23c2c13aec3e60e56d3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,16 +38,16 @@
The exact version is a moving target until we ship.
It should never go ahead of the Roslyn version included in the SDK version in dotnet/arcade's global.json to avoid causing breaks in product construction.
-->
- 4.4.0-1.22369.1
+ 4.4.0-2.22423.18
3.3.3
- 4.4.0-1.final
- 4.4.0-1.final
- 4.4.0-1.final
+ 4.4.0-2.22423.18
+ 4.4.0-2.22423.18
+ 4.4.0-2.22423.18
7.0.0-preview1.22466.1
- 4.4.0-1.final
+ 4.4.0-2.22423.18
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn4.0.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn4.0.cs
index ab34238427080779610d37bb5e3d15e1a32ae9e8..7dd80ba2926bf186e4750cab8fccd4c47a64c7df 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn4.0.cs
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Roslyn4.0.cs
@@ -7,7 +7,9 @@
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
+#if !ROSLYN4_4_OR_GREATER
using Microsoft.CodeAnalysis.DotnetRuntime.Extensions;
+#endif
using Microsoft.CodeAnalysis.Text;
[assembly: System.Resources.NeutralResourcesLanguage("en-us")]
@@ -21,7 +23,9 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
{
IncrementalValuesProvider classDeclarations = context.SyntaxProvider
.ForAttributeWithMetadataName(
+#if !ROSLYN4_4_OR_GREATER
context,
+#endif
Parser.LoggerMessageAttribute,
(node, _) => node is MethodDeclarationSyntax,
(context, _) => context.TargetNode.Parent as ClassDeclarationSyntax)
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.4.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.4.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..27bbeb67f7ef374d89ced8867ca913addfa470bf
--- /dev/null
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.Roslyn4.4.csproj
@@ -0,0 +1,20 @@
+
+
+
+ 4.4
+ $(MicrosoftCodeAnalysisVersion_4_4)
+ $(DefineConstants);ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
index 09e2e23824b20e1ef7ccfab907b285128ecfd0f0..e95fbc0ac9916707642f4b6f43f09b9f6d5dc51f 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
@@ -45,6 +45,9 @@ Microsoft.Extensions.Logging.Abstractions.NullLogger
+
diff --git a/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj b/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
index d9231b030725f68999206e06353d5f8c45e5351b..416e4e58d0aa4f857074413990e7e5f40308030b 100644
--- a/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
+++ b/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
@@ -20,8 +20,8 @@
PrivateAssets="all"
Private="true"
IncludeReferenceAssemblyInPackage="true" />
-
-
+
diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props
index 9f8552592523e04f6384233fce5017b82071cc66..add24c58210a9eb18d925093fca4f92ac33f2ce7 100644
--- a/src/libraries/NetCoreAppLibrary.props
+++ b/src/libraries/NetCoreAppLibrary.props
@@ -186,7 +186,7 @@
LibraryImportGenerator;
JSImportGenerator;
Microsoft.Interop.SourceGeneration;
- System.Text.Json.SourceGeneration.Roslyn4.0;
+ System.Text.Json.SourceGeneration.Roslyn4.4;
System.Text.RegularExpressions.Generator;
diff --git a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
index b438859ebbf6044cb7a5cf8f7e00ffaae1c087f6..fa2e1a2fc8598e8a773fc41558f97d70a91955da 100644
--- a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
+++ b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
@@ -9,7 +9,6 @@
using System.Threading;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
-using GeneratorAttributeSyntaxContext = Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext;
namespace Generators
{
diff --git a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.cs b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.cs
index e57f11d6f4ea5a49fbfbca4982097c3b6286aa73..90ea79020dda9f7114a6eed19494b3d08b6b9065 100644
--- a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.cs
+++ b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.cs
@@ -7,7 +7,6 @@
using System.Threading;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.DotnetRuntime.Extensions;
namespace Generators
{
@@ -40,7 +39,6 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
IncrementalValuesProvider eventSourceClasses =
context.SyntaxProvider.ForAttributeWithMetadataName(
- context,
EventSourceAutoGenerateAttribute,
(node, _) => node is ClassDeclarationSyntax,
GetSemanticTargetForGeneration)
diff --git a/src/libraries/System.Private.CoreLib/gen/System.Private.CoreLib.Generators.csproj b/src/libraries/System.Private.CoreLib/gen/System.Private.CoreLib.Generators.csproj
index 90d6ae99bb27cbbadeeb7089d87a30e90b1e53ab..9b8934e682a8835d234141866bbd5519ebcd169b 100644
--- a/src/libraries/System.Private.CoreLib/gen/System.Private.CoreLib.Generators.csproj
+++ b/src/libraries/System.Private.CoreLib/gen/System.Private.CoreLib.Generators.csproj
@@ -13,16 +13,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs
index 221cb32988497cabda847e5c626fb0ccad48b22b..70ada65966b061183d39dffd8274685f66038409 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs
@@ -12,7 +12,6 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.DotnetRuntime.Extensions;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
[assembly: System.Resources.NeutralResourcesLanguage("en-US")]
@@ -64,7 +63,6 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
// Collect all methods adorned with LibraryImportAttribute
var attributedMethods = context.SyntaxProvider
.ForAttributeWithMetadataName(
- context,
TypeNames.LibraryImportAttribute,
static (node, ct) => node is MethodDeclarationSyntax,
static (context, ct) => context.TargetSymbol is IMethodSymbol methodSymbol
diff --git a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
index 9a3f5a5d8e2df7747068900d8ccbb7db54c9a89e..9077f4cf523cb618bc8aa9d65f3bcfd4ff155ae6 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
@@ -23,14 +23,6 @@
-
-
-
-
-
-
-
-
diff --git a/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Roslyn4.0.cs b/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Roslyn4.0.cs
index 8f4cd15e2dfb9d1b471fd130b4965ab2f04ffa76..1a7df0e821e6052bdb444e1522cf7b7d44465fd7 100644
--- a/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Roslyn4.0.cs
+++ b/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Roslyn4.0.cs
@@ -13,7 +13,9 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text;
+#if !ROSLYN4_4_OR_GREATER
using Microsoft.CodeAnalysis.DotnetRuntime.Extensions;
+#endif
namespace System.Text.Json.SourceGeneration
{
@@ -27,7 +29,9 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
{
IncrementalValuesProvider classDeclarations = context.SyntaxProvider
.ForAttributeWithMetadataName(
+#if !ROSLYN4_4_OR_GREATER
context,
+#endif
Parser.JsonSerializableAttributeFullName,
(node, _) => node is ClassDeclarationSyntax,
(context, _) => (ClassDeclarationSyntax)context.TargetNode);
diff --git a/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn4.4.csproj b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn4.4.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..9e538deef6e31bbb56f156de2053e13f35ceea55
--- /dev/null
+++ b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.Roslyn4.4.csproj
@@ -0,0 +1,20 @@
+
+
+
+ 4.4
+ $(MicrosoftCodeAnalysisVersion_4_4)
+ $(DefineConstants);ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index 8cd779f5a021888b9428fd8ea868f6cc15d2ed79..f0341a109304e8d40470fbee04041bdc8969ee90 100644
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -385,5 +385,6 @@ The System.Text.Json library is built-in as part of the shared framework in .NET
+
diff --git a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.cs b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.cs
index ed237b82379f11b977034a1c98adc9c0c5debcc8..effe0127442616c465c5c7ee8cf2051e4181ad55 100644
--- a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.cs
+++ b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.cs
@@ -11,7 +11,6 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.DotnetRuntime.Extensions;
[assembly: System.Resources.NeutralResourcesLanguage("en-us")]
@@ -48,7 +47,6 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
// Find all MethodDeclarationSyntax nodes attributed with GeneratedRegex and gather the required information.
.ForAttributeWithMetadataName(
- context,
GeneratedRegexAttributeName,
(node, _) => node is MethodDeclarationSyntax,
GetSemanticTargetForGeneration)
diff --git a/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj b/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj
index bf14a855c9014ebd79020a4067cf9c60431d413d..ed6adef253720b15c5d3fcc05fb9dd708fe60798 100644
--- a/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj
+++ b/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj
@@ -14,20 +14,12 @@
-
+
-
-
-
-
-
-
-
-