diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 024b1ff..133dd04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,15 +42,13 @@ jobs: with: fetch-depth: 0 - - name: Install .NET SDK 5.0.x + - name: Install .NET SDK 6.0.x - 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: '5.0.x' - - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '6.0.x' + dotnet-version: | + 6.0.x + 7.0.x + 8.0.x - name: Install .NET Core SDK (global.json) uses: actions/setup-dotnet@v3 diff --git a/global.json b/global.json index 2ece999..7d3b56c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.403", + "version": "8.0.100", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj b/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj index b58a241..e340067 100644 --- a/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj +++ b/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true true @@ -14,8 +14,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.Bakery/Cake.Bakery.csproj b/src/Cake.Bakery/Cake.Bakery.csproj index 292c3d9..732feba 100644 --- a/src/Cake.Bakery/Cake.Bakery.csproj +++ b/src/Cake.Bakery/Cake.Bakery.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true false Exe @@ -15,9 +15,9 @@ - - - + + + diff --git a/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj b/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj index dba1537..b21f2c5 100644 --- a/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj +++ b/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true true @@ -107,12 +107,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj b/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj index a7c71e5..dd132bb 100644 --- a/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj +++ b/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true true @@ -28,8 +28,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj b/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj index 3aadfff..bd37abf 100644 --- a/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj +++ b/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Cake.Scripting/Cake.Scripting.csproj b/src/Cake.Scripting/Cake.Scripting.csproj index b4de1a5..7464a28 100644 --- a/src/Cake.Scripting/Cake.Scripting.csproj +++ b/src/Cake.Scripting/Cake.Scripting.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true AnyCPU @@ -12,9 +12,10 @@ - - + + + diff --git a/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs b/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs index 2239164..1f23343 100644 --- a/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs +++ b/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs @@ -23,8 +23,10 @@ IEnumerable TryGetReferenceAssemblies() foreach (var reference in #if NET6_0 Basic.Reference.Assemblies.Net60.References.All) -#else +#elif NET7_0 Basic.Reference.Assemblies.Net70.References.All) +#else + Basic.Reference.Assemblies.Net80.References.All) #endif { Assembly assembly; diff --git a/tests/integration/Cake.Bakery.Tests.Integration.csproj b/tests/integration/Cake.Bakery.Tests.Integration.csproj index 3fa09df..ce8b1d7 100644 --- a/tests/integration/Cake.Bakery.Tests.Integration.csproj +++ b/tests/integration/Cake.Bakery.Tests.Integration.csproj @@ -1,11 +1,11 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 Exe - - + +