From 5b4aed8dccbc39ed4ace2bc45ec1eac07b0381cc Mon Sep 17 00:00:00 2001 From: Praburaj Date: Fri, 17 Apr 2015 21:59:12 -0700 Subject: [PATCH] Fixing the configoverride.json location --- build.cmd | 4 ++-- test/E2ETests/Common/Helpers.cs | 23 +++++++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/build.cmd b/build.cmd index 54837f2f1d..9c9b21f092 100644 --- a/build.cmd +++ b/build.cmd @@ -21,9 +21,9 @@ IF EXIST packages\KoreBuild goto run IF "%SKIP_DNX_INSTALL%"=="1" goto run CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x64 -CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x64 +CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x64 -NoNative CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86 +CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86 -NoNative :run CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86 diff --git a/test/E2ETests/Common/Helpers.cs b/test/E2ETests/Common/Helpers.cs index 5dfecb6b4f..f3081785fe 100644 --- a/test/E2ETests/Common/Helpers.cs +++ b/test/E2ETests/Common/Helpers.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Linq; using Microsoft.AspNet.Server.Testing; using Microsoft.Framework.Logging; @@ -28,11 +29,25 @@ namespace E2ETests // Can't use localdb with IIS. Setting an override to use InMemoryStore. logger.LogInformation("Creating configoverride.json file to override default config."); - var overrideConfig = deploymentParameters.PublishWithNoSource ? - Path.Combine(deploymentParameters.ApplicationPath, "..", "approot", "packages", "MusicStore", "1.0.0", "root", "configoverride.json") : - Path.Combine(deploymentParameters.ApplicationPath, "..", "approot", "src", "MusicStore", "configoverride.json"); + string overrideConfig; + if (deploymentParameters.PublishWithNoSource) + { + var compileRoot = Path.GetFullPath( + Path.Combine( + deploymentParameters.ApplicationPath, + "..", "approot", "packages", "MusicStore")); + + // We don't know the exact version number with which sources are built. + overrideConfig = Path.Combine(Directory.GetDirectories(compileRoot).First(), "root", "configoverride.json"); + } + else + { + overrideConfig = Path.GetFullPath( + Path.Combine( + deploymentParameters.ApplicationPath, + "..", "approot", "src", "MusicStore", "configoverride.json")); + } - overrideConfig = Path.GetFullPath(overrideConfig); File.WriteAllText(overrideConfig, "{\"UseInMemoryStore\": \"true\"}"); } }