diff --git a/InnoSetup.iss b/InnoSetup.iss
index 834b98cd39..8bb1ee64f0 100644
--- a/InnoSetup.iss
+++ b/InnoSetup.iss
@@ -30,6 +30,8 @@ OutputBaseFilename=NETworkManager_{#MyAppVersion}_Setup
Compression=lzma
SolidCompression=yes
WizardStyle=modern
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
WizardSmallImageFile=Images\NETworkManager_Logo_InnoSetup.bmp
[Languages]
@@ -47,7 +49,7 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
[Files]
Source: "Build\NETworkManager\NETworkManager.exe"; DestDir: "{app}"; Flags: ignoreversion
diff --git a/Source/NETworkManager.Controls/NETworkManager.Controls.csproj b/Source/NETworkManager.Controls/NETworkManager.Controls.csproj
index a261e1d24f..58247e7eed 100644
--- a/Source/NETworkManager.Controls/NETworkManager.Controls.csproj
+++ b/Source/NETworkManager.Controls/NETworkManager.Controls.csproj
@@ -5,6 +5,7 @@
NETworkManager.Controls
NETworkManager.Controls
net5.0-windows10.0.17763.0
+ win10-x64
true
false
diff --git a/Source/NETworkManager.Converters/NETworkManager.Converters.csproj b/Source/NETworkManager.Converters/NETworkManager.Converters.csproj
index 564b1441bb..d99e436685 100644
--- a/Source/NETworkManager.Converters/NETworkManager.Converters.csproj
+++ b/Source/NETworkManager.Converters/NETworkManager.Converters.csproj
@@ -6,6 +6,7 @@
NETworkManager.Converters
NETworkManager.Converters
net5.0-windows10.0.17763.0
+ win10-x64
true
false
bin\Debug\NETworkManager.Converters.xml
diff --git a/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj b/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj
index 03312bae59..f38a04e48b 100644
--- a/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj
+++ b/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj
@@ -6,6 +6,7 @@
NETworkManager.Documentation
NETworkManager.Documentation
net5.0-windows10.0.17763.0
+ win10-x64
true
false
bin\Debug\NETworkManager.Documentation.xml
diff --git a/Source/NETworkManager.Localization/NETworkManager.Localization.csproj b/Source/NETworkManager.Localization/NETworkManager.Localization.csproj
index aba3281026..b0e737a70b 100644
--- a/Source/NETworkManager.Localization/NETworkManager.Localization.csproj
+++ b/Source/NETworkManager.Localization/NETworkManager.Localization.csproj
@@ -5,6 +5,7 @@
NETworkManager.Localization
NETworkManager.Localization
net5.0-windows10.0.17763.0
+ win10-x64
true
false
1701;1702;CA1712
diff --git a/Source/NETworkManager.Models/NETworkManager.Models.csproj b/Source/NETworkManager.Models/NETworkManager.Models.csproj
index 768d94c20f..75d92f01b4 100644
--- a/Source/NETworkManager.Models/NETworkManager.Models.csproj
+++ b/Source/NETworkManager.Models/NETworkManager.Models.csproj
@@ -4,7 +4,8 @@
Library
NETworkManager.Models
NETworkManager.Models
- net5.0-windows10.0.17763.0
+ net5.0-windows10.0.17763.0
+ win10-x64
sdk
true
false
diff --git a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
index dbae81e56e..43fa80fd92 100644
--- a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
+++ b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
@@ -5,6 +5,7 @@
NETworkManager.Profiles
NETworkManager.Profiles
net5.0-windows10.0.17763.0
+ win10-x64
true
false
diff --git a/Source/NETworkManager.Settings/NETworkManager.Settings.csproj b/Source/NETworkManager.Settings/NETworkManager.Settings.csproj
index 493397cbc7..6f3f2b48e9 100644
--- a/Source/NETworkManager.Settings/NETworkManager.Settings.csproj
+++ b/Source/NETworkManager.Settings/NETworkManager.Settings.csproj
@@ -5,6 +5,7 @@
NETworkManager.Settings
NETworkManager.Settings
net5.0-windows10.0.17763.0
+ win10-x64
true
false
diff --git a/Source/NETworkManager.Update/NETworkManager.Update.csproj b/Source/NETworkManager.Update/NETworkManager.Update.csproj
index 5e9cdd004c..760d3c9161 100644
--- a/Source/NETworkManager.Update/NETworkManager.Update.csproj
+++ b/Source/NETworkManager.Update/NETworkManager.Update.csproj
@@ -6,6 +6,7 @@
NETworkManager.Update
NETworkManager.Update
net5.0-windows10.0.17763.0
+ win10-x64
true
false
diff --git a/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj b/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj
index 4bd8176c90..8e45df7382 100644
--- a/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj
+++ b/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj
@@ -5,6 +5,7 @@
NETworkManager.Utilities.WPF
NETworkManager.Utilities.WPF
net5.0-windows10.0.17763.0
+ win10-x64
true
false
diff --git a/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj b/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj
index 033c932b4c..cfafada141 100644
--- a/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj
+++ b/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj
@@ -5,6 +5,7 @@
NETworkManager.Utilities
NETworkManager.Utilities
net5.0-windows10.0.17763.0
+ win10-x64
true
true
false
diff --git a/Source/NETworkManager.Validators/NETworkManager.Validators.csproj b/Source/NETworkManager.Validators/NETworkManager.Validators.csproj
index 2838d9b7bf..3ef04b239b 100644
--- a/Source/NETworkManager.Validators/NETworkManager.Validators.csproj
+++ b/Source/NETworkManager.Validators/NETworkManager.Validators.csproj
@@ -5,6 +5,7 @@
NETworkManager.Validators
NETworkManager.Validators
net5.0-windows10.0.17763.0
+ win10-x64
true
false
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
index d7348e616a..6c88ef5d55 100644
--- a/Source/NETworkManager/NETworkManager.csproj
+++ b/Source/NETworkManager/NETworkManager.csproj
@@ -2,6 +2,7 @@
WinExe
net5.0-windows10.0.17763.0
+ win10-x64
sdk
NETworkManager
NETworkManager
@@ -12,9 +13,10 @@
false
BornToBeRoot
https://github.com/BornToBeRoot/NETworkManager
- https://github.com/BornToBeRoot/NETworkManager/
+ https://github.com/BornToBeRoot/NETworkManager
NETworkManager.txt
NETworkManager.ico
+ en
@@ -49,11 +51,7 @@
$(TargetDir)\MSTSCLib.dll
-
-
- PreserveNewest
-
@@ -86,6 +84,9 @@
+
+
+
Designer
diff --git a/build.ps1 b/build.ps1
index 5c8928a19d..ae9aba447c 100644
--- a/build.ps1
+++ b/build.ps1
@@ -9,21 +9,22 @@ if (Test-Path -Path $BuildPath) {
Remove-Item -Path $BuildPath -Recurse -ErrorAction Stop
}
-# Dotnet clean, restore and build
+# Dotnet clean, restore, build and publish
dotnet clean "$PSScriptRoot\Source\NETworkManager.sln"
dotnet restore "$PSScriptRoot\Source\NETworkManager.sln"
-dotnet build --configuration Release "$PSScriptRoot\Source\NETworkManager.sln"
-
-$ReleasePath = "$PSScriptRoot\Source\NETworkManager\bin\Release\net5.0-windows10.0.17763.0"
+# dotnet build --configuration Release "$PSScriptRoot\Source\NETworkManager.sln"
+dotnet publish --configuration Release --framework net5.0-windows10.0.17763.0 --runtime win10-x64 --self-contained false --output "$BuildPath\NETworkManager" "$PSScriptRoot\Source\NETworkManager\NETworkManager.csproj"
# Test if release build is available
-if(-not(Test-Path -Path $ReleasePath))
+if(-not(Test-Path -Path "$BuildPath\NETworkManager\NETworkManager.exe"))
{
Write-Error "Could not find dotnet release build. Is .NET SDK 5.0 or later installed?" -ErrorAction Stop
}
-# Copy files
-Copy-Item -Recurse -Path $ReleasePath -Destination "$BuildPath\NETworkManager"
+# Cleanup WebView2Loader.dll (https://github.com/MicrosoftEdge/WebView2Feedback/issues/461)
+Remove-Item "$BuildPath\NETworkManager\arm64" -Recurse
+Remove-Item "$BuildPath\NETworkManager\x64" -Recurse
+Remove-Item "$BuildPath\NETworkManager\x86" -Recurse
# Cleanup .pdb files
Get-ChildItem -Recurse | Where-Object {$_.Name.EndsWith(".pdb")} | Remove-Item
@@ -33,7 +34,7 @@ if ($IsPreview) {
New-Item -Path "$BuildPath\NETworkManager" -Name "IsPreview.settings" -ItemType File
}
-# Archiv Build / Sources
+# Archiv Build
Compress-Archive -Path "$BuildPath\NETworkManager" -DestinationPath "$BuildPath\NETworkManager_$($Version)_Archiv.zip"
# Portable Build