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:51:40 -07:00
parent 58c8e44786
commit 2d7500c3bb
5 changed files with 16 additions and 16 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
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 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 -x64
CALL packages\KoreBuild\build\kvm install default -runtime CoreCLR -x64
CALL packages\KoreBuild\build\kvm install default -x86

4
src/MusicStore/CopyAspNetLoader.cmd
View File

@ -1,7 +1,7 @@
REM copy the AspNet.Loader.dll to bin folder
REM copy the AspNet.Loader.dll to bin folder
md wwwroot\bin
SET ASPNETLOADER_PACKAGE_BASEPATH=%USERPROFILE%\.k\packages\Microsoft.AspNet.Loader.IIS.Interop
SET ASPNETLOADER_PACKAGE_BASEPATH=%USERPROFILE%\\.dnx\\packages\Microsoft.AspNet.Loader.IIS.Interop
REM figure out the path of AspNet.Loader.dll
FOR /F %%j IN ('dir /b /o:D %ASPNETLOADER_PACKAGE_BASEPATH%\*') do (SET AspNetLoaderPath=%ASPNETLOADER_PACKAGE_BASEPATH%\%%j\tools\AspNet.Loader.dll)
echo Found AspNetLoader.dll at %AspNetLoaderPath%. Copying to bin\

4
src/MusicStore/Helios.cmd
View File

@ -1,6 +1,6 @@
SET KRE_HOME=%USERPROFILE%\.kre\
SET DNX_HOME=%USERPROFILE%\.dnx\
REM copy the AspNet.Loader.dll to the bin folder
call CopyAspNetLoader.cmd
"%ProgramFiles(x86)%\iis Express\iisexpress.exe" /port:5001 /path:"%cd%\wwwroot"
"%ProgramFiles(x86)%\iis Express\iisexpress.exe" /port:5001 /path:"%cd%\wwwroot"

16
test/E2ETests/Common/DeploymentUtility.cs
View File

@ -64,9 +64,9 @@ namespace E2ETests
{
startParameters.ApplicationPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), APP_RELATIVE_PATH));
//To avoid the KRE_DEFAULT_LIB of the test process flowing into Helios, set it to empty
var backupRuntimeDefaultLibPath = Environment.GetEnvironmentVariable("KRE_DEFAULT_LIB");
Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", string.Empty);
//To avoid the DNX_DEFAULT_LIB of the test process flowing into Helios, set it to empty
var backupRuntimeDefaultLibPath = Environment.GetEnvironmentVariable("DNX_DEFAULT_LIB");
Environment.SetEnvironmentVariable("DNX_DEFAULT_LIB", string.Empty);
if (!string.IsNullOrWhiteSpace(startParameters.EnvironmentName))
{
@ -164,8 +164,8 @@ namespace E2ETests
}
}
//Restore the KRE_DEFAULT_LIB after starting the host process
Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", backupRuntimeDefaultLibPath);
//Restore the DNX_DEFAULT_LIB after starting the host process
Environment.SetEnvironmentVariable("DNX_DEFAULT_LIB", backupRuntimeDefaultLibPath);
Environment.SetEnvironmentVariable("ASPNET_ENV", string.Empty);
return hostProcess;
}
@ -174,7 +174,7 @@ namespace E2ETests
{
var path = Environment.GetEnvironmentVariable("PATH");
var runtimeBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).
Where(c => c.Contains("kre-mono")).FirstOrDefault();
Where(c => c.Contains("dnx-mono")).FirstOrDefault();
if (string.IsNullOrWhiteSpace(runtimeBin))
{
@ -307,13 +307,13 @@ namespace E2ETests
logger.LogInformation("Current %PATH% value : {0}", pathValue);
var replaceStr = new StringBuilder().
Append("kre").
Append("dnx").
Append((runtimeFlavor == RuntimeFlavor.CoreClr) ? "-coreclr" : "-clr").
Append("-win").
Append((runtimeArchitecture == RuntimeArchitecture.x86) ? "-x86" : "-x64").
ToString();
pathValue = Regex.Replace(pathValue, "kre-(clr|coreclr)-win-(x86|x64)", replaceStr, RegexOptions.IgnoreCase);
pathValue = Regex.Replace(pathValue, "dnx-(clr|coreclr)-win-(x86|x64)", replaceStr, RegexOptions.IgnoreCase);
var startIndex = pathValue.IndexOf(replaceStr); // First instance of this runtime name.
var runtimeName = pathValue.Substring(startIndex, pathValue.IndexOf(';', startIndex) - startIndex);

4
test/E2ETests/xunit/SkipIfCurrentRuntimeIsCoreClr.cs
View File

@ -19,8 +19,8 @@ namespace E2ETests
{
get
{
return "Cannot run these test variations using CoreCLR KRE as helpers are not available on CoreCLR.";
return "Cannot run these test variations using CoreCLR DNX as helpers are not available on CoreCLR.";
}
}
}
}
}