From 7b1cfa42da15a3373809916cb2ec55e744757553 Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Fri, 15 Apr 2022 00:07:35 +1200 Subject: [PATCH] update to NET 7.0 --- .github/workflows/build.yml | 28 +++++++++---------- HorseIsleServer/HISPCli/HISPCli.csproj | 2 +- .../PublishProfiles/AndroidARM.pubxml | 9 +++--- .../PublishProfiles/AndroidARM64.pubxml | 7 ++--- .../Properties/PublishProfiles/Linux64.pubxml | 2 +- .../PublishProfiles/LinuxARM.pubxml | 2 +- .../PublishProfiles/LinuxARM64.pubxml | 2 +- .../Properties/PublishProfiles/Osx64.pubxml | 2 +- .../PublishProfiles/OsxARM64.pubxml | 6 ++-- .../Properties/PublishProfiles/Win32.pubxml | 6 ++-- .../Properties/PublishProfiles/Win64.pubxml | 2 +- .../Properties/PublishProfiles/WinARM.pubxml | 2 +- .../PublishProfiles/WinARM64.pubxml | 2 +- HorseIsleServer/LibHISP/LibHISP.csproj | 2 +- .../PublishProfiles/AndroidARM.pubxml | 4 +-- .../PublishProfiles/OsxARM64.pubxml | 4 +-- .../Properties/PublishProfiles/Win32.pubxml | 4 +-- HorseIsleServer/N00BS/N00BS.csproj | 9 +++--- .../Properties/PublishProfiles/Win64.pubxml | 4 +-- 19 files changed, 49 insertions(+), 50 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8eb08a7..77691cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x include-prerelease: true - name: Restore dependencies @@ -88,79 +88,79 @@ jobs: uses: actions/upload-artifact@v2 with: name: HISP-Win64 - path: HorseIsleServer\HISPCli\bin\x64\Windows\net6.0\win-x64\publish\ + path: HorseIsleServer\HISPCli\bin\x64\Windows\net7.0\win-x64\publish\ - name: Upload win-x86 uses: actions/upload-artifact@v2 with: name: HISP-Win32 - path: HorseIsleServer\HISPCli\bin\x86\Windows\net6.0\win-x86\publish\ + path: HorseIsleServer\HISPCli\bin\x86\Windows\net7.0\win-x86\publish\ - name: Upload win-arm uses: actions/upload-artifact@v2 with: name: HISP-WinARM - path: HorseIsleServer\HISPCli\bin\arm\Windows\net6.0\windows-arm\publish\ + path: HorseIsleServer\HISPCli\bin\arm\Windows\net7.0\windows-arm\publish\ - name: Upload win-arm64 uses: actions/upload-artifact@v2 with: name: HISP-WinARM64 - path: HorseIsleServer\HISPCli\bin\arm64\Windows\net6.0\windows-arm64\publish\ + path: HorseIsleServer\HISPCli\bin\arm64\Windows\net7.0\windows-arm64\publish\ - name: Upload win-x86-noobs uses: actions/upload-artifact@v2 with: name: HISP-Win32-Noobs - path: HorseIsleServer\N00BS\bin\x86\Windows\net6.0\win-x86\publish\ + path: HorseIsleServer\N00BS\bin\x86\Windows\net7.0\win-x86\publish\ - name: Upload win-x64-noobs uses: actions/upload-artifact@v2 with: name: HISP-Win64-Noobs - path: HorseIsleServer\N00BS\bin\x64\Windows\net6.0\win-x64\publish\ + path: HorseIsleServer\N00BS\bin\x64\Windows\net7.0\win-x64\publish\ - name: Upload linux-x64 uses: actions/upload-artifact@v2 with: name: HISP-Linux64 - path: HorseIsleServer/HISPCli/bin/x64/Linux/net6.0/linux-x64/publish/ + path: HorseIsleServer/HISPCli/bin/x64/Linux/net7.0/linux-x64/publish/ - name: Upload linux-arm uses: actions/upload-artifact@v2 with: name: HISP-LinuxARM - path: HorseIsleServer/HISPCli/bin/ARM/Linux/net6.0/linux-arm/publish/ + path: HorseIsleServer/HISPCli/bin/ARM/Linux/net7.0/linux-arm/publish/ - name: Upload linux-arm64 uses: actions/upload-artifact@v2 with: name: HISP-LinuxARM64 - path: HorseIsleServer/HISPCli/bin/ARM64/Linux/net6.0/linux-arm64/publish/ + path: HorseIsleServer/HISPCli/bin/ARM64/Linux/net7.0/linux-arm64/publish/ - name: Upload mac-x64 uses: actions/upload-artifact@v2 with: name: HISP-Mac64 - path: HorseIsleServer/HISPCli/bin/x64/MacOS/net6.0/osx-x64/publish/ + path: HorseIsleServer/HISPCli/bin/x64/MacOS/net7.0/osx-x64/publish/ - name: Upload mac-arm64 uses: actions/upload-artifact@v2 with: name: HISP-MacARM64 - path: HorseIsleServer/HISPCli/bin/arm64/MacOS/net6.0/osx-arm64/publish/ + path: HorseIsleServer/HISPCli/bin/arm64/MacOS/net7.0/osx-arm64/publish/ - name: Upload android-arm uses: actions/upload-artifact@v2 with: name: HISP-AndroidARM - path: HorseIsleServer/HISPCli/bin/arm/Android/net6.0/android-arm/publish/ + path: HorseIsleServer/HISPCli/bin/arm/Android/net7.0/android-arm/publish/ - name: Upload android-arm64 uses: actions/upload-artifact@v2 with: name: HISP-AndroidARM64 - path: HorseIsleServer/HISPCli/bin/arm64/Android/net6.0/android-arm64/publish/ + path: HorseIsleServer/HISPCli/bin/arm64/Android/net7.0/android-arm64/publish/ - name: Upload Website (master) diff --git a/HorseIsleServer/HISPCli/HISPCli.csproj b/HorseIsleServer/HISPCli/HISPCli.csproj index 0aafef3..f6c06be 100644 --- a/HorseIsleServer/HISPCli/HISPCli.csproj +++ b/HorseIsleServer/HISPCli/HISPCli.csproj @@ -21,7 +21,7 @@ false - net6.0 + net7.0 false true icon.ico diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM.pubxml index d6707c6..8843d6e 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM.pubxml @@ -6,15 +6,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Android ARM - bin\arm\Android\net6.0\android-arm\publish\ + bin\arm\Linux\net7.0\android-arm\publish\ FileSystem - net6.0 + net7.0 android-arm True - True - True + True True OS_ANDROID;ARCH_ARM - + \ No newline at end of file diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM64.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM64.pubxml index 9a8e766..9f99d74 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM64.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM64.pubxml @@ -6,15 +6,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Android ARM64 - bin\arm64\Android\net6.0\android-arm64\publish\ + bin\arm\Linux\net6.0\android-arm64\publish\ FileSystem net6.0 android-arm64 True - True - True + True True OS_ANDROID;ARCH_ARM64 - + \ No newline at end of file diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Linux64.pubxml index e633e09..1115827 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Linux64.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Linux64.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net6.0 linux-x64 True - True + True True OS_LINUX;ARCH_X86_64 diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM.pubxml index 8257770..cc21064 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net6.0 linux-arm True - True + True True OS_LINUX;ARCH_ARM diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM64.pubxml index b9c21d1..7aef131 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM64.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM64.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net6.0 linux-arm64 True - True + True True OS_LINUX;ARCH_ARM64 diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Osx64.pubxml index 8e6230a..8d1be6f 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Osx64.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Osx64.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net6.0 osx-x64 True - True + True True OS_MACOS;ARCH_X86_64 diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/OsxARM64.pubxml index bf66d06..d2dea28 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/OsxARM64.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/OsxARM64.pubxml @@ -6,12 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. MacOS ARM64 - bin\arm64\MacOS\net6.0\osx-arm64\publish\ + bin\arm64\MacOS\net7.0\osx-arm64\publish\ FileSystem - net6.0 + net7.0 osx-arm64 True - True + True True OS_MACOS;ARCH_ARM64 diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win32.pubxml index 627bbac..232eba4 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win32.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win32.pubxml @@ -6,12 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows x86 - bin\x86\Windows\net6.0\win-x86\publish\ + bin\x86\Windows\net7.0\win-x86\publish\ FileSystem - net6.0 + net7.0 win-x86 True - True + True True OS_WINDOWS;ARCH_X86 diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win64.pubxml index b7888f5..6b056c9 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/Win64.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net6.0 win-x64 True - True + True True OS_WINDOWS;ARCH_X86_64 diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM.pubxml index 202b002..03461a2 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net6.0 win-arm True - True + True True OS_WINDOWS;ARCH_ARM diff --git a/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM64.pubxml index 32dcdcb..b843480 100644 --- a/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM64.pubxml +++ b/HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM64.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net6.0 win-arm64 True - True + True True OS_WINDOWS;ARCH_ARM64 diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj index f4e7070..b3c8950 100644 --- a/HorseIsleServer/LibHISP/LibHISP.csproj +++ b/HorseIsleServer/LibHISP/LibHISP.csproj @@ -40,7 +40,7 @@ false - net6.0 + net7.0 false true OnBuildSuccess diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml index 7e3b969..8843d6e 100644 --- a/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Android ARM - bin\arm\Linux\net6.0\android-arm\publish\ + bin\arm\Linux\net7.0\android-arm\publish\ FileSystem - net6.0 + net7.0 android-arm True diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml index 8b8328e..d2dea28 100644 --- a/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. MacOS ARM64 - bin\arm64\MacOS\net6.0\osx-arm64\publish\ + bin\arm64\MacOS\net7.0\osx-arm64\publish\ FileSystem - net6.0 + net7.0 osx-arm64 True diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml index 5eb1a87..232eba4 100644 --- a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows x86 - bin\x86\Windows\net6.0\win-x86\publish\ + bin\x86\Windows\net7.0\win-x86\publish\ FileSystem - net6.0 + net7.0 win-x86 True diff --git a/HorseIsleServer/N00BS/N00BS.csproj b/HorseIsleServer/N00BS/N00BS.csproj index a07178b..938603c 100644 --- a/HorseIsleServer/N00BS/N00BS.csproj +++ b/HorseIsleServer/N00BS/N00BS.csproj @@ -8,9 +8,6 @@ x64;x86;AnyCPU Debug;Windows - - - True @@ -70,12 +67,16 @@ + + + + false false - net6.0-windows + net7.0-windows false true icon.ico diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml index 943de83..8fe4575 100644 --- a/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows x64 - bin\x64\Windows\net6.0\win-x64\publish\ + bin\x64\Windows\net7.0\win-x64\publish\ FileSystem - net6.0-windows + net7.0-windows win-x64 True True