diff --git a/src/MauiAspire.Hosting.SettingsGenerator/Program.cs b/src/MauiAspire.Hosting.SettingsGenerator/Program.cs
index f3c9264..583a59f 100644
--- a/src/MauiAspire.Hosting.SettingsGenerator/Program.cs
+++ b/src/MauiAspire.Hosting.SettingsGenerator/Program.cs
@@ -47,7 +47,7 @@ static void WriteSettings(IDictionary environmentVariables, string settingsPath)
using (StreamWriter file = new StreamWriter(settingsPath))
{
file.Write("""
- // This file is generated from the Aspire AppHost project. Re-run the Aspre AppHost
+ // This file is generated from the Aspire AppHost project. Rerun the Aspire AppHost
// to regenerate it.
public static class AspireAppSettings
diff --git a/src/MauiAspire.ProjectTemplates/MauiAspire.ProjectTemplates.csproj b/src/MauiAspire.ProjectTemplates/MauiAspire.ProjectTemplates.csproj
index 11a7589..2b9f5e8 100644
--- a/src/MauiAspire.ProjectTemplates/MauiAspire.ProjectTemplates.csproj
+++ b/src/MauiAspire.ProjectTemplates/MauiAspire.ProjectTemplates.csproj
@@ -1,6 +1,6 @@
-
+
net8.0
@@ -13,15 +13,17 @@
$(NoWarn);NU5128
false
.NET MAUI Aspire Template Pack for Microsoft Template Engine
+ 8.0.0-preview.2.23619.3
-
-
+
+
@@ -34,8 +36,8 @@
-
-
+
+
@@ -43,7 +45,7 @@
-
+
diff --git a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/.template.config/template.json b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/.template.config/template.json
index 593a620..b79dedc 100644
--- a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/.template.config/template.json
+++ b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/.template.config/template.json
@@ -30,6 +30,7 @@
"DB7A3AC1-6E4F-4805-B710-2FCD1084E96E",
"9FEB877E-015D-4E20-AE63-06C596E242E4",
"AC2DB38C-F5AD-4CEF-BC4C-04AE6EE86C9F",
+ "8757E021-D0C4-4DAD-836D-4C5F3F8350BA",
"EB6E56D3-85C9-43D0-A65C-775F4C780950"
],
"sources": [
@@ -266,6 +267,37 @@
"datatype": "bool",
"defaultValue": "true",
"description": "Whether to turn off HTTPS."
+ },
+
+ "applicationId": {
+ "type": "parameter",
+ "description": "Overrides the $(ApplicationId) in the project",
+ "datatype": "string"
+ },
+ "defaultAppId": {
+ "type": "generated",
+ "generator": "join",
+ "parameters": {
+ "symbols": [
+ {
+ "type": "const",
+ "value": "com.companyname."
+ },
+ {
+ "type": "ref",
+ "value": "nameToAppId"
+ }
+ ]
+ }
+ },
+ "finalAppId": {
+ "type": "generated",
+ "generator": "coalesce",
+ "parameters": {
+ "sourceVariableName": "applicationId",
+ "fallbackVariableName": "defaultAppId"
+ },
+ "replaces": "com.companyname.mauiapp"
}
},
"primaryOutputs": [
@@ -284,6 +316,9 @@
},
{
"path": "AspireStarterApplication.1.Web\\AspireStarterApplication.1.Web.csproj"
+ },
+ {
+ "path": "AspireStarterApplication.1.MauiApp\\AspireStarterApplication.1.MauiApp.csproj"
}
],
"postActions": [
diff --git a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.AppHost/AspireStarterApplication.1.AppHost.csproj b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.AppHost/AspireStarterApplication.1.AppHost.csproj
index 91c26cf..1897a0a 100644
--- a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.AppHost/AspireStarterApplication.1.AppHost.csproj
+++ b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.AppHost/AspireStarterApplication.1.AppHost.csproj
@@ -14,7 +14,8 @@
-
+
+
diff --git a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireAppSettings.g.cs b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireAppSettings.g.cs
index fdb3e69..89c8d94 100644
--- a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireAppSettings.g.cs
+++ b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireAppSettings.g.cs
@@ -20,4 +20,4 @@ public static class AspireAppSettings
["services:apiservice:0"] = "http://_http.localhost:5303",
["services:apiservice:1"] = "http://localhost:5303",
};
-}
\ No newline at end of file
+}
diff --git a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireStarterApplication1.MauiApp.csproj b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireStarterApplication.1.MauiApp.csproj
similarity index 89%
rename from src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireStarterApplication1.MauiApp.csproj
rename to src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireStarterApplication.1.MauiApp.csproj
index 5e2cce1..1f5b053 100644
--- a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireStarterApplication1.MauiApp.csproj
+++ b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.MauiApp/AspireStarterApplication.1.MauiApp.csproj
@@ -15,17 +15,16 @@
false
Exe
- ClientAppsIntegration.MAUI
true
true
enable
enable
- ClientAppsIntegration.MAUI
+ MauiApp.1
- com.companyname.clientappsintegration.maui
+ com.companyname.mauiapp
1.0
@@ -74,11 +73,10 @@
-
+
+
-
-
-
+
+
-
diff --git a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.ServiceDefaults/AspireStarterApplication.1.ServiceDefaults.csproj b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.ServiceDefaults/AspireStarterApplication.1.ServiceDefaults.csproj
index 19a65b2..34b2456 100644
--- a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.ServiceDefaults/AspireStarterApplication.1.ServiceDefaults.csproj
+++ b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.ServiceDefaults/AspireStarterApplication.1.ServiceDefaults.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.Web/AspireStarterApplication.1.Web.csproj b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.Web/AspireStarterApplication.1.Web.csproj
index cd19512..13286fc 100644
--- a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.Web/AspireStarterApplication.1.Web.csproj
+++ b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.Web/AspireStarterApplication.1.Web.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.sln b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.sln
index c503b3f..1752a83 100644
--- a/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.sln
+++ b/src/MauiAspire.ProjectTemplates/templates/maui-aspire/AspireStarterApplication.1.sln
@@ -10,6 +10,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireStarterApplication.1.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireStarterApplication.1.Web", "AspireStarterApplication.1.Web\AspireStarterApplication.1.Web.csproj", "{AC2DB38C-F5AD-4CEF-BC4C-04AE6EE86C9F}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireStarterApplication.1.MauiApp", "AspireStarterApplication.1.Web\AspireStarterApplication.1.Web.csproj", "{8757E021-D0C4-4DAD-836D-4C5F3F8350BA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -32,6 +34,10 @@ Global
{AC2DB38C-F5AD-4CEF-BC4C-04AE6EE86C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC2DB38C-F5AD-4CEF-BC4C-04AE6EE86C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC2DB38C-F5AD-4CEF-BC4C-04AE6EE86C9F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8757E021-D0C4-4DAD-836D-4C5F3F8350BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8757E021-D0C4-4DAD-836D-4C5F3F8350BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8757E021-D0C4-4DAD-836D-4C5F3F8350BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8757E021-D0C4-4DAD-836D-4C5F3F8350BA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE