Merge pull request OmniSharp#653 from DustinCampbell/support-32bit-wi…

…ndows Support 32-bit Windows
Zajn · Oct 26, 2016 · d20ba23 · d20ba23
2 parents 92e1099 + c8feec6
commit d20ba23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build.cake b/build.cake
@@ -96,9 +96,14 @@ Task("PopulateRuntimes")
  .IsDependentOn("BuildEnvironment")
  .Does(() =>
 {
- if (IsRunningOnWindows())
+ if (IsRunningOnWindows() && string.Equals(Environment.GetEnvironmentVariable("APPVEYOR"), "True"))
  {
- buildPlan.Rids = new string[] {"default"};
+ buildPlan.Rids = new string[]
+ {
+ "default", // To allow testing the published artifact
+ "win7-x86",
+ "win7-x64"
+ };
  }
  else if (string.Equals(Environment.GetEnvironmentVariable("TRAVIS_OS_NAME"), "linux"))
  {
@@ -116,6 +121,7 @@ Task("PopulateRuntimes")
  }
  else
  {
+ // In this case, the build is not happening in CI, so just use the default RID.
  buildPlan.Rids = new string[] {"default"};
  }
 });

diff --git a/src/OmniSharp/project.json b/src/OmniSharp/project.json
@@ -1,6 +1,7 @@
 {
  "version": "1.0.0-*",
  "buildOptions": {
+ "platform": "anycpu",
  "warningsAsErrors": true,
  "preserveCompilationContext": true,
  "emitEntryPoint": true