Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#354) Update Cake.Core to 4.0.0 #356

Merged
merged 2 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
2.1.818
3.1.x
5.0.x
6.0.x
7.0.x
2.1
3.1
5.0
6.0
7.0
8.0
- name: Cache Tools
uses: actions/cache@v3
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
5.0
6.0
7.0
8.0
- name: Cache Tools
uses: actions/cache@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions demo/frosting/build/Build.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="3.2.0" />
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="Cake.Gradle, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\src\Cake.Gradle\bin\Release\net6.0\Cake.Gradle.dll</HintPath>
<Reference Include="Cake.Gradle">
<HintPath>$(ProjectDir)../../../src/Cake.Gradle/bin/Release/net8.0/Cake.Gradle.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion demo/script/.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
12 changes: 6 additions & 6 deletions demo/script/build.cake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// build artifacts first by executing ./build.ps1 in root
#r "../../src/Cake.Gradle/bin/Release/net6.0/Cake.Gradle.dll"
#r "../../src/Cake.Gradle/bin/Release/net8.0/Cake.Gradle.dll"

// requires Java Runtime Environment
// requires Java Runtime Environment

Task("Gradle-Example")
.Does(() =>
Expand All @@ -12,15 +12,15 @@ Task("Gradle-Example")
// Run 'gradle --version'
// run this, in example folder too. So the "test" does not break when gradle is not installed globally.
Gradle.FromPath("./example").WithArguments("--version").Run();

// Run 'gradle hello' in a specific folder
// Note: if you have a gradle wrapper setup in the specified path, this one will be used
Gradle.FromPath("./example").WithTask("hello").Run();

// Run 'gradle hello' in a specific folder with default log level
// Note: if no log level is set, it is derived from the Cake verbosity (which is set to 'verbose' in build.ps1)
Gradle.FromPath("./example").WithTask("hello").WithLogLevel(GradleLogLevel.Default).Run();
Gradle.FromPath("./example").WithTask("hello").WithLogLevel(GradleLogLevel.Default).Run();

// Run 'gradle --offline --build-file build.gradle hello' in a specific folder
Gradle.FromPath("./example").WithTask("hello").WithArguments("--offline --build-file build.gradle").Run();
});
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "latestFeature"
}
}
11 changes: 8 additions & 3 deletions src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<!--
Fool Cake.Incubator into thinking we're building against netcoreapp3.1.
This is done to make Cake.Recipe avoid using OpenCover.
https://github.com/cake-contrib/Cake.Recipe/issues/570 will resolve this workaround.
-->
<TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoFixture.AutoMoq" Version="4.18.0" />
<PackageReference Include="Cake.Common" Version="3.0.0" />
<PackageReference Include="Cake.Testing" Version="3.2.0" />
<PackageReference Include="Cake.Common" Version="4.0.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>
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.Gradle/Cake.Gradle.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>
<CodeAnalysisRuleSet>$(SolutionDir)/Cake.Gradle.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
Expand Down Expand Up @@ -32,13 +32,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="CakeContrib.Guidelines" Version="1.4.0">
<PackageReference Include="CakeContrib.Guidelines" Version="1.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading