Properly Multi-target Roslyn

.github/workflows/build.yml

@@ -17,6 +17,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v7
+      with:
+        fetch-depth: '0'
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v6

.github/workflows/release.yml

@@ -32,13 +32,18 @@ jobs:
         dotnet-version: |
           11.0.x
 
+    - name: Restore tools
+      run: dotnet tool restore
+
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build -c Release --no-restore
 
     - name: Package 
       run: dotnet pack -c Release --no-build --property:PackageOutputPath=../../nupkgs
+    - name: Validate Package 
+      run: dotnet tool run dotnet-validate -- package local ./nupkgs/*.nupkg
 
     - name: NuGet login (OIDC → temp API key)
       uses: NuGet/login@v1

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-	<TargetFrameworks>net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
+	<TargetFrameworks>net8.0;net10.0;net11.0</TargetFrameworks>
 	<LangVersion>latest</LangVersion>
 
 	<Nullable>enable</Nullable>

Directory.Packages.props

@@ -5,8 +5,7 @@
 
   <ItemGroup>
 	<PackageVersion Include="AssemblyMetadata.Generators" Version="2.2.0" />
-	<PackageVersion Include="Immediate.Handlers" Version="3.11.1" />
-	<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
+	<PackageVersion Include="Immediate.Handlers" Version="4.2.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
 	<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.12.0" />
@@ -16,7 +15,7 @@
 	<PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.1" />
   </ItemGroup>
 
-  <!-- IV.Shared dependencies -->
+  <!-- IC.Shared dependencies -->
   <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
 	<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.12" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
@@ -26,18 +25,9 @@
 	<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'net9.0'">
-	<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.12" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-	<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.20" />
-	<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.20" />
-	<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.20" />
-	<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.20" />
-  </ItemGroup>
-
   <ItemGroup Condition="$(TargetFramework) == 'net10.0'">
 	<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.12" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302" />
+	<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.401" />
 	<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.12" />
 	<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.12" />
 	<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
@@ -53,36 +43,29 @@
 	<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="11.0.0-rc.1.26425.128" />
   </ItemGroup>
 
-  <!-- IV.Generators dependencies -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net11.0' ">
+  <!-- IC.Generators dependencies -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net11.0' or '$(TargetFramework)' == 'roslyn5.9' ">
 	<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.9.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.9.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.9.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' or '$(TargetFramework)' == 'roslyn5.0' ">
 	<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-	<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 	<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'roslyn4.8' ">
 	<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />

src/Immediate.Cache.Analyzers/Immediate.Cache.Analyzers.csproj

@@ -1,18 +1,36 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
-    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <IsRoslynComponent>true</IsRoslynComponent>
+	<TargetFrameworks>roslyn4.8;roslyn5.0;roslyn5.9</TargetFrameworks>
+	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+	<IsRoslynComponent>true</IsRoslynComponent>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="../Common/*.cs" Link="Common/%(Filename).cs" />
+	<Compile Include="../Common/*.cs" Link="Common/%(Filename).cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+	<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="All" />
+	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'roslyn4.8' ">
+	<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+	<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+	<TargetFrameworkMoniker>.NETStandard,Version=v2.0</TargetFrameworkMoniker>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'roslyn5.0' ">
+	<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+	<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+	<TargetFrameworkMoniker>.NETStandard,Version=v2.0</TargetFrameworkMoniker>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'roslyn5.9' ">
+	<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+	<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+	<TargetFrameworkMoniker>.NETStandard,Version=v2.0</TargetFrameworkMoniker>
+  </PropertyGroup>
+
 </Project>

src/Immediate.Cache.Generators/Immediate.Cache.Generators.csproj

@@ -1,49 +1,66 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
-    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <IsRoslynComponent>true</IsRoslynComponent>
-    <NoWarn>$(NoWarn);CA1716</NoWarn>
+	<TargetFrameworks>roslyn4.8;roslyn5.0;roslyn5.9</TargetFrameworks>
+	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+	<IsRoslynComponent>true</IsRoslynComponent>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="../Common/*.cs" Link="Common/%(Filename).cs" />
+	<Compile Include="../Common/*.cs" Link="Common/%(Filename).cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Templates/*.sbntxt" />
-    <EmbeddedResource Include="Templates/*.sbntxt" />
+	<None Remove="Templates/*.sbntxt" />
+	<EmbeddedResource Include="Templates/*.sbntxt" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AssemblyMetadata.Generators" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+	<PackageReference Include="AssemblyMetadata.Generators" PrivateAssets="All" />
+	<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
   </ItemGroup>
 
   <!-- Scriban (code in netstandard2.0; lib in net10+) -->
-  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'roslyn4.8' ">
 	<PackageReference Include="Scriban" PrivateAssets="all" IncludeAssets="Build" />
   </ItemGroup>
 
-  <PropertyGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'roslyn4.8' ">
 	<PackageScribanIncludeSource>true</PackageScribanIncludeSource>
 	<DefineConstants>$(DefineConstants);SCRIBAN_NO_ASYNC</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+  <ItemGroup Condition=" '$(TargetFramework)' != 'roslyn4.8' ">
 	<PackageReference Include="Scriban" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'roslyn4.8' ">
 	<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
   </PropertyGroup>
 
-  <Target Name="GetDependencyTargetPaths" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+  <Target Name="GetDependencyTargetPaths" Condition=" '$(TargetFramework)' != 'roslyn4.8' ">
 	<ItemGroup>
-	  <TargetPathWithTargetPlatformMoniker Include="$(PkgScriban)/lib/netstandard2.0/Scriban.dll" IncludeRuntimeDependency="false" />
+	  <TargetPathWithTargetPlatformMoniker Include="$(PkgScriban)/lib/net8.0/Scriban.dll" IncludeRuntimeDependency="false" />
 	</ItemGroup>
   </Target>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'roslyn4.8' ">
+	<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+	<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+	<TargetFrameworkMoniker>.NETStandard,Version=v2.0</TargetFrameworkMoniker>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'roslyn5.0' ">
+	<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+	<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+	<TargetFrameworkMoniker>.NETCoreApp,Version=v10.0</TargetFrameworkMoniker>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'roslyn5.9' ">
+	<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+	<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+	<TargetFrameworkMoniker>.NETCoreApp,Version=v10.0</TargetFrameworkMoniker>
+  </PropertyGroup>
+
 </Project>

src/Immediate.Cache/Immediate.Cache.csproj

@@ -3,6 +3,9 @@
   <PropertyGroup>
 	<IsPackable>true</IsPackable>
 	<IncludeBuildOutput>false</IncludeBuildOutput>
+
+	<EnablePackageValidation>true</EnablePackageValidation>
+	<PackageValidationBaselineVersion>2.0.0</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
@@ -22,14 +25,8 @@
 
   <ItemGroup>
 	<PackageReference Include="Immediate.Handlers" />
-	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
-	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
-  </ItemGroup>
-
-  <ItemGroup>
-	<ProjectReference Include="../Immediate.Cache.Analyzers/Immediate.Cache.Analyzers.csproj" ReferenceOutputAssembly="false" />
-	<ProjectReference Include="../Immediate.Cache.Generators/Immediate.Cache.Generators.csproj" ReferenceOutputAssembly="false" />
-	<ProjectReference Include="../Immediate.Cache.Shared/Immediate.Cache.Shared.csproj" PrivateAssets="All" />
+	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" NoWarn="NU5104" />
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" NoWarn="NU5104" />
   </ItemGroup>
 
   <!--
@@ -50,39 +47,76 @@
 	  PackagePath="lib/$(TargetFramework)" />
   </ItemGroup>
 
-  <!-- roslyn 4.8 for net8/net9 -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-	<TfmSpecificPackageFile
-	  Include="../Immediate.Cache.Analyzers/bin/$(Configuration)/netstandard2.0/Immediate.Cache.Analyzers.dll"
+  <ItemGroup>
+	<None
+	  Include="../Immediate.Cache.Analyzers/bin/$(Configuration)/roslyn4.8/Immediate.Cache.Analyzers.dll"
 	  Pack="true"
 	  PackagePath="analyzers/dotnet/roslyn4.8/cs" />
 
-	<TfmSpecificPackageFile
-	  Include="../Immediate.Cache.Generators/bin/$(Configuration)/netstandard2.0/Immediate.Cache.Generators.dll"
+	<None
+	  Include="../Immediate.Cache.Generators/bin/$(Configuration)/roslyn4.8/Immediate.Cache.Generators.dll"
 	  Pack="true"
 	  PackagePath="analyzers/dotnet/roslyn4.8/cs" />
   </ItemGroup>
 
-  <!-- roslyn 5.0 for net10/net11 -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-	<TfmSpecificPackageFile
-	  Include="../Immediate.Cache.Analyzers/bin/$(Configuration)/net10.0/Immediate.Cache.Analyzers.dll"
+  <ItemGroup>
+	<None
+	  Include="../Immediate.Cache.Analyzers/bin/$(Configuration)/roslyn5.0/Immediate.Cache.Analyzers.dll"
 	  Pack="true"
 	  PackagePath="analyzers/dotnet/roslyn5.0/cs" />
 
-	<TfmSpecificPackageFile
-	  Include="../Immediate.Cache.Generators/bin/$(Configuration)/net10.0/Immediate.Cache.Generators.dll"
+	<None
+	  Include="../Immediate.Cache.Generators/bin/$(Configuration)/roslyn5.0/Immediate.Cache.Generators.dll"
 	  Pack="true"
 	  PackagePath="analyzers/dotnet/roslyn5.0/cs" />
 
 	<TfmSpecificPackageFile
+	  Condition=" '$(TargetFramework)' == 'net8.0' "
 	  Include="$(PkgScriban)/lib/net8.0/Scriban.dll"
 	  Pack="true"
 	  PackagePath="analyzers/dotnet/roslyn5.0/cs" />
   </ItemGroup>
 
+  <ItemGroup>
+	<None
+	  Include="../Immediate.Cache.Analyzers/bin/$(Configuration)/roslyn5.9/Immediate.Cache.Analyzers.dll"
+	  Pack="true"
+	  PackagePath="analyzers/dotnet/roslyn5.9/cs" />
+
+	<None
+	  Include="../Immediate.Cache.Generators/bin/$(Configuration)/roslyn5.9/Immediate.Cache.Generators.dll"
+	  Pack="true"
+	  PackagePath="analyzers/dotnet/roslyn5.9/cs" />
+
+	<TfmSpecificPackageFile
+	  Condition=" '$(TargetFramework)' == 'net8.0' "
+	  Include="$(PkgScriban)/lib/net8.0/Scriban.dll"
+	  Pack="true"
+	  PackagePath="analyzers/dotnet/roslyn5.9/cs" />
+  </ItemGroup>
+
   <ItemGroup>
 	<PackageReference Include="Scriban" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
+  <ItemGroup>
+	<ProjectReference Include="../Immediate.Cache.Shared/Immediate.Cache.Shared.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <PropertyGroup>
+	<RoslynVersion Condition=" '$(TargetFramework)' == 'net8.0' ">roslyn4.8</RoslynVersion>
+	<RoslynVersion Condition=" '$(TargetFramework)' == 'net10.0' ">roslyn5.0</RoslynVersion>
+	<RoslynVersion Condition=" '$(TargetFramework)' == 'net11.0' ">roslyn5.9</RoslynVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<ProjectReference Include="../../src/Immediate.Cache.Analyzers/Immediate.Cache.Analyzers.csproj" ReferenceOutputAssembly="false">
+	  <SetTargetFramework>TargetFramework=$(RoslynVersion)</SetTargetFramework>
+	</ProjectReference>
+
+	<ProjectReference Include="../../src/Immediate.Cache.Generators/Immediate.Cache.Generators.csproj" ReferenceOutputAssembly="false">
+	  <SetTargetFramework>TargetFramework=$(RoslynVersion)</SetTargetFramework>
+	</ProjectReference>
+  </ItemGroup>
+
 </Project>

tests/Immediate.Cache.FunctionalTests/ApplicationCacheTests.cs

@@ -1,6 +1,6 @@
+using System.Globalization;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
-using Xunit;
 
 namespace Immediate.Cache.FunctionalTests;
 
@@ -29,7 +29,7 @@ public async Task GetValueCachesValue()
 		Assert.True(response.ExecutedHandler);
 
 		var memoryCache = _serviceProvider.GetRequiredService<IMemoryCache>();
-		Assert.True(memoryCache.TryGetValue($"GetValue(query: {request.Value})", out var _));
+		Assert.True(memoryCache.TryGetValue(string.Create(CultureInfo.InvariantCulture, $"GetValue(query: {request.Value})"), out var _));
 	}
 
 	[Fact]
@@ -40,7 +40,7 @@ public async Task SetValueCachesValue()
 		cache.SetValue(request, new(4, ExecutedHandler: false));
 
 		var memoryCache = _serviceProvider.GetRequiredService<IMemoryCache>();
-		Assert.True(memoryCache.TryGetValue($"GetValue(query: {request.Value})", out var _));
+		Assert.True(memoryCache.TryGetValue(string.Create(CultureInfo.InvariantCulture, $"GetValue(query: {request.Value})"), out var _));
 
 		var response = await cache.GetValue(request, TestContext.Current.CancellationToken);