Skip to content

Commit 7f3b34f

Browse files
authored
[templates] Fix applicationId template option (dotnet#13509)
By preventing the templating engine from matching the AppID to the App's name (the sourceName), we allow the parameter to work
1 parent db7f68f commit 7f3b34f

File tree

4 files changed

+70
-6
lines changed

4 files changed

+70
-6
lines changed

src/Templates/src/templates/maui-blazor/.template.config/template.json

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
"applicationId": {
5656
"type": "parameter",
5757
"description": "Overrides the $(ApplicationId) in the project",
58-
"datatype": "string",
59-
"replaces": "com.companyname.MauiApp.1"
58+
"datatype": "string"
6059
},
6160
"msExtensionsVersion": {
6261
"type": "parameter",
@@ -85,6 +84,39 @@
8584
"type": "generated",
8685
"generator": "guid",
8786
"replaces": "$guid9$"
87+
},
88+
"nameToLower":{
89+
"type": "generated",
90+
"generator": "casing",
91+
"parameters": {
92+
"source" : "name",
93+
"toLower": true
94+
}
95+
},
96+
"defaultAppId":{
97+
"type": "generated",
98+
"generator": "join",
99+
"parameters": {
100+
"symbols": [
101+
{
102+
"type": "const",
103+
"value": "com.companyname."
104+
},
105+
{
106+
"type": "ref",
107+
"value": "nameToLower"
108+
}
109+
]
110+
}
111+
},
112+
"finalAppId":{
113+
"type":"generated",
114+
"generator": "coalesce",
115+
"parameters": {
116+
"sourceVariableName": "applicationId",
117+
"fallbackVariableName": "defaultAppId"
118+
},
119+
"replaces": "com.companyname.mauiapp"
88120
}
89121
},
90122
"defaultName": "MauiApp1"

src/Templates/src/templates/maui-blazor/MauiApp.1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ApplicationTitle>MauiApp.1</ApplicationTitle>
1717

1818
<!-- App Identifier -->
19-
<ApplicationId>com.companyname.mauiapp._1</ApplicationId>
19+
<ApplicationId>com.companyname.mauiapp</ApplicationId>
2020

2121
<!-- Versions -->
2222
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

src/Templates/src/templates/maui-mobile/.template.config/template.json

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
"applicationId": {
6060
"type": "parameter",
6161
"description": "Overrides the $(ApplicationId) in the project",
62-
"datatype": "string",
63-
"replaces": "com.companyname.MauiApp.1"
62+
"datatype": "string"
6463
},
6564
"msExtensionsVersion": {
6665
"type": "parameter",
@@ -89,6 +88,39 @@
8988
"type": "generated",
9089
"generator": "guid",
9190
"replaces": "$guid9$"
91+
},
92+
"nameToLower":{
93+
"type": "generated",
94+
"generator": "casing",
95+
"parameters": {
96+
"source" : "name",
97+
"toLower": true
98+
}
99+
},
100+
"defaultAppId":{
101+
"type": "generated",
102+
"generator": "join",
103+
"parameters": {
104+
"symbols": [
105+
{
106+
"type": "const",
107+
"value": "com.companyname."
108+
},
109+
{
110+
"type": "ref",
111+
"value": "nameToLower"
112+
}
113+
]
114+
}
115+
},
116+
"finalAppId":{
117+
"type":"generated",
118+
"generator": "coalesce",
119+
"parameters": {
120+
"sourceVariableName": "applicationId",
121+
"fallbackVariableName": "defaultAppId"
122+
},
123+
"replaces": "com.companyname.mauiapp"
92124
}
93125
},
94126
"defaultName": "MauiApp1"

src/Templates/src/templates/maui-mobile/MauiApp.1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ApplicationTitle>MauiApp.1</ApplicationTitle>
1616

1717
<!-- App Identifier -->
18-
<ApplicationId>com.companyname.mauiapp._1</ApplicationId>
18+
<ApplicationId>com.companyname.mauiapp</ApplicationId>
1919

2020
<!-- Versions -->
2121
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

0 commit comments

Comments
 (0)