diff --git a/.gitignore b/.gitignore index d1a7f74..2e15667 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +*.lock.json # User-specific files *.suo diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..07624e7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: CSharp +mono: latest +script: + - ./build.sh --quiet verify diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..2273dd6 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index 474571c..0000000 --- a/NuGet.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/README.md b/README.md index 9f87ff9..643f55d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# JabbR v2 +# JabbR v2 [![Build Status](https://travis-ci.org/alfhenrik/JabbRv2.svg?branch=dev)](https://travis-ci.org/alfhenrik/JabbRv2) JabbR is a xplat chat web application built with ASP.NET 5 and MVC 6 using SignalR. diff --git a/build.cmd b/build.cmd new file mode 100644 index 0000000..45666d6 --- /dev/null +++ b/build.cmd @@ -0,0 +1,23 @@ +@echo off +cd %~dp0 + +IF EXIST artifacts\ RMDIR /S /Q artifacts\ +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 1.0.0-beta5-11911 -u + +echo Restoring... +CALL dnu restore src/JabbR + +echo Publishing... +CALL dnu publish src/JabbR --no-source --out artifacts/build/jabbr --runtime active diff --git a/build.sh b/build.sh index 2c2f3d3..7b51a24 100755 --- a/build.sh +++ b/build.sh @@ -1,13 +1,15 @@ #!/bin/bash -rm -rf artifacts + +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 1.0.0-beta5-11911 +dnvm install 1.0.0-beta5-11911 -u dnu restore src/JabbR rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi dnu publish src/JabbR --no-source --out artifacts/build/jabbr --runtime active 2>&1 | tee buildlog -grep "Build succeeded" buildlog +grep "Build succeeded" buildlog \ No newline at end of file diff --git a/makefile.shade b/makefile.shade new file mode 100644 index 0000000..5f7967a --- /dev/null +++ b/makefile.shade @@ -0,0 +1,6 @@ +var VERSION='0.1' +var FULL_VERSION='0.1' +var AUTHORS='JabbR Kore Team' + +use-standard-lifecycle +k-standard-goals \ No newline at end of file diff --git a/src/JabbR/Startup.cs b/src/JabbR/Startup.cs index f172020..cb7ac99 100644 --- a/src/JabbR/Startup.cs +++ b/src/JabbR/Startup.cs @@ -18,9 +18,6 @@ public class Startup public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv) { // Setup configuration sources. -// Configuration = new ConfigurationSection(appEnv.ApplicationBasePath) -// .AddJsonFile("config.json") -// .AddEnvironmentVariables(); } public IConfiguration Configuration { get; set; } @@ -46,9 +43,9 @@ public void ConfigureServices(IServiceCollection services) // Configure is called after ConfigureServices is called. public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerfactory) { + // Configure the HTTP request pipeline. app.UseKestrelWorkaround(); - // Configure the HTTP request pipeline. // Add the console logger. loggerfactory.AddConsole(); @@ -74,9 +71,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF name: "default", template: "{controller}/{action}/{id?}", defaults: new { controller = "Home", action = "Index" }); - - // Uncomment the following line to add a route for porting Web API 2 controllers. - // routes.MapWebApiRoute("DefaultApi", "api/{controller}/{id?}"); }); app.UseSignalR();