From a4c5586c50c3ab59aeea67e21d9a0d03586b5e8c Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Mon, 10 Oct 2016 10:21:11 +0200 Subject: [PATCH] Change to use AnyCPU to address mono issue This fixes #1247, because issue in .NET Core tooling AnyCPU needs to be specified --- src/Cake.Common.Tests/project.json | 3 ++- src/Cake.Common/project.json | 3 ++- src/Cake.Core.Tests/project.json | 3 ++- src/Cake.Core/project.json | 3 ++- src/Cake.NuGet.Tests/project.json | 3 ++- src/Cake.NuGet/project.json | 3 ++- src/Cake.Testing.Xunit/project.json | 3 ++- src/Cake.Testing/project.json | 3 ++- src/Cake.Tests/project.json | 3 ++- src/Cake/project.json | 3 ++- tests/integration/Cake.Common/Tools/Cake/CakeAliases.cake | 5 ----- 11 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/Cake.Common.Tests/project.json b/src/Cake.Common.Tests/project.json index 9429c15d11..611387dc8f 100644 --- a/src/Cake.Common.Tests/project.json +++ b/src/Cake.Common.Tests/project.json @@ -1,6 +1,7 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "buildOptions": { + "platform": "AnyCpu", "additionalArguments": [ "/ruleset:../Test.ruleset", "/additionalfile:../stylecop.json" diff --git a/src/Cake.Common/project.json b/src/Cake.Common/project.json index de83bec39c..2ee8f5de29 100644 --- a/src/Cake.Common/project.json +++ b/src/Cake.Common/project.json @@ -1,5 +1,5 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "description": "Provides aliases (extension methods on Cake context) that support CI, build, unit tests, zip, signing, etc. for Cake.", "copyright": "Copyright (c) .NET Foundation and contributors", "authors": [ @@ -31,6 +31,7 @@ }, "buildOptions": { "xmlDoc": true, + "platform": "AnyCpu", "additionalArguments": [ "/ruleset:../Cake.ruleset", "/additionalfile:../stylecop.json" diff --git a/src/Cake.Core.Tests/project.json b/src/Cake.Core.Tests/project.json index 4c8e6d3670..28941d31f7 100644 --- a/src/Cake.Core.Tests/project.json +++ b/src/Cake.Core.Tests/project.json @@ -1,5 +1,5 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "dependencies": { "dotnet-test-xunit": "2.2.0-preview2-build1029", "Cake.Core": { @@ -24,6 +24,7 @@ } }, "buildOptions": { + "platform": "AnyCpu", "embed": [ "Unit/Scripting/CodeGen/Expected/Methods/*", "Unit/Scripting/CodeGen/Expected/Properties/*" diff --git a/src/Cake.Core/project.json b/src/Cake.Core/project.json index 72688f26cb..2fc36c881d 100644 --- a/src/Cake.Core/project.json +++ b/src/Cake.Core/project.json @@ -1,5 +1,5 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "description": "The Cake core library.", "copyright": "Copyright (c) .NET Foundation and contributors", "authors": [ @@ -28,6 +28,7 @@ }, "buildOptions": { "xmlDoc": true, + "platform": "AnyCpu", "additionalArguments": [ "/ruleset:../Cake.ruleset", "/additionalfile:../stylecop.json" diff --git a/src/Cake.NuGet.Tests/project.json b/src/Cake.NuGet.Tests/project.json index ec80295ad3..7e8a1673e0 100644 --- a/src/Cake.NuGet.Tests/project.json +++ b/src/Cake.NuGet.Tests/project.json @@ -1,6 +1,7 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "buildOptions": { + "platform": "AnyCpu", "additionalArguments": [ "/ruleset:../Test.ruleset", "/additionalfile:../stylecop.json" diff --git a/src/Cake.NuGet/project.json b/src/Cake.NuGet/project.json index eecc99ccee..afb9bb8b9a 100644 --- a/src/Cake.NuGet/project.json +++ b/src/Cake.NuGet/project.json @@ -1,5 +1,5 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "dependencies": { "Cake.Core": { "target": "project" @@ -11,6 +11,7 @@ }, "buildOptions": { "xmlDoc": true, + "platform": "AnyCpu", "additionalArguments": [ "/ruleset:../Cake.ruleset", "/additionalfile:../stylecop.json" diff --git a/src/Cake.Testing.Xunit/project.json b/src/Cake.Testing.Xunit/project.json index 4a0aa7e52e..4b76a7f038 100644 --- a/src/Cake.Testing.Xunit/project.json +++ b/src/Cake.Testing.Xunit/project.json @@ -1,5 +1,5 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "configurations": { "Release": { "buildOptions": { @@ -8,6 +8,7 @@ } }, "buildOptions": { + "platform": "AnyCpu", "compile": { "includeFiles": [ "../SolutionInfo.cs" diff --git a/src/Cake.Testing/project.json b/src/Cake.Testing/project.json index 767ac9b6b8..c39dfae5d6 100644 --- a/src/Cake.Testing/project.json +++ b/src/Cake.Testing/project.json @@ -1,5 +1,5 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "description": "Contains testing utilities for Cake.", "copyright": "Copyright (c) .NET Foundation and contributors", "authors": [ @@ -22,6 +22,7 @@ }, "buildOptions": { "xmlDoc": true, + "platform": "AnyCpu", "additionalArguments": [ "/ruleset:../Cake.ruleset", "/additionalfile:../stylecop.json" diff --git a/src/Cake.Tests/project.json b/src/Cake.Tests/project.json index 8432830db7..a00a9321ed 100644 --- a/src/Cake.Tests/project.json +++ b/src/Cake.Tests/project.json @@ -1,5 +1,5 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "dependencies": { "dotnet-test-xunit": "2.2.0-preview2-build1029", "Cake": { @@ -27,6 +27,7 @@ } }, "buildOptions": { + "platform": "AnyCpu", "embed": [ "Data/MonoScriptProcessor/ArrayInitializer/*", "Data/MonoScriptProcessor/Blocks/*", diff --git a/src/Cake/project.json b/src/Cake/project.json index ad5f8be374..6f81158d6e 100644 --- a/src/Cake/project.json +++ b/src/Cake/project.json @@ -1,8 +1,9 @@ { - "version": "0.16.1-*", + "version": "0.16.2-*", "buildOptions": { "emitEntryPoint": true, "xmlDoc": true, + "platform": "AnyCpu", "additionalArguments": [ "/ruleset:../Cake.ruleset", "/additionalfile:../stylecop.json" diff --git a/tests/integration/Cake.Common/Tools/Cake/CakeAliases.cake b/tests/integration/Cake.Common/Tools/Cake/CakeAliases.cake index 33f7ce7a6b..39674dfb9e 100644 --- a/tests/integration/Cake.Common/Tools/Cake/CakeAliases.cake +++ b/tests/integration/Cake.Common/Tools/Cake/CakeAliases.cake @@ -107,10 +107,5 @@ public static CakeSettings GetCakeSettings(ICakeContext context, IDictionary "./tools/Cake.CoreCLR/Cake.dll " + args.Render(); } - else if (context.IsRunningOnUnix()) - { - settings.ToolPath = FindToolInPath(context, "mono"); - settings.ArgumentCustomization = args => "./tools/Cake/Cake.exe " + args.Render(); - } return settings; }