diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18b14e2..2aa7885 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Build run: dotnet build -c Release --no-restore - name: Test - run: dotnet test -c Release --no-build + run: dotnet test -c Release --no-build -- --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml - name: Upload coverage reports to Codecov with GitHub Action uses: codecov/codecov-action@v5 diff --git a/Directory.Packages.props b/Directory.Packages.props index 44f06f1..c4f3de3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,23 +4,22 @@ - - - + - - + + + @@ -28,6 +27,8 @@ + + @@ -35,14 +36,17 @@ - - - - + + + + + + - - + + + diff --git a/tests/Immediate.Cache.FunctionalTests/Immediate.Cache.FunctionalTests.csproj b/tests/Immediate.Cache.FunctionalTests/Immediate.Cache.FunctionalTests.csproj index 7078f23..9afcfdb 100644 --- a/tests/Immediate.Cache.FunctionalTests/Immediate.Cache.FunctionalTests.csproj +++ b/tests/Immediate.Cache.FunctionalTests/Immediate.Cache.FunctionalTests.csproj @@ -5,10 +5,9 @@ - - + diff --git a/tests/Immediate.Cache.Tests/Immediate.Cache.Tests.csproj b/tests/Immediate.Cache.Tests/Immediate.Cache.Tests.csproj index 7f1dcf9..ea974e0 100644 --- a/tests/Immediate.Cache.Tests/Immediate.Cache.Tests.csproj +++ b/tests/Immediate.Cache.Tests/Immediate.Cache.Tests.csproj @@ -1,8 +1,7 @@ - net8.0 - Exe + Exe <_SkipUpgradeNetAnalyzersNuGetWarning>true @@ -11,16 +10,26 @@ - - - - - - - - + + + + + - + + + + + + + + + + + + + + @@ -29,9 +38,14 @@ - - - + + + + + + diff --git a/tests/Immediate.Cache.Tests/SuppressorTests/SuppressorTestHelpers.cs b/tests/Immediate.Cache.Tests/SuppressorTests/SuppressorTestHelpers.cs index f987e7d..3bdb75c 100644 --- a/tests/Immediate.Cache.Tests/SuppressorTests/SuppressorTestHelpers.cs +++ b/tests/Immediate.Cache.Tests/SuppressorTests/SuppressorTestHelpers.cs @@ -88,28 +88,17 @@ public static CSharpSuppressorTest CreateSuppresso var test = new CSharpSuppressorTest { TestCode = inputSource, - ReferenceAssemblies = new ReferenceAssemblies( - "net8.0", - new PackageIdentity( - "Microsoft.NETCore.App.Ref", - "8.0.0"), - Path.Combine("ref", "net8.0") - ), + ReferenceAssemblies = Utility.ReferenceAssemblies, CompilerDiagnostics = CompilerDiagnostics.Warnings, DisabledDiagnostics = { "CS1591", "CS8767", }, - TestState = - { - AdditionalReferences = - { - MetadataReference.CreateFromFile("./Immediate.Cache.Shared.dll"), - }, - }, }; + test.TestState.AdditionalReferences.AddRange(Utility.GetMetadataReferences()); + return test; } diff --git a/tests/Immediate.Cache.Tests/Utility.cs b/tests/Immediate.Cache.Tests/Utility.cs new file mode 100644 index 0000000..5345d3a --- /dev/null +++ b/tests/Immediate.Cache.Tests/Utility.cs @@ -0,0 +1,25 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Testing; + +namespace Immediate.Cache.Tests; + +internal static class Utility +{ +#if NET8_0 + public static ReferenceAssemblies ReferenceAssemblies => ReferenceAssemblies.Net.Net80; + public static IEnumerable NetCoreAssemblies => Basic.Reference.Assemblies.Net80.References.All; +#elif NET9_0 + public static ReferenceAssemblies ReferenceAssemblies => ReferenceAssemblies.Net.Net90; + public static IEnumerable NetCoreAssemblies => Basic.Reference.Assemblies.Net90.References.All; +#elif NET10_0 + public static ReferenceAssemblies ReferenceAssemblies => ReferenceAssemblies.Net.Net100; + public static IEnumerable NetCoreAssemblies => Basic.Reference.Assemblies.Net100.References.All; +#else +#error .net version not yet implemented +#endif + + public static IEnumerable GetMetadataReferences() => + [ + MetadataReference.CreateFromFile("./Immediate.Cache.Shared.dll"), + ]; +}