From b55e06b826a254d5266032d5866cd9a80ec28135 Mon Sep 17 00:00:00 2001
From: Bluzume <39113159+KuromeSan@users.noreply.github.com>
Date: Tue, 26 Oct 2021 04:02:59 -0400
Subject: [PATCH] fixed yet?
---
.github/workflows/linux.yml | 30 ++++++++---------
.github/workflows/macos.yml | 25 ++++++++++++---
.github/workflows/windows.yml | 32 +++++++++----------
.../PublishProfiles/OsxARM64.pubxml | 18 +++++++++++
.../PublishProfiles/Win32.pubxml.user | 9 ------
5 files changed, 69 insertions(+), 45 deletions(-)
create mode 100644 HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml
delete mode 100644 HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml.user
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b568acc..8e9d9fa 100755
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -32,43 +32,43 @@ jobs:
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=Linux64.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/"
- mkdir "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www"
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/"
+ mkdir "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www"
- name: Build linux-arm
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=LinuxARM.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/"
- mkdir "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www"
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/"
+ mkdir "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www"
- name: Build linux-arm64
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=LinuxARM64.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/"
- mkdir "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/"
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/"
+ mkdir "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/"
- name: upload linux-64
uses: actions/upload-artifact@v2
with:
name: linux-x64
- path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/
- name: upload linux-arm
uses: actions/upload-artifact@v2
with:
name: linux-arm
- path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/
- name: upload linux-arm64
uses: actions/upload-artifact@v2
with:
name: linux-arm64
- path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 43d718a..6046487 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -32,13 +32,28 @@ jobs:
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=Osx64.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/"
- mkdir "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www"
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/"
+ mkdir "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www"
+ - name: Build mac-arm64
+ continue-on-error: false
+ run: |
+ dotnet publish -p:PublishProfile=OsxARM64.pubxml
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/"
+ mkdir "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/www"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/www"
+
- name: upload mac-x64
uses: actions/upload-artifact@v2
with:
name: mac-x64
- path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/
+
+ - name: upload mac-arm64
+ uses: actions/upload-artifact@v2
+ with:
+ name: mac-arm64
+ path: HorseIsleServer/HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index baf45e4..e5119e1 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -32,50 +32,50 @@ jobs:
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=Win64.pubxml
- copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\gamedata.json"
- copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\HI1.MAP"
- copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\www" -Recurse
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\www" -Recurse
- name: Build win-x86
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=Win32.pubxml
- copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\gamedata.json"
- copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\HI1.MAP"
- copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\www" -Recurse
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\www" -Recurse
- name: Build win-arm
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=WinARM.pubxml
- copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\gamedata.json"
- copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\HI1.MAP"
- copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\www" -Recurse
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\www" -Recurse
- name: Build win-arm64
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=WinARM64.pubxml
- copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\gamedata.json"
- copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\HI1.MAP"
- copy ..\HorseIsleWeb "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\www" -Recurse
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\www" -Recurse
- name: Upload win-x64
uses: actions/upload-artifact@v2
with:
name: win-x64
- path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net6.0\win-x64\publish\
+ path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net5.0\win-x64\publish\
- name: Upload win-x86
uses: actions/upload-artifact@v2
with:
name: win-x86
- path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\
+ path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\
- name: Upload win-arm
uses: actions/upload-artifact@v2
with:
name: win-arm
- path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net6.0\win-arm\publish\
+ path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net5.0\win-arm\publish\
- name: Upload win-arm64
uses: actions/upload-artifact@v2
with:
name: win-arm64
- path: HorseIsleServer\HorseIsleServer\bin\arm64\Windows\net6.0\win-arm64\publish\
+ path: HorseIsleServer\HorseIsleServer\bin\arm64\Windows\net5.0\win-arm64\publish\
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml
new file mode 100644
index 0000000..31e2553
--- /dev/null
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml
@@ -0,0 +1,18 @@
+
+
+
+
+ MacOS
+ ARM64
+ bin\arm64\MacOS\net5.0\osx-arm64\publish\
+ FileSystem
+ net5.0
+ osx-arm64
+ True
+ True
+ True
+ True
+
+
\ No newline at end of file
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml.user b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml.user
deleted file mode 100644
index 7f1de8b..0000000
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml.user
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- False|2021-10-26T07:51:56.3298896Z;False|2021-10-26T03:36:44.5305762-04:00;
-
-
\ No newline at end of file