Skip to content

Commit

Permalink
Update to beta6
Browse files Browse the repository at this point in the history
  • Loading branch information
hnrkndrssn committed Aug 7, 2015
1 parent ec1f3d6 commit fd5fc67
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
3 changes: 1 addition & 2 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ IF EXIST src\JabbR\wwwroot\lib\ RMDIR /S /Q src\JabbR\wwwroot\lib\

SETLOCAL
SET CACHED_DNVM=%USERPROFILE%\.dnx\bin\dnvm.cmd
SET DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetrelease/api/v2

IF EXIST %CACHED_DNVM% GOTO dnvminstall
echo Installing dnvm
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "&{$Branch='dev';iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}"

:dnvminstall
echo Installing dnx...
CALL dnvm install latest -u
CALL dnvm install 1.0.0-beta6

echo Restoring...
CALL dnu restore src/JabbR
Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash
#!/usr/bin/env bash

rm -rf artifacts/* src/JabbR/wwwroot/lib/*

if ! type dnvm > /dev/null 2>&1; then
curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | sh && source ~/.dnx/dnvm/dnvm.sh
fi
export DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetrelease/api/v2
dnvm install latest -u

dnvm install 1.0.0-beta6 -force
dnu restore src/JabbR

rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-beta5-11911"
"version": "1.0.0-beta6"
}
}
2 changes: 1 addition & 1 deletion src/JabbR/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
// Add the following to the request pipeline only in development environment.
if (string.Equals(env.EnvironmentName, "Development", StringComparison.OrdinalIgnoreCase))
{
app.UseErrorPage(ErrorPageOptions.ShowAll);
app.UseErrorPage();
}
else
{
Expand Down
23 changes: 12 additions & 11 deletions src/JabbR/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"webroot": "wwwroot",
"version": "1.0.0-*",
"dependencies": {
"Microsoft.AspNet.Mvc": "6.0.0-beta5-*",
"Microsoft.AspNet.Diagnostics": "1.0.0-beta5-*",
"Microsoft.AspNet.Server.IIS": "1.0.0-beta5-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta5-*",
"Microsoft.AspNet.SignalR.Server": "3.0.0-beta5-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-beta5-*",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta5-*",
"Microsoft.Framework.Logging": "1.0.0-beta5-*",
"Microsoft.Framework.Logging.Console": "1.0.0-beta5-*",
"Kestrel": "1.0.0-beta5-*"
"Microsoft.AspNet.Mvc": "6.0.0-beta6-*",
"Microsoft.AspNet.Diagnostics": "1.0.0-beta6-*",
"Microsoft.AspNet.Server.IIS": "1.0.0-beta6-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta6-*",
"Microsoft.AspNet.SignalR.Server": "3.0.0-beta6-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-beta6-*",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta6-*",
"Microsoft.Framework.Logging": "1.0.0-beta6-*",
"Microsoft.Framework.Logging.Console": "1.0.0-beta6-*",
"Kestrel": "1.0.0-beta6-*"
},
"commands": {
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001",
Expand All @@ -24,7 +24,8 @@
"exclude": [
"wwwroot",
"node_modules",
"bower_components"
"bower_components",
"bin"
],
"publishExclude": [
"node_modules",
Expand Down

0 comments on commit fd5fc67

Please sign in to comment.