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

Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:51:38 -07:00
parent 2ecb358c10
commit 58c8e44786
13 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MusicStore.Spa/project.json
View File

@ -1,4 +1,4 @@
{
{
"webroot": "wwwroot",
"exclude": [
"wwwroot",
@ -47,7 +47,7 @@
"prepare": [ "grunt bower:install" ]
},*/
"frameworks": {
"aspnet50": {},
"aspnetcore50": {}
"dnx451": {},
"dnxcore50": {}
}
}

6
src/MusicStore/project.json
View File

@ -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": { }
}
}

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

@ -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)
{

2
test/E2ETests/Common/Helpers.cs
View File

@ -29,7 +29,7 @@ namespace E2ETests
catch (AggregateException exception)
{
if (exception.InnerException is HttpRequestException
#if ASPNET50
#if DNX451
|| exception.InnerException is WebException
#endif
)

2
test/E2ETests/Common/IISApplication.cs
View File

@ -1,4 +1,4 @@
#if ASPNET50
#if DNX451
using System;
using System.IO;
using System.Linq;

2
test/E2ETests/Common/StartParameters.cs
View File

@ -27,7 +27,7 @@
public string Runtime { get; set; }
#if ASPNET50
#if DNX451
public IISApplication IISApplication { get; set; }
#endif
}

6
test/E2ETests/Implementation/Scenarios.cs
View File

@ -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<string>(_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";

2
test/E2ETests/OpenIdConnectTests.cs
View File

@ -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.

2
test/E2ETests/SmokeTests.cs
View File

@ -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.

4
test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
View File

@ -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
});

4
test/E2ETests/project.json
View File

@ -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": "",

2
test/MusicStore.Spa.Test/project.json
View File

@ -12,6 +12,6 @@
"test": "xunit.runner.kre"
},
"frameworks": {
"aspnet50": { }
"dnx451": { }
}
}

2
test/MusicStore.Test/project.json
View File

@ -12,6 +12,6 @@
"test": "xunit.runner.kre"
},
"frameworks": {
"aspnet50": { }
"dnx451": { }
}
}