huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update K_BUILD_VERSION/kre/KRE/.k => DNX_BUILD_VERSION/dnx/DNX/.dnx.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:50:29 -07:00
parent 19df67f33e
commit 1bf2c7c7f3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.cmd
View File

@ -1,4 +1,4 @@
@echo off @echo off
cd %~dp0 cd %~dp0
SETLOCAL SETLOCAL
@ -19,7 +19,7 @@ IF EXIST packages\KoreBuild goto run
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion .nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
IF "%SKIP_KRE_INSTALL%"=="1" goto run IF "%SKIP_DNX_INSTALL%"=="1" goto run
CALL packages\KoreBuild\build\kvm upgrade -runtime CLR -x86 CALL packages\KoreBuild\build\kvm upgrade -runtime CLR -x86
CALL packages\KoreBuild\build\kvm install default -runtime CoreCLR -x86 CALL packages\KoreBuild\build\kvm install default -runtime CoreCLR -x86

6
src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -44,7 +44,7 @@ namespace Microsoft.AspNet.Builder
public static IApplicationBuilder UseServices(this IApplicationBuilder builder, Func<IServiceCollection, IServiceProvider> configureServices) public static IApplicationBuilder UseServices(this IApplicationBuilder builder, Func<IServiceCollection, IServiceProvider> configureServices)
{ {
// Import services from hosting/KRE as fallback // Import services from hosting/DNX as fallback
var serviceCollection = HostingServices.Create(builder.ApplicationServices); var serviceCollection = HostingServices.Create(builder.ApplicationServices);
builder.ApplicationServices = configureServices(serviceCollection); builder.ApplicationServices = configureServices(serviceCollection);
@ -52,4 +52,4 @@ namespace Microsoft.AspNet.Builder
return builder.UseMiddleware<ContainerMiddleware>(); return builder.UseMiddleware<ContainerMiddleware>();
} }
} }
} }