Fix

BUTR · Dec 10, 2024 · d2e35c8 · d2e35c8
1 parent 7c2e479
commit d2e35c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,8 @@ jobs:
 
     - name: Pack
       run: >-
+        dotnet build PrismSharp.RegExCompiler/PrismSharp.RegExCompiler.csproj --configuration Release;
+
         dotnet build PrismSharp.RegExProvider/PrismSharp.RegExProvider.csproj --configuration Release;
 
         mkdir regex;
@@ -29,7 +31,6 @@ jobs:
         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 build PrismSharp.RegExCompiler/PrismSharp.RegExCompiler.csproj --configuration Release;
         dotnet build PrismSharp.SourceGenerator/PrismSharp.SourceGenerator.csproj --configuration Release;
         dotnet build PrismSharp.Core/PrismSharp.Core.csproj --configuration Release;
 

diff --git a/PrismSharp.Core/PrismSharp.Core.csproj b/PrismSharp.Core/PrismSharp.Core.csproj
@@ -26,41 +26,12 @@
     <CompilerVisibleProperty Include="MSBuildProjectFullPath" />
     <CompilerVisibleProperty Include="OutputPath" />
     <CompilerVisibleProperty Include="TargetFramework" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
-    <ProjectReference Include="..\PrismSharp.SourceGenerator\PrismSharp.SourceGenerator.csproj"
-                      SetTargetFramework="TargetFramework=netstandard2.0"
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false"
-                      Pack="false"  />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net45'">
-    <ProjectReference Include="..\PrismSharp.SourceGenerator\PrismSharp.SourceGenerator.csproj"
-                      SetTargetFramework="TargetFramework=netstandard2.0"
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false"
-                      Pack="false" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
-    <ProjectReference Include="..\PrismSharp.SourceGenerator\PrismSharp.SourceGenerator.csproj"
-                      SetTargetFramework="TargetFramework=net8.0"
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false"
-                      Pack="false"  />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net9.0'">
+
+    <Reference Include="..\regex\$(TargetFramework)\PrismSharp.RegEx.dll"  />
     <ProjectReference Include="..\PrismSharp.SourceGenerator\PrismSharp.SourceGenerator.csproj"
-                      SetTargetFramework="TargetFramework=net9.0"
                       OutputItemType="Analyzer"
                       ReferenceOutputAssembly="false"
                       Pack="false"  />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="PrismSharp.RegEx">
-      <HintPath>$(OutputPath)\PrismSharp.RegEx.dll</HintPath>
-      <Private>false</Private>
-      <Pack>true</Pack>
-    </Reference>
-  </ItemGroup>
 
 </Project>