Cleanup build folder / improved build process (BornToBeRoot#431)

BornToBeRoot · web-flow · commit 2d47dce11aef · 2021-01-03T03:38:21.000+01:00
* Self contained=false, remove runtimes, remove language files for code analyzer

* Improve build

Co-authored-by: BornToBeRoot &lt;BornToBeRoot@users.noreply.github.com&gt;
diff --git 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
@@ -5,6 +5,7 @@
     <RootNamespace>NETworkManager.Controls</RootNamespace>
     <AssemblyName>NETworkManager.Controls</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
diff --git a/Source/NETworkManager.Converters/NETworkManager.Converters.csproj b/Source/NETworkManager.Converters/NETworkManager.Converters.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>NETworkManager.Converters</RootNamespace>
     <AssemblyName>NETworkManager.Converters</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DocumentationFile>bin\Debug\NETworkManager.Converters.xml</DocumentationFile>
diff --git a/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj b/Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>NETworkManager.Documentation</RootNamespace>
     <AssemblyName>NETworkManager.Documentation</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DocumentationFile>bin\Debug\NETworkManager.Documentation.xml</DocumentationFile>
diff --git a/Source/NETworkManager.Localization/NETworkManager.Localization.csproj b/Source/NETworkManager.Localization/NETworkManager.Localization.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>NETworkManager.Localization</RootNamespace>
     <AssemblyName>NETworkManager.Localization</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NoWarn>1701;1702;CA1712</NoWarn>
diff --git a/Source/NETworkManager.Models/NETworkManager.Models.csproj b/Source/NETworkManager.Models/NETworkManager.Models.csproj
@@ -4,7 +4,8 @@
 		<OutputType>Library</OutputType>
 		<RootNamespace>NETworkManager.Models</RootNamespace>
 		<AssemblyName>NETworkManager.Models</AssemblyName>
-    <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>    
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <CsWinRTWindowsMetadata>sdk</CsWinRTWindowsMetadata>
     <UseWPF>true</UseWPF>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>NETworkManager.Profiles</RootNamespace>
     <AssemblyName>NETworkManager.Profiles</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
diff --git a/Source/NETworkManager.Settings/NETworkManager.Settings.csproj b/Source/NETworkManager.Settings/NETworkManager.Settings.csproj
@@ -5,6 +5,7 @@
 		<RootNamespace>NETworkManager.Settings</RootNamespace>
 		<AssemblyName>NETworkManager.Settings</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
diff --git a/Source/NETworkManager.Update/NETworkManager.Update.csproj b/Source/NETworkManager.Update/NETworkManager.Update.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>NETworkManager.Update</RootNamespace>
     <AssemblyName>NETworkManager.Update</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
diff --git a/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj b/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>NETworkManager.Utilities.WPF</RootNamespace>
     <AssemblyName>NETworkManager.Utilities.WPF</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
diff --git a/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj b/Source/NETworkManager.Utilities/NETworkManager.Utilities.csproj
@@ -5,6 +5,7 @@
 		<RootNamespace>NETworkManager.Utilities</RootNamespace>
 		<AssemblyName>NETworkManager.Utilities</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
 		<UseWindowsForms>true</UseWindowsForms>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Source/NETworkManager.Validators/NETworkManager.Validators.csproj b/Source/NETworkManager.Validators/NETworkManager.Validators.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>NETworkManager.Validators</RootNamespace>
     <AssemblyName>NETworkManager.Validators</AssemblyName>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <CsWinRTWindowsMetadata>sdk</CsWinRTWindowsMetadata>
     <RootNamespace>NETworkManager</RootNamespace>
     <AssemblyName>NETworkManager</AssemblyName>
@@ -12,9 +13,10 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Authors>BornToBeRoot</Authors>
     <PackageProjectUrl>https://github.com/BornToBeRoot/NETworkManager</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/BornToBeRoot/NETworkManager/</RepositoryUrl>
+    <RepositoryUrl>https://github.com/BornToBeRoot/NETworkManager</RepositoryUrl>
     <PackageLicenseFile>NETworkManager.txt</PackageLicenseFile>
     <PackageIcon>NETworkManager.ico</PackageIcon>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="NETworkManager.ico" />
@@ -49,11 +51,7 @@
     <Reference Include="MSTSCLib">
       <HintPath>$(TargetDir)\MSTSCLib.dll</HintPath>
     </Reference>
-    <Page Remove="Resources\Styles\WindowStyles.xaml" />
     <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
-    <Content Include="Resources\Styles\WindowStyles.xaml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NETworkManager.Controls\NETworkManager.Controls.csproj" />
@@ -86,6 +84,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Page Update="Resources\Styles\WindowStyles.xaml">
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+    </Page>
     <Page Update="Views\PortProfilesDialog.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git 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
