Merge pull request #394 from OmniSharp/unpin-deps

Unpin dependencies, leave dnx pinned
OmniSharp · Feb 2, 2016 · 06eabc8 · 06eabc8
2 parents bc22c3f + 25bb80e
commit 06eabc8
Show file tree

Hide file tree

Showing 26 changed files with 87 additions and 84 deletions.
diff --git a/build.cmd b/build.cmd
@@ -44,24 +44,24 @@ call:_test "OmniSharp.Tests" "clr"
 call:_test "OmniSharp.Tests" "coreclr"
 
 :: omnisharp-clr-win-x86.zip
-call:_publish "OmniSharp" "clr" "x86" "artifacts\clr-win-x86" "..\omnisharp-clr-win-x86"
+call:_publish "OmniSharp" "clr" "x86" "clr-win-x86" "omnisharp-clr-win-x86"
 :: omnisharp-coreclr-win-x86.zip
-call:_publish "OmniSharp" "coreclr" "x86" "artifacts\coreclr-win-x86" "..\omnisharp-coreclr-win-x86"
+call:_publish "OmniSharp" "coreclr" "x86" "coreclr-win-x86" "omnisharp-coreclr-win-x86"
 :: omnisharp-clr-win-x64.zip
-call:_publish "OmniSharp" "clr" "x64" "artifacts\clr-win-x64" "..\omnisharp-clr-win-x64"
+call:_publish "OmniSharp" "clr" "x64" "clr-win-x64" "omnisharp-clr-win-x64"
 :: omnisharp-coreclr-win-x64.zip
-call:_publish "OmniSharp" "coreclr" "x64" "artifacts\coreclr-win-x64" "..\omnisharp-coreclr-win-x64"
+call:_publish "OmniSharp" "coreclr" "x64" "coreclr-win-x64" "omnisharp-coreclr-win-x64"
 :: omnisharp.zip
 :::: TODO
 
 :: omnisharp.bootstrap-clr-win-x86.zip
-call:_publish "OmniSharp.Bootstrap" "clr" "x86" "artifacts\boot-clr-win-x86" "..\omnisharp.bootstrap-clr-win-x86"
+call:_publish "OmniSharp.Bootstrap" "clr" "x86" "boot-clr-win-x86" "omnisharp.bootstrap-clr-win-x86"
 :: omnisharp.bootstrap-coreclr-win-x86.zip
-call:_publish "OmniSharp.Bootstrap" "coreclr" "x86" "artifacts\boot-coreclr-win-x86" "..\omnisharp.bootstrap-coreclr-win-x86"
+call:_publish "OmniSharp.Bootstrap" "coreclr" "x86" "boot-coreclr-win-x86" "omnisharp.bootstrap-coreclr-win-x86"
 :: omnisharp.bootstrap-clr-win-x64.zip
-call:_publish "OmniSharp.Bootstrap" "clr" "x64" "artifacts\boot-clr-win-x64" "..\omnisharp.bootstrap-clr-win-x64"
+call:_publish "OmniSharp.Bootstrap" "clr" "x64" "boot-clr-win-x64" "omnisharp.bootstrap-clr-win-x64"
 :: omnisharp.bootstrap-coreclr-win-x64.zip
-call:_publish "OmniSharp.Bootstrap" "coreclr" "x64" "artifacts\boot-coreclr-win-x64" "..\omnisharp.bootstrap-coreclr-win-x64"
+call:_publish "OmniSharp.Bootstrap" "coreclr" "x64" "boot-coreclr-win-x64" "omnisharp.bootstrap-coreclr-win-x64"
 :: omnisharp.bootstrap.zip
 :::: TODO
 
@@ -105,7 +105,7 @@ setlocal
 call dnu restore src\%~1 --quiet
 call dnu pack src\%~1 --configuration Release --quiet --out artifacts\nuget
 if %errorlevel% neq 0 (
-  echo Package failed for src/%~1, destination: %~4
+  echo Package failed for src/%~1
   (goto) 2>nul & endlocal & exit /b YOUR_EXITCODE_HERE
 )
 endlocal
