Skip to content
This repository has been archived by the owner on Dec 18, 2017. It is now read-only.

Rename Microsoft.AspNet.Hosting.json to hosting.json #3099

Merged
merged 1 commit into from
Oct 29, 2015
Merged

Rename Microsoft.AspNet.Hosting.json to hosting.json #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...WithWebRoot/Microsoft.AspNet.Hosting.json → ...ot/src/HelloWorldWithWebRoot/hosting.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Microsoft.Dnx.Tooling/Publish/PublishManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public bool Publish()
_options.Reports.Information.WriteLine(warning.FormattedMessage.Yellow());
}

if (string.IsNullOrEmpty(_options.WwwRoot) && File.Exists(Path.Combine(project.ProjectDirectory, "Microsoft.AspNet.Hosting.json")))
if (string.IsNullOrEmpty(_options.WwwRoot) && File.Exists(Path.Combine(project.ProjectDirectory, "hosting.json")))
{
var jsonObj = JObject.Parse(File.ReadAllText(Path.Combine(project.ProjectDirectory, "Microsoft.AspNet.Hosting.json")));
var jsonObj = JObject.Parse(File.ReadAllText(Path.Combine(project.ProjectDirectory, "hosting.json")));
_options.WwwRoot = PublishOperations.GetWebRootJson(jsonObj)?.ToString();
}

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Dnx.Tooling/Publish/PublishProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ private void UpdateWebRoot(PublishRoot root, string targetPath)
// Update the 'webroot' property, which was specified with '--wwwroot-out' option
if (!string.IsNullOrEmpty(WwwRootOut))
{
var hostingConfig = Path.Combine(targetPath, "Microsoft.AspNet.Hosting.json");
var hostingConfig = Path.Combine(targetPath, "hosting.json");
if (!File.Exists(hostingConfig))
{
File.AppendAllText(hostingConfig, $@"{{
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.Dnx.Testing.SampleTests/DnuPublishTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void DnuPublishWebApp_SubdirAsPublicDir_DirPlusFlatList(DnxSdk sdk)
var projectStructure = new Dir
{
["project.json"] = projectJson,
["Microsoft.AspNet.Hosting.json"] = hostingJson,
["hosting.json"] = hostingJson,
["Config.json", "Program.cs"] = Dir.EmptyFile,
["public"] = new Dir
{
Expand Down Expand Up @@ -141,7 +141,7 @@ public void DnuPublishWebApp_SubdirAsPublicDir_DirPlusFlatList(DnxSdk sdk)
{
["project.json"] = expectedOutputProjectJson,
["project.lock.json"] = expectedOutputLockFile,
["Microsoft.AspNet.Hosting.json"] = expectedOutputHostingJson,
["hosting.json"] = expectedOutputHostingJson,
["Config.json", "Program.cs"] = Dir.EmptyFile,
["Views"] = new Dir
{
Expand Down
40 changes: 20 additions & 20 deletions test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPublishTests.Old.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void DnuPublishWebApp_RootAsPublicFolder(string flavor, string os, string
{

var projectStructure = @"{
'.': ['project.json', 'Config.json', 'Program.cs', 'build_config1.bconfig', 'Microsoft.AspNet.Hosting.json'],
'.': ['project.json', 'Config.json', 'Program.cs', 'build_config1.bconfig', 'hosting.json'],
'Views': {
'Home': ['index.cshtml'],
'Shared': ['_Layout.cshtml']
Expand All @@ -141,7 +141,7 @@ public void DnuPublishWebApp_RootAsPublicFolder(string flavor, string os, string
'global.json': '',
'src': {
'PROJECT_NAME': {
'.': ['project.json', 'project.lock.json', 'Config.json', 'Program.cs', 'Microsoft.AspNet.Hosting.json'],
'.': ['project.json', 'project.lock.json', 'Config.json', 'Program.cs', 'hosting.json'],
'Views': {
'Home': ['index.cshtml'],
'Shared': ['_Layout.cshtml']
Expand Down Expand Up @@ -173,7 +173,7 @@ public void DnuPublishWebApp_RootAsPublicFolder(string flavor, string os, string
""dnx451"": {}
}
}")
.WithFileContents("Microsoft.AspNet.Hosting.json", @"{
.WithFileContents("hosting.json", @"{
""WebRoot"": ""to_be_overridden""
}")
.WriteTo(testEnv.ProjectPath);
Expand All @@ -199,7 +199,7 @@ public void DnuPublishWebApp_RootAsPublicFolder(string flavor, string os, string
""dnx451"": {}
}
}")
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "Microsoft.AspNet.Hosting.json"), @"{
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "hosting.json"), @"{
""WebRoot"": ""../../../wwwroot""
}")
.WithFileContents(Path.Combine("wwwroot", "project.json"), @"{
Expand All @@ -208,7 +208,7 @@ public void DnuPublishWebApp_RootAsPublicFolder(string flavor, string os, string
""dnx451"": {}
}
}")
.WithFileContents(Path.Combine("wwwroot", "Microsoft.AspNet.Hosting.json"), @"{
.WithFileContents(Path.Combine("wwwroot", "hosting.json"), @"{
""WebRoot"": ""to_be_overridden""
}")
.WithFileContents(Path.Combine("approot", "global.json"), @"{
Expand All @@ -231,7 +231,7 @@ public void DnuPublishWebApp_SubfolderAsPublicFolder(string flavor, string os, s
var runtimeHomeDir = _fixture.GetRuntimeHomeDir(flavor, os, architecture);

var projectStructure = @"{
'.': ['project.json', 'Microsoft.AspNet.Hosting.json', 'Config.json', 'Program.cs'],
'.': ['project.json', 'hosting.json', 'Config.json', 'Program.cs'],
'public': {
'Scripts': ['bootstrap.js', 'jquery.js'],
'Images': ['logo.png'],
Expand All @@ -256,7 +256,7 @@ public void DnuPublishWebApp_SubfolderAsPublicFolder(string flavor, string os, s
'global.json': '',
'src': {
'PROJECT_NAME': {
'.': ['project.json', 'project.lock.json', 'Microsoft.AspNet.Hosting.json', 'Config.json', 'Program.cs'],
'.': ['project.json', 'project.lock.json', 'hosting.json', 'Config.json', 'Program.cs'],
'Views': {
'Home': ['index.cshtml'],
'Shared': ['_Layout.cshtml']
Expand Down Expand Up @@ -284,7 +284,7 @@ public void DnuPublishWebApp_SubfolderAsPublicFolder(string flavor, string os, s
""dnx451"": {}
}
}")
.WithFileContents("Microsoft.AspNet.Hosting.json", @"{
.WithFileContents("hosting.json", @"{
""WebRoot"": ""public""
}")
.WriteTo(testEnv.ProjectPath);
Expand All @@ -310,7 +310,7 @@ public void DnuPublishWebApp_SubfolderAsPublicFolder(string flavor, string os, s
""dnx451"": {}
}
}")
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "Microsoft.AspNet.Hosting.json"), @"{
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "hosting.json"), @"{
""WebRoot"": ""../../../wwwroot""
}")
.WithFileContents(Path.Combine("approot", "global.json"), @"{
Expand All @@ -333,7 +333,7 @@ public void DnuPublishWebApp_NonexistentFolderAsPublicFolder(string flavor, stri
var runtimeHomeDir = _fixture.GetRuntimeHomeDir(flavor, os, architecture);

var projectStructure = @"{
'.': ['project.json', 'Microsoft.AspNet.Hosting.json'],
'.': ['project.json', 'hosting.json'],
}";
var expectedOutputStructure = @"{
'wwwroot': {
Expand All @@ -343,7 +343,7 @@ public void DnuPublishWebApp_NonexistentFolderAsPublicFolder(string flavor, stri
'global.json': '',
'src': {
'PROJECT_NAME': {
'.': ['project.json', 'project.lock.json', 'Microsoft.AspNet.Hosting.json'],
'.': ['project.json', 'project.lock.json', 'hosting.json'],
}
}
}
Expand All @@ -357,7 +357,7 @@ public void DnuPublishWebApp_NonexistentFolderAsPublicFolder(string flavor, stri
""dnx451"": {}
}
}")
.WithFileContents("Microsoft.AspNet.Hosting.json", @"{
.WithFileContents("hosting.json", @"{
""WebRoot"": ""wwwroot""
}")
.WriteTo(testEnv.ProjectPath);
Expand Down Expand Up @@ -1214,7 +1214,7 @@ public void DnuPublishWebApp_CopyExistingWebConfig(string flavor, string os, str
var runtimeHomeDir = _fixture.GetRuntimeHomeDir(flavor, os, architecture);

var projectStructure = @"{
'.': ['project.json', 'Microsoft.AspNet.Hosting.json'],
'.': ['project.json', 'hosting.json'],
'public': ['index.html', 'web.config'],
'packages': {}
}";
Expand All @@ -1223,7 +1223,7 @@ public void DnuPublishWebApp_CopyExistingWebConfig(string flavor, string os, str
'approot': {
'global.json': '',
'src': {
'PROJECT_NAME': ['project.json', 'project.lock.json', 'Microsoft.AspNet.Hosting.json']
'PROJECT_NAME': ['project.json', 'project.lock.json', 'hosting.json']
}
}
}".Replace("PROJECT_NAME", _projectName);
Expand Down Expand Up @@ -1253,7 +1253,7 @@ public void DnuPublishWebApp_CopyExistingWebConfig(string flavor, string os, str
""dnx451"": {}
}
}")
.WithFileContents("Microsoft.AspNet.Hosting.json", @"{
.WithFileContents("hosting.json", @"{
""WebRoot"": ""public""
}")
.WithFileContents(Path.Combine("public", "web.config"), originalWebConfigContents)
Expand All @@ -1279,7 +1279,7 @@ public void DnuPublishWebApp_CopyExistingWebConfig(string flavor, string os, str
""dnx451"": {}
}
}")
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "Microsoft.AspNet.Hosting.json"), @"{
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "hosting.json"), @"{
""WebRoot"": ""../../../wwwroot""
}")
.WithFileContents(Path.Combine("approot", "global.json"), @"{
Expand All @@ -1302,7 +1302,7 @@ public void DnuPublishWebApp_UpdateExistingWebConfig(string flavor, string os, s
var runtimeHomeDir = _fixture.GetRuntimeHomeDir(flavor, os, architecture);

var projectStructure = @"{
'.': ['project.json', 'Microsoft.AspNet.Hosting.json'],
'.': ['project.json', 'hosting.json'],
'public': ['index.html', 'web.config'],
'packages': {}
}";
Expand All @@ -1311,7 +1311,7 @@ public void DnuPublishWebApp_UpdateExistingWebConfig(string flavor, string os, s
'approot': {
'global.json': '',
'src': {
'PROJECT_NAME': ['project.json', 'project.lock.json', 'Microsoft.AspNet.Hosting.json']
'PROJECT_NAME': ['project.json', 'project.lock.json', 'hosting.json']
}
}
}".Replace("PROJECT_NAME", _projectName);
Expand Down Expand Up @@ -1349,7 +1349,7 @@ public void DnuPublishWebApp_UpdateExistingWebConfig(string flavor, string os, s
}
}")
.WithFileContents(Path.Combine("public", "web.config"), originalWebConfigContents)
.WithFileContents("Microsoft.AspNet.Hosting.json", @"{
.WithFileContents("hosting.json", @"{
""WebRoot"": ""../../../wwwroot""
}")
.WriteTo(testEnv.ProjectPath);
Expand All @@ -1374,7 +1374,7 @@ public void DnuPublishWebApp_UpdateExistingWebConfig(string flavor, string os, s
""dnx451"": {}
}
}")
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "Microsoft.AspNet.Hosting.json"), @"{
.WithFileContents(Path.Combine("approot", "src", testEnv.ProjectName, "hosting.json"), @"{
""WebRoot"": ""../../../wwwroot""
}")
.WithFileContents(Path.Combine("approot", "global.json"), @"{
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPublishTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public void PublishedAppWithWebRootDefaults(DnxSdk sdk)
sdk.Dnu.Publish(project.ProjectDirectory, outputPath).EnsureSuccess();

var root = Path.Combine(Path.Combine(outputPath, "approot", "src"), project.Name);
var json = JObject.Parse(File.ReadAllText(Path.Combine(root, "Microsoft.AspNet.Hosting.json")));
var json = JObject.Parse(File.ReadAllText(Path.Combine(root, "hosting.json")));
var config = File.ReadAllText(Path.Combine(root, json?["webroot"]?.ToString(), "web.config"));

var expected = @"<configuration>
Expand Down