Skip to content

Commit 13f1203

Browse files
committed
Use ElectronPackageId instead of PackageId
1 parent 19e785f commit 13f1203

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

docs/Core/Migration-Checks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ A `package.json` file **is allowed** in the `ElectronHostHook` folder if you're
4141

4242
```xml
4343
<PropertyGroup Label="ElectronNetCommon">
44-
<PackageId>my-electron-app</PackageId>
44+
<ElectronPackageId>my-electron-app</ElectronPackageId>
4545
<Title>My Electron App</Title>
4646
<Version>1.0.0</Version>
4747
<Description>My awesome Electron.NET application</Description>

docs/Using/Configuration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ These are the current default values when you don't make any changes:
2525
<ElectronSingleInstance>true</ElectronSingleInstance>
2626
<ElectronSplashScreen></ElectronSplashScreen>
2727
<ElectronIcon></ElectronIcon>
28-
<PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
28+
<ElectronPackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</ElectronPackageId>
2929
<ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
3030
<Title>$(MSBuildProjectName)</Title>
3131
</PropertyGroup>
@@ -38,15 +38,15 @@ Since electron builder still expects a `package.json` file to exist, ElectronNET
3838

3939
```json
4040
{
41-
"name": "$(PackageId)",
41+
"name": "$(ElectronPackageId)",
4242
"productName": "$(ElectronTitle)",
4343
"build": {
44-
"appId": "$(PackageId)",
44+
"appId": "$(ElectronPackageId)",
4545
"linux": {
4646
"desktop": {
4747
"entry": { "Name": "$(Title)" }
4848
},
49-
"executableName": "$(PackageId)"
49+
"executableName": "$(ElectronPackageId)"
5050
},
5151
"deb": {
5252
"desktop": {

src/ElectronNET/build/ElectronNET.Core.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ElectronSplashScreen></ElectronSplashScreen>
1010
<ElectronIcon></ElectronIcon>
1111
<PackageIcon></PackageIcon>
12-
<PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
12+
<ElectronPackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</ElectronPackageId>
1313
<ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
1414
<Title>$(MSBuildProjectName)</Title>
1515
</PropertyGroup>

src/ElectronNET/build/ElectronNET.Core.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup Condition="'$(ElectronExecutable)' == ''">
55
<WinPrefix>win</WinPrefix>
66
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
7-
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
7+
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(ElectronPackageId)</ElectronExecutable>
88
</PropertyGroup>
99

1010
<PropertyGroup>

src/ElectronNET/build/ElectronNET.LateImport.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125

126126
<ItemGroup>
127-
<TemplateProperty Include="PackageId" Value="$(PackageId)" />
127+
<TemplateProperty Include="ElectronPackageId" Value="$(ElectronPackageId)" />
128128
<TemplateProperty Include="Title" Value="$(Title)" />
129129
<TemplateProperty Include="ElectronTitle" Value="$(ElectronTitle)" />
130130
<TemplateProperty Include="Version" Value="$(Version)" />
@@ -452,7 +452,7 @@
452452

453453
<PropertyGroup>
454454
<ElectronPaParams></ElectronPaParams>
455-
<ElectronPaParams Condition="'$(PackageId)' != ''">$(ElectronPaParams) -c.appId &quot;$(PackageId)&quot;</ElectronPaParams>
455+
<ElectronPaParams Condition="'$(ElectronPackageId)' != ''">$(ElectronPaParams) -c.appId &quot;$(ElectronPackageId)&quot;</ElectronPaParams>
456456
<ElectronPaParams Condition="'$(Version)' != ''">$(ElectronPaParams) -c.buildVersion &quot;$(Version)&quot;</ElectronPaParams>
457457
<ElectronPaParams Condition="'$(Copyright)' != ''">$(ElectronPaParams) -c.copyright &quot;$(Copyright)&quot;</ElectronPaParams>
458458
<ElectronPaParams>$(ElectronPaParams) -c.extraResources &quot;bin/**/*&quot;</ElectronPaParams>

src/ElectronNET/build/ElectronNETRules.Project.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@
479479
Description="The version of the app, following the major.minor.patch pattern. Version numbers may include a pre-release suffix."
480480
Category="AppInfo" />
481481

482-
<StringProperty Name="PackageId"
482+
<StringProperty Name="ElectronPackageId"
483483
DisplayName="App Identifier"
484484
Category="AppInfo">
485485
</StringProperty>

src/ElectronNET/build/package.template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"name": "$(PackageId)",
2+
"name": "$(ElectronPackageId)",
33
"productName": "$(ElectronTitle)",
44
"build": {
5-
"appId": "$(PackageId)",
5+
"appId": "$(ElectronPackageId)",
66
"linux": {
77
"desktop": {
88
"entry": { "Name": "$(Title)" }
99
},
10-
"executableName": "$(PackageId)"
10+
"executableName": "$(ElectronPackageId)"
1111
},
1212
"deb": {
1313
"desktop": {

0 commit comments

Comments
 (0)