Change to use AnyCPU to address mono issue

This fixes #1247, because issue in .NET Core tooling AnyCPU needs to be specified
cake-build · Oct 10, 2016 · a4185cf · a4185cf
1 parent 3a8ac68
commit a4185cf
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 15 deletions.
diff --git a/src/Cake.Common.Tests/project.json b/src/Cake.Common.Tests/project.json
@@ -1,6 +1,7 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "buildOptions": {
+    "platform": "AnyCpu",
     "additionalArguments": [
       "/ruleset:../Test.ruleset",
       "/additionalfile:../stylecop.json"

diff --git a/src/Cake.Common/project.json b/src/Cake.Common/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -1,6 +1,7 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "buildOptions": {
+    "platform": "AnyCpu",
     "additionalArguments": [
       "/ruleset:../Test.ruleset",
       "/additionalfile:../stylecop.json"

diff --git a/src/Cake.NuGet/project.json b/src/Cake.NuGet/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -1,8 +1,9 @@
 {
-  "version": "0.16.1-*",
+  "version": "0.17.0-*",
   "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
@@ -107,10 +107,5 @@ public static CakeSettings GetCakeSettings(ICakeContext context, IDictionary<str
         settings.ArgumentCustomization = args => "./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;
 }