From 1a1d0d900495a27f0d64aa1f2a1a1550d2e70bf1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 20 May 2022 15:49:58 +0800
Subject: [PATCH] refactor<build>: no longer provides .NET48 and .NET6 x86
 targets.

---
 build.bat            | 37 +++++++++----------------------------
 src/SourceGit.csproj |  5 +----
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/build.bat b/build.bat
index 85d8b67d..82079e8b 100644
--- a/build.bat
+++ b/build.bat
@@ -1,28 +1,9 @@
-@echo off
-
-rmdir /s /q publish
-
-cd src
-rmdir /s /q bin
-rmdir /s /q obj
-dotnet publish SourceGit.csproj --nologo -c Release -r win-x86 -f net48 -o ..\publish\net48
-ilrepack /ndebug /wildcards /out:..\publish\SourceGit.exe ..\publish\net48\SourceGit.exe ..\publish\net48\*.dll
-cd ..\publish
-ren SourceGit.exe SourceGit.net4.8.exe
-rmdir /s /q net48
-
-cd ..\src
-rmdir /s /q bin
-rmdir /s /q obj
-dotnet publish SourceGit.csproj --nologo -c Release -r win-x86 -f net6.0-windows -p:PublishSingleFile=true --no-self-contained -o ..\publish
-cd ..\publish
-ren SourceGit.exe SourceGit.net6.0.x86.exe
-
-cd ..\src
-rmdir /s /q bin
-rmdir /s /q obj
-dotnet publish SourceGit.csproj --nologo -c Release -r win-x64 -f net6.0-windows -p:PublishSingleFile=true --no-self-contained -o ..\publish
-cd ..\publish
-ren SourceGit.exe SourceGit.net6.0.x64.exe
-
-cd ../
\ No newline at end of file
+@echo off
+
+rmdir /s /q publish
+
+cd src
+dotnet publish SourceGit.csproj --nologo -c Release -r win-x64 -f net6.0-windows -p:PublishSingleFile=true --no-self-contained -o ..\publish
+dotnet publish SourceGit.csproj --nologo -c Release -r win-x64 -f net6.0-windows --self-contained -o ..\publish\SourceGit
+
+cd ..
\ No newline at end of file
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 371e8456..08fcddce 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0-windows;net48</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows</TargetFrameworks>
         <OutputType>WinExe</OutputType>
         <UseWPF>true</UseWPF>
         <ApplicationIcon>App.ico</ApplicationIcon>
@@ -17,7 +17,4 @@
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
     </PropertyGroup>
-    <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
-        <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    </ItemGroup>
 </Project>
\ No newline at end of file