Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ba75b1583a | ||
![]() |
45068ea932 | ||
![]() |
181e9297a1 | ||
![]() |
e0417d3235 | ||
![]() |
17a244a536 | ||
![]() |
bd27360655 | ||
![]() |
b24eee3ecf | ||
![]() |
9068558a53 | ||
![]() |
9c22948ce9 | ||
![]() |
2b1a5d4c6e | ||
![]() |
2860dda41b |
44
.github/workflows/release.yaml
vendored
44
.github/workflows/release.yaml
vendored
@@ -2,56 +2,60 @@ name: Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '*'
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
TORCH_VERSION: ${{ github.ref_name }}
|
||||
BUILD_CONFIGURATION: Release
|
||||
DOTNET_NOLOGO: true
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: true
|
||||
steps:
|
||||
- uses: actions/checkout@master
|
||||
name: Checkout
|
||||
with:
|
||||
ref: ${{ github.head_ref }}
|
||||
fetch-depth: 0
|
||||
|
||||
- uses: actions/setup-dotnet@v3
|
||||
name: Setup dotnet
|
||||
with:
|
||||
dotnet-version: '7.0.x'
|
||||
|
||||
- name: Add Gh Packages Nuget Source
|
||||
run: dotnet nuget add source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github
|
||||
- name: Restore dependencies
|
||||
run: dotnet restore Torch.Server/Torch.Server.csproj --locked-mode
|
||||
|
||||
- name: Git Version
|
||||
id: version
|
||||
uses: codacy/git-version@2.7.1
|
||||
|
||||
- name: Build
|
||||
run: dotnet build Torch.Server/Torch.Server.csproj --no-restore -c ${{ env.BUILD_CONFIGURATION }} /p:AssemblyVersion=${{ env.TORCH_VERSION }} /p:Version=${{ env.TORCH_VERSION }}
|
||||
run: dotnet build Torch.Server/Torch.Server.csproj --no-restore -c ${{ env.BUILD_CONFIGURATION }} -p:Version="${{ steps.version.outputs.version }}" -p:AssemblyVersion="${{ steps.version.outputs.version }}"
|
||||
- name: Publish
|
||||
run: dotnet publish Torch.Server/Torch.Server.csproj --no-build -r win-x64 --sc -c ${{ env.BUILD_CONFIGURATION }} -o ./publish
|
||||
|
||||
- uses: vimtor/action-zip@v1
|
||||
name: Zip Release
|
||||
with:
|
||||
files: publish/
|
||||
dest: release.zip
|
||||
- name: Build Changelog
|
||||
id: build_changelog
|
||||
uses: mikepenz/release-changelog-builder-action@v3
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
commitMode: true
|
||||
|
||||
- name: Create release
|
||||
id: create_release
|
||||
uses: actions/create-release@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ env.TORCH_VERSION }}
|
||||
release_name: Release v${{ env.TORCH_VERSION }}
|
||||
tag_name: ${{ steps.version.outputs.version }}
|
||||
release_name: Release v${{ steps.version.outputs.version }}
|
||||
body: ${{ steps.github_release.outputs.changelog }}
|
||||
draft: true
|
||||
prerelease: false
|
||||
|
||||
- name: Upload release asset
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
@@ -61,16 +65,16 @@ jobs:
|
||||
asset_path: release.zip
|
||||
asset_name: torch-server.zip
|
||||
asset_content_type: application/zip
|
||||
- name: Publish release
|
||||
uses: StuYarrow/publish-release@v1
|
||||
|
||||
- uses: eregon/publish-release@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
id: ${{ steps.create_release.outputs.id }}
|
||||
release_id: ${{ steps.create_release.outputs.id }}
|
||||
|
||||
- run: dotnet pack -c Release ./Torch.API/Torch.API.csproj -o pack --include-symbols -p:SymbolPackageFormat=snupkg -p:Version=${{ env.TORCH_VERSION }} --no-build
|
||||
- run: dotnet pack -c Release ./Torch/Torch.csproj -o pack --include-symbols -p:SymbolPackageFormat=snupkg -p:Version=${{ env.TORCH_VERSION }} --no-build
|
||||
- run: dotnet pack -c Release ./Torch.Server/Torch.Server.csproj -o pack --include-symbols -p:SymbolPackageFormat=snupkg -p:Version=${{ env.TORCH_VERSION }} --no-build
|
||||
- run: mkdir blank && sed -i 's/torchVersion/${{ env.TORCH_VERSION }}/g' Torch.Server.ReferenceAssemblies.net7.nuspec && nuget pack Torch.Server.ReferenceAssemblies.net7.nuspec -BasePath ./blank -Version ${{ env.TORCH_VERSION }} -OutputDirectory pack -NonInteractive -NoPackageAnalysis
|
||||
- run: dotnet pack -c Release ./Torch.API/Torch.API.csproj -o pack --include-symbols -p:SymbolPackageFormat=snupkg -p:Version="${{ steps.version.outputs.version }}" -p:AssemblyVersion="${{ steps.version.outputs.version }}" --no-build
|
||||
- run: dotnet pack -c Release ./Torch/Torch.csproj -o pack --include-symbols -p:SymbolPackageFormat=snupkg -p:Version="${{ steps.version.outputs.version }}" -p:AssemblyVersion="${{ steps.version.outputs.version }}" --no-build
|
||||
- run: dotnet pack -c Release ./Torch.Server/Torch.Server.csproj -o pack --include-symbols -p:SymbolPackageFormat=snupkg -p:Version="${{ steps.version.outputs.version }}" -p:AssemblyVersion="${{ steps.version.outputs.version }}" --no-build
|
||||
- run: mkdir blank && sed -i 's/torchVersion/${{ steps.version.outputs.version }}/g' Torch.Server.ReferenceAssemblies.net7.nuspec && nuget pack Torch.Server.ReferenceAssemblies.net7.nuspec -BasePath ./blank -OutputDirectory pack -NonInteractive -NoPackageAnalysis
|
||||
|
||||
- run: dotnet nuget push ./pack/*.nupkg -s github
|
||||
|
@@ -21,7 +21,7 @@
|
||||
<PackageReference Include="NuGet.Commands" Version="6.4.0" />
|
||||
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.4.0" />
|
||||
<PackageReference Include="SemanticVersioning" Version="2.0.2" />
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.66">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>compile</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@@ -43,9 +43,9 @@
|
||||
},
|
||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.202.48, )",
|
||||
"resolved": "1.202.48",
|
||||
"contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
|
||||
"requested": "[1.202.66, )",
|
||||
"resolved": "1.202.66",
|
||||
"contentHash": "VTOwwfTPnov6WWJNrsmB9lWs5s+6XVUXtV8SgLvgJTswK11MTA0e+TZFfZJoSZ1WUsE2dvxlMrNOYJ6aL6j0wA==",
|
||||
"dependencies": {
|
||||
"protobuf-net": "1.0.0"
|
||||
}
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>Torch.Server.ReferenceAssemblies.net7</id>
|
||||
<version>1.0.1</version>
|
||||
<version>torchVersion</version>
|
||||
<title>Torch Server Reference Assemblies</title>
|
||||
<authors>zznty</authors>
|
||||
<owners>zznty</owners>
|
||||
@@ -11,7 +11,7 @@
|
||||
<repository type="git" url="https://github.com/PveTeam/Torch" />
|
||||
<dependencies>
|
||||
<group targetFramework="net7.0-windows7.0">
|
||||
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.201.13" />
|
||||
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.202.66" />
|
||||
<dependency id="Torch.Server" version="torchVersion" />
|
||||
</group>
|
||||
</dependencies>
|
||||
|
@@ -30,7 +30,7 @@ namespace Torch.Server
|
||||
private const string TOOL_DIR = "tool";
|
||||
private const string TOOL_ZIP = "temp.zip";
|
||||
private static readonly string TOOL_EXE = "DepotDownloader.exe";
|
||||
private const string TOOL_ARGS = "-app 298740 -depot 298741 -beta automatons-beta -dir \"{0}\"";
|
||||
private const string TOOL_ARGS = "-app 298740 -depot 298741 -dir \"{0}\"";
|
||||
private TorchServer _server;
|
||||
|
||||
internal Persistent<TorchConfig> ConfigPersistent { get; }
|
||||
@@ -102,25 +102,26 @@ namespace Torch.Server
|
||||
}
|
||||
#endif
|
||||
|
||||
var gameThread = new Thread(() =>
|
||||
var uiThread = new Thread(() =>
|
||||
{
|
||||
_server.Init();
|
||||
var ui = new TorchUI(_server);
|
||||
|
||||
if (Config.Autostart || Config.TempAutostart)
|
||||
{
|
||||
Config.TempAutostart = false;
|
||||
_server.Start();
|
||||
}
|
||||
SynchronizationContext.SetSynchronizationContext(
|
||||
new DispatcherSynchronizationContext(Dispatcher.CurrentDispatcher));
|
||||
|
||||
ui.ShowDialog();
|
||||
});
|
||||
|
||||
gameThread.Start();
|
||||
uiThread.SetApartmentState(ApartmentState.STA);
|
||||
uiThread.Start();
|
||||
|
||||
var ui = new TorchUI(_server);
|
||||
_server.Init();
|
||||
|
||||
SynchronizationContext.SetSynchronizationContext(
|
||||
new DispatcherSynchronizationContext(Dispatcher.CurrentDispatcher));
|
||||
|
||||
ui.ShowDialog();
|
||||
if (Config.Autostart || Config.TempAutostart)
|
||||
{
|
||||
Config.TempAutostart = false;
|
||||
_server.Start();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -12,7 +12,7 @@ namespace Torch.Server
|
||||
{
|
||||
internal static class Program
|
||||
{
|
||||
[STAThread]
|
||||
[MTAThread]
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
var configurationBuilder = new ConfigurationBuilder()
|
||||
|
@@ -51,7 +51,7 @@
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
<PackageReference Include="System.Management" Version="7.0.0" />
|
||||
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.66">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>compile</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@@ -122,9 +122,9 @@
|
||||
},
|
||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.202.48, )",
|
||||
"resolved": "1.202.48",
|
||||
"contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
|
||||
"requested": "[1.202.66, )",
|
||||
"resolved": "1.202.66",
|
||||
"contentHash": "VTOwwfTPnov6WWJNrsmB9lWs5s+6XVUXtV8SgLvgJTswK11MTA0e+TZFfZJoSZ1WUsE2dvxlMrNOYJ6aL6j0wA==",
|
||||
"dependencies": {
|
||||
"protobuf-net": "1.0.0"
|
||||
}
|
||||
@@ -162,10 +162,10 @@
|
||||
},
|
||||
"HarmonyX": {
|
||||
"type": "Transitive",
|
||||
"resolved": "2.10.2-prerelease.3",
|
||||
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==",
|
||||
"resolved": "2.10.2-prerelease.4",
|
||||
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
|
||||
"dependencies": {
|
||||
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.RuntimeDetour": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
|
||||
@@ -318,48 +318,48 @@
|
||||
},
|
||||
"MonoModReorg.Backports": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
|
||||
"dependencies": {
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"MonoModReorg.Core": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
|
||||
"dependencies": {
|
||||
"Mono.Cecil": "0.11.4",
|
||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.Backports": "23.3.22.1",
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||
"MonoModReorg.Utils": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"MonoModReorg.ILHelpers": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA=="
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
|
||||
},
|
||||
"MonoModReorg.RuntimeDetour": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
|
||||
"dependencies": {
|
||||
"Mono.Cecil": "0.11.4",
|
||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.Core": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.Backports": "23.3.22.1",
|
||||
"MonoModReorg.Core": "23.3.22.1",
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||
"MonoModReorg.Utils": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"MonoModReorg.Utils": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
|
||||
"dependencies": {
|
||||
"Mono.Cecil": "0.11.4",
|
||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.Backports": "23.3.22.1",
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"Newtonsoft.Json": {
|
||||
@@ -585,11 +585,11 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"ControlzEx": "[5.0.2, )",
|
||||
"HarmonyX": "[2.10.2-prerelease.3, )",
|
||||
"HarmonyX": "[2.10.2-prerelease.4, )",
|
||||
"MahApps.Metro": "[2.4.9, )",
|
||||
"Microsoft.CodeAnalysis.CSharp": "[4.4.0, )",
|
||||
"Microsoft.CodeAnalysis.Common": "[4.4.0, )",
|
||||
"MonoModReorg.RuntimeDetour": "[23.1.2-prerelease.1, )",
|
||||
"MonoModReorg.RuntimeDetour": "[23.3.22.1, )",
|
||||
"NLog": "[5.1.0, )",
|
||||
"System.ComponentModel.Annotations": "[5.0.0, )",
|
||||
"Torch.API": "[1.0.0, )",
|
||||
|
@@ -62,13 +62,20 @@ namespace Torch.Managers
|
||||
{
|
||||
File.Delete(source);
|
||||
}
|
||||
catch (IOException)
|
||||
catch (Exception e) when (e is IOException or UnauthorizedAccessException)
|
||||
{
|
||||
var tempFilePath = Path.Combine(path, file + ".old");
|
||||
if (File.Exists(tempFilePath))
|
||||
File.Delete(tempFilePath);
|
||||
|
||||
File.Move(source, tempFilePath);
|
||||
try
|
||||
{
|
||||
File.Move(source, tempFilePath);
|
||||
}
|
||||
catch (UnauthorizedAccessException)
|
||||
{
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -133,6 +133,12 @@ namespace Torch.Managers.PatchManager.MSIL
|
||||
case double @double when Operand is MsilOperandInline.MsilOperandDouble operandDouble:
|
||||
operandDouble.Value = @double;
|
||||
break;
|
||||
case byte @byte when Operand is MsilOperandInline.MsilOperandArgument operandArgument:
|
||||
operandArgument.Value = new(@byte);
|
||||
break;
|
||||
case byte @byte when Operand is MsilOperandInline.MsilOperandLocal operandArgument:
|
||||
operandArgument.Value = new(@byte);
|
||||
break;
|
||||
}
|
||||
|
||||
Labels = instruction.labels.Select(b => new MsilLabel(b)).ToHashSet();
|
||||
@@ -153,7 +159,10 @@ namespace Torch.Managers.PatchManager.MSIL
|
||||
MsilOperandInline.MsilOperandDouble msilOperandDouble => msilOperandDouble.Value,
|
||||
MsilOperandInline.MsilOperandInt32 msilOperandInt32 => msilOperandInt32.Value,
|
||||
MsilOperandInline.MsilOperandInt64 msilOperandInt64 => msilOperandInt64.Value,
|
||||
MsilOperandInline.MsilOperandLocal msilOperandLocal => msilOperandLocal.Value.Local,
|
||||
MsilOperandInline.MsilOperandLocal msilOperandLocal when OpCode.OperandType == OperandType.InlineVar => msilOperandLocal.Value.Local,
|
||||
MsilOperandInline.MsilOperandLocal msilOperandLocal when OpCode.OperandType == OperandType.ShortInlineVar => (byte)msilOperandLocal.Value.Index,
|
||||
MsilOperandInline.MsilOperandArgument msilOperandArgument when OpCode.OperandType == OperandType.InlineVar => msilOperandArgument.Value,
|
||||
MsilOperandInline.MsilOperandArgument msilOperandArgument when OpCode.OperandType == OperandType.ShortInlineVar => (byte)msilOperandArgument.Value.Position,
|
||||
MsilOperandInline.MsilOperandSignature msilOperandSignature => msilOperandSignature.Value,
|
||||
MsilOperandInline.MsilOperandSingle msilOperandSingle => msilOperandSingle.Value,
|
||||
MsilOperandInline.MsilOperandString msilOperandString => msilOperandString.Value,
|
||||
|
@@ -109,7 +109,14 @@ namespace Torch.Managers
|
||||
else
|
||||
{
|
||||
_fsManager.SoftDelete(extractPath, file.FullName);
|
||||
file.ExtractToFile(targetFile, true);
|
||||
try
|
||||
{
|
||||
file.ExtractToFile(targetFile, true);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.Warn(e, "unable to extract {0}", targetFile);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -58,10 +58,10 @@ namespace Torch.Patches
|
||||
typeof(TypeConverter).Assembly.Location,
|
||||
typeof(System.Diagnostics.TraceSource).Assembly.Location,
|
||||
typeof(System.Security.Policy.Evidence).Assembly.Location,
|
||||
typeof(ProtoBuf.Meta.RuntimeTypeModel).Assembly.Location,
|
||||
typeof(ProtoContractAttribute).Assembly.Location,
|
||||
Path.Combine(baseDir, "System.Xml.ReaderWriter.dll"),
|
||||
Path.Combine(baseDir, "netstandard.dll"),
|
||||
Path.Combine(baseDir, "System.Runtime.dll"),
|
||||
Path.Combine(MyFileSystem.ExePath, "ProtoBuf.Net.Core.dll"),
|
||||
Path.Combine(MyFileSystem.ExePath, "Sandbox.Game.dll"),
|
||||
Path.Combine(MyFileSystem.ExePath, "Sandbox.Common.dll"),
|
||||
Path.Combine(MyFileSystem.ExePath, "Sandbox.Graphics.dll"),
|
||||
@@ -83,14 +83,6 @@ namespace Torch.Patches
|
||||
|
||||
using var batch = MyScriptCompiler.Static.Whitelist.OpenBatch();
|
||||
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(ConcurrentQueue<>));
|
||||
batch.AllowNamespaceOfTypes(MyWhitelistTarget.Both, typeof(ImmutableArray), typeof(ArrayExtensions));
|
||||
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(ProtoContractAttribute).Assembly.GetExportedTypes()
|
||||
.Where(b => b.Namespace == "ProtoBuf" && b.Name.Contains("Attribute"))
|
||||
.Concat(new[]
|
||||
{
|
||||
typeof(DataFormat), typeof(MemberSerializationOptions), typeof(ImplicitFields)
|
||||
}).ToArray());
|
||||
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(WorkData));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@@ -24,18 +24,18 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ControlzEx" Version="5.0.2" />
|
||||
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.3" />
|
||||
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
|
||||
<PackageReference Include="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
|
||||
<PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.1.2-prerelease.1" />
|
||||
<PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.3.22.1" />
|
||||
<PackageReference Include="NLog" Version="5.1.0" />
|
||||
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
|
||||
<PackageReference Include="protobuf-net" Version="3.1.26" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.66">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>compile</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@@ -47,7 +47,7 @@ namespace Torch.Utils
|
||||
|
||||
private static void CopyNative()
|
||||
{
|
||||
if (ApplicationContext.Current.GameFilesDirectory.Attributes.HasFlag(FileAttributes.ReadOnly))
|
||||
if (ApplicationContext.Current.IsService || ApplicationContext.Current.GameFilesDirectory.Attributes.HasFlag(FileAttributes.ReadOnly))
|
||||
{
|
||||
Log.Warn("Torch directory is readonly. You should copy steam_api64.dll, Havok.dll from bin manually");
|
||||
return;
|
||||
|
@@ -14,11 +14,11 @@
|
||||
},
|
||||
"HarmonyX": {
|
||||
"type": "Direct",
|
||||
"requested": "[2.10.2-prerelease.3, )",
|
||||
"resolved": "2.10.2-prerelease.3",
|
||||
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==",
|
||||
"requested": "[2.10.2-prerelease.4, )",
|
||||
"resolved": "2.10.2-prerelease.4",
|
||||
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
|
||||
"dependencies": {
|
||||
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.RuntimeDetour": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"InfoOf.Fody": {
|
||||
@@ -65,15 +65,15 @@
|
||||
},
|
||||
"MonoModReorg.RuntimeDetour": {
|
||||
"type": "Direct",
|
||||
"requested": "[23.1.2-prerelease.1, )",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==",
|
||||
"requested": "[23.3.22.1, )",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
|
||||
"dependencies": {
|
||||
"Mono.Cecil": "0.11.4",
|
||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.Core": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.Backports": "23.3.22.1",
|
||||
"MonoModReorg.Core": "23.3.22.1",
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||
"MonoModReorg.Utils": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"NLog": {
|
||||
@@ -102,9 +102,9 @@
|
||||
},
|
||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.202.48, )",
|
||||
"resolved": "1.202.48",
|
||||
"contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
|
||||
"requested": "[1.202.66, )",
|
||||
"resolved": "1.202.66",
|
||||
"contentHash": "VTOwwfTPnov6WWJNrsmB9lWs5s+6XVUXtV8SgLvgJTswK11MTA0e+TZFfZJoSZ1WUsE2dvxlMrNOYJ6aL6j0wA==",
|
||||
"dependencies": {
|
||||
"protobuf-net": "1.0.0"
|
||||
}
|
||||
@@ -157,36 +157,36 @@
|
||||
},
|
||||
"MonoModReorg.Backports": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
|
||||
"dependencies": {
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"MonoModReorg.Core": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
|
||||
"dependencies": {
|
||||
"Mono.Cecil": "0.11.4",
|
||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.Backports": "23.3.22.1",
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||
"MonoModReorg.Utils": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"MonoModReorg.ILHelpers": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA=="
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
|
||||
},
|
||||
"MonoModReorg.Utils": {
|
||||
"type": "Transitive",
|
||||
"resolved": "23.1.2-prerelease.1",
|
||||
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==",
|
||||
"resolved": "23.3.22.1",
|
||||
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
|
||||
"dependencies": {
|
||||
"Mono.Cecil": "0.11.4",
|
||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
||||
"MonoModReorg.Backports": "23.3.22.1",
|
||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||
}
|
||||
},
|
||||
"Newtonsoft.Json": {
|
||||
|
Reference in New Issue
Block a user