Skip to content

Commit 959fcd3

Browse files
authored
Vintage Story: add .NET 8 selector (#1564)
1 parent c225df8 commit 959fcd3

3 files changed

Lines changed: 23 additions & 7 deletions

File tree

vintage-story-new.kvp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Meta.ContainerPolicy=Supported
1717
Meta.Prerequisites=[]
1818
Meta.ConfigReleaseState=NotSpecified
1919
Meta.NoCommercialUsage=False
20-
Meta.ConfigVersion=1.10
20+
Meta.ConfigVersion=11
2121
Meta.AppConfigId=161f1dcd-f9c5-47d8-b191-f9dceecd4fc6
2222
App.DisplayName=Vintage Story
2323
App.RootDir=./vintage-story/

vintage-story-newconfig.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,27 @@
211211
"1.18": "1.18"
212212
}
213213
},
214+
{
215+
"DisplayName": "Dotnet Release Stream",
216+
"Category": "Updates",
217+
"Subcategory": "Server Updates:build:-1",
218+
"Description": "Sets the .NET release stream from which to install the latest .NET SDK version, unless a specific version is specified under Dotnet Version. Use 8.0 for Vintage Story v1.21.0+. Update the server after changing this setting",
219+
"Keywords": "dotnet,release,stream",
220+
"FieldName": "DotnetRelease",
221+
"InputType": "enum",
222+
"ParamFieldName": "DotnetRelease",
223+
"IncludeInCommandLine": false,
224+
"DefaultValue": "7.0",
225+
"EnumValues": {
226+
"8.0": "8.0",
227+
"7.0": "7.0 (default)"
228+
}
229+
},
214230
{
215231
"DisplayName": "Dotnet Version",
216232
"Category": "Updates",
217233
"Subcategory": "Server Updates:build:-1",
218-
"Description": "Sets the [.NET SDK 7.0 version](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) to install to run the server. Empty = latest. NOTE: Update the server after switching versions!",
234+
"Description": "Sets the .NET SDK [7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) or [8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) version to install. Empty = latest version for the release stream specified under Dotnet Release Stream. Use an 8.0 version for Vintage Story v1.21.0+. Update the server after changing this setting",
219235
"Keywords": "dotnet,version",
220236
"FieldName": "DotnetSDKVersion",
221237
"InputType": "text",
@@ -226,4 +242,4 @@
226242
"Placeholder": "7.0.410",
227243
"EnumValues": {}
228244
}
229-
]
245+
]

