Skip to content

Commit 3e3e945

Browse files
committed
Refactor appsettings.json handling and update package version to 3.9.6-pre.0
1 parent 8957215 commit 3e3e945

File tree

8 files changed

+23
-21
lines changed

8 files changed

+23
-21
lines changed

Modules/Intent.Modules.VisualStudio.Projects/Intent.Metadata/Module Builder/Intent.VisualStudio.Projects/Intent.VisualStudio.Projects.pkg.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
3131
<definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
3232
<properties>
33-
<property name="4bb9695b-6004-46e1-acea-c48c60c5f8ce" display="Version" value="3.9.5" isActive="true" />
33+
<property name="4bb9695b-6004-46e1-acea-c48c60c5f8ce" display="Version" value="3.9.6-pre.0" isActive="true" />
3434
<property name="177a2415-e749-46e7-8257-440e19ecfb5e" display="API Namespace" value="Intent.Modules.VisualStudio.Projects.Api" isActive="true" />
3535
<property name="0d2ae582-090e-42d6-a7d6-689144433254" display="NuGet Package Id" isActive="true" />
3636
<property name="27cf6544-a9a2-4992-9fef-51d0ed49e66e" display="NuGet Package Version" value="" isActive="true" />

Modules/Intent.Modules.VisualStudio.Projects/Intent.VisualStudio.Projects.imodspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package>
33
<id>Intent.VisualStudio.Projects</id>
4-
<version>3.9.5</version>
4+
<version>3.9.6-pre.0</version>
55
<supportedClientVersions>[4.5.15-a, 5.0.0-a)</supportedClientVersions>
66
<summary>Visual Studio solution and project layout designer</summary>
77
<description>Visual Studio solution and project layout designer</description>

Modules/Intent.Modules.VisualStudio.Projects/Templates/CoreWeb/AppSettings/AppSettingsTemplatePartial.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,20 @@ public override ITemplateFileConfig GetTemplateFileConfig()
241241
? ($".{Model.RuntimeEnvironment.Name.ToPascalCase()}", "appsettings.json")
242242
: (null, null);
243243

244-
return new TemplateFileConfig(
245-
fileName: $"appsettings{runtimeEnvironment}",
246-
fileExtension: "json",
247-
relativeLocation: Model.Location)
248-
.WithDependsOn(dependsOn);
244+
var templateConfig = new TemplateFileConfig(
245+
fileName: $"appsettings{runtimeEnvironment}",
246+
fileExtension: "json",
247+
relativeLocation: Model.Location);
248+
249+
if (!Model.IncludeAllowHosts && !Model.IncludeAspNetCoreLoggingLevel && !Model.RequiresSpecifiedRole)
250+
{
251+
templateConfig.WithRemoveItemType("Content");
252+
templateConfig.WithCopyToOutputDirectory(CopyToOutputDirectory.CopyIfNewer);
253+
}
254+
255+
templateConfig.WithDependsOn(dependsOn);
256+
257+
return templateConfig;
249258
}
250259

251260
private void HandleAppSetting(AppSettingRegistrationRequest @event)

Modules/Intent.Modules.VisualStudio.Projects/Templates/CoreWeb/CsProject/CoreWebCSProjectTemplateRegistrations.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@ public void DoRegistration(ITemplateInstanceRegistry registry, IApplication appl
2929
var project = application.Projects.Single(x => x.Id == model.Id);
3030
registry.RegisterTemplate(TemplateId, project, p => new CoreWebCSProjectTemplate(project, model));
3131
}
32-
//var targetProjectIds = new List<string>
33-
//{
34-
// VisualStudioProjectTypeIds.CoreWebApp
35-
//};
36-
37-
//var projects = application.Projects.Where(p => targetProjectIds.Contains(p.Type));
38-
39-
//foreach (var project in projects)
40-
//{
41-
// registery.Register(TemplateId, project, p => new CoreWebCSProjectTemplate(project));
42-
//}
4332
}
4433
}
4534
}

Modules/Intent.Modules.VisualStudio.Projects/VisualStudio.Projects.application.deviations.log.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
<approvedByDisplayName>Joel Turner</approvedByDisplayName>
307307
<approvedAt>2024-08-20T12:30:39.7876106Z</approvedAt>
308308
<deviationsHash>95F024BBB9B93CC06F17BC55CA2B849AF9EDD9596525892D00915BACFA8C917B</deviationsHash>
309-
<fileHash>4DBDBD37F9EC829DD2B9E44D8D0D6AE422AA1DFFBD07FDEA23341114A9D188EA</fileHash>
309+
<fileHash>BFF25292FA91246CEDFA41287653940297BA2DDA431C42B15AB35441AB2C3AAB</fileHash>
310310
</file>
311311
<file>
312312
<correlationId>Intent.ModuleBuilder.Templates.FileTemplateStringInterpolation#807ee533-3ab8-4fe6-a06c-30d45eecf014</correlationId>

Modules/Intent.Modules.VisualStudio.Projects/VisualStudio.Projects.application.output.config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<files>
44
<file relativePath="Intent.Modules.VisualStudio.Projects/Intent.Modules.VisualStudio.Projects.csproj" state="ignored" />
55
<file relativePath="Intent.Modules.VisualStudio.Projects/modelers/Visual Studio Types.designer.settings" state="ignored" />
6-
<file relativePath="Intent.Modules.VisualStudio.Projects/release-notes.md" state="once-off-generated" />
6+
<file relativePath="Intent.Modules.VisualStudio.Projects/release-notes.md" state="ignored;once-off-generated" />
77
</files>
88
</outputFiles>

Modules/Intent.Modules.VisualStudio.Projects/VisualStudio.Projects.application.output.log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
<OverwriteBehaviour>once-off</OverwriteBehaviour>
457457
<ApplicationRelativeFilePath>release-notes.md</ApplicationRelativeFilePath>
458458
<ProjectRelativeFilePath>release-notes.md</ProjectRelativeFilePath>
459-
<IsIgnored>false</IsIgnored>
459+
<IsIgnored>true</IsIgnored>
460460
</FileLog>
461461
<FileLog>
462462
<ProjectId>96360cfe-c70c-4e69-af16-283802634a26</ProjectId>

Modules/Intent.Modules.VisualStudio.Projects/release-notes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### Version 3.9.6
2+
3+
- Fixed: Adding `appsettings.json` for a standard C# Class project will make sure that it will output to target output folder during compilation.
4+
15
### Version 3.9.5
26

37
- Fixed: Standard C# Projects did not receive app settings supplied in general.

0 commit comments

Comments
 (0)