Skip to content

Commit

Permalink
Merge branch 'release/0.7.0'
Browse files Browse the repository at this point in the history
* release/0.7.0:
  (#142) replace the default InspectCode task
  (#142) update JetBrains.ReSharper.CommandLineTools
  (#142) move actions/setup-dotnet after actions/checkout
  (#142) Update builds for .NET 6.0
  (#142) Compile additional for .NET Standard 2.0
  (#142) MSBuild can not build .NET 6.0
  (#142) Update integration tests
  (#142) Remove mention of net461
  (#142) Pin to Cake 0.38.5 for build
  (#142) Change TFM to .NET 6.0
  • Loading branch information
gep13 committed Nov 11, 2021
2 parents 3665b24 + 81b1b06 commit 2217a74
Show file tree
Hide file tree
Showing 30 changed files with 89 additions and 121 deletions.
5 changes: 4 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
#---------------------------------#

# Build worker image (VM template)
image: Visual Studio 2019
image: Visual Studio 2022

install:
- ps: dotnet --info

#---------------------------------#
# Build Script #
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,15 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
steps:
- name: Setup dotnet 3.1.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.x'
- name: Setup dotnet 5.0.100
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
- name: Checkout the repository
uses: actions/checkout@v2

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

- name: Install .NET Core SDK (global.json)
uses: actions/setup-dotnet@v1

- name: Cache Tools
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $DotNetUnixInstallerUri = 'https://dot.net/v1/dotnet-install.sh'
$DotNetChannel = 'LTS'
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent

[string] $DotNetVersion = '5.0.100'
[string] $DotNetVersion = '6.0.100'

###########################################################################
# INSTALL .NET CORE CLI
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Define varibles
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
DOTNET_VERSION="5.0.100"
DOTNET_VERSION="6.0.100"

###########################################################################
# INSTALL .NET CORE CLI
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": "5.0.100",
"version": "6.0.100",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion nuspec/chocolatey/Cake-Bakery.portable.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<iconUrl>https://raw.githubusercontent.com/cake-build/graphics/master/png/cake-medium.png</iconUrl>
</metadata>
<files>
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\Cake.Bakery\net461\**\*.*" exclude="runtimes/*.*" target="tools"/>
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\Cake.Bakery\net6.0\**\*.*" exclude="runtimes/*.*" target="tools"/>
<file src="..\..\LICENSE" target="tools\LICENSE"/>
<file src="VERIFICATION.txt" target="tools"/>
</files>
Expand Down
71 changes: 39 additions & 32 deletions recipe.cake
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ BuildParameters.SetParameters(context: Context,
shouldRunDotNetCorePack: true,
shouldRunDupFinder: false,
shouldRunCodecov: false,
shouldRunInspectCode: false, // we have a workaround in place
nugetConfig: "./src/NuGet.Config",
gitterMessage: "@/all " + standardNotificationMessage,
twitterMessage: standardNotificationMessage,
Expand All @@ -29,7 +30,11 @@ ToolSettings.SetToolSettings(context: Context,
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");

var binArtifactPath = BuildParameters.Paths.Directories.PublishedApplications.Combine("Cake.Bakery/net461");
// workaround https://github.com/cake-contrib/Cake.Recipe/issues/862
ToolSettings.SetToolPreprocessorDirectives(
reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.2.0");

var binArtifactPath = BuildParameters.Paths.Directories.PublishedApplications.Combine("Cake.Bakery/net6.0");
var zipArtifactsPath = BuildParameters.Paths.Directories.Build.Combine("Packages/Zip");
var omnisharpBaseDownloadURL = "https://omnisharpdownload.blob.core.windows.net/ext";
var omnisharpMonoRuntimeMacOS = $"{omnisharpBaseDownloadURL}/mono.macOS-5.12.0.301.zip";
Expand Down Expand Up @@ -92,29 +97,6 @@ Task("Publish-GitHub-Release-Zip")
publishingError = true;
});

// Override default Build and Restore tasks
(BuildParameters.Tasks.DotNetCoreRestoreTask.Task as CakeTask).Actions.Clear();
(BuildParameters.Tasks.DotNetCoreBuildTask.Task as CakeTask).Actions.Clear();
BuildParameters.Tasks.DotNetCoreBuildTask
.Does<BuildVersion>((context, buildVersion) =>
{
Information("Building {0}", BuildParameters.SolutionFilePath);

MSBuild(BuildParameters.SolutionFilePath.FullPath, new MSBuildSettings {
Configuration = BuildParameters.Configuration,
Restore = true,
Properties = {
["Version"] = new[] { buildVersion.SemVersion },
["AssemblyVersion"] = new[] { "1.0.0.0" },
["FileVersion"] = new[] { buildVersion.Version },
["AssemblyInformationalVersion"] = new[] { buildVersion.InformationalVersion },
}
});

CleanDirectory(binArtifactPath);
CopyFiles(GetFiles($"./src/Cake.Bakery/bin/{BuildParameters.Configuration}/net461/**/*"), binArtifactPath, true);
});

// Override default Pack task
(BuildParameters.Tasks.DotNetCorePackTask.Task as CakeTask).Actions.Clear();
BuildParameters.Tasks.DotNetCorePackTask
Expand Down Expand Up @@ -182,12 +164,10 @@ Task("Init-Integration-Tests")
FallbackSource = new[] { "https://api.nuget.org/v3/index.json" }
});

MSBuild("./tests/integration/integration.csproj", new MSBuildSettings {
DotNetCoreBuild("./tests/integration/Cake.Bakery.Tests.Integration.csproj", new DotNetCoreBuildSettings {
Configuration = BuildParameters.Configuration,
Restore = true,
Properties = {
["OutputPath"] = new[] { "./bin/" }
}
NoRestore = false,
OutputDirectory = "./tests/integration/bin"
});
});

Expand Down Expand Up @@ -235,7 +215,7 @@ Task("Run-Bakery-Integration-Tests")
if (!IsRunningOnWindows())
{
var exitCode = StartProcess("mono", new ProcessSettings {
Arguments = MakeAbsolute(new FilePath("./tests/integration/bin/integration.exe")).FullPath + " " +
Arguments = MakeAbsolute(new FilePath("./tests/integration/bin/Cake.Bakery.Tests.Integration.exe")).FullPath + " " +
MakeAbsolute(new FilePath("./tests/integration/tools/Cake.Bakery/tools/Cake.Bakery.exe")).FullPath,
WorkingDirectory = new DirectoryPath("./tests/integration")
});
Expand All @@ -247,7 +227,7 @@ Task("Run-Bakery-Integration-Tests")

exitCode = StartProcess("./tests/integration/mono/run", new ProcessSettings {
Arguments = "--no-omnisharp " +
MakeAbsolute(new FilePath("./tests/integration/bin/integration.exe")).FullPath + " " +
MakeAbsolute(new FilePath("./tests/integration/bin/Cake.Bakery.Tests.Integration.exe")).FullPath + " " +
MakeAbsolute(new FilePath("./tests/integration/tools/Cake.Bakery/tools/Cake.Bakery.exe")).FullPath,
WorkingDirectory = new DirectoryPath("./tests/integration")
});
Expand All @@ -259,7 +239,7 @@ Task("Run-Bakery-Integration-Tests")
}
else
{
var exitCode = StartProcess("./tests/integration/bin/integration.exe", new ProcessSettings {
var exitCode = StartProcess("./tests/integration/bin/Cake.Bakery.Tests.Integration.exe", new ProcessSettings {
Arguments = MakeAbsolute(new FilePath("./tests/integration/tools/Cake.Bakery/tools/Cake.Bakery.exe")).FullPath,
WorkingDirectory = new DirectoryPath("./tests/integration")
});
Expand Down Expand Up @@ -340,4 +320,31 @@ Task("Sign-Binaries")
}
});

// additional workaround for https://github.com/cake-contrib/Cake.Recipe/issues/862
// to suppress the --build/--no-build warning that is generated in the default
BuildParameters.Tasks.InspectCodeTask = Task("InspectCode2021")
.WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping due to not running on Windows")
.Does<BuildData>(data => RequireTool(ToolSettings.ReSharperTools, () => {
var inspectCodeLogFilePath = BuildParameters.Paths.Directories.InspectCodeTestResults.CombineWithFilePath("inspectcode.xml");

var settings = new InspectCodeSettings() {
SolutionWideAnalysis = true,
OutputFile = inspectCodeLogFilePath,
ArgumentCustomization = x => x.Append("--no-build")
};

if (FileExists(BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName)))
{
settings.Profile = BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName);
}

InspectCode(BuildParameters.SolutionFilePath, settings);

// Pass path to InspectCode log file to Cake.Issues.Recipe
IssuesParameters.InputFiles.InspectCodeLogFilePath = inspectCodeLogFilePath;
})
);
BuildParameters.Tasks.AnalyzeTask.IsDependentOn("InspectCode2021");
IssuesBuildTasks.ReadIssuesTask.IsDependentOn("InspectCode2021");

Build.RunDotNetCore();
2 changes: 1 addition & 1 deletion src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<IsCakeTestProject>true</IsCakeTestProject>
</PropertyGroup>
Expand Down
56 changes: 21 additions & 35 deletions src/Cake.Bakery.sln
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30709.132
# Visual Studio Version 17
VisualStudioVersion = 17.0.31717.71
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Bakery", "Cake.Bakery\Cake.Bakery.csproj", "{121DB3A6-CF66-4A9C-8CBE-0D77C9F43BA0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Scripting", "Cake.Scripting\Cake.Scripting.csproj", "{449B5DB5-6772-4601-9976-9BD4CBDBAC8F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Scripting.Tests", "Cake.Scripting.Tests\Cake.Scripting.Tests.csproj", "{0C65770C-8A9D-4BEF-B42E-B75F3F1521BE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A0CAC73D-2BF4-4C58-A9C4-8B943FA0E785}"
ProjectSection(SolutionItems) = preProject
Shared.props = Shared.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{775E536B-2E05-43CF-9917-9864C7E099A1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Bakery.Tests", "Cake.Bakery.Tests\Cake.Bakery.Tests.csproj", "{46980627-657B-4075-928F-1143A20DEC6C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Scripting.Abstractions", "Cake.Scripting.Abstractions\Cake.Scripting.Abstractions.csproj", "{55A9E6D5-3420-4641-8B27-2CA80A74F813}"
Expand All @@ -24,16 +17,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Scripting.Transport",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Scripting.Transport.Tests", "Cake.Scripting.Transport.Tests\Cake.Scripting.Transport.Tests.csproj", "{9F448FB9-7A89-4EAA-B748-6046CB1330A9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unit", "unit", "{8B759B98-7125-4175-8EE0-1218E28F8A8F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{F346C211-5B5E-4DFD-84CB-FE37C74DCE27}"
ProjectSection(SolutionItems) = preProject
NuGet.config = NuGet.config
Shared.props = Shared.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integration", "integration", "{74DC4D8A-F1C5-473D-9531-81D242AA60A6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Bakery.Tests.Integration", "..\tests\integration\Cake.Bakery.Tests.Integration.csproj", "{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "integration", "..\tests\integration\integration.csproj", "{4560EB98-29E6-4F3B-A536-A819F6CA3B63}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A90ECBAF-7DCA-476C-BDFF-9893C20232CD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -129,33 +121,27 @@ Global
{9F448FB9-7A89-4EAA-B748-6046CB1330A9}.Release|x64.Build.0 = Release|Any CPU
{9F448FB9-7A89-4EAA-B748-6046CB1330A9}.Release|x86.ActiveCfg = Release|Any CPU
{9F448FB9-7A89-4EAA-B748-6046CB1330A9}.Release|x86.Build.0 = Release|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Debug|x64.ActiveCfg = Debug|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Debug|x64.Build.0 = Debug|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Debug|x86.ActiveCfg = Debug|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Debug|x86.Build.0 = Debug|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Release|Any CPU.Build.0 = Release|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Release|x64.ActiveCfg = Release|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Release|x64.Build.0 = Release|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Release|x86.ActiveCfg = Release|Any CPU
{4560EB98-29E6-4F3B-A536-A819F6CA3B63}.Release|x86.Build.0 = Release|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Debug|x64.ActiveCfg = Debug|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Debug|x64.Build.0 = Debug|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Debug|x86.ActiveCfg = Debug|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Debug|x86.Build.0 = Debug|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Release|Any CPU.Build.0 = Release|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Release|x64.ActiveCfg = Release|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Release|x64.Build.0 = Release|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Release|x86.ActiveCfg = Release|Any CPU
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{121DB3A6-CF66-4A9C-8CBE-0D77C9F43BA0} = {A0CAC73D-2BF4-4C58-A9C4-8B943FA0E785}
{449B5DB5-6772-4601-9976-9BD4CBDBAC8F} = {A0CAC73D-2BF4-4C58-A9C4-8B943FA0E785}
{0C65770C-8A9D-4BEF-B42E-B75F3F1521BE} = {8B759B98-7125-4175-8EE0-1218E28F8A8F}
{46980627-657B-4075-928F-1143A20DEC6C} = {8B759B98-7125-4175-8EE0-1218E28F8A8F}
{55A9E6D5-3420-4641-8B27-2CA80A74F813} = {A0CAC73D-2BF4-4C58-A9C4-8B943FA0E785}
{20EE22C2-6C99-4896-BCE5-2840218C5AAB} = {A0CAC73D-2BF4-4C58-A9C4-8B943FA0E785}
{9F448FB9-7A89-4EAA-B748-6046CB1330A9} = {8B759B98-7125-4175-8EE0-1218E28F8A8F}
{8B759B98-7125-4175-8EE0-1218E28F8A8F} = {775E536B-2E05-43CF-9917-9864C7E099A1}
{74DC4D8A-F1C5-473D-9531-81D242AA60A6} = {775E536B-2E05-43CF-9917-9864C7E099A1}
{4560EB98-29E6-4F3B-A536-A819F6CA3B63} = {74DC4D8A-F1C5-473D-9531-81D242AA60A6}
{0C65770C-8A9D-4BEF-B42E-B75F3F1521BE} = {A90ECBAF-7DCA-476C-BDFF-9893C20232CD}
{46980627-657B-4075-928F-1143A20DEC6C} = {A90ECBAF-7DCA-476C-BDFF-9893C20232CD}
{9F448FB9-7A89-4EAA-B748-6046CB1330A9} = {A90ECBAF-7DCA-476C-BDFF-9893C20232CD}
{E4F3C9AD-C2AF-43F8-B26C-66EAB2D51321} = {A90ECBAF-7DCA-476C-BDFF-9893C20232CD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {81962124-7F99-4AF9-807F-607F27DFCDBB}
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Bakery/Cake.Bakery.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<PreserveCompilationContext>false</PreserveCompilationContext>
<OutputType>Exe</OutputType>
Expand Down
11 changes: 0 additions & 11 deletions src/Cake.Bakery/app.config

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<PlatformTarget>AnyCPU</PlatformTarget>

Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<IsCakeTestProject>true</IsCakeTestProject>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Text;
using Cake.Core.IO;

namespace Cake.Scripting.Tests.Extensions
namespace Cake.Scripting.Tests
{
internal static class FileSystemExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Scripting.Tests/Extensions/StringExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static class StringExtensions
/// Removes line endings from the specified text.
/// </summary>
/// <param name="text">The text.</param>
/// <returns>The text without line ending</returns>
/// <returns>The text without line ending.</returns>
public static string NormalizeGeneratedCode(this string text)
{
return text.NormalizeLineEndings()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using Cake.Core.IO;
using Cake.Scripting.CodeGen;
using Cake.Scripting.CodeGen.Generators;
using Cake.Scripting.Tests;

namespace Cake.Scripting.Tests.Fixtures
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using Cake.Core.IO;
using Cake.Scripting.Abstractions.Models;
using Cake.Scripting.IO;
using Cake.Scripting.Tests.Extensions;
using Cake.Scripting.Tests.Fixtures;
using Cake.Testing;
using Xunit;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<IsCakeTestProject>true</IsCakeTestProject>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<PlatformTarget>AnyCPU</PlatformTarget>

Expand Down
Loading

0 comments on commit 2217a74

Please sign in to comment.