Skip to content

Commit 518bda2

Browse files
jp-seinijp-seini
committed
- Updated duplicate https ApplicationUrl entries, to instead have an https and http entry.
- Updated `LaunchSettings.json` parsing to take in account the scheme (http vs https) of the ApplicationUrl
1 parent 15c145d commit 518bda2

File tree

9 files changed

+18
-13
lines changed

9 files changed

+18
-13
lines changed

‎Modules/Intent.Modules.Blazor/Intent.Blazor.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.Blazor</id>
4-
<version>1.0.5-pre.3</version>
4+
<version>1.0.5-pre.4</version>
55
<supportedClientVersions>[4.5.0-a, 5.0.0-a)</supportedClientVersions>
66
<summary>Automates the bootstrapping and core patterns of a Blazor web application.</summary>
77
<description>Automates the bootstrapping and core patterns of a Blazor web application.</description>

‎Modules/Intent.Modules.Blazor/Intent.Modules.Blazor.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
<Version>1.0.5-pre.3</Version>
5+
<Version>1.0.5-pre.4</Version>
66
<Authors>Intent Architect</Authors>
77
<Description>Base classes and helpers for building templates for Blazor for Intent Architect.</Description>
88
<Copyright>Copyright 2024</Copyright>

‎Modules/Intent.Modules.Blazor/Templates/Templates/Client/Program/ProgramTemplatePartial.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public ProgramTemplate(IOutputTarget outputTarget, object model = null) : base(T
105105
DotnetRunMessages = true,
106106
CommandName = "Project",
107107
LaunchBrowser = true,
108-
ApplicationUrl = $"https://localhost:{x.SslPort};https://localhost:{x.Port}",
108+
ApplicationUrl = $"https://localhost:{x.SslPort};http://localhost:{x.Port}",
109109
PublishAllPorts = false,
110110
InspectUri = "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
111111
EnvironmentVariables = new Dictionary<string, string> { { "ASPNETCORE_ENVIRONMENT", "Development" } }
@@ -127,7 +127,7 @@ public ProgramTemplate(IOutputTarget outputTarget, object model = null) : base(T
127127
CommandName = "Project",
128128
DotnetRunMessages = true,
129129
LaunchBrowser = true,
130-
ApplicationUrl = $"https://localhost:{x.SslPort};https://localhost:{x.Port}",
130+
ApplicationUrl = $"https://localhost:{x.SslPort};http://localhost:{x.Port}",
131131
LaunchUrl = $"https://localhost:{x.SslPort}",
132132
PublishAllPorts = false,
133133
EnvironmentVariables = new Dictionary<string, string> { { "ASPNETCORE_ENVIRONMENT", "Development" } }

‎Modules/Intent.Modules.Blazor/release-notes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- Improvement: Updated error messaging when Route of a `Page` contains incorrect route parameters.
55
- Fixed: SF Crash in scenario of remote service with missing mappings.
66
- Fixed: When newer versions of the `Intent.Code.Weaving.Razor` module was installed, ``<>f__AnonymousDelegate0`2[System.String,System.String]`` would appear on the home page.
7+
- Fixed: Updated duplicate `https` ApplicationUrl entries, to instead have an `https` and `http` entry.
78

89
### Version 1.0.4
910

‎Modules/Intent.Modules.NET.sln‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 18
3-
VisualStudioVersion = 18.0.11104.47 d18.0
3+
VisualStudioVersion = 18.0.11104.47
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Modules.Application.Contracts", "Intent.Modules.Application.Contracts\Intent.Modules.Application.Contracts.csproj", "{2972A488-2F67-426D-8762-C85FB36FB32C}"
66
EndProject
@@ -428,7 +428,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Modules.Aws.Sqs", "I
428428
EndProject
429429
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Modules.Aws.SecretsManager", "Intent.Modules.Aws.SecretsManager\Intent.Modules.Aws.SecretsManager.csproj", "{7DF3FC9C-FBAE-4C18-96D6-6365C30600DF}"
430430
EndProject
431-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Intent.Modules.Integration.IaC.Shared.AwsSqs", "Intent.Modules.Integration.IaC.Shared.AwsSqs\Intent.Modules.Integration.IaC.Shared.AwsSqs.shproj", "{992BB1F9-CDD6-4A3D-BF90-6554358DD319}"
431+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Intent.Modules.Integration.IaC.Shared.AwsSqs", "Intent.Modules.Integration.IaC.Shared.AwsSqs\Intent.Modules.Integration.IaC.Shared.AwsSqs.shproj", "{F9083B8E-7876-4C23-B615-5C75AB49F572}"
432432
EndProject
433433
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Modules.Aws.Lambda.Functions.Sqs", "Intent.Modules.Aws.Lambda.Functions.Sqs\Intent.Modules.Aws.Lambda.Functions.Sqs.csproj", "{E8EE9F41-D5B2-4A78-B2BB-281A4C60A3AE}"
434434
EndProject
@@ -1317,7 +1317,6 @@ Global
13171317
{73A5C654-4BD1-4A47-8FC2-BEE212DD3A0A} = {496D7CE4-4A5B-412F-B3AA-E837E159B974}
13181318
{6161ED7E-68BE-4788-8BDF-9942F39626B5} = {496D7CE4-4A5B-412F-B3AA-E837E159B974}
13191319
{6EEC0527-206C-4437-B8D7-8E1D6EDE530F} = {BD882ECC-9AA8-4455-AC46-45BD045553EB}
1320-
{992BB1F9-CDD6-4A3D-BF90-6554358DD319} = {F24A3FC4-85CD-4089-9C1C-0A9DA1900B86}
13211320
{14629E11-96B5-4050-A853-12D4FC016914} = {F75494CA-24E5-4CF2-8123-55A41BC20BC6}
13221321
{AC620C37-6585-4E04-B43E-0BAEFAE34E3C} = {5F9FE51C-33D0-4FDE-81AF-20FD12C6AF27}
13231322
{C46B3DF3-628D-48C6-A8DB-D1AFC2CB7CF5} = {5F9FE51C-33D0-4FDE-81AF-20FD12C6AF27}
@@ -1411,13 +1410,17 @@ Global
14111410
Intent.Modules.EntityFrameworkCore.Shared\Intent.Modules.EntityFrameworkCore.Shared.projitems*{ded84d15-0d51-44ab-a00d-fbdb739730a7}*SharedItemsImports = 5
14121411
Intent.Modules.DocumentDB.Shared\Intent.Modules.DocumentDB.Shared.projitems*{e18a801d-8b65-406e-ba1b-4280d754f5d3}*SharedItemsImports = 5
14131412
Intent.Modules.DocumentDB.Shared\Intent.Modules.DocumentDB.Shared.projitems*{e515e56c-436e-40d9-b8da-9fbb3f2d5545}*SharedItemsImports = 5
1413+
Intent.Modules.Eventing.Shared\Intent.Modules.Eventing.Shared.projitems*{e6a962cc-6864-45d9-ab6a-fcfb19173e82}*SharedItemsImports = 5
1414+
Intent.Modules.Integration.IaC.Shared.AwsSqs\Intent.Modules.Integration.IaC.Shared.AwsSqs.projitems*{e6a962cc-6864-45d9-ab6a-fcfb19173e82}*SharedItemsImports = 5
14141415
Intent.Modules.Security.Shared\Intent.Modules.Security.Shared.projitems*{e734455f-4103-4ef0-932c-28948e7f2e94}*SharedItemsImports = 5
1416+
Intent.Modules.Integration.IaC.Shared.AwsSqs\Intent.Modules.Integration.IaC.Shared.AwsSqs.projitems*{e8ee9f41-d5b2-4a78-b2bb-281a4c60a3ae}*SharedItemsImports = 5
14151417
Intent.Modules.EntityFrameworkCore.Shared\Intent.Modules.EntityFrameworkCore.Shared.projitems*{e8fc2c42-6fc9-4a68-8f84-79cea0ea9cab}*SharedItemsImports = 5
14161418
Intent.Modules.Eventing.Shared\Intent.Modules.Eventing.Shared.projitems*{ea54e3e6-234d-4eb9-b691-39c833b6ecaf}*SharedItemsImports = 5
14171419
Intent.Modules.Integration.IaC.Shared.AzureServiceBus\Intent.Modules.Integration.IaC.Shared.AzureServiceBus.projitems*{ea54e3e6-234d-4eb9-b691-39c833b6ecaf}*SharedItemsImports = 5
14181420
Intent.Modules.Enums.Shared\Intent.Modules.Enums.Shared.projitems*{f2270b39-91aa-4126-b3a5-48b2c0cabe0b}*SharedItemsImports = 5
14191421
Intent.Modules.Contracts.Clients.Shared\Intent.Modules.Contracts.Clients.Shared.projitems*{f2d877d3-cbe3-4165-853e-8dc4461b9b5d}*SharedItemsImports = 13
14201422
Intent.Modules.Application.Shared\Intent.Modules.Application.Shared.projitems*{f70df819-b1a1-460c-ad99-567cf48a1a99}*SharedItemsImports = 5
14211423
Intent.Modules.FluentValidation.Shared\Intent.Modules.FluentValidation.Shared.projitems*{f70df819-b1a1-460c-ad99-567cf48a1a99}*SharedItemsImports = 5
1424+
Intent.Modules.Integration.IaC.Shared.AwsSqs\Intent.Modules.Integration.IaC.Shared.AwsSqs.projitems*{f9083b8e-7876-4c23-b615-5c75ab49f572}*SharedItemsImports = 13
14221425
EndGlobalSection
14231426
EndGlobal

‎Modules/Intent.Modules.VisualStudio.Projects/Intent.Modules.VisualStudio.Projects.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
6-
<Version>3.9.4</Version>
6+
<Version>3.9.6-pre.1</Version>
77
<Authors>Intent Architect</Authors>
88
<Company>Intent Architect</Company>
99
<Product>Intent Architect</Product>

‎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.6-pre.0</version>
4+
<version>3.9.6-pre.1</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/LaunchSettings/LaunchSettingsJsonTemplate.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ public override void BeforeTemplateExecution()
189189
{
190190
base.BeforeTemplateExecution();
191191

192+
_randomPort = new Random().Next(56600, 65535);
193+
_randomSslPort = new Random().Next(44300, 44399);
194+
192195
if (!TryGetExistingFileContent(out var content))
193196
{
194-
_randomPort = new Random().Next(56600, 65535);
195-
_randomSslPort = new Random().Next(44300, 44399);
196-
197197
if (!string.IsNullOrWhiteSpace(_defaultApplicationUrl))
198198
{
199199
_randomSslPort = new Uri(_defaultApplicationUrl).Port;
@@ -216,7 +216,7 @@ public override void BeforeTemplateExecution()
216216
return;
217217
}
218218

219-
_randomPort = iisExpress.ApplicationUrl.Port;
219+
_randomPort = iisExpress.ApplicationUrl.Scheme == Uri.UriSchemeHttps ? _randomPort : iisExpress.ApplicationUrl.Port;
220220
_randomSslPort = iisExpress.SslPort.Value;
221221

222222
ExecutionContext.EventDispatcher.Publish(new HostingSettingsCreatedEvent(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
### Version 3.9.6
22

33
- Fixed: Adding `appsettings.json` for a standard C# Class project will make sure that it will output to target output folder during compilation.
4+
- Fixed: Updated `LaunchSettings.json` parsing to take in account the scheme (http vs https) of the ApplicationUrl
45

56
### Version 3.9.5
67

0 commit comments

Comments
 (0)