Add bootstrap to builds, and sync json version

mickaelistria · Oct 30, 2015 · f56b9e4 · f56b9e4
1 parent 337b006
commit f56b9e4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/build.cmd b/build.cmd
@@ -62,6 +62,7 @@ rem if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 
 call dnu build src/OmniSharp.Abstractions --configuration Release --out artifacts
+call dnu build src/OmniSharp.Bootstrap --configuration Release --out artifacts
 call dnu build src/OmniSharp.Dnx --configuration Release --out artifacts
 call dnu build src/OmniSharp.MSBuild --configuration Release --out artifacts
 call dnu build src/OmniSharp.Nuget --configuration Release --out artifacts

diff --git a/build.sh b/build.sh
@@ -58,6 +58,7 @@ popd
 
 dnvm use 1.0.0-beta4
 dnu build src/OmniSharp.Abstractions --configuration Release --out artifacts
+dnu build src/OmniSharp.Bootstrap --configuration Release --out artifacts
 dnu build src/OmniSharp.Dnx --configuration Release --out artifacts
 dnu build src/OmniSharp.MSBuild --configuration Release --out artifacts
 dnu build src/OmniSharp.Nuget --configuration Release --out artifacts

diff --git a/src/OmniSharp.Bootstrap/Program.cs b/src/OmniSharp.Bootstrap/Program.cs
@@ -26,6 +26,7 @@ public int Main(string[] args)
  {
  var enumerator = args.GetEnumerator();
  var pluginPaths = new List<string>();
+ var pluginNames = new List<string>();
 
  var bootstrapPath = Path.GetDirectoryName(_appEnv.ApplicationBasePath);
  var omnisharpProjectPath = Path.Combine(bootstrapPath, "OmniSharp", "project.json");
@@ -43,9 +44,16 @@ public int Main(string[] args)
  enumerator.MoveNext();
  pluginPaths.Add((string)enumerator.Current);
  }
+
+ if (arg == "--plugin-name")
+ {
+ enumerator.MoveNext();
+ pluginNames.Add((string)enumerator.Current);
+ }
  }
 
- if (!pluginPaths.Any()) {
+ if (!pluginPaths.Any() && !pluginNames.Any())
+ {
  Console.WriteLine(Path.GetDirectoryName(omnisharpProjectPath));
  return 0;
  }
@@ -117,6 +125,11 @@ public int Main(string[] args)
 
  var allDeps = new Dictionary<string, string>();
  allDeps.Add("OmniSharp", "1.0.0-*");
+ foreach (var pluginName in pluginNames)
+ {
+ allDeps.Add(pluginName, "");
+ }
+
  var frameworkDeps = new Dictionary<string, Dictionary<string, string>>();
  foreach (var framework in defaultFrameworks)
  {

diff --git a/src/OmniSharp.Bootstrap/project.json b/src/OmniSharp.Bootstrap/project.json
@@ -1,28 +1,23 @@
 {
  "version": "1.0.0-*",
- "description": "OmniSharp.Bootstrap Console Application",
- "authors": [""],
- "tags": [""],
- "projectUrl": "",
- "licenseUrl": "",
- "tooling": {
- "defaultNamespace": "OmniSharp.Bootstrap"
+ "compilationOptions": {
+ "warningsAsErrors": true
  },
-
  "dependencies": {
  "OmniSharp.Abstractions": "1.0.0-*",
  "Newtonsoft.Json": "7.0.1"
  },
-
  "commands": {
  "ConsoleApplication": "ConsoleApplication"
  },
-
  "frameworks": {
  "dnx451": {},
  "dnxcore50": {
  "dependencies": {
- "System.Security.Cryptography.Hashing": "4.0.0-beta-22816"
+ "System.Runtime": "4.0.20-beta-22816",
+ "System.IO.FileSystem": "4.0.0-beta-22816",
+ "System.Dynamic.Runtime": "4.0.10-beta-22816",
+ "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-22816"
  }
  }
  }

diff --git a/src/OmniSharp/project.json b/src/OmniSharp/project.json
@@ -5,6 +5,7 @@
  },
  "dependencies": {
  "OmniSharp.Abstractions": "1.0.0-*",
+ "OmniSharp.Bootstrap": "1.0.0-*",
  "OmniSharp.Dnx": "1.0.0-*",
  "OmniSharp.Stdio": "1.0.0-*",
  "OmniSharp.Nuget": "1.0.0-*",

diff --git a/tests/OmniSharp.Stdio.Tests/project.json b/tests/OmniSharp.Stdio.Tests/project.json
@@ -7,7 +7,7 @@
  "OmniSharp.Stdio": "1.0.0-*",
  "xunit": "2.1.0-beta2-build2977",
  "xunit.runner.dnx": "2.1.0-beta2-build75",
- "Newtonsoft.Json": "6.0.8"
+ "Newtonsoft.Json": "7.0.1"
  },
  "commands": {
  "test": "xunit.runner.dnx"