From 09f3f4be38320f5f4f9b91329e562eb780fee64a Mon Sep 17 00:00:00 2001
From: enteryournamehere <11255568+enteryournamehere@users.noreply.github.com>
Date: Sun, 21 Nov 2021 21:57:18 +0100
Subject: [PATCH] support .net 6
---
.gitmodules | 2 +-
Uchu | 2 +-
Uchu.Dockerfile | 4 ++--
config.default.xml | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 62eceb2..e1f6655 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "Uchu"]
path = Uchu
- url = git@github.com:yuwui/Uchu.git
+ url = git@github.com:UchuServer/Uchu.git
diff --git a/Uchu b/Uchu
index 8d89e3c..448bd74 160000
--- a/Uchu
+++ b/Uchu
@@ -1 +1 @@
-Subproject commit 8d89e3cae170d1e226eeaf180b6fedd5b1cbb6bb
+Subproject commit 448bd7415d1931a4bd91fcc634d6e77ddd5444f7
diff --git a/Uchu.Dockerfile b/Uchu.Dockerfile
index 04b080a..0ccf3e1 100644
--- a/Uchu.Dockerfile
+++ b/Uchu.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine
+FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine
RUN apk update && apk add --no-cache gettext curl python3 py3-pip
@@ -14,4 +14,4 @@ RUN dotnet build --configuration Release
COPY config.default.xml .env cert.pfx* ./
RUN set -o allexport && source .env && set +o allexport && envsubst < config.default.xml > config.xml
-ENTRYPOINT ["dotnet", "Uchu.Master/bin/Release/net5.0/Uchu.Master.dll"]
+ENTRYPOINT ["dotnet", "Uchu.Master/bin/Release/net6.0/Uchu.Master.dll"]
diff --git a/config.default.xml b/config.default.xml
index e0750ab..4729067 100644
--- a/config.default.xml
+++ b/config.default.xml
@@ -19,8 +19,8 @@
dotnet
- ../../../../Uchu.Instance/bin/Release/net5.0/Uchu.Instance.dll
- ../../../../Uchu.StandardScripts/bin/Release/net5.0/Uchu.StandardScripts.dll
+ ../../../../Uchu.Instance/bin/Release/net6.0/Uchu.Instance.dll
+ ../../../../Uchu.StandardScripts/bin/Release/net6.0/Uchu.StandardScripts.dll