From f5ac590e5333e911feb67c6eea68e6cf47efd102 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Wed, 12 Oct 2016 15:19:42 -0700 Subject: [PATCH] 1.1.0 dependencies --- NuGet.config | 3 +-- build.ps1 | 2 +- build.sh | 2 +- makefile.shade | 6 ++++++ src/Microsoft.AspNetCore/project.json | 28 +++++++++++++-------------- 5 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 makefile.shade diff --git a/NuGet.config b/NuGet.config index 9f4165645a..2ad0f8ba84 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,8 +1,7 @@ - - + \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 6d49c4dccd..8f2f99691a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index a55d3ebc12..f4208100eb 100644 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi diff --git a/makefile.shade b/makefile.shade new file mode 100644 index 0000000000..3b0f5f69bf --- /dev/null +++ b/makefile.shade @@ -0,0 +1,6 @@ +var AUTHORS='Microsoft Open Technologies, Inc.' + +use-standard-lifecycle +k-standard-goals + +-Environment.SetEnvironmentVariable("KOREBUILD_ADD_ASSEMBLY_INFO", "0"); \ No newline at end of file diff --git a/src/Microsoft.AspNetCore/project.json b/src/Microsoft.AspNetCore/project.json index 52259023b3..fc3219c84a 100644 --- a/src/Microsoft.AspNetCore/project.json +++ b/src/Microsoft.AspNetCore/project.json @@ -1,20 +1,20 @@ { - "version": "1.0.1-*", + "version": "1.1.0-*", "dependencies": { - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Hosting": "1.0.0", - "Microsoft.AspNetCore.Routing": "1.0.1", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "NETStandard.Library": "1.6.0" + "Microsoft.AspNetCore.Diagnostics": "1.1.0-*", + "Microsoft.AspNetCore.Hosting": "1.1.0-*", + "Microsoft.AspNetCore.Routing": "1.1.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", + "Microsoft.AspNetCore.StaticFiles": "1.1.0-*", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0-*", + "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0-*", + "Microsoft.Extensions.Configuration.Json": "1.1.0-*", + "Microsoft.Extensions.Logging": "1.1.0-*", + "Microsoft.Extensions.Logging.Console": "1.1.0-*", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0-*", + "NETStandard.Library": "1.6.1-*" }, "frameworks": { "netstandard1.3": {},