diff --git a/app/Desktop/Desktop.csproj b/app/Desktop/Desktop.csproj index 3e8b544..d6ab5f5 100644 --- a/app/Desktop/Desktop.csproj +++ b/app/Desktop/Desktop.csproj @@ -1,24 +1,18 @@  + + + DHT.Desktop + DiscordHistoryTracker + DiscordHistoryTracker + + WinExe - enable - DiscordHistoryTracker - DHT.Desktop - DiscordHistoryTracker - chylex - DiscordHistoryTracker - DiscordHistoryTracker ./Resources/icon.ico true en - false - false - false - - - true - none + @@ -28,9 +22,11 @@ + + @@ -38,6 +34,7 @@ Code + @@ -49,4 +46,5 @@ false + diff --git a/app/Directory.Build.props b/app/Directory.Build.props new file mode 100644 index 0000000..b126d4b --- /dev/null +++ b/app/Directory.Build.props @@ -0,0 +1,37 @@ + + + + net8.0 + 11 + enable + + + + chylex + DiscordHistoryTracker + DiscordHistoryTracker + + + + false + false + false + + + + true + partial + true + + + + false + none + + + + true + $(MSBuildThisFileDirectory).artifacts + + + diff --git a/app/Directory.build.props b/app/Directory.build.props deleted file mode 100644 index b8611d8..0000000 --- a/app/Directory.build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - net8.0 - 11 - - - diff --git a/app/Server/Server.csproj b/app/Server/Server.csproj index 75a7721..07ff97d 100644 --- a/app/Server/Server.csproj +++ b/app/Server/Server.csproj @@ -1,32 +1,27 @@ + DHT.Server - enable DiscordHistoryTracker.Server DiscordHistoryTrackerServer - chylex - DiscordHistoryTracker - DiscordHistoryTrackerServer - false - false - false - - - true - none + + + + + Tracker\%(RecursiveDir)%(Filename)%(Extension) @@ -44,4 +39,5 @@ false + diff --git a/app/Utils/Utils.csproj b/app/Utils/Utils.csproj index a46b9dd..cd8267d 100644 --- a/app/Utils/Utils.csproj +++ b/app/Utils/Utils.csproj @@ -1,27 +1,21 @@ + DHT.Utils - enable DiscordHistoryTracker.Utils DiscordHistoryTrackerUtils - chylex - DiscordHistoryTracker - DiscordHistoryTrackerUtils - false - false - false - - - true - none + + + + diff --git a/app/build.bat b/app/build.bat index 2e17e12..96a8cd0 100644 --- a/app/build.bat +++ b/app/build.bat @@ -4,11 +4,11 @@ set list=win-x64 linux-x64 osx-x64 rmdir /S /Q bin (for %%a in (%list%) do ( - dotnet publish Desktop -c Release -r %%a -o ./bin/%%a -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishReadyToRun=false -p:PublishTrimmed=true -p:TrimMode=partial -p:JsonSerializerIsReflectionEnabledByDefault=true --self-contained true + dotnet publish Desktop -c Release -r %%a -o ./bin/%%a -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishReadyToRun=false --self-contained true powershell "Compress-Archive -Path ./bin/%%a/* -DestinationPath ./bin/%%a.zip -CompressionLevel Optimal" )) -dotnet publish Desktop -c Release -o ./bin/portable --self-contained false +dotnet publish Desktop -c Release -o ./bin/portable -p:PublishTrimmed=false --self-contained false powershell "Compress-Archive -Path ./bin/portable/* -DestinationPath ./bin/portable.zip -CompressionLevel Optimal" echo Done diff --git a/app/build.sh b/app/build.sh index deba837..ed8a267 100755 --- a/app/build.sh +++ b/app/build.sh @@ -17,9 +17,9 @@ rm -rf "./bin" configurations=(win-x64 linux-x64 osx-x64) for cfg in ${configurations[@]}; do - dotnet publish Desktop -c Release -r "$cfg" -o "./bin/$cfg" -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishReadyToRun=false -p:PublishTrimmed=true -p:TrimMode=partial -p:JsonSerializerIsReflectionEnabledByDefault=true --self-contained true + dotnet publish Desktop -c Release -r "$cfg" -o "./bin/$cfg" -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishReadyToRun=false --self-contained true makezip "$cfg" done -dotnet publish Desktop -c Release -o "./bin/portable" --self-contained false +dotnet publish Desktop -c Release -o "./bin/portable" -p:PublishTrimmed=false --self-contained false makezip "portable"