From 34fac30b2b7b09b6f0debed969a54e099b33710d Mon Sep 17 00:00:00 2001 From: pixil98 <46978190+pixil98@users.noreply.github.com> Date: Thu, 24 Nov 2022 23:53:00 -0600 Subject: [PATCH] Merge official updates (#6) Pull latest Libation updates, fix move to net7 --- .github/workflows/dotnet-build.yml | 5 ++-- .github/workflows/dotnet-publish.yml | 2 +- .github/workflows/dotnet-validate.yml | 2 +- Source/AaxDecrypter/AaxDecrypter.csproj | 2 +- Source/AppScaffolding/AppScaffolding.csproj | 2 +- .../ApplicationServices.csproj | 6 ++-- .../AudibleUtilities/AudibleUtilities.csproj | 4 +-- Source/DataLayer/DataLayer.csproj | 12 ++++---- .../DtoImporterService.csproj | 2 +- Source/FileLiberator/FileLiberator.csproj | 2 +- Source/FileManager/FileManager.csproj | 4 +-- .../HangoverAvalonia/HangoverAvalonia.csproj | 4 +-- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- Source/HangoverBase/HangoverBase.csproj | 2 +- .../HangoverWinForms/HangoverWinForms.csproj | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../LibationAvalonia/LibationAvalonia.csproj | 4 +-- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- Source/LibationCli/LibationCli.csproj | 4 +-- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../LibationFileManager.csproj | 4 +-- .../LibationSearchEngine.csproj | 2 +- .../LibationWinForms/LibationWinForms.csproj | 4 +-- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../LinuxConfigApp/LinuxConfigApp.csproj | 2 +- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../MacOSConfigApp/MacOSConfigApp.csproj | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../WindowsConfigApp/WindowsConfigApp.csproj | 4 +-- .../CrossPlatformClientExe.csproj | 30 ++++++++++--------- .../LinuxConfigApp/LinuxConfigApp.csproj | 2 +- .../WindowsConfigApp/WindowsConfigApp.csproj | 2 +- .../AudibleUtilities.Tests.csproj | 4 +-- .../FileLiberator.Tests.csproj | 4 +-- .../FileManager.Tests.csproj | 4 +-- .../LibationFileManager.Tests.csproj | 4 +-- .../LibationSearchEngine.Tests.csproj | 4 +-- 44 files changed, 80 insertions(+), 79 deletions(-) rename Source/LoadByOS/LinuxConfigApp/{ => Properties}/PublishProfiles/LinuxProfile.pubxml (92%) rename Source/LoadByOS/MacOSConfigApp/{ => Properties}/PublishProfiles/MacOSProfile.pubxml (92%) rename Source/LoadByOS/WindowsConfigApp/{ => Properties}/PublishProfiles/WindowsProfile.pubxml (89%) diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml index 7a5fc62d..6ae3c87a 100644 --- a/.github/workflows/dotnet-build.yml +++ b/.github/workflows/dotnet-build.yml @@ -7,7 +7,6 @@ on: workflow_call: env: - DOTNET_VERSION: '7' # The .NET SDK version to use DOTNET_CONFIGURATION: 'Release' jobs: @@ -27,14 +26,14 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + dotnet-version: '7.x' env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build working-directory: ./Source run: | dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}\Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml - dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml + dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\Properties\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LibationCli\LibationCli.csproj -p:PublishProfile=LibationCli\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}\Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml - name: Publish artifact diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml index de307eb1..134a6dcc 100644 --- a/.github/workflows/dotnet-publish.yml +++ b/.github/workflows/dotnet-publish.yml @@ -62,4 +62,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: release_id: ${{ steps.create_release.outputs.id }} - assets_path: ./artifacts/assets \ No newline at end of file + assets_path: ./artifacts/assets diff --git a/.github/workflows/dotnet-validate.yml b/.github/workflows/dotnet-validate.yml index fa1ef57d..16313d20 100644 --- a/.github/workflows/dotnet-validate.yml +++ b/.github/workflows/dotnet-validate.yml @@ -16,4 +16,4 @@ env: jobs: build: - uses: ./.github/workflows/dotnet-build.yml \ No newline at end of file + uses: ./.github/workflows/dotnet-build.yml diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj index 5161a357..7a885fb2 100644 --- a/Source/AaxDecrypter/AaxDecrypter.csproj +++ b/Source/AaxDecrypter/AaxDecrypter.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 61400c70..2c1c3052 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 8.5.1.1 diff --git a/Source/ApplicationServices/ApplicationServices.csproj b/Source/ApplicationServices/ApplicationServices.csproj index 9ac7be2f..91084ca4 100644 --- a/Source/ApplicationServices/ApplicationServices.csproj +++ b/Source/ApplicationServices/ApplicationServices.csproj @@ -1,12 +1,12 @@  - net6.0 + net7.0 - - + + diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj index d8ff5281..bdd7a08f 100644 --- a/Source/AudibleUtilities/AudibleUtilities.csproj +++ b/Source/AudibleUtilities/AudibleUtilities.csproj @@ -1,11 +1,11 @@  - net6.0 + net7.0 - + diff --git a/Source/DataLayer/DataLayer.csproj b/Source/DataLayer/DataLayer.csproj index 963b1dfe..848a6f35 100644 --- a/Source/DataLayer/DataLayer.csproj +++ b/Source/DataLayer/DataLayer.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 @@ -10,14 +10,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/DtoImporterService/DtoImporterService.csproj b/Source/DtoImporterService/DtoImporterService.csproj index aba836a6..201f603b 100644 --- a/Source/DtoImporterService/DtoImporterService.csproj +++ b/Source/DtoImporterService/DtoImporterService.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/FileLiberator/FileLiberator.csproj b/Source/FileLiberator/FileLiberator.csproj index 524efe12..859d2ff3 100644 --- a/Source/FileLiberator/FileLiberator.csproj +++ b/Source/FileLiberator/FileLiberator.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/FileManager/FileManager.csproj b/Source/FileManager/FileManager.csproj index b179c3d3..2827e340 100644 --- a/Source/FileManager/FileManager.csproj +++ b/Source/FileManager/FileManager.csproj @@ -1,11 +1,11 @@  - net6.0 + net7.0 - + diff --git a/Source/HangoverAvalonia/HangoverAvalonia.csproj b/Source/HangoverAvalonia/HangoverAvalonia.csproj index 9a9a3329..a78f4fe2 100644 --- a/Source/HangoverAvalonia/HangoverAvalonia.csproj +++ b/Source/HangoverAvalonia/HangoverAvalonia.csproj @@ -1,7 +1,7 @@  WinExe - net6.0 + net7.0 copyused true @@ -68,7 +68,7 @@ - + diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml index cd35f42e..0b59245a 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml index 53a83413..edc665dd 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml index 8f28c798..0a5269ea 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Windows-chardonnay FileSystem - net6.0 + net7.0 win-x64 true false diff --git a/Source/HangoverBase/HangoverBase.csproj b/Source/HangoverBase/HangoverBase.csproj index 12b4b19e..340e1006 100644 --- a/Source/HangoverBase/HangoverBase.csproj +++ b/Source/HangoverBase/HangoverBase.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable diff --git a/Source/HangoverWinForms/HangoverWinForms.csproj b/Source/HangoverWinForms/HangoverWinForms.csproj index da3934ca..c08bed6b 100644 --- a/Source/HangoverWinForms/HangoverWinForms.csproj +++ b/Source/HangoverWinForms/HangoverWinForms.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true hangover.ico enable diff --git a/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml index 708a4cb7..7d5103f3 100644 --- a/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\classic FileSystem - net6.0-windows + net7.0-windows win-x64 true false diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index dfe2f0cb..09aa80f2 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -3,7 +3,7 @@ WinExe - net6.0 + net7.0 copyused true @@ -129,7 +129,7 @@ - + diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml index cd35f42e..0b59245a 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml index 53a83413..edc665dd 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml index 8f28c798..0a5269ea 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Windows-chardonnay FileSystem - net6.0 + net7.0 win-x64 true false diff --git a/Source/LibationCli/LibationCli.csproj b/Source/LibationCli/LibationCli.csproj index ef5b0954..b61341eb 100644 --- a/Source/LibationCli/LibationCli.csproj +++ b/Source/LibationCli/LibationCli.csproj @@ -3,7 +3,7 @@ Exe - net6.0 + net7.0 true false false @@ -44,7 +44,7 @@ - + diff --git a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml index cd35f42e..0b59245a 100644 --- a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml index 53a83413..edc665dd 100644 --- a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml index 8f28c798..0a5269ea 100644 --- a/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Windows-chardonnay FileSystem - net6.0 + net7.0 win-x64 true false diff --git a/Source/LibationFileManager/LibationFileManager.csproj b/Source/LibationFileManager/LibationFileManager.csproj index 5f1b6be1..c7cb0609 100644 --- a/Source/LibationFileManager/LibationFileManager.csproj +++ b/Source/LibationFileManager/LibationFileManager.csproj @@ -1,11 +1,11 @@  - net6.0 + net7.0 - + diff --git a/Source/LibationSearchEngine/LibationSearchEngine.csproj b/Source/LibationSearchEngine/LibationSearchEngine.csproj index cf14f994..6e17c84d 100644 --- a/Source/LibationSearchEngine/LibationSearchEngine.csproj +++ b/Source/LibationSearchEngine/LibationSearchEngine.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj index d420ec8a..5f318f12 100644 --- a/Source/LibationWinForms/LibationWinForms.csproj +++ b/Source/LibationWinForms/LibationWinForms.csproj @@ -3,7 +3,7 @@ WinExe - net6.0-windows + net7.0-windows true libation.ico Libation @@ -44,7 +44,7 @@ - + diff --git a/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml index e3a5e4e2..5e3f4318 100644 --- a/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\classic FileSystem - net6.0-windows + net7.0-windows win-x64 true false diff --git a/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj b/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj index 72fc3206..9a7e5ba2 100644 --- a/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj +++ b/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable true linux-x64 diff --git a/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml b/Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml similarity index 92% rename from Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml rename to Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml index 034694b5..f3a25bb3 100644 --- a/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj b/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj index cf6d1f79..55bb69bf 100644 --- a/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj +++ b/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable true osx-x64 diff --git a/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml b/Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml similarity index 92% rename from Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml rename to Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml index 6322c994..ea9e44d8 100644 --- a/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/LoadByOS/WindowsConfigApp/PublishProfiles/WindowsProfile.pubxml b/Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml similarity index 89% rename from Source/LoadByOS/WindowsConfigApp/PublishProfiles/WindowsProfile.pubxml rename to Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml index 46581a34..03ef4015 100644 --- a/Source/LoadByOS/WindowsConfigApp/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\..\bin\Publish\classic FileSystem - net6.0-windows + net7.0-windows win-x64 true false diff --git a/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj b/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj index 5a27ff40..a033b1bf 100644 --- a/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj +++ b/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true enable true @@ -32,7 +32,7 @@ - + diff --git a/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj b/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj index abb684bd..8ffb5672 100644 --- a/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj +++ b/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj @@ -2,22 +2,24 @@ Exe - net6.0 - false - false + net7.0 + enable + false + false + + + + ..\bin\Debug + embedded - - ..\bin\Debug - embedded - - - ..\bin\Release - embedded - + + ..\bin\Release + embedded + - - - + + + diff --git a/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj b/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj index 1c150006..b90c3c04 100644 --- a/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj +++ b/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable false false diff --git a/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj b/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj index de6f17b7..96fabc93 100644 --- a/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj +++ b/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true enable false diff --git a/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj b/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj index 5d425e06..6dee5c6d 100644 --- a/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj +++ b/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj @@ -1,13 +1,13 @@ - net6.0-windows + net7.0 false - + diff --git a/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj b/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj index da4a4118..d2b567e0 100644 --- a/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj +++ b/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj @@ -1,13 +1,13 @@ - net6.0-windows + net7.0 false - + diff --git a/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj b/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj index faff9c59..bf335980 100644 --- a/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj +++ b/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 false - + diff --git a/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj b/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj index bd54c556..f0ebf32d 100644 --- a/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj +++ b/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj @@ -1,14 +1,14 @@ - net6.0-windows + net7.0 false - + diff --git a/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj b/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj index 86ec7676..229430fc 100644 --- a/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj +++ b/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj @@ -1,14 +1,14 @@ - net6.0-windows + net7.0 false - +