Skip to content

Commit 68c50f1

Browse files
FlorianRapplFlorianRappl
authored
Merge pull request #928 from softworkz/submit_remove_priv
Remove softworkz' special sauce
2 parents 1006355 + 5305e17 commit 68c50f1

File tree

8 files changed

+56
-78
lines changed

8 files changed

+56
-78
lines changed

‎src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ElectronNetDevMode>true</ElectronNetDevMode>
66
</PropertyGroup>
77

8-
<Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
8+
<Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
99

1010
<PropertyGroup>
1111
<TargetFramework>net8.0</TargetFramework>
@@ -72,6 +72,6 @@
7272
<PackageReference Include="ElectronNET.Core" Version="0.2.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
7373
</ItemGroup>
7474

75-
<Import Project="..\ElectronNET\build\ElectronNET.targets" Condition="$(ElectronNetDevMode)" />
75+
<Import Project="..\ElectronNET\build\ElectronNET.Core.targets" Condition="$(ElectronNetDevMode)" />
7676

7777
</Project>

‎src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ElectronNetDevMode>true</ElectronNetDevMode>
66
</PropertyGroup>
77

8-
<Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
8+
<Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
99

1010
<PropertyGroup>
1111
<TargetFramework>net8.0</TargetFramework>
@@ -37,6 +37,6 @@
3737
<ParallelizeTestCollections>false</ParallelizeTestCollections>
3838
</PropertyGroup>
3939

40-
<Import Project="..\ElectronNET\build\ElectronNET.targets" Condition="$(ElectronNetDevMode)" />
40+
<Import Project="..\ElectronNET\build\ElectronNET.Core.targets" Condition="$(ElectronNetDevMode)" />
4141

4242
</Project>

‎src/ElectronNET.WebApp/ElectronNET.WebApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ElectronNetDevMode>true</ElectronNetDevMode>
66
</PropertyGroup>
77

8-
<Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
8+
<Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
99

1010
<PropertyGroup>
1111
<TargetFramework>net8.0</TargetFramework>
@@ -76,6 +76,6 @@
7676
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" />
7777
</ItemGroup>
7878

79-
<Import Project="..\ElectronNET\build\ElectronNET.targets" Condition="$(ElectronNetDevMode)" />
79+
<Import Project="..\ElectronNET\build\ElectronNET.Core.targets" Condition="$(ElectronNetDevMode)" />
8080

8181
</Project>

‎src/ElectronNET/build/ElectronNET.Core.props‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<Import Project="$(MSBuildThisFileDirectory)ElectronNET.props" />
4+
<PropertyGroup Label="ElectronNetCommon">
5+
<ElectronVersion>30.4.0</ElectronVersion>
6+
<ElectronBuilderVersion>26.0</ElectronBuilderVersion>
7+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
8+
<ElectronSingleInstance>true</ElectronSingleInstance>
9+
<ElectronSplashScreen></ElectronSplashScreen>
10+
<ElectronIcon></ElectronIcon>
11+
<PackageIcon></PackageIcon>
12+
<PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
13+
<ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
14+
<Title>$(MSBuildProjectName)</Title>
15+
</PropertyGroup>
516

6-
</Project>
17+
<PropertyGroup>
18+
<IsPackable>false</IsPackable>
19+
<AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
20+
<ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
21+
</PropertyGroup>
22+
23+
<PropertyGroup>
24+
<CustomAfterDirectoryBuildTargets>$(MSBuildThisFileDirectory)ElectronNET.LateImport.targets</CustomAfterDirectoryBuildTargets>
25+
</PropertyGroup>
26+
27+
<PropertyGroup>
28+
<CollectUpToDateCheckBuiltDesignTimeDependsOn>$(CollectUpToDateCheckBuiltDesignTimeDependsOn);ElectronCollectUpToDateCheckBuiltDesignTime</CollectUpToDateCheckBuiltDesignTimeDependsOn>
29+
<FileSystemPublishDependsOn>$(FileSystemPublishDependsOn);ElectronFileSystemPublishClearItems</FileSystemPublishDependsOn>
30+
</PropertyGroup>
31+
32+
</Project>

‎src/ElectronNET/build/ElectronNET.Core.targets‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<Import Project="$(MSBuildThisFileDirectory)ElectronNET.targets" />
4+
<PropertyGroup Condition="'$(ElectronExecutable)' == ''">
5+
<WinPrefix>win</WinPrefix>
6+
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
7+
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
8+
</PropertyGroup>
59

6-
</Project>
10+
<PropertyGroup>
11+
<_IsMsAspNetProject>False</_IsMsAspNetProject>
12+
<_IsMsAspNetProject Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">True</_IsMsAspNetProject>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<AssemblyMetadata Include="ElectronExecutable" Value="$(ElectronExecutable)" />
17+
<AssemblyMetadata Include="ElectronVersion" Value="$(ElectronVersion)" />
18+
<AssemblyMetadata Include="RuntimeIdentifier" Value="$(RuntimeIdentifier)" />
19+
<AssemblyMetadata Include="ElectronSingleInstance" Value="$(ElectronSingleInstance)" />
20+
<AssemblyMetadata Include="Title" Value="$(Title)" />
21+
<AssemblyMetadata Include="Version" Value="$(Version)" />
22+
<AssemblyMetadata Include="BuildConfiguration" Value="$(Configuration)" />
23+
<AssemblyMetadata Include="IsAspNet" Value="$(_IsMsAspNetProject)" />
24+
</ItemGroup>
25+
26+
</Project>

‎src/ElectronNET/build/ElectronNET.props‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/ElectronNET/build/ElectronNET.targets‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/common.props‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@
1414
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/main/Changelog.md</PackageReleaseNotes>
1515
<PackageIcon>PackageIcon.png</PackageIcon>
1616
<DescriptionFirstPart>Building cross platform electron based desktop apps with .NET Core and - optionally - ASP.NET Core.</DescriptionFirstPart>
17-
</PropertyGroup>
18-
<PropertyGroup Condition="'$(SOFTWORKZ)' == '1'">
19-
<Version>50.0.24.0</Version>
20-
<PackageNamePrefix>ElectronNET</PackageNamePrefix>
21-
<PackageProjectUrl>/</PackageProjectUrl>
22-
<PublishRepositoryUrl>false</PublishRepositoryUrl>
23-
<PackageReleaseNotes></PackageReleaseNotes>
24-
<PackageIcon>PackageIcon.png</PackageIcon>
25-
</PropertyGroup>
26-
<PropertyGroup>
2717
<AssemblyVersion>$(Version)</AssemblyVersion>
2818
<FileVersion>$(Version)</FileVersion>
2919
<Version>$(Version)$(VersionPostFix)</Version>

0 commit comments

Comments
 (0)