From 43ce225af191403ee1566bd4ea41ae2bc09ec1b4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 9 Aug 2021 14:21:47 +0800
Subject: [PATCH] optimize<project>: thanks to Jai for providing solution -
 using one project to manage multi-targetframeworks

---
 README.md               |  5 +++--
 build.bat               |  8 +++++---
 src/SourceGit.csproj    |  5 ++++-
 src/SourceGit_48.csproj | 25 -------------------------
 4 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 src/SourceGit_48.csproj

diff --git a/README.md b/README.md
index b1c83bd3..284ed823 100644
--- a/README.md
+++ b/README.md
@@ -43,11 +43,12 @@
 
 ## Thanks
 
+* [Jai](https://gitee.com/abel) 简化工程，由一个project管理多目标平台
 * [Jai](https://gitee.com/abel) .NET Framework 4.8 与 .NET 5 平台使用System.Text.Json统一代码
 * [Jai](https://gitee.com/abel) 修复SUBMODULE路径不正确的BUG
 * [Jai](https://gitee.com/abel) 修复刷新分支时，分支树节点状态未正常恢复的BUG
+* [Jai](https://gitee.com/abel) 启动恢复上次浏览页面功能
+* [Jai](https://gitee.com/abel) 修复不同remote分支结构生成错误的BUG
 * [PUMA](https://gitee.com/whgfu) 配置默认User
 * [Rwing](https://gitee.com/rwing) GitFlow: add an option to keep branch after finish
 * [XiaoLinger](https://gitee.com/LingerNN) 纠正弹出框文本配置方式
-* [Jai](https://gitee.com/abel) 启动恢复上次浏览页面功能
-* [Jai](https://gitee.com/abel) 修复不同remote分支结构生成错误的BUG
diff --git a/build.bat b/build.bat
index f055fd4c..7e745b10 100644
--- a/build.bat
+++ b/build.bat
@@ -5,15 +5,17 @@ rmdir /s /q publish
 cd src
 rmdir /s /q bin
 rmdir /s /q obj
-dotnet publish SourceGit_48.csproj --nologo -c Release -r win-x86 -o ..\publish\net48
+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_48.exe
+ren SourceGit.exe SourceGit.net48.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 -p:PublishSingleFile=true --no-self-contained -o ..\publish
+dotnet publish SourceGit.csproj --nologo -c Release -r win-x86 -f net5.0-windows -p:PublishSingleFile=true --no-self-contained -o ..\publish
+cd ..\publish
+ren SourceGit.exe SourceGit.net50.exe
 
 cd ../
\ No newline at end of file
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 182711ac..26ada0df 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net5.0-windows</TargetFramework>
+        <TargetFrameworks>net5.0-windows;net48</TargetFrameworks>
         <OutputType>WinExe</OutputType>
         <UseWPF>true</UseWPF>
         <ApplicationIcon>App.ico</ApplicationIcon>
@@ -17,4 +17,7 @@
         <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
diff --git a/src/SourceGit_48.csproj b/src/SourceGit_48.csproj
deleted file mode 100644
index 18a4497b..00000000
--- a/src/SourceGit_48.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    <PropertyGroup>
-        <TargetFramework>net48</TargetFramework>
-        <OutputType>WinExe</OutputType>
-        <UseWPF>true</UseWPF>
-        <ApplicationIcon>App.ico</ApplicationIcon>
-        <Company>sourcegit</Company>
-        <Description>OpenSource GIT client for Windows</Description>
-        <Copyright>Copyright © sourcegit 2020. All rights reserved.</Copyright>
-        <ApplicationManifest>App.manifest</ApplicationManifest>
-        <Version>4.8</Version>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <StartupObject>SourceGit.App</StartupObject>
-        <PackageProjectUrl>https://gitee.com/sourcegit/SourceGit.git</PackageProjectUrl>
-        <RepositoryUrl>https://gitee.com/sourcegit/SourceGit.git</RepositoryUrl>
-        <RepositoryType>Public</RepositoryType>
-        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
-        <RootNamespace>SourceGit</RootNamespace>
-        <AssemblyName>SourceGit</AssemblyName>
-    </PropertyGroup>
-    <ItemGroup>
-      <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    </ItemGroup>
-</Project>
\ No newline at end of file