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

Appending .exe to the project name instead of just changing the extension 

Fixes #93
This commit is contained in:
moozzyk 2016-03-08 16:43:22 -08:00
parent 420382133e
commit 3e7efd04da
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dotnet-publish-iis/PublishIISCommand.cs
View File

@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Tools.PublishIIS
Reporter.Output.WriteLine($"No web.config found. Creating '{webConfigPath}'"); Reporter.Output.WriteLine($"No web.config found. Creating '{webConfigPath}'");
} }
var applicationName = Path.ChangeExtension(GetApplicationName(applicationBasePath), "exe"); var applicationName = GetApplicationName(applicationBasePath) + ".exe";
var transformedConfig = WebConfigTransform.Transform(webConfigXml, applicationName, ConfigureForAzure()); var transformedConfig = WebConfigTransform.Transform(webConfigXml, applicationName, ConfigureForAzure());
using (var f = new FileStream(webConfigPath, FileMode.Create)) using (var f = new FileStream(webConfigPath, FileMode.Create))

2
test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json
View File

@ -19,5 +19,5 @@
} }
} }
}, },
"testRunner": "xunit" "testRunner": "xunit"
} }

32
test/dotnet-publish-iis.Tests/PublishIISCommandFacts.cs
View File

@ -31,18 +31,20 @@ namespace Microsoft.AspNetCore.Tools.PublishIIS.Tests
Directory.Delete(folders.TestRoot, recursive: true); Directory.Delete(folders.TestRoot, recursive: true);
} }
[Fact] [Theory]
public void PublishIIS_reads_application_name_from_project_json_if_exists() [InlineData("awesomeApp")]
[InlineData("awesome.App")]
public void PublishIIS_reads_application_name_from_project_json_if_exists(string projectName)
{ {
var webRoot = "wwwroot"; var webRoot = "wwwroot";
var folders = CreateTestDir(@"{ ""name"": ""awesomeApp""}", webRoot); var folders = CreateTestDir($@"{{ ""name"": ""{projectName}"" }}", webRoot);
new PublishIISCommand(folders.PublishOutput, folders.ProjectPath, null).Run(); new PublishIISCommand(folders.PublishOutput, folders.ProjectPath, null).Run();
var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot) var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot)
.Descendants("httpPlatform").Attributes("processPath").Single(); .Descendants("httpPlatform").Attributes("processPath").Single();
Assert.Equal($@"..\awesomeApp.exe", processPath); Assert.Equal($@"..\{projectName}.exe", processPath);
Directory.Delete(folders.TestRoot, recursive: true); Directory.Delete(folders.TestRoot, recursive: true);
} }
@ -59,7 +61,7 @@ namespace Microsoft.AspNetCore.Tools.PublishIIS.Tests
var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot) var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot)
.Descendants("httpPlatform").Attributes("processPath").Single(); .Descendants("httpPlatform").Attributes("processPath").Single();
Assert.Equal($@"..\projectDir.exe", processPath); Assert.Equal(@"..\projectDir.exe", processPath);
Directory.Delete(folders.TestRoot, recursive: true); Directory.Delete(folders.TestRoot, recursive: true);
} }
@ -76,23 +78,25 @@ namespace Microsoft.AspNetCore.Tools.PublishIIS.Tests
var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot) var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot)
.Descendants("httpPlatform").Attributes("processPath").Single(); .Descendants("httpPlatform").Attributes("processPath").Single();
Assert.Equal($@"..\projectDir.exe", processPath); Assert.Equal(@"..\projectDir.exe", processPath);
Directory.Delete(folders.TestRoot, recursive: true); Directory.Delete(folders.TestRoot, recursive: true);
} }
[Fact] [Theory]
public void PublishIIS_accepts_path_to_project_json_as_project_path() [InlineData("projectDir")]
[InlineData("project.Dir")]
public void PublishIIS_accepts_path_to_project_json_as_project_path(string projectDir)
{ {
var webRoot = "wwwroot"; var webRoot = "wwwroot";
var folders = CreateTestDir("{}", webRoot); var folders = CreateTestDir("{}", webRoot, projectDir);
new PublishIISCommand(folders.PublishOutput, Path.Combine(folders.ProjectPath, "project.json"), null).Run(); new PublishIISCommand(folders.PublishOutput, Path.Combine(folders.ProjectPath, "project.json"), null).Run();
var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot) var processPath = (string)GetPublishedWebConfig(folders.PublishOutput, webRoot)
.Descendants("httpPlatform").Attributes("processPath").Single(); .Descendants("httpPlatform").Attributes("processPath").Single();
Assert.Equal($@"..\projectDir.exe", processPath); Assert.Equal($@"..\{projectDir}.exe", processPath);
Directory.Delete(folders.TestRoot, recursive: true); Directory.Delete(folders.TestRoot, recursive: true);
} }
@ -118,8 +122,8 @@ namespace Microsoft.AspNetCore.Tools.PublishIIS.Tests
var httpPlatformElement = GetPublishedWebConfig(folders.PublishOutput, webRoot) var httpPlatformElement = GetPublishedWebConfig(folders.PublishOutput, webRoot)
.Descendants("httpPlatform").Single(); .Descendants("httpPlatform").Single();
Assert.Equal($@"..\projectDir.exe", (string)httpPlatformElement.Attribute("processPath")); Assert.Equal(@"..\projectDir.exe", (string)httpPlatformElement.Attribute("processPath"));
Assert.Equal($@"1234", (string)httpPlatformElement.Attribute("startupTimeLimit")); Assert.Equal(@"1234", (string)httpPlatformElement.Attribute("startupTimeLimit"));
Directory.Delete(folders.TestRoot, recursive: true); Directory.Delete(folders.TestRoot, recursive: true);
} }
@ -129,12 +133,12 @@ namespace Microsoft.AspNetCore.Tools.PublishIIS.Tests
return XDocument.Load(Path.Combine(publishOut, webRoot, "web.config")); return XDocument.Load(Path.Combine(publishOut, webRoot, "web.config"));
} }
private Folders CreateTestDir(string projectJson, string webRoot) private Folders CreateTestDir(string projectJson, string webRoot, string projectDir = "projectDir")
{ {
var testRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); var testRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
Directory.CreateDirectory(testRoot); Directory.CreateDirectory(testRoot);
var projectPath = Path.Combine(testRoot, "projectDir"); var projectPath = Path.Combine(testRoot, projectDir);
Directory.CreateDirectory(projectPath); Directory.CreateDirectory(projectPath);
Directory.CreateDirectory(Path.Combine(projectPath, webRoot)); Directory.CreateDirectory(Path.Combine(projectPath, webRoot));
File.WriteAllText(Path.Combine(projectPath, "project.json"), projectJson); File.WriteAllText(Path.Combine(projectPath, "project.json"), projectJson);

3
test/dotnet-publish-iis.Tests/project.json
View File

@ -11,5 +11,6 @@
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
} }
} }
} },
"testRunner": "xunit"
} }