Merge branch 'release/0.14.0'

cake-build · Jul 9, 2023 · 120bd21 · 120bd21
2 parents 6fd7e86 + 0141fd1
commit 120bd21
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 30 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,11 +34,15 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
     steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v2
+      - name: Get the sources
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
-      - name: Fetch all tags and branches
-        run: git fetch --prune --unshallow
+      - name: Install .NET SDK 5.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
@@ -47,6 +51,8 @@ jobs:
 
       - name: Install .NET Core SDK (global.json)
         uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: global.json
 
       - name: Cache Tools
         uses: actions/cache@v2

diff --git a/.github/workflows/posixbuild.yml b/.github/workflows/posixbuild.yml
@@ -15,14 +15,25 @@ jobs:
         os: [macos-latest]
 
     steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v2
+      - name: Get the sources
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
-      - name: Fetch all tags and branches
-        run: git fetch --prune --unshallow
+      - name: Install .NET SDK 5.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'
 
       - name: Install .NET Core SDK (global.json)
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: global.json
 
       - name: Cache Tools
         uses: actions/cache@v2

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "7.0.100",
+        "version": "7.0.305",
         "rollForward": "latestFeature"
     }
 }
diff --git a/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj b/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj
@@ -13,9 +13,9 @@
   <Import Project="..\Shared.props" />
 
   <ItemGroup>
-    <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">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <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
@@ -15,8 +15,8 @@
     <InternalsVisibleTo Include="Cake.Bakery.Tests" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="3.0.0" />
-    <PackageReference Include="Cake.NuGet" Version="3.0.0" />
+    <PackageReference Include="Cake.Core" Version="3.1.0" />
+    <PackageReference Include="Cake.NuGet" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj b/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj
@@ -107,12 +107,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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.4.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Cake.Core" Version="3.1.0" />
+    <PackageReference Include="Cake.Testing" Version="3.1.0" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <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
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Cake.Scripting/Cake.Scripting.csproj b/src/Cake.Scripting/Cake.Scripting.csproj
@@ -12,11 +12,11 @@
     <InternalsVisibleTo Include="Cake.Scripting.Tests" />
   </ItemGroup>
   <ItemGroup>
-    <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.Net70" Version="1.4.1" Condition="'$(TargetFramework)' == 'net7.0'" />
-    <PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.4.1" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <PackageReference Include="Cake.Core" Version="3.1.0" />
+    <PackageReference Include="Cake.Common" Version="3.1.0" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net70" Version="1.4.2" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.4.2" Condition="'$(TargetFramework)' == 'net6.0'" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cake.Scripting.Abstractions\Cake.Scripting.Abstractions.csproj" />

diff --git a/tests/integration/Cake.Bakery.Tests.Integration.csproj b/tests/integration/Cake.Bakery.Tests.Integration.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xunit.Assert" Version="2.4.2" />
+    <PackageReference Include="Xunit.Assert" Version="2.5.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>