Merge pull request #501 from OmniSharp/troy/fix.deps2

A few follow up changes after dependencies update
OmniSharp · Apr 5, 2016 · aab690c · aab690c
2 parents 2f4774e + 9a9a360
commit aab690c
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 44 deletions.
diff --git a/build.json b/build.json
@@ -3,7 +3,7 @@
     "DotNetFolder": ".dotnet",
     "DotNetInstallScriptURL": "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain",
     "DotNetChannel": "beta",
-    "DotNetVersion": "Latest",
+    "DotNetVersion": "1.0.0-beta-002202",
     "BuildToolsFolder": ".tools",
     "ArtifactsFolder": "artifacts",
     "TestProjects": {

diff --git a/scripts/cake-bootstrap.ps1 b/scripts/cake-bootstrap.ps1
@@ -77,14 +77,6 @@ if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
     New-Item -Path $TOOLS_DIR -Type directory | out-null
 }
 
-# Make sure that packages.config exist.
-if (!(Test-Path $PACKAGES_CONFIG)) {
-    Write-Verbose -Message "Downloading packages.config..."
-    try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
-        Throw "Could not download packages.config."
-    }
-}
-
 # Try download NuGet.exe if not exists
 if (!(Test-Path $NUGET_EXE)) {
     Write-Verbose -Message "Downloading NuGet.exe..."
@@ -106,7 +98,7 @@ if(-Not $SkipToolPackageRestore.IsPresent)
     Set-Location $TOOLS_DIR
 
     Write-Verbose -Message "Restoring tools from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install Cake -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
     Write-Verbose -Message ($NuGetOutput | out-string)
 
     Pop-Location

diff --git a/scripts/cake-bootstrap.sh b/scripts/cake-bootstrap.sh
@@ -35,16 +35,6 @@ if [ ! -d "$TOOLS_DIR" ]; then
   mkdir "$TOOLS_DIR"
 fi
 
-# Make sure that packages.config exist.
-if [ ! -f "$TOOLS_DIR/packages.config" ]; then
-    echo "Downloading packages.config..."
-    curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages
-    if [ $? -ne 0 ]; then
-        echo "An error occured while downloading packages.config."
-        exit 1
-    fi
-fi
-
 # Download NuGet if it does not exist.
 if [ ! -f "$NUGET_EXE" ]; then
     echo "Downloading NuGet..."
@@ -57,7 +47,7 @@ fi
 
 # Restore tools from NuGet.
 pushd "$TOOLS_DIR" >/dev/null
-mono "$NUGET_EXE" install -ExcludeVersion
+mono "$NUGET_EXE" install Cake -ExcludeVersion
 if [ $? -ne 0 ]; then
     echo "Could not restore NuGet packages."
     exit 1

diff --git a/src/OmniSharp.Abstractions/project.json b/src/OmniSharp.Abstractions/project.json
@@ -8,12 +8,12 @@
     "Newtonsoft.Json": "8.0.3",
     "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04",
     "Microsoft.Composition": "1.0.30",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.Configuration": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448",
+    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.Configuration": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449",
     "System.Reflection.Metadata": "1.3.0-rc2-23931"
   },
   "frameworks": {

diff --git a/src/OmniSharp.Bootstrap/project.json b/src/OmniSharp.Bootstrap/project.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "Microsoft.Composition": "1.0.30",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449",
     "Newtonsoft.Json": "8.0.3"
   },
   "commands": {

diff --git a/src/OmniSharp.DotNet/project.json b/src/OmniSharp.DotNet/project.json
@@ -9,7 +9,7 @@
     "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04",
     "Microsoft.CodeAnalysis.Common": "1.3.0-beta1-20160321-04",
     "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448"
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449"
   },
   "frameworks": {
     "net451": {

diff --git a/src/OmniSharp.Host/project.json b/src/OmniSharp.Host/project.json
@@ -10,18 +10,18 @@
     "OmniSharp.Stdio": "1.0.0-*",
     "OmniSharp.Plugins": "1.0.0-*",
     "OmniSharp.Roslyn": "1.0.0-*",
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-20448",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20448",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-20449",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20449",
     "Microsoft.Composition": "1.0.30",
     "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-20448",
+    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-20449",
     "Microsoft.Extensions.DependencyModel": "1.0.0-beta-002202",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-20448",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-20448"
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.Options": "1.0.0-rc2-20449",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-20449"
   },
   "frameworks": {
     "net451": {

diff --git a/src/OmniSharp.MSBuild/project.json b/src/OmniSharp.MSBuild/project.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
     "OmniSharp.Roslyn.CSharp": "1.0.0-*",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-20448"
+    "Microsoft.Extensions.Options": "1.0.0-rc2-20449"
   },
   "frameworks": {
     "net451": {

diff --git a/src/OmniSharp.Roslyn/project.json b/src/OmniSharp.Roslyn/project.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20449",
     "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04"
   },
   "frameworks": {

diff --git a/src/OmniSharp.Stdio/project.json b/src/OmniSharp.Stdio/project.json
@@ -7,8 +7,8 @@
   },
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
-    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20448",
-    "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-20448",
+    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20449",
+    "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-20449",
     "Newtonsoft.Json": "8.0.3"
   },
   "frameworks": {

diff --git a/tests/OmniSharp.Bootstrap.Tests/project.json b/tests/OmniSharp.Bootstrap.Tests/project.json
@@ -20,8 +20,8 @@
         "NETStandard.Library": "1.5.0-rc2-23931",
         "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202",
         "Microsoft.DotNet.InternalAbstractions": "1.0.0-beta-002202",
-        "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20448",
-        "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448",
+        "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20449",
+        "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20449",
         "NuGet.Packaging": "3.5.0-beta-1123",
         "System.Diagnostics.Process": "4.1.0-rc2-23931",
         "System.IO.Compression": "4.1.0-rc2-23931",