vintage-story-newupdates.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"UpdateSourceArch": "x86_64",
3434
"UpdateSource": "Executable",
3535
"UpdateSourceData": "/bin/bash",
36-
"UpdateSourceArgs": "-c \"DotnetVersion=\\\"{{DotnetSDKVersion}}\\\" && if [[ -z \\\"$DotnetVersion\\\" ]]; then DotnetVersion=$(wget -qO- https://builds.dotnet.microsoft.com/dotnet/release-metadata/7.0/releases.json | jq -r \\\".[\\\\\\\"latest-sdk\\\\\\\"]\\\"); fi && if [[ ! \\\"$DotnetVersion\\\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then echo \\\"Invalid .NET SDK version format specified\\\" && exit 1; fi && wget -qO dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/$DotnetVersion/dotnet-sdk-$DotnetVersion-linux-x64.tar.gz && echo \\\".NET SDK v$DotnetVersion downloaded\\\"\"",
36+
"UpdateSourceArgs": "-c \"DotnetVersion=\\\"{{DotnetSDKVersion}}\\\" && if [[ -z \\\"$DotnetVersion\\\" ]]; then DotnetVersion=$(wget -qO- https://builds.dotnet.microsoft.com/dotnet/release-metadata/{{DotnetRelease}}/releases.json | jq -r \\\".[\\\\\\\"latest-sdk\\\\\\\"]\\\"); fi && if [[ ! \\\"$DotnetVersion\\\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then echo \\\"Invalid .NET SDK version format specified\\\" && exit 1; fi && wget -qO dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/$DotnetVersion/dotnet-sdk-$DotnetVersion-linux-x64.tar.gz && echo \\\".NET SDK v$DotnetVersion downloaded\\\"\"",
3737
"SkipOnFailure": false
3838
},
3939
{
@@ -42,15 +42,15 @@
4242
"UpdateSourceArch": "aarch64",
4343
"UpdateSource": "Executable",
4444
"UpdateSourceData": "/bin/bash",
45-
"UpdateSourceArgs": "-c \"DotnetVersion=\\\"{{DotnetSDKVersion}}\\\" && if [[ -z \\\"$DotnetVersion\\\" ]]; then DotnetVersion=$(wget -qO- https://builds.dotnet.microsoft.com/dotnet/release-metadata/7.0/releases.json | jq -r \\\".[\\\\\\\"latest-sdk\\\\\\\"]\\\"); fi && if [[ ! \\\"$DotnetVersion\\\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then echo \\\"Invalid .NET SDK version format specified\\\" && exit 1; fi && wget -qO dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/$DotnetVersion/dotnet-sdk-$DotnetVersion-linux-arm64.tar.gz && echo \\\".NET SDK v$DotnetVersion downloaded\\\"\"",
45+
"UpdateSourceArgs": "-c \"DotnetVersion=\\\"{{DotnetSDKVersion}}\\\" && if [[ -z \\\"$DotnetVersion\\\" ]]; then DotnetVersion=$(wget -qO- https://builds.dotnet.microsoft.com/dotnet/release-metadata/{{DotnetRelease}}/releases.json | jq -r \\\".[\\\\\\\"latest-sdk\\\\\\\"]\\\"); fi && if [[ ! \\\"$DotnetVersion\\\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then echo \\\"Invalid .NET SDK version format specified\\\" && exit 1; fi && wget -qO dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/$DotnetVersion/dotnet-sdk-$DotnetVersion-linux-arm64.tar.gz && echo \\\".NET SDK v$DotnetVersion downloaded\\\"\"",
4646
"SkipOnFailure": false
4747
},
4848
{
4949
"UpdateStageName": ".NET SDK Download",
5050
"UpdateSourcePlatform": "Windows",
5151
"UpdateSource": "Executable",
5252
"UpdateSourceData": "powershell.exe",
53-
"UpdateSourceArgs": "-NoProfile -Command \"$ProgressPreference='SilentlyContinue'; $DotnetVersion='{{DotnetSDKVersion}}'; if ([string]::IsNullOrWhiteSpace($DotnetVersion)) { $DotnetVersion=(Invoke-RestMethod -UseBasicParsing -Uri https://builds.dotnet.microsoft.com/dotnet/release-metadata/7.0/releases.json).\\\"latest-sdk\\\" }; if ($DotnetVersion -notmatch '^\\d+\\.\\d+\\.\\d+$') { Write-Output \\\"Invalid .NET SDK version format specified\\\"; exit 1 }; Invoke-WebRequest -UseBasicParsing -Uri https://builds.dotnet.microsoft.com/dotnet/Sdk/$DotnetVersion/dotnet-sdk-$DotnetVersion-win-x64.zip -OutFile 'dotnet.zip'; if ($?) { Write-Output \\\".NET SDK v$DotnetVersion downloaded\\\" }\"",
53+
"UpdateSourceArgs": "-NoProfile -Command \"$ProgressPreference='SilentlyContinue'; $DotnetVersion='{{DotnetSDKVersion}}'; if ([string]::IsNullOrWhiteSpace($DotnetVersion)) { $DotnetVersion=(Invoke-RestMethod -UseBasicParsing -Uri https://builds.dotnet.microsoft.com/dotnet/release-metadata/{{DotnetRelease}}/releases.json).\\\"latest-sdk\\\" }; if ($DotnetVersion -notmatch '^\\d+\\.\\d+\\.\\d+$') { Write-Output \\\"Invalid .NET SDK version format specified\\\"; exit 1 }; Invoke-WebRequest -UseBasicParsing -Uri https://builds.dotnet.microsoft.com/dotnet/Sdk/$DotnetVersion/dotnet-sdk-$DotnetVersion-win-x64.zip -OutFile 'dotnet.zip'; if ($?) { Write-Output \\\".NET SDK v$DotnetVersion downloaded\\\" }\"",
5454
"SkipOnFailure": false
5555
},
5656
{
@@ -144,4 +144,4 @@
144144
"UpdateSourcePlatform": "All",
145145
"UpdateSource": "ShutdownApplication"
146146
}
147-
]
147+
]

0 commit comments

Comments
 (0)