diff --git a/.github/workflows/Format.yml b/.github/workflows/Format.yml index 9c5b85b..a428f7d 100644 --- a/.github/workflows/Format.yml +++ b/.github/workflows/Format.yml @@ -46,7 +46,6 @@ jobs: if: ${{ needs.discover.result == 'success' }} uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main with: - dotnet_version: "10.0.x" branch: ${{ needs.discover.outputs.branch_name }} secrets: inherit diff --git a/Directory.Build.props b/Directory.Build.props index ad2e476..cc5a5ea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,15 +2,15 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -46,4 +46,10 @@ PackagePath="\" Link="LICENSE" /> + + + + enable + net8.0;net10.0 + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..1240d9a --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,17 @@ + + + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Hyperbee.Resources.slnx b/Hyperbee.Resources.slnx index f72cf28..118963f 100644 --- a/Hyperbee.Resources.slnx +++ b/Hyperbee.Resources.slnx @@ -1,6 +1,7 @@ + diff --git a/src/Hyperbee.Resources/Hyperbee.Resources.csproj b/src/Hyperbee.Resources/Hyperbee.Resources.csproj index 0b99969..3b0fded 100644 --- a/src/Hyperbee.Resources/Hyperbee.Resources.csproj +++ b/src/Hyperbee.Resources/Hyperbee.Resources.csproj @@ -1,8 +1,6 @@  - net10.0 - enable enable true true @@ -12,7 +10,7 @@ resources;NET;embedded resources icon.png https://github.com/Stillpoint-Software/Hyperbee.Resources/ - net10.0 + net8.0;net10.0 LICENSE Stillpoint Software, Inc. Hyperbee Resources @@ -35,11 +33,11 @@ \ PreserveNewest - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Hyperbee.Resources.Tests/AssemblyInfo.cs b/test/Hyperbee.Resources.Tests/AssemblyInfo.cs new file mode 100644 index 0000000..a4f4c34 --- /dev/null +++ b/test/Hyperbee.Resources.Tests/AssemblyInfo.cs @@ -0,0 +1,6 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +// Explicitly enable test parallelization at method level +// This allows multiple test methods to run in parallel for faster execution +// Safe for resource loading tests that don't share mutable state +[assembly: Parallelize( Workers = 0, Scope = ExecutionScope.MethodLevel )] diff --git a/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj b/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj index ed5d497..7b7bba7 100644 --- a/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj +++ b/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj @@ -1,10 +1,7 @@  - net10.0 - enable enable - false true @@ -18,13 +15,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -36,11 +33,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/version.json b/version.json index 026c978..2e042e3 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.0.3", + "version": "2.0.4", "publicReleaseRefSpec": [ "^refs/heads/main$", "^refs/heads/hotfix$",