add roslyn 4.11 as target (#1555)

riok · Oct 24, 2024 · e229bf2 · e229bf2 · github-actions · Oct 24, 2024
1 parent e9abaf4
commit e229bf2
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/.csharpierrc.yaml b/.csharpierrc.yaml
@@ -7,8 +7,9 @@ preprocessorSymbolSets:
   - "DEBUG_SOURCE_GENERATOR"
   - "SYSTEM_PRIVATE_CORELIB"
   - "NETSTANDARD2_0"
-  - "ROSLYN4_4_OR_GREATER"
-  - "ROSLYN4_7_OR_GREATER"
   - "NET6_0_OR_GREATER"
   - "NET7_0_OR_GREATER"
   - "NET8_0_OR_GREATER"
+  - "NET9_0_OR_GREATER"
+  - "ROSLYN4_4_OR_GREATER"
+  - "ROSLYN4_7_OR_GREATER"
diff --git a/benchmarks/Riok.Mapperly.Benchmarks/Riok.Mapperly.Benchmarks.csproj b/benchmarks/Riok.Mapperly.Benchmarks/Riok.Mapperly.Benchmarks.csproj
@@ -8,11 +8,11 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/build/package.sh b/build/package.sh
@@ -5,7 +5,7 @@ set -Eeuo pipefail
 # pack a nupkg for each roslyn version that is supported by Mapperly
 # and merge them together into one nupkg
 
-roslyn_versions=('4.0' '4.4' '4.5' '4.7')
+roslyn_versions=('4.0' '4.4' '4.5' '4.7' '4.11')
 
 RELEASE_VERSION=${RELEASE_VERSION:-"0.0.1-dev.$(date +%s)"}
 RELEASE_NOTES=${RELEASE_NOTES:-''}

diff --git a/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.11.props b/src/Riok.Mapperly/Riok.Mapperly.Roslyn4.11.props
@@ -0,0 +1,7 @@
+<Project>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Riok.Mapperly/Riok.Mapperly.csproj b/src/Riok.Mapperly/Riok.Mapperly.csproj
@@ -16,10 +16,10 @@
     <PackageTags>Mapper SourceGenerator</PackageTags>
     <PackageIcon>logo.png</PackageIcon>
 
-    <!-- default roslyn version and constants -->
-    <ROSLYN_VERSION Condition="'$(ROSLYN_VERSION)' == ''">4.7</ROSLYN_VERSION>
-    <DefineConstants Condition="$(ROSLYN_VERSION) >= 4.4">$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
-    <DefineConstants Condition="$(ROSLYN_VERSION) >= 4.7">$(DefineConstants);ROSLYN4_7_OR_GREATER</DefineConstants>
+    <!-- default roslyn version and constants, compare 4 numeric part versions -->
+    <ROSLYN_VERSION Condition="'$(ROSLYN_VERSION)' == ''">4.11</ROSLYN_VERSION>
+    <DefineConstants Condition="'$(ROSLYN_VERSION).0.0' >= '4.4.0.0'">$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
+    <DefineConstants Condition="'$(ROSLYN_VERSION).0.0' >= '4.7.0.0'">$(DefineConstants);ROSLYN4_7_OR_GREATER</DefineConstants>
   </PropertyGroup>
 
   <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0 AND '$(CI)' == ''">

diff --git a/test/Riok.Mapperly.Tests/Riok.Mapperly.Tests.csproj b/test/Riok.Mapperly.Tests/Riok.Mapperly.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
     <PackageReference Include="Verify.SourceGenerators" Version="2.3.0" />
   </ItemGroup>
Benchmark suite	Current: `e229bf2`	Previous: `e9abaf4`	Ratio
`Riok.Mapperly.Benchmarks.SourceGeneratorBenchmarks.Compile`	`2114275.35859375` ns (`± 195325.98145994742`)	`120741.05671574519` ns (`± 1678.1529391966976`)	`17.51`
`Riok.Mapperly.Benchmarks.SourceGeneratorBenchmarks.LargeCompile`	`45984993.872727275` ns (`± 175774.8150199352`)	`1277208.939174107` ns (`± 7926.104374412328`)	`36.00`