IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 13:15:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to NET 7.0

Browse source
This commit is contained in:
SilicaAndPina 2022-04-15 00:07:35 +12:00
parent 6ff3735eb4
commit 7b1cfa42da
19 changed files with 49 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.github/workflows/build.yml vendored
View file

@ -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)

2
HorseIsleServer/HISPCli/HISPCli.csproj
View file

@ -21,7 +21,7 @@
<GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoWin32Manifest>true</NoWin32Manifest>
<ApplicationIcon>icon.ico</ApplicationIcon>

9
HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM.pubxml
View file

@ -6,15 +6,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Android</Configuration>
<Platform>ARM</Platform>
<PublishDir>bin\arm\Android\net6.0\android-arm\publish\</PublishDir>
<PublishDir>bin\arm\Linux\net7.0\android-arm\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<UseAppHost>True</UseAppHost>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_ANDROID;ARCH_ARM</DefineConstants>
</PropertyGroup>
</Project>
</Project>

7
HorseIsleServer/HISPCli/Properties/PublishProfiles/AndroidARM64.pubxml
View file

@ -6,15 +6,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Android</Configuration>
<Platform>ARM64</Platform>
<PublishDir>bin\arm64\Android\net6.0\android-arm64\publish\</PublishDir>
<PublishDir>bin\arm\Linux\net6.0\android-arm64\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>android-arm64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<UseAppHost>True</UseAppHost>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_ANDROID;ARCH_ARM64</DefineConstants>
</PropertyGroup>
</Project>
</Project>

2
HorseIsleServer/HISPCli/Properties/PublishProfiles/Linux64.pubxml
View file

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants>

2
HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM.pubxml
View file

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>linux-arm</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_LINUX;ARCH_ARM</DefineConstants>

2
HorseIsleServer/HISPCli/Properties/PublishProfiles/LinuxARM64.pubxml
View file

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_LINUX;ARCH_ARM64</DefineConstants>

2
HorseIsleServer/HISPCli/Properties/PublishProfiles/Osx64.pubxml
View file

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_MACOS;ARCH_X86_64</DefineConstants>

6
HorseIsleServer/HISPCli/Properties/PublishProfiles/OsxARM64.pubxml
View file

@ -6,12 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>MacOS</Configuration>
<Platform>ARM64</Platform>
<PublishDir>bin\arm64\MacOS\net6.0\osx-arm64\publish\</PublishDir>
<PublishDir>bin\arm64\MacOS\net7.0\osx-arm64\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_MACOS;ARCH_ARM64</DefineConstants>

6
HorseIsleServer/HISPCli/Properties/PublishProfiles/Win32.pubxml
View file

@ -6,12 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Windows</Configuration>
<Platform>x86</Platform>
<PublishDir>bin\x86\Windows\net6.0\win-x86\publish\</PublishDir>
<PublishDir>bin\x86\Windows\net7.0\win-x86\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants>

2
HorseIsleServer/HISPCli/Properties/PublishProfiles/Win64.pubxml
View file

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>

2
HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM.pubxml
View file

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>win-arm</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_WINDOWS;ARCH_ARM</DefineConstants>

2
HorseIsleServer/HISPCli/Properties/PublishProfiles/WinARM64.pubxml
View file

@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<!-- <PublishSingleFile>True</PublishSingleFile> -->
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
<DefineConstants>OS_WINDOWS;ARCH_ARM64</DefineConstants>

2
HorseIsleServer/LibHISP/LibHISP.csproj
View file

@ -40,7 +40,7 @@
<GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoWin32Manifest>true</NoWin32Manifest>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>

4
HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml
View file

@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Android</Configuration>
<Platform>ARM</Platform>
<PublishDir>bin\arm\Linux\net6.0\android-arm\publish\</PublishDir>
<PublishDir>bin\arm\Linux\net7.0\android-arm\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<!-- <PublishSingleFile>True</PublishSingleFile> -->

4
HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml
View file

@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>MacOS</Configuration>
<Platform>ARM64</Platform>
<PublishDir>bin\arm64\MacOS\net6.0\osx-arm64\publish\</PublishDir>
<PublishDir>bin\arm64\MacOS\net7.0\osx-arm64\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<!-- <PublishSingleFile>True</PublishSingleFile> -->

4
HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml
View file

@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Windows</Configuration>
<Platform>x86</Platform>
<PublishDir>bin\x86\Windows\net6.0\win-x86\publish\</PublishDir>
<PublishDir>bin\x86\Windows\net7.0\win-x86\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<!-- <PublishSingleFile>True</PublishSingleFile> -->

9
HorseIsleServer/N00BS/N00BS.csproj
View file

@ -8,9 +8,6 @@
<Platforms>x64;x86;AnyCPU</Platforms>
<Configurations>Debug;Windows</Configurations>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\LibHISP\LibHISP.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@ -70,12 +67,16 @@
</ContentWithTargetPath>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LibHISP\LibHISP.csproj" />
</ItemGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoWin32Manifest>true</NoWin32Manifest>
<ApplicationIcon>icon.ico</ApplicationIcon>

4
HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml
View file

@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Windows</Configuration>
<Platform>x64</Platform>
<PublishDir>bin\x64\Windows\net6.0\win-x64\publish\</PublishDir>
<PublishDir>bin\x64\Windows\net7.0\win-x64\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>True</SelfContained>
<PublishSingleFile>True</PublishSingleFile>