Skip to content

Commit

Permalink
support .net 6
Browse files Browse the repository at this point in the history
  • Loading branch information
enteryournamehere committed Nov 21, 2021
1 parent 152437f commit 09f3f4b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Uchu"]
path = Uchu
url = [email protected]:yuwui/Uchu.git
url = [email protected]:UchuServer/Uchu.git
2 changes: 1 addition & 1 deletion Uchu
Submodule Uchu updated 684 files
4 changes: 2 additions & 2 deletions Uchu.Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
4 changes: 2 additions & 2 deletions config.default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</FileLogging>
<DllSource>
<DotNetPath>dotnet</DotNetPath>
<Instance>../../../../Uchu.Instance/bin/Release/net5.0/Uchu.Instance.dll</Instance>
<ScriptDllSource>../../../../Uchu.StandardScripts/bin/Release/net5.0/Uchu.StandardScripts.dll</ScriptDllSource>
<Instance>../../../../Uchu.Instance/bin/Release/net6.0/Uchu.Instance.dll</Instance>
<ScriptDllSource>../../../../Uchu.StandardScripts/bin/Release/net6.0/Uchu.StandardScripts.dll</ScriptDllSource>
</DllSource>
<ManagedScriptSources />
<ResourcesConfiguration>
Expand Down

0 comments on commit 09f3f4b

Please sign in to comment.