Skip to content

Remove softworkz' special sauce #928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 15, 2025
+56 −78
Merged

Remove softworkz' special sauce #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd205ed
common.props: Remove personal extras
softworkz Nov 15, 2025
442084a
MSBuild props/targets: Remove wrapped files
softworkz Nov 15, 2025
5305e17
MSBuild props/targets: Adapt demo/test projects for change
softworkz Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ElectronNetDevMode>true</ElectronNetDevMode>
</PropertyGroup>

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

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Expand Down Expand Up @@ -72,6 +72,6 @@
<PackageReference Include="ElectronNET.Core" Version="0.2.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
</ItemGroup>

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

</Project>
4 changes: 2 additions & 2 deletions src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ElectronNetDevMode>true</ElectronNetDevMode>
</PropertyGroup>

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

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Expand Down Expand Up @@ -37,6 +37,6 @@
<ParallelizeTestCollections>false</ParallelizeTestCollections>
</PropertyGroup>

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

</Project>
4 changes: 2 additions & 2 deletions src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ElectronNetDevMode>true</ElectronNetDevMode>
</PropertyGroup>

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

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Expand Down Expand Up @@ -76,6 +76,6 @@
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" />
</ItemGroup>

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

</Project>
30 changes: 28 additions & 2 deletions src/ElectronNET/build/ElectronNET.Core.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$(MSBuildThisFileDirectory)ElectronNET.props" />
<PropertyGroup Label="ElectronNetCommon">
<ElectronVersion>30.4.0</ElectronVersion>
<ElectronBuilderVersion>26.0</ElectronBuilderVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<ElectronSingleInstance>true</ElectronSingleInstance>
<ElectronSplashScreen></ElectronSplashScreen>
<ElectronIcon></ElectronIcon>
<PackageIcon></PackageIcon>
<PackageId>$(MSBuildProjectName.Replace(".", "-").ToLower())</PackageId>
<ElectronBuilderJson>electron-builder.json</ElectronBuilderJson>
<Title>$(MSBuildProjectName)</Title>
</PropertyGroup>

</Project>
<PropertyGroup>
<IsPackable>false</IsPackable>
<AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
<ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
</PropertyGroup>

<PropertyGroup>
<CustomAfterDirectoryBuildTargets>$(MSBuildThisFileDirectory)ElectronNET.LateImport.targets</CustomAfterDirectoryBuildTargets>
</PropertyGroup>

<PropertyGroup>
<CollectUpToDateCheckBuiltDesignTimeDependsOn>$(CollectUpToDateCheckBuiltDesignTimeDependsOn);ElectronCollectUpToDateCheckBuiltDesignTime</CollectUpToDateCheckBuiltDesignTimeDependsOn>
<FileSystemPublishDependsOn>$(FileSystemPublishDependsOn);ElectronFileSystemPublishClearItems</FileSystemPublishDependsOn>
</PropertyGroup>

</Project>
24 changes: 22 additions & 2 deletions src/ElectronNET/build/ElectronNET.Core.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$(MSBuildThisFileDirectory)ElectronNET.targets" />
<PropertyGroup Condition="'$(ElectronExecutable)' == ''">
<WinPrefix>win</WinPrefix>
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
</PropertyGroup>

</Project>
<PropertyGroup>
<_IsMsAspNetProject>False</_IsMsAspNetProject>
<_IsMsAspNetProject Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">True</_IsMsAspNetProject>
</PropertyGroup>

<ItemGroup>
<AssemblyMetadata Include="ElectronExecutable" Value="$(ElectronExecutable)" />
<AssemblyMetadata Include="ElectronVersion" Value="$(ElectronVersion)" />
<AssemblyMetadata Include="RuntimeIdentifier" Value="$(RuntimeIdentifier)" />
<AssemblyMetadata Include="ElectronSingleInstance" Value="$(ElectronSingleInstance)" />
<AssemblyMetadata Include="Title" Value="$(Title)" />
<AssemblyMetadata Include="Version" Value="$(Version)" />
<AssemblyMetadata Include="BuildConfiguration" Value="$(Configuration)" />
<AssemblyMetadata Include="IsAspNet" Value="$(_IsMsAspNetProject)" />
</ItemGroup>

</Project>
32 changes: 0 additions & 32 deletions src/ElectronNET/build/ElectronNET.props
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/ElectronNET/build/ElectronNET.targets
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions src/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/main/Changelog.md</PackageReleaseNotes>
<PackageIcon>PackageIcon.png</PackageIcon>
<DescriptionFirstPart>Building cross platform electron based desktop apps with .NET Core and - optionally - ASP.NET Core.</DescriptionFirstPart>
</PropertyGroup>
<PropertyGroup Condition="'$(SOFTWORKZ)' == '1'">
<Version>50.0.24.0</Version>
<PackageNamePrefix>ElectronNET</PackageNamePrefix>
<PackageProjectUrl>/</PackageProjectUrl>
<PublishRepositoryUrl>false</PublishRepositoryUrl>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageIcon>PackageIcon.png</PackageIcon>
</PropertyGroup>
<PropertyGroup>
<AssemblyVersion>$(Version)</AssemblyVersion>
<FileVersion>$(Version)</FileVersion>
<Version>$(Version)$(VersionPostFix)</Version>
Expand Down