diff --git a/src/MusicStore.Spa/project.json b/src/MusicStore.Spa/project.json index e394d76151..11f4158e62 100644 --- a/src/MusicStore.Spa/project.json +++ b/src/MusicStore.Spa/project.json @@ -1,4 +1,4 @@ -{ +{ "webroot": "wwwroot", "exclude": [ "wwwroot", @@ -47,7 +47,7 @@ "prepare": [ "grunt bower:install" ] },*/ "frameworks": { - "aspnet50": {}, - "aspnetcore50": {} + "dnx451": {}, + "dnxcore50": {} } } diff --git a/src/MusicStore/project.json b/src/MusicStore/project.json index c352cbe9b8..514b409ee1 100644 --- a/src/MusicStore/project.json +++ b/src/MusicStore/project.json @@ -1,4 +1,4 @@ -{ +{ "authors": [ "Microsoft" ], @@ -42,7 +42,7 @@ "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5002" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } -} \ No newline at end of file +} diff --git a/test/E2ETests/Common/DeploymentUtility.cs b/test/E2ETests/Common/DeploymentUtility.cs index 05b8905a3f..793cdee802 100644 --- a/test/E2ETests/Common/DeploymentUtility.cs +++ b/test/E2ETests/Common/DeploymentUtility.cs @@ -97,7 +97,7 @@ namespace E2ETests //Reason to do pack here instead of in a common place is use the right runtime to do the packing. Previous line switches to use the right runtime. if (startParameters.BundleApplicationBeforeStart) { -#if ASPNET50 +#if DNX451 if (startParameters.ServerType == ServerType.IISNativeModule || startParameters.ServerType == ServerType.IIS) { @@ -145,7 +145,7 @@ namespace E2ETests } } -#if ASPNET50 +#if DNX451 if (startParameters.ServerType == ServerType.IISNativeModule || startParameters.ServerType == ServerType.IIS) { @@ -360,7 +360,7 @@ namespace E2ETests if (startParameters.ServerType == ServerType.IISNativeModule || startParameters.ServerType == ServerType.IIS) { -#if ASPNET50 +#if DNX451 // Stop & delete the application pool. if (startParameters.IISApplication != null) { @@ -424,4 +424,4 @@ namespace E2ETests } } } -} \ No newline at end of file +} diff --git a/test/E2ETests/Common/Helpers.cs b/test/E2ETests/Common/Helpers.cs index c4a5b5d6ce..95af71ba5b 100644 --- a/test/E2ETests/Common/Helpers.cs +++ b/test/E2ETests/Common/Helpers.cs @@ -29,7 +29,7 @@ namespace E2ETests catch (AggregateException exception) { if (exception.InnerException is HttpRequestException -#if ASPNET50 +#if DNX451 || exception.InnerException is WebException #endif ) @@ -41,4 +41,4 @@ namespace E2ETests } } } -} \ No newline at end of file +} diff --git a/test/E2ETests/Common/IISApplication.cs b/test/E2ETests/Common/IISApplication.cs index 295b1d77e4..d74c15e5d8 100644 --- a/test/E2ETests/Common/IISApplication.cs +++ b/test/E2ETests/Common/IISApplication.cs @@ -1,4 +1,4 @@ -#if ASPNET50 +#if DNX451 using System; using System.IO; using System.Linq; @@ -78,4 +78,4 @@ namespace E2ETests } } } -#endif \ No newline at end of file +#endif diff --git a/test/E2ETests/Common/StartParameters.cs b/test/E2ETests/Common/StartParameters.cs index 384a4b6282..6ab34fad56 100644 --- a/test/E2ETests/Common/StartParameters.cs +++ b/test/E2ETests/Common/StartParameters.cs @@ -27,8 +27,8 @@ public string Runtime { get; set; } -#if ASPNET50 +#if DNX451 public IISApplication IISApplication { get; set; } #endif } -} \ No newline at end of file +} diff --git a/test/E2ETests/Implementation/Scenarios.cs b/test/E2ETests/Implementation/Scenarios.cs index 8634455ab8..18b0e48394 100644 --- a/test/E2ETests/Implementation/Scenarios.cs +++ b/test/E2ETests/Implementation/Scenarios.cs @@ -64,7 +64,7 @@ namespace E2ETests private string PrefixBaseAddress(string url) { -#if ASPNET50 +#if DNX451 url = (_startParameters.ServerType == ServerType.IISNativeModule || _startParameters.ServerType == ServerType.IIS) ? string.Format(url, _startParameters.IISApplication.VirtualDirectoryName) : @@ -295,7 +295,7 @@ namespace E2ETests private string CreateAlbum() { var albumName = Guid.NewGuid().ToString().Replace("-", string.Empty).Substring(0, 12); -#if ASPNET50 +#if DNX451 string dataFromHub = null; var OnReceivedEvent = new AutoResetEvent(false); var hubConnection = new HubConnection(_applicationBaseUrl + "SignalR"); @@ -328,7 +328,7 @@ namespace E2ETests responseContent = response.Content.ReadAsStringAsync().Result; Assert.Equal(_applicationBaseUrl + "Admin/StoreManager", response.RequestMessage.RequestUri.AbsoluteUri); Assert.Contains(albumName, responseContent); -#if ASPNET50 +#if DNX451 _logger.LogInformation("Waiting for the SignalR client to receive album created announcement"); OnReceivedEvent.WaitOne(TimeSpan.FromSeconds(10)); dataFromHub = dataFromHub ?? "No relevant data received from Hub"; @@ -448,4 +448,4 @@ namespace E2ETests } } } -} \ No newline at end of file +} diff --git a/test/E2ETests/OpenIdConnectTests.cs b/test/E2ETests/OpenIdConnectTests.cs index f07f10a942..009e924a4b 100644 --- a/test/E2ETests/OpenIdConnectTests.cs +++ b/test/E2ETests/OpenIdConnectTests.cs @@ -56,7 +56,7 @@ namespace E2ETests try { hostProcess = DeploymentUtility.StartApplication(_startParameters, _logger); -#if ASPNET50 +#if DNX451 if (serverType == ServerType.IISNativeModule || serverType == ServerType.IIS) { // Accomodate the vdir name. @@ -103,4 +103,4 @@ namespace E2ETests } } } -} \ No newline at end of file +} diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs index e5e7338665..76cd607b80 100644 --- a/test/E2ETests/SmokeTests.cs +++ b/test/E2ETests/SmokeTests.cs @@ -120,7 +120,7 @@ namespace E2ETests try { hostProcess = DeploymentUtility.StartApplication(_startParameters, _logger); -#if ASPNET50 +#if DNX451 if (serverType == ServerType.IISNativeModule || serverType == ServerType.IIS) { // Accomodate the vdir name. @@ -245,4 +245,4 @@ namespace E2ETests } } } -} \ No newline at end of file +} diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs index cfb5f6ac58..0354716637 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Authentication.Facebook; @@ -187,7 +187,7 @@ namespace MusicStore }; options.StateDataFormat = new CustomTwitterStateDataFormat(); options.BackchannelHttpHandler = new TwitterMockBackChannelHttpHandler(); -#if ASPNET50 +#if DNX451 options.BackchannelCertificateValidator = null; #endif }); @@ -231,4 +231,4 @@ namespace MusicStore SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait(); } } -} \ No newline at end of file +} diff --git a/test/E2ETests/project.json b/test/E2ETests/project.json index 691ed36b33..a03dd5ea46 100644 --- a/test/E2ETests/project.json +++ b/test/E2ETests/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": "true" }, @@ -16,7 +16,7 @@ "xunit.runner.kre": "1.0.0-*" }, "frameworks": { - "aspnet50": { + "dnx451": { "frameworkAssemblies": { "System.Data": "", "System.Net.Http": "", @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/test/MusicStore.Spa.Test/project.json b/test/MusicStore.Spa.Test/project.json index 7375de534f..9d8d61a950 100644 --- a/test/MusicStore.Spa.Test/project.json +++ b/test/MusicStore.Spa.Test/project.json @@ -12,6 +12,6 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { } + "dnx451": { } } -} \ No newline at end of file +} diff --git a/test/MusicStore.Test/project.json b/test/MusicStore.Test/project.json index 35111a9dbb..d037a39a14 100644 --- a/test/MusicStore.Test/project.json +++ b/test/MusicStore.Test/project.json @@ -12,6 +12,6 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { } + "dnx451": { } } -} \ No newline at end of file +}