@@ -114,16 +114,19 @@ GOTO:EOF
 :_publish - %~1=project %~2=runtime %~3=arch %~4=dest %~5=zip
 setlocal
 call dnvm use 1.0.0-rc2-16444 -r %~2 -arch %~3
-call dnu publish "src\%~1" --configuration Release --no-source --quiet --runtime active --out "%~4"
+call dnu publish "src\%~1" --configuration Release --no-source --quiet --runtime active --out "artifacts\%~4"
 if %errorlevel% neq 0 (
-  echo Publish failed for src/%~1 with runtime %~2-%~3, destination: %~4
+  echo Publish failed for src/%~1 with runtime %~2-%~3, destination: artifacts\%~4
   (goto) 2>nul & endlocal & exit /b YOUR_EXITCODE_HERE
 )
-pushd %~4\approot
-call 7z a -r ..\%~5.zip .
-if %errorlevel% neq 0 (
-  echo Zip failed for src/%~1 with runtime %~2-%~3, destination: %~4
-  (goto) 2>nul & endlocal & exit /b YOUR_EXITCODE_HERE
+if "%APPVEYOR%" == "True" (
+  pushd artifacts\%~4\approot
+  echo Compressing %~5.zip
+  call 7z a -r ..\..\%~5.zip . > NUL
+  if %errorlevel% neq 0 (
+    echo Zip failed for src/%~1 with runtime %~2-%~3, destination: artifacts\%~4
+    (goto) 2>nul & endlocal & exit /b YOUR_EXITCODE_HERE
+  )
 )
 popd
 endlocal

diff --git a/scripts/Bootstrap b/scripts/Bootstrap
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-RUNTIME="dnx-mono.1.0.0-rc2-16430"
+RUNTIME="dnx-mono.1.0.0-rc2-16444"
 # Enable if you wish to run on coreclr
 #if [[ "$OSTYPE" == "linux-gnu" ]]; then
-#  RUNTIME="dnx-coreclr-linux-x64.1.0.0-rc2-16430"
+#  RUNTIME="dnx-coreclr-linux-x64.1.0.0-rc2-16444"
 #elif [[ "$OSTYPE" == "darwin"* ]]; then
-#  RUNTIME="dnx-coreclr-darwin-x64.1.0.0-rc2-16430"
+#  RUNTIME="dnx-coreclr-darwin-x64.1.0.0-rc2-16444"
 #fi
 
 SOURCE="${BASH_SOURCE[0]}"

diff --git a/scripts/Bootstrap-coreclr.cmd b/scripts/Bootstrap-coreclr.cmd
@@ -4,7 +4,7 @@ rem make sure we're bootstrapped
 for /f "delims=" %%a in ('%~dp0Bootstrap.cmd') do @set LOCATION=%%a
 echo exist %LOCATION%\project.lock.json
 if not exist %LOCATION%\project.lock.json (
-  call "%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16430\bin\dnu.cmd" restore %LOCATION%
+  call "%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16444\bin\dnu.cmd" restore %LOCATION%
 )
 echo %LOCATION%
-"%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16430\bin\dnx" -p %LOCATION% run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16444\bin\dnx" -p %LOCATION% run %*
diff --git a/scripts/Bootstrap.cmd b/scripts/Bootstrap.cmd
@@ -4,7 +4,7 @@ rem make sure we're bootstrapped
 for /f "delims=" %%a in ('%~dp0Bootstrap.cmd') do @set LOCATION=%%a
 echo exist %LOCATION%\project.lock.json
 if not exist %LOCATION%\project.lock.json (
-  call "%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16430\bin\dnu.cmd" restore %LOCATION%
+  call "%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16444\bin\dnu.cmd" restore %LOCATION%
 )
 echo %LOCATION%
-"%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16430\bin\dnx" -p %LOCATION% run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16444\bin\dnx" -p %LOCATION% run %*
diff --git a/scripts/Omnisharp b/scripts/Omnisharp
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-RUNTIME="dnx-mono.1.0.0-rc2-16430"
+RUNTIME="dnx-mono.1.0.0-rc2-16444"
 # Enable if you wish to run on coreclr
 #if [[ "$OSTYPE" == "linux-gnu" ]]; then
-#  RUNTIME="dnx-coreclr-linux-x64.1.0.0-rc2-16430"
+#  RUNTIME="dnx-coreclr-linux-x64.1.0.0-rc2-16444"
 #elif [[ "$OSTYPE" == "darwin"* ]]; then
-#  RUNTIME="dnx-coreclr-darwin-x64.1.0.0-rc2-16430"
+#  RUNTIME="dnx-coreclr-darwin-x64.1.0.0-rc2-16444"
 #fi
 
 SOURCE="${BASH_SOURCE[0]}"

diff --git a/scripts/Omnisharp-coreclr.cmd b/scripts/Omnisharp-coreclr.cmd
@@ -1,3 +1,3 @@
 SETLOCAL
 
-"%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16430\bin\dnx" -p %~dp0..\src\OmniSharp run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16444\bin\dnx" -p %~dp0..\src\OmniSharp run %*
diff --git a/scripts/Omnisharp.cmd b/scripts/Omnisharp.cmd
@@ -1,3 +1,3 @@
 SETLOCAL
 
-"%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16430\bin\dnx" -p %~dp0..\src\OmniSharp run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16444\bin\dnx" -p %~dp0..\src\OmniSharp run %*
diff --git a/src/OmniSharp.Abstractions/project.json b/src/OmniSharp.Abstractions/project.json
@@ -7,12 +7,12 @@
     "Newtonsoft.Json": "7.0.1",
     "Microsoft.CodeAnalysis": "1.1.1",
     "Microsoft.Composition": "1.0.30",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-16063",
-    "Microsoft.Extensions.Configuration": "1.0.0-rc2-16025",
-    "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-16024",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15993",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16041",
-    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-16444"
+    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-*",
+    "Microsoft.Extensions.Configuration": "1.0.0-rc2-*",
+    "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-*",
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-*",
+    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-*"
   },
   "frameworks": {
     "dnx451": {
@@ -33,9 +33,9 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722",
-        "System.IO.FileSystem.Watcher": "4.0.0-rc2-23727",
-        "System.Threading.Thread": "4.0.0-rc2-23727"
+        "NETStandard.Library": "1.0.0-rc2-*",
+        "System.IO.FileSystem.Watcher": "4.0.0-rc2-*",
+        "System.Threading.Thread": "4.0.0-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp.Bootstrap/project.json b/src/OmniSharp.Bootstrap/project.json
@@ -4,8 +4,8 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16538",
-    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-16444",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-*",
+    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-*",
     "Newtonsoft.Json": "7.0.1"
   },
   "commands": {
@@ -19,9 +19,9 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722",
-        "System.Dynamic.Runtime": "4.0.11-rc2-23722",
-        "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*",
+        "System.Dynamic.Runtime": "4.0.11-rc2-*",
+        "System.Security.Cryptography.Algorithms": "4.0.0-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp.Dnx/project.json b/src/OmniSharp.Dnx/project.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
     "OmniSharp.Roslyn.CSharp": "1.0.0-*",
-    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-16263"
+    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-*"
   },
   "frameworks": {
     "dnx451": {
@@ -16,7 +16,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp.Host/project.json b/src/OmniSharp.Host/project.json
@@ -9,16 +9,16 @@
     "OmniSharp.Stdio": "1.0.0-*",
     "OmniSharp.Plugins": "1.0.0-*",
     "OmniSharp.Roslyn": "1.0.0-*",
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-16536",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-16357",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-*",
     "Microsoft.Composition": "1.0.30",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-16063",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-16025",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-15993",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15993",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16041",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-16016",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-16015"
+    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-*",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-*",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-*",
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-*",
+    "Microsoft.Extensions.Options": "1.0.0-rc2-*",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-*"
   },
   "commands": {
     "omnisharp.host": "run"
@@ -32,7 +32,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

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

diff --git a/src/OmniSharp.Nuget/project.json b/src/OmniSharp.Nuget/project.json
@@ -30,7 +30,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp.Plugins/project.json b/src/OmniSharp.Plugins/project.json
@@ -20,7 +20,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp.Roslyn.CSharp/project.json b/src/OmniSharp.Roslyn.CSharp/project.json
@@ -31,7 +31,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp.Roslyn/project.json b/src/OmniSharp.Roslyn/project.json
@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-16444",
+    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-*",
     "Microsoft.CodeAnalysis": "1.1.1"
   },
   "frameworks": {
@@ -29,8 +29,8 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722",
-        "System.Xml.XDocument": "4.0.11-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*",
+        "System.Xml.XDocument": "4.0.11-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp.Stdio/project.json b/src/OmniSharp.Stdio/project.json
@@ -6,15 +6,15 @@
   },
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
-    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-16263",
-    "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-16187",
+    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-*",
+    "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-*",
     "Newtonsoft.Json": "7.0.1"
   },
   "frameworks": {
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

diff --git a/src/OmniSharp/project.json b/src/OmniSharp/project.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "OmniSharp.Host": "1.0.0-*",
     "OmniSharp.Dnx": "1.0.0-*",
-    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23722"
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-*"
   },
   "commands": {
     "run": "run"

diff --git a/tests/OmniSharp.Bootstrap.Tests/project.json b/tests/OmniSharp.Bootstrap.Tests/project.json
@@ -5,9 +5,9 @@
   },
   "dependencies": {
     "OmniSharp.Bootstrap": "1.0.0-*",
-    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16128",
+    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-*",
     "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1",
-    "xunit.runner.aspnet": "2.0.0-aspnet-16076"
+    "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {
     "test": "xunit.runner.aspnet"
@@ -16,7 +16,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

diff --git a/tests/OmniSharp.Dnx.Tests/project.json b/tests/OmniSharp.Dnx.Tests/project.json
@@ -7,9 +7,9 @@
     "OmniSharp.Dnx": "1.0.0-*",
     "OmniSharp.Tests": "1.0.0-*",
     "OmniSharp.Roslyn.CSharp": "1.0.0-*",
-    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16119",
+    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-*",
     "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1",
-    "xunit.runner.aspnet": "2.0.0-aspnet-16076"
+    "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {
     "test": "xunit.runner.aspnet"
@@ -19,7 +19,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "NETStandard.Library": "1.0.0-rc2-23722"
+        "NETStandard.Library": "1.0.0-rc2-*"
       }
     }
   }

diff --git a/tests/OmniSharp.MSBuild.Tests/project.json b/tests/OmniSharp.MSBuild.Tests/project.json
@@ -6,9 +6,9 @@
   "dependencies": {
     "OmniSharp.MSBuild": "1.0.0-*",
     "OmniSharp.Tests": "1.0.0-*",
-    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16119",
+    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-*",
     "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1",
-    "xunit.runner.aspnet": "2.0.0-aspnet-16076"
+    "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {
     "test": "xunit.runner.aspnet"

diff --git a/tests/OmniSharp.Plugins.Tests/project.json b/tests/OmniSharp.Plugins.Tests/project.json
@@ -5,8 +5,8 @@
   },
   "dependencies": {
     "OmniSharp.Plugins": "1.0.0-*",
-    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16128",
-    "xunit.runner.aspnet": "2.0.0-aspnet-16076"
+    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-*",
+    "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {
     "test": "xunit.runner.aspnet"