Skip to content

Commit

Permalink
Merge pull request #398 from nils-a/feature/GH-396
Browse files Browse the repository at this point in the history
(#396) Update Cake.Core to 4.0.0
  • Loading branch information
nils-a authored Nov 23, 2023
2 parents 6e4c60e + cbbcb08 commit 60b1822
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions demo/frosting/build/Build.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<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" />
<PackageReference Include="Cake.Npm" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="Cake.ESLint, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\src\Cake.ESLint\bin\Debug\netstandard2.0\Cake.ESLint.dll</HintPath>
<Reference Include="Cake.ESLint">
<HintPath>$(ProjectDir)../../../src/Cake.ESLint/bin/Debug/net8.0/Cake.ESLint.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
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
6 changes: 3 additions & 3 deletions demo/script/build.cake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#addin nuget:?package=Cake.Npm&version=3.0.0
#r "..\..\src\Cake.ESLint\bin\Debug\net6.0\Cake.ESLint.dll"
#r "..\..\src\Cake.ESLint\bin\Debug\net8.0\Cake.ESLint.dll"

///////////////////////////////////////////////////////////////////////////////
// ARGUMENTS
Expand All @@ -12,11 +12,11 @@ var target = Argument("target", "Default");
///////////////////////////////////////////////////////////////////////////////

Task("ensure-eslint-tool")
.Does(() =>
.Does(() =>
{
var tools = Context.Configuration.GetToolPath(Context.Environment.WorkingDirectory, Context.Environment);
CreateDirectory(tools);
var settings = new NpmInstallSettings
var settings = new NpmInstallSettings
{
WorkingDirectory = tools
};
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
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>
<NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>

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

<ItemGroup>
<PackageReference Include="Cake.Testing" 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>
Expand Down
6 changes: 3 additions & 3 deletions src/Cake.ESLint/Cake.ESLint.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>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand Down Expand Up @@ -32,8 +32,8 @@
</PropertyGroup>

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

0 comments on commit 60b1822

Please sign in to comment.