Fix

BUTR · Dec 10, 2024 · 41da9a4 · 41da9a4
1 parent d2e35c8
commit 41da9a4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,10 +26,10 @@ jobs:
         mkdir -p regex/net45;
         mkdir -p regex/net8.0;
         mkdir -p regex/net9.0;
-        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -- "$PWD/regex/netstandard2.0" netstandard2.0;
-        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -- "$PWD/regex/net45" net45;
-        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -- "$PWD/regex/net8.0" net8.0;
-        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -- "$PWD/regex/net9.0" net9.0;
+        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -f net9.0 -- "$PWD/regex/netstandard2.0" netstandard2.0;
+        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -f net9.0 -- "$PWD/regex/net45" net45;
+        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -f net8.0 -- "$PWD/regex/net8.0" net8.0;
+        dotnet run --project PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release -f net9.0 -- "$PWD/regex/net9.0" net9.0;
 
         dotnet build PrismSharp.SourceGenerator/PrismSharp.SourceGenerator.csproj --configuration Release;
         dotnet build PrismSharp.Core/PrismSharp.Core.csproj --configuration Release;

diff --git a/PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj b/PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj
@@ -1,13 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup Condition="$(TargetFramework) == 'net9.0'">
+    <PackageReference Include="Microsoft.NETCore.App.Ref" Version="9.0.0" PrivateAssets="all" IncludeAssets="none" GeneratePathProperty="true" />
+    <Reference Include="$(PkgMicrosoft_NETCore_App_Ref)\analyzers\dotnet\cs\System.Text.RegularExpressions.Generator.dll" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
+    <PackageReference Include="Microsoft.NETCore.App.Ref" Version="8.0.0" PrivateAssets="all" IncludeAssets="none" GeneratePathProperty="true" />
+    <Reference Include="$(PkgMicrosoft_NETCore_App_Ref)\analyzers\dotnet\cs\System.Text.RegularExpressions.Generator.dll" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
 

diff --git a/PrismSharp.RegExProvider/Program.cs b/PrismSharp.RegExProvider/Program.cs
@@ -204,9 +204,7 @@ private static void CompileNET90(KeyValuePair<string, string>[] languageDefiniti
             new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
         //new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).WithPlatform(Platform.AnyCpu).WithOptimizationLevel(OptimizationLevel.Release));
 
-        //var sourceGenDriver = CSharpGeneratorDriver.Create(new System.Text.RegularExpressions.Generator.RegexGenerator());
-        var type = ByName("System.Text.RegularExpressions.Generator.RegexGenerator")!;
-        var sourceGenDriver = CSharpGeneratorDriver.Create((IIncrementalGenerator)Activator.CreateInstance(type)!);
+        var sourceGenDriver = CSharpGeneratorDriver.Create(new System.Text.RegularExpressions.Generator.RegexGenerator());
         sourceGenDriver.RunGeneratorsAndUpdateCompilation(compilation, out var outputCompilation, out var diagnostics);
 
         using var dllStream = new MemoryStream();
@@ -241,9 +239,7 @@ private static void CompileNET80(KeyValuePair<string, string>[] languageDefiniti
             new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
         //new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).WithPlatform(Platform.AnyCpu).WithOptimizationLevel(OptimizationLevel.Release));
 
-        //var sourceGenDriver = CSharpGeneratorDriver.Create(new System.Text.RegularExpressions.Generator.RegexGenerator());
-        var type = ByName("System.Text.RegularExpressions.Generator.RegexGenerator")!;
-        var sourceGenDriver = CSharpGeneratorDriver.Create((IIncrementalGenerator)Activator.CreateInstance(type)!);
+        var sourceGenDriver = CSharpGeneratorDriver.Create(new System.Text.RegularExpressions.Generator.RegexGenerator());
         sourceGenDriver.RunGeneratorsAndUpdateCompilation(compilation, out var outputCompilation, out var diagnostics);
 
         using var dllStream = new MemoryStream();