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

[Fixes #181] Go back to server selected listening ports.

This commit is contained in:
Javier Calvarro Nelson 2017-12-22 09:59:43 -08:00
parent 886a985726
commit 8c94d27d6a
13 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

1
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Properties/launchSettings.json
View File

@ -21,7 +21,6 @@
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HTTPS_PORT": "44300",
"ASPNETCORE_URLS": "https://localhost:44300;http://localhost:8080"
}
}

16
test/Templates.Test/Helpers/AspNetProcess.cs
View File

@ -9,7 +9,6 @@ using Microsoft.Extensions.CommandLineUtils;
using Xunit;
using Xunit.Abstractions;
using Microsoft.AspNetCore.Certificates.Generation;
using System.Threading;
namespace Templates.Test.Helpers
{
@ -23,8 +22,6 @@ namespace Templates.Test.Helpers
private readonly Uri _listeningUri;
private readonly HttpClient _httpClient;
private readonly ITestOutputHelper _output;
private readonly int _httpsPort;
private readonly int _httpPort;
public AspNetProcess(ITestOutputHelper output, string workingDirectory, string projectName, string targetFrameworkOverride, bool publish)
{
@ -62,12 +59,9 @@ namespace Templates.Test.Helpers
.WaitForExit(assertSuccess: true);
}
_httpPort = Interlocked.Increment(ref Port);
_httpsPort = Interlocked.Increment(ref Port);
var envVars = new Dictionary<string, string>
{
{ "ASPNETCORE_URLS", $"http://localhost:{_httpPort};https://localhost:{_httpsPort}" },
{ "ASPNETCORE_HTTPS_PORT", $"{_httpsPort}" }
{ "ASPNETCORE_URLS", $"http://localhost:127.0.0.0:0;https://localhost:127.0.0.0:0" }
};
if (!publish)
@ -99,8 +93,14 @@ namespace Templates.Test.Helpers
// Verify we have a valid URL to make requests to
var listeningUrlString = listeningMessage.Substring(ListeningMessagePrefix.Length);
_listeningUri = new Uri(listeningUrlString, UriKind.Absolute);
output.WriteLine($"Detected that ASP.NET application is accepting connections on: {listeningUrlString}");
listeningUrlString = listeningUrlString.Substring(0, listeningUrlString.IndexOf(':')) +
"://localhost" +
listeningUrlString.Substring(listeningUrlString.LastIndexOf(':'));
output.WriteLine("Sending requests to " + listeningUrlString);
_listeningUri = new Uri(listeningUrlString, UriKind.Absolute);
}
public void AssertOk(string requestUrl)