Fix Publish Build Missing NTT.exe

BUILD.ps1

@@ -1,8 +1,6 @@
 Write-Host 'Building'
 
 dotnet build -p:Configuration="Release" `
-	-p:Platform="x64" `
-	-p:SolutionDir="$pwd\" `
 	-restore `
 	Netch\Netch.csproj
 

Netch/Netch.csproj

@@ -11,6 +11,8 @@
         <ApplicationIcon>Resources\Netch.ico</ApplicationIcon>
         <Platforms>x64</Platforms>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <LangVersion>latest</LangVersion>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
@@ -36,10 +38,6 @@
         <DebugSymbols>false</DebugSymbols>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove=".gitignore" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="HMBSbige.SingleInstance" Version="5.0.0" />
         <PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
@@ -62,8 +60,19 @@
         <ProjectReference Include="..\Interop.nfapinet\Interop.nfapinet.csproj" />
     </ItemGroup>
 
+    <PropertyGroup>
+        <PublishSingleFile>true</PublishSingleFile>
+        <SelfContained>false</SelfContained>
+        <PublishTrimmed>false</PublishTrimmed>
+        <PublishReadyToRun>false</PublishReadyToRun>
+    </PropertyGroup>
+
     <ItemGroup>
+        <None Remove=".gitignore" />
         <None Visible="false" Include="..\binaries\**" LinkBase="bin" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
+        <None Update="..\binaries\NTT.exe">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        </None>
         <None Remove="..\binaries\.git" />
         <None Visible="false" Include="..\translations\i18n\**" LinkBase="i18n" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
         <None Visible="false" Include="..\modes\mode\**" LinkBase="mode" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
@@ -96,14 +105,12 @@
             <LastGenOutput>Settings.Designer.cs</LastGenOutput>
         </None>
     </ItemGroup>
+
     <ProjectExtensions>
         <VisualStudio>
             <UserProperties />
         </VisualStudio>
     </ProjectExtensions>
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Exec Command="set TargetFramework=$(TargetFramework)&#xD;&#xA;set Configuration=$(Configuration)&#xD;&#xA;set ILMergeConsolePath=$(ILMergeConsolePath)&#xD;&#xA;set TargetDir=$(TargetDir)&#xD;&#xA;set SolutionDir=$(SolutionDir)&#xD;&#xA;call $(ProjectDir)PostBuild.bat" />
-    </Target>
 
     <Target Condition="'$(PublishSingleFile)' == 'true'" AfterTargets="_ComputeFilesToBundle" Name="RemoveDupeAssemblies">
         <ItemGroup>

Netch/PostBuild.bat

@@ -1,20 +0,0 @@
-if %Configuration%==Release if %TargetFramework%==net48 (
-:: Merge dlls
-%ILMergeConsolePath% /wildcards /out:%TargetDir%Netch.exe ^
-/lib:"C:\Windows\Microsoft.NET\Framework64\v4.0.30319" ^
-/targetplatform:v4,"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8" ^
-%TargetDir%Netch.exe ^
-%TargetDir%*.dll
-
-DEL /f %TargetDir%*.dll >NUL 2>&1
-)
-
-if %Configuration%==Release (
-DEL /f %TargetDir%*.config >NUL 2>&1
-DEL /f %TargetDir%*.pdb >NUL 2>&1
-)
-
-RD /s /Q %TargetDir%x86 >NUL 2>&1
-RD /s /Q %TargetDir%de %TargetDir%es %TargetDir%fr %TargetDir%it %TargetDir%pl %TargetDir%ru %TargetDir%zh-CN >NUL 2>&1
-
-exit 0

PUBLISH.ps1

@@ -1,12 +1,7 @@
 Write-Host 'Building'
 
 dotnet publish -c "Release" `
-	-p:Platform="x64" `
-	-p:PublishSingleFile=true `
-	-p:RuntimeIdentifier=win-x64 `
-	-p:SolutionDir="$pwd\" `
 	-o Netch\bin\Publish\ `
-	--no-self-contained `
 	Netch\Netch.csproj
 
 if ($LASTEXITCODE) { exit $LASTEXITCODE }