diff --git a/nuke/Directory.Build.props b/Directory.Build.props
similarity index 100%
rename from nuke/Directory.Build.props
rename to Directory.Build.props
diff --git a/nuke/Directory.Build.targets b/Directory.Build.targets
similarity index 100%
rename from nuke/Directory.Build.targets
rename to Directory.Build.targets
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 00000000..7fb0f766
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/src/ElectronNET.AspNet/Runtime/Controllers/RuntimeControllerAspNetBase.cs b/src/ElectronNET.AspNet/Runtime/Controllers/RuntimeControllerAspNetBase.cs
index f214e8a3..42693b9c 100644
--- a/src/ElectronNET.AspNet/Runtime/Controllers/RuntimeControllerAspNetBase.cs
+++ b/src/ElectronNET.AspNet/Runtime/Controllers/RuntimeControllerAspNetBase.cs
@@ -145,7 +145,7 @@ private async Task RunReadyCallback()
catch (Exception ex)
{
Console.WriteLine("Exception while executing OnAppReadyCallback. Stopping...\n" + ex);
- this.Stop();
+ _ = this.Stop();
}
}
}
diff --git a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
index b4cd9e1b..2cf1f268 100644
--- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -34,7 +34,6 @@
wwwroot\assets\img\about@2x.png
MIT
false
- win-x64
26.0
diff --git a/src/ElectronNET/build/ElectronNET.Core.props b/src/ElectronNET/build/ElectronNET.Core.props
index 5242960c..8a83754e 100644
--- a/src/ElectronNET/build/ElectronNET.Core.props
+++ b/src/ElectronNET/build/ElectronNET.Core.props
@@ -4,9 +4,12 @@
30.4.0
26.0
-
- $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)
+
+
+
+ $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)
+
+ win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLower())
true
diff --git a/src/ElectronNET/build/ElectronNET.LateImport.targets b/src/ElectronNET/build/ElectronNET.LateImport.targets
index 46ccd062..2fa843b6 100644
--- a/src/ElectronNET/build/ElectronNET.LateImport.targets
+++ b/src/ElectronNET/build/ElectronNET.LateImport.targets
@@ -121,7 +121,7 @@
linux
$(Title)
- $(Title.Replace(' ', '-'))
+ $(Title.Replace(' ', '-'))
@@ -365,18 +365,18 @@
- x64
- ia32
- arm64
- x64
- armv7l
- arm64
- x64
- arm64
-
- win
- linux
- mac
+ x64
+ ia32
+ arm64
+ x64
+ armv7l
+ arm64
+ x64
+ arm64
+
+ win
+ linux
+ mac
win32
@@ -385,7 +385,7 @@
$(ElectronArch)
- arm
+ arm
<_CurrentOSPlatform Condition="$([MSBuild]::IsOSPlatform('Windows'))">win
<_CurrentOSPlatform Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux
@@ -522,7 +522,7 @@
- <_NpxCmd>npx electron-builder --config=./$(ElectronBuilderJson) --$(ElectronPlatform) --$(ElectronArch) -c.electronVersion=$(ElectronVersion) -c.directories.output "$(ElectronPublishUrlFullPath)" $(ElectronPaParams)
+ <_NpxCmd>npx electron-builder --config=./$(ElectronBuilderJson)
+ <_NpxCmd Condition="'$(IsLinuxWsl)' == 'true'">$(_NpxCmd) --$(ElectronPlatform)
+ <_NpxCmd Condition="'$(IsLinuxWsl)' == 'true'">$(_NpxCmd) --$(ElectronArch)
+ <_NpxCmd>$(_NpxCmd) -c.electronVersion=$(ElectronVersion) -c.directories.output "$(ElectronPublishUrlFullPath)" $(ElectronPaParams)
<_NpxCmd Condition="'$(IsLinuxWsl)' == 'true'">wsl bash -ic '$(_NpxCmd)'