Skip to content

Commit

Permalink
Update client binaries & Unix launcher script
Browse files Browse the repository at this point in the history
- Included .NET 8 binaries for UniversalGL build and changed Unix launcher script to point to it
- Updating on linux should no longer fail due to it being unable to set UnixFileMode on downloaded scripts
  • Loading branch information
Starkku committed Mar 24, 2024
1 parent 619ff04 commit 2c24f91
Show file tree
Hide file tree
Showing 107 changed files with 1,931 additions and 1 deletion.
Binary file modified ClientFiles/Resources/Binaries/ClientUpdater.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/ClientCore.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/ClientCore.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/ClientGUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/ClientGUI.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/ClientUpdater.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/DTAConfig.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/DTAConfig.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Updater/SecondStageUpdater.exe
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Updater/SecondStageUpdater.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/ClientCore.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/ClientCore.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/ClientGUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/ClientGUI.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/ClientUpdater.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/DTAConfig.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/DTAConfig.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/ClientCore.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/ClientCore.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/ClientGUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/ClientGUI.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/ClientUpdater.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/DTAConfig.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/DTAConfig.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
524 changes: 524 additions & 0 deletions ClientFiles/Resources/BinariesNET8/UniversalGL/ClientUpdater.xml

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1,206 changes: 1,206 additions & 0 deletions ClientFiles/Resources/BinariesNET8/UniversalGL/clientogl.deps.json

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"runtimeOptions": {
"tfm": "net8.0",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "8.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
"System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v8.0",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v8.0": {
"SecondStageUpdater/2.11.0-beta0004": {
"dependencies": {
"GitVersion.MsBuild": "5.11.1",
"Rampastring.Tools": "2.0.6"
},
"runtime": {
"SecondStageUpdater.dll": {}
}
},
"GitVersion.MsBuild/5.11.1": {},
"Rampastring.Tools/2.0.6": {
"runtime": {
"lib/net8.0/Rampastring.Tools.dll": {
"assemblyVersion": "2.0.6.0",
"fileVersion": "2.0.6.0"
}
}
}
}
},
"libraries": {
"SecondStageUpdater/2.11.0-beta0004": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"GitVersion.MsBuild/5.11.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-JlJB4dAc/MpLQvbF8OeyMKotDo5EcgU2pXmB+MlTe64B1Y0fc9GTMiAHiyUiHLnFRnOtrcSi1C3BsfRTmlD0sA==",
"path": "gitversion.msbuild/5.11.1",
"hashPath": "gitversion.msbuild.5.11.1.nupkg.sha512"
},
"Rampastring.Tools/2.0.6": {
"type": "package",
"serviceable": true,
"sha512": "sha512-eNKfJU1hBAMO7KHhoehkUdIOw+zOJCsSWWP9FoXL2jO0RG9Z0cd87tEQTfSB81y9LVi0ZMBA+FAy2y2wWZsYWg==",
"path": "rampastring.tools/2.0.6",
"hashPath": "rampastring.tools.2.0.6.nupkg.sha512"
}
}
}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"runtimeOptions": {
"tfm": "net8.0",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "8.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
"System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added ClientFiles/Resources/BinariesNET8/lzo.net.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/clientdx.exe
Binary file not shown.
38 changes: 38 additions & 0 deletions ClientFiles/Resources/clientdx.exe.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Binary file added ClientFiles/Resources/clientdx.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/clientogl.exe
Binary file not shown.
38 changes: 38 additions & 0 deletions ClientFiles/Resources/clientogl.exe.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Binary file added ClientFiles/Resources/clientogl.pdb
Binary file not shown.
Binary file modified ClientFiles/Resources/clientxna.exe
Binary file not shown.
38 changes: 38 additions & 0 deletions ClientFiles/Resources/clientxna.exe.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Binary file added ClientFiles/Resources/clientxna.pdb
Binary file not shown.
4 changes: 3 additions & 1 deletion ClientFiles/YRLauncherUnix.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#!/bin/sh
env MONO_IOMAP=all mono --debug YRLauncher.exe

cd "$(dirname "$0")"
dotnet Resources/BinariesNET8/UniversalGL/clientogl.dll "$@"

0 comments on commit 2c24f91

Please sign in to comment.