Skip to content

Commit

Permalink
Merge pull request #287 from nils-a/release/4.0.0
Browse files Browse the repository at this point in the history
Release/4.0.0
  • Loading branch information
nils-a authored Nov 21, 2023
2 parents c4e2cfc + c8cdad3 commit a93a25b
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 35 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-2019, ubuntu-18.04, macos-10.15 ]
os: [ windows-2022, ubuntu-22.04, macos-12 ]

env:
AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
Expand All @@ -43,18 +43,19 @@ jobs:
WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}

steps:
- name: Checkout the repository
uses: actions/checkout@v3
- name: Checkout the repository
uses: actions/checkout@v4
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- uses: actions/setup-dotnet@v3.0.3
- uses: actions/setup-dotnet@v3.2.0
with:
dotnet-version: |
2.1.818
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
- name: Cache Tools
uses: actions/cache@v3
with:
Expand All @@ -66,7 +67,7 @@ jobs:
script-path: recipe.cake
target: CI
verbosity: Diagnostic
cake-version: 1.3.0
cake-version: tool-manifest
- name: Upload Issues
uses: actions/upload-artifact@v3
with:
Expand All @@ -81,4 +82,4 @@ jobs:
with:
if-no-files-found: warn
name: package
path: BuildArtifacts/Packages/**/*
path: BuildArtifacts/Packages/**/*
12 changes: 7 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand All @@ -31,12 +31,14 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v3.0.3
- uses: actions/setup-dotnet@v3.2.0
with:
dotnet-version: 7.0.x
dotnet-version: |
5.0.x
8.0.x
- name: Cache Tools
uses: actions/cache@v3
Expand All @@ -59,7 +61,7 @@ jobs:
with:
script-path: recipe.cake
target: DotNetCore-Build
cake-version: 1.3.0
cake-version: tool-manifest
env:
COMPlus_DbgEnableMiniDump: 1
COMPlus_DbgMiniDumpType: 1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publishDocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ env:

jobs:
cake:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Fetch all tags and branches
run: git fetch --prune --unshallow

- name: Cache Tools
uses: actions/cache@v3
with:
Expand All @@ -32,4 +32,4 @@ jobs:
script-path: recipe.cake
target: Force-Publish-Documentation
verbosity: Diagnostic
cake-version: 1.3.0
cake-version: tool-manifest
2 changes: 1 addition & 1 deletion demo/cake/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "2.0.0",
"version": "4.0.0",
"commands": [
"dotnet-cake"
]
Expand Down
2 changes: 1 addition & 1 deletion demo/frosting/build/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Reference Include="Cake.7zip, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\src\Cake.7zip\bin\Release\net6.0\Cake.7zip.dll</HintPath>
</Reference>
<PackageReference Include="Cake.Frosting" Version="3.0.0" />
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Remove="output\**" />
Expand Down
3 changes: 2 additions & 1 deletion demo/frosting/build/BuildSetup.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using Cake.Common.Diagnostics;
using Cake.Core;
using Cake.Frosting;

namespace Build
{
public class BuildSetup : FrostingSetup<BuildContext>
{
public override void Setup(BuildContext context)
public override void Setup(BuildContext context, ISetupContext info)
{
var startPath = context.Environment.WorkingDirectory;
context.Information($"Frosting was started from: {startPath}");
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.100",
"version": "8.0.100",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion recipe.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load nuget:?package=Cake.Recipe&version=3.0.1
#load nuget:?package=Cake.Recipe&version=3.1.1

Environment.SetVariableNames();

Expand Down
20 changes: 10 additions & 10 deletions src/Cake.7zip.Tests/Cake.7zip.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
This is done to make Cake.Recipe avoid using OpenCover. Remove this hack if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0
-->
<TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<CodeAnalysisRuleSet>..\cake.7zip.ruleset</CodeAnalysisRuleSet>

<IsPackable>false</IsPackable>
Expand All @@ -15,21 +15,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Testing" Version="3.0.0" />
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
<PackageReference Include="Cake.Testing" Version="4.0.0" />
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.analyzers" Version="1.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.analyzers" Version="1.6.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions src/Cake.7zip/Cake.7zip.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
Expand Down Expand Up @@ -39,16 +39,16 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="CakeContrib.Guidelines" Version="1.4.0" PrivateAssets="All" />
<PackageReference Include="IDisposableAnalyzers" Version="4.0.2">
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="CakeContrib.Guidelines" Version="1.5.1" PrivateAssets="All" />
<PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="stylecop.analyzers" Version="1.1.118">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>

0 comments on commit a93a25b

Please sign in to comment.