Merge branch 'release/0.13.0'

* release/0.13.0: (build) Update DOTNET_VERSION (GH-176) Updated Cake tool to version 3.0.0 * fixes 176
cake-build · Nov 9, 2022 · 6fd7e86 · 6fd7e86
2 parents dd7e12f + 25cfae9
commit 6fd7e86
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 31 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,6 +10,9 @@ image:
 #  Build Script                   #
 #---------------------------------#
 build_script:
+  - ps: Invoke-RestMethod -Uri 'https://dot.net/v1/dotnet-install.ps1' -OutFile '.\dotnet-install.ps1'
+  - ps: New-Item -Path .\.dotnet -ItemType Directory -Force | Out-Null
+  - ps: .\dotnet-install.ps1 -Channel 6.0 -InstallDir .\.dotnet
   - ps: .\build.ps1 --target=CI
 
 # Tests

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,8 +40,13 @@ jobs:
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
 
+      - name: Install .NET SDK 6.0.x
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '6.0.x'
+
       - name: Install .NET Core SDK (global.json)
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
 
       - name: Cache Tools
         uses: actions/cache@v2

diff --git a/build.sh b/build.sh
@@ -2,7 +2,7 @@
 
 # Define varibles
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-DOTNET_VERSION="6.0.402"
+DOTNET_VERSION="7.0.100"
 
 ###########################################################################
 # INSTALL .NET CORE CLI

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.402",
+        "version": "7.0.100",
         "rollForward": "latestFeature"
     }
 }
diff --git a/recipe.cake b/recipe.cake
@@ -175,6 +175,7 @@ Task("Init-Integration-Tests")
     DotNetCoreBuild("./tests/integration/Cake.Bakery.Tests.Integration.csproj", new DotNetCoreBuildSettings {
         Configuration = BuildParameters.Configuration,
         NoRestore = false,
+        Framework = "net6.0",
         OutputDirectory = "./tests/integration/bin"
     });
 });

diff --git a/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj b/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <IsCakeTestProject>true</IsCakeTestProject>
   </PropertyGroup>
@@ -13,9 +13,9 @@
   <Import Project="..\Shared.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Cake.Bakery/Cake.Bakery.csproj b/src/Cake.Bakery/Cake.Bakery.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
     <PreserveCompilationContext>false</PreserveCompilationContext>
     <OutputType>Exe</OutputType>
@@ -15,9 +15,9 @@
     <InternalsVisibleTo Include="Cake.Bakery.Tests" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.3.0" />
-    <PackageReference Include="Cake.NuGet" Version="2.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" />
+    <PackageReference Include="Cake.NuGet" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cake.Scripting.Abstractions\Cake.Scripting.Abstractions.csproj" />

diff --git a/src/Cake.Scripting.Abstractions/Cake.Scripting.Abstractions.csproj b/src/Cake.Scripting.Abstractions/Cake.Scripting.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
     <PlatformTarget>AnyCPU</PlatformTarget>
 

diff --git a/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj b/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <IsCakeTestProject>true</IsCakeTestProject>
   </PropertyGroup>
@@ -107,12 +107,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.3.0" />
-    <PackageReference Include="Cake.Testing" Version="2.3.0" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" />
+    <PackageReference Include="Cake.Testing" Version="3.0.0" />
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <IsCakeTestProject>true</IsCakeTestProject>
 
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj b/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cake.Scripting/Cake.Scripting.csproj b/src/Cake.Scripting/Cake.Scripting.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
@@ -12,10 +12,11 @@
     <InternalsVisibleTo Include="Cake.Scripting.Tests" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.3.0" />
-    <PackageReference Include="Cake.Common" Version="2.3.0" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" />
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
-    <PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.3.0" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net70" Version="1.4.1" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.4.1" Condition="'$(TargetFramework)' == 'net6.0'" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cake.Scripting.Abstractions\Cake.Scripting.Abstractions.csproj" />

diff --git a/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs b/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs
@@ -20,7 +20,12 @@ public Assembly[] GetReferenceAssemblies()
         {
             IEnumerable<Assembly> TryGetReferenceAssemblies()
             {
-                foreach (var reference in Basic.Reference.Assemblies.Net60.All)
+                foreach (var reference in
+#if NET6_0
+            Basic.Reference.Assemblies.Net60.References.All)
+#else
+            Basic.Reference.Assemblies.Net70.References.All)
+#endif
                 {
                     Assembly assembly;
                     try

diff --git a/tests/integration/Cake.Bakery.Tests.Integration.csproj b/tests/integration/Cake.Bakery.Tests.Integration.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xunit.Assert" Version="2.4.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Xunit.Assert" Version="2.4.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Cake.Scripting.Abstractions\Cake.Scripting.Abstractions.csproj" />