diff --git a/README.md b/README.md index ca46334120..44b0800e68 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This project is part of ASP.NET 5.0. You can find samples, documentation and get 1. Open MusicStore.sln in Visual Studio 2015 and run the individual applications on `IIS Express`. * If you don't have Visual Studio 2015 1. Open a command prompt and cd `\src\MusicStore\`. - 2. Execute `kpm restore`. + 2. Execute `dnu restore`. 3. Execute `Helios.cmd` to launch the app on IISExpress from command line (Application started at URL **http://localhost:5001/**). NOTE: App and tests require Visual Studio 2015 LocalDB on the machine to run. @@ -23,7 +23,7 @@ This project is part of ASP.NET 5.0. You can find samples, documentation and get ## To run the sample on Mac/Mono: * Follow [Home](https://github.com/aspnet/home) instructions to install mono, kvm on Mac. * Open a command prompt and cd `\src\MusicStore\`. -* Execute `kpm restore`. +* Execute `dnu restore`. * Try `k kestrel` to run the application. **NOTE: On Mono since SQL client is not available the sample uses an InMemoryStore to run the application. So the changes that you make will not be persisted. diff --git a/test/E2ETests/Common/DeploymentUtility.cs b/test/E2ETests/Common/DeploymentUtility.cs index 46e9a52e07..5946c518d6 100644 --- a/test/E2ETests/Common/DeploymentUtility.cs +++ b/test/E2ETests/Common/DeploymentUtility.cs @@ -57,7 +57,7 @@ namespace E2ETests startParameters.ServerType == ServerType.IIS) { // Bundle to IIS root\application folder. - KpmBundle(startParameters, logger, Path.Combine(Environment.GetEnvironmentVariable("SystemDrive") + @"\", @"inetpub\wwwroot")); + DnuBundle(startParameters, logger, Path.Combine(Environment.GetEnvironmentVariable("SystemDrive") + @"\", @"inetpub\wwwroot")); // Drop a Microsoft.AspNet.Hosting.ini with ASPNET_ENV information. logger.LogInformation("Creating Microsoft.AspNet.Hosting.ini file with ASPNET_ENV."); @@ -96,7 +96,7 @@ namespace E2ETests else #endif { - KpmBundle(startParameters, logger); + DnuBundle(startParameters, logger); } } @@ -140,7 +140,7 @@ namespace E2ETests { // We use full path to runtime to pack. startParameters.Runtime = new DirectoryInfo(runtimeBin).Parent.FullName; - KpmBundle(startParameters, logger); + DnuBundle(startParameters, logger); } //Mono now supports --appbase @@ -291,7 +291,7 @@ namespace E2ETests return runtimeName; } - private static void KpmBundle(StartParameters startParameters, ILogger logger, string bundleRoot = null) + private static void DnuBundle(StartParameters startParameters, ILogger logger, string bundleRoot = null) { startParameters.BundledApplicationRootPath = Path.Combine(bundleRoot ?? Path.GetTempPath(), Guid.NewGuid().ToString()); @@ -303,11 +303,11 @@ namespace E2ETests startParameters.Runtime, startParameters.BundleWithNoSource ? "--no-source" : string.Empty); - logger.LogInformation("Executing command kpm {args}", parameters); + logger.LogInformation("Executing command dnu {args}", parameters); var startInfo = new ProcessStartInfo { - FileName = "kpm", + FileName = "dnu", Arguments = parameters, UseShellExecute = true, CreateNoWindow = true @@ -323,7 +323,7 @@ namespace E2ETests Path.Combine(startParameters.BundledApplicationRootPath, "wwwroot") : Path.Combine(startParameters.BundledApplicationRootPath, "approot", "src", "MusicStore"); - logger.LogInformation("kpm bundle finished with exit code : {exitCode}", hostProcess.ExitCode); + logger.LogInformation("dnu bundle finished with exit code : {exitCode}", hostProcess.ExitCode); } public static void CleanUpApplication(StartParameters startParameters, Process hostProcess, string musicStoreDbName, ILogger logger)