Skip to content

Commit

Permalink
support .net 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MickVermeulen committed Mar 1, 2021
1 parent ab552d3 commit 152437f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ UCHU_CHAT_PORT=2004
UCHU_API_PORT_RANGE=10000-10100
UCHU_WORLD_PORT_RANGE=20000-20100
UCHU_SERVER_PORT=21836
UCHU_AUTH_PORT=40000
UCHU_AUTH_PORT=40000
HEART_BEAT_INTERVAL=5
REQUIRED_HEART_BEATS=10
2 changes: 1 addition & 1 deletion Uchu
Submodule Uchu updated from 92aad5 to 8d89e3
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/core/sdk:3.1-alpine
FROM mcr.microsoft.com/dotnet/sdk:5.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/netcoreapp3.1/Uchu.Master.dll"]
ENTRYPOINT ["dotnet", "Uchu.Master/bin/Release/net5.0/Uchu.Master.dll"]
6 changes: 4 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/netcoreapp3.1/Uchu.Instance.dll</Instance>
<ScriptDllSource>../../../../Uchu.StandardScripts/bin/Release/netcoreapp3.1/Uchu.StandardScripts.dll</ScriptDllSource>
<Instance>../../../../Uchu.Instance/bin/Release/net5.0/Uchu.Instance.dll</Instance>
<ScriptDllSource>../../../../Uchu.StandardScripts/bin/Release/net5.0/Uchu.StandardScripts.dll</ScriptDllSource>
</DllSource>
<ManagedScriptSources />
<ResourcesConfiguration>
Expand All @@ -33,6 +33,8 @@
<HostAuthentication>true</HostAuthentication>
<HostCharacter>true</HostCharacter>
<MaxWorldServers>100</MaxWorldServers>
<WorldServerHeartBeatIntervalInMinutes>$HEART_BEAT_INTERVAL</WorldServerHeartBeatIntervalInMinutes>
<WorldServerHeartBeatsPerInterval>$REQUIRED_HEART_BEATS</WorldServerHeartBeatsPerInterval>
</Networking>
<GamePlay>
<PathFinding>false</PathFinding>
Expand Down

0 comments on commit 152437f

Please sign in to comment.