Merge branch 'master' of https://github.com/BornToBeRoot/NETworkManager

Author: BornToBeRoot

Source/NETworkManager/NETworkManager.csproj

@@ -19,6 +19,7 @@
 		<PackageIcon>NETworkManager.ico</PackageIcon>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<Description>A powerful tool for managing networks and troubleshoot network problems!</Description>
+		<PlatformTarget>x64</PlatformTarget>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Remove="NETworkManager.ico" />
@@ -34,9 +35,7 @@
 	</ItemGroup>
 	<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
 	<ItemGroup>
-		<FrameworkReference
-		Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms"
-		TargetingPackVersion="6.0.0" />
+		<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="AirspaceFixer" Version="1.0.5" />

build.ps1

@@ -6,6 +6,9 @@ if (Test-Path -Path $BuildPath) {
     Remove-Item -Path $BuildPath -Recurse -ErrorAction Stop
 }
 
+# Run a cleanup
+& ".\cleanup.ps1"
+
 # Set the version based on the current date (e.g. 2021.2.15.0)
 $Date = Get-Date
 $Patch = 0
@@ -37,20 +40,38 @@ $SetupContent | Set-Content -Path $InnoSetupFile -Encoding utf8
 # CS1591 - Missing XML comment
 
 # Dotnet clean, restore, build and publish
-dotnet clean "$PSScriptRoot\Source\NETworkManager.sln"
-dotnet restore "$PSScriptRoot\Source\NETworkManager.sln"
+##dotnet clean "$PSScriptRoot\Source\NETworkManager.sln"
+##dotnet restore "$PSScriptRoot\Source\NETworkManager.sln"
 # Issue: dotnet publish ignores zh-CN, zh-TW (https://github.com/dotnet/msbuild/issues/3897)
-dotnet publish --configuration Release --framework net6.0-windows10.0.17763.0 --runtime win10-x64 --self-contained false --output "$BuildPath\NETworkManager" "$PSScriptRoot\Source\NETworkManager\NETworkManager.csproj" 
+##dotnet publish --configuration Release --framework net6.0-windows10.0.17763.0 --runtime win10-x64 --self-contained false --output "$BuildPath\NETworkManager" "$PSScriptRoot\Source\NETworkManager\NETworkManager.csproj" 
+##Read-Host "Copy the missing language files and press enter"
+
+# Get msbuild path (docs: https://www.meziantou.net/locating-msbuild-on-a-machine.htm)
+$VSwherePath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+
+if(-not(Test-Path -Path $VSwherePath -PathType Leaf))
+{
+    Write-Error "Could not find VSwhere. Is Visual Studio installed?" -ErrorAction Stop
+}
+
+$VSwhere = & $VSwherePath -version "[16.0,18.0)" -products * -requires Microsoft.Component.MSBuild -prerelease -latest -utf8 -format json | ConvertFrom-Json
+$MSBuildPath = Join-Path $VSwhere[0].installationPath "MSBuild" "Current" "Bin" "MSBuild.exe"
+
+# Test if we found msbuild
+if(-not(Test-Path -Path $MSBuildPath -PathType Leaf))
+{
+    Write-Error "Could not find msbuild. Is Visual Studio installed?" -ErrorAction Stop
+}
 
-Read-Host "Copy the missing language files and press enter"
+Start-Process -FilePath $MSBuildPath -ArgumentList "$PSScriptRoot\Source\NETworkManager.sln /restore /t:Clean,Build /p:Configuration=Release /p:OutputPath=$BuildPath\NETworkManager" -Wait -NoNewWindow
 
 # Test if release build is available
-if(-not(Test-Path -Path "$BuildPath\NETworkManager\NETworkManager.exe"))
+if(-not(Test-Path -Path "$BuildPath\NETworkManager\NETworkManager.exe" -PathType Leaf))
 {
-    Write-Error "Could not find dotnet release build. Is .NET SDK 6.0 or later installed?" -ErrorAction Stop
+    Write-Error "Could not find release build. Is .NET SDK 6.0 or later installed?" -ErrorAction Stop
 }
 
-# Get NETworkManager File Version
+# Get NETworkManager file version
 $Version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$BuildPath\NETworkManager\NETworkManager.exe").FileVersion
 
 # Cleanup .pdb files
@@ -83,7 +104,7 @@ if(-not(Test-Path -Path "$InnoSetupPath\Languages\ChineseTraditional.isl"))
 
 $InnoSetupCompiler = "$InnoSetupPath\ISCC.exe"
 
-if(-not(Test-Path -Path $InnoSetupCompiler) -or $InnoSetupLanguageMissing)
+if(-not(Test-Path -Path $InnoSetupCompiler -PathType Leaf) -or $InnoSetupLanguageMissing)
 {
     Write-Host "InnoSetup is not installed correctly. Skip installer build..." -ForegroundColor Cyan
 }

cleanup.ps1

@@ -1,6 +1,8 @@
 foreach($path in Get-ChildItem -Path "$PSScriptRoot\Source\" -Directory)
 {
-    "bin","obj" | ForEach-Object {        
-        Remove-Item "$path\$_" -Recurse -Force
+    "bin","obj" | ForEach-Object {
+        if(Test-Path -Path "$path\$_" -PathType Container) {
+            Remove-Item -Path "$path\$_" -Recurse -Force
+        }
     }
 }

docs/Changelog/next-release.md

@@ -44,6 +44,7 @@ permalink: /Changelog/next-release
 - Visibility of the min/max/close button on the pulled out window fixed [#1366](https://github.com/BornToBeRoot/NETworkManager/pull/1366){:target="_blank"}
 - App crash when building with SDK .NET 6.0.2 and running the app on 6.0.0 or 6.0.1 fixed [#1236](https://github.com/BornToBeRoot/NETworkManager/pull/1236){:target="_blank"} [#1381](https://github.com/BornToBeRoot/NETworkManager/issues/1381){:target="_blank"}
 - App crash when renaming a profile file fixed [#1318](https://github.com/BornToBeRoot/NETworkManager/issues/1318){:target="_blank"}
+- Language `zh-CN` and `zh-TW` is missing in dotnet publish. Build script changed from `dotnet` to `msbuild` [#1316](https://github.com/BornToBeRoot/NETworkManager/issues/1316){:target="_blank"}
 - Remote Desktop 
   - Connection via Profile leads to error message "Error Code 4 (Total login limit was reached)" fixed [#1265](https://github.com/BornToBeRoot/NETworkManager/issues/1265){:target="_blank"}
 - PuTTY