Compare commits

...

33 Commits

Author SHA1 Message Date
zznty
343420f1d8 fix initialization issues 2023-07-01 19:57:18 +07:00
zznty
1396c8b1da upgrade packages 2023-06-29 14:35:37 +07:00
zznty
9900f92133 init server before starting ui due to static ctors 2023-06-29 14:20:23 +07:00
zznty
3be524d169 expose custom config to plugins
add support for some basic game parameters to be set via custom config
2023-06-29 14:08:45 +07:00
ed694ae95b Move SetupBasicGameInfo to initializer so it can be called before ui thread init 2023-06-27 15:51:12 -04:00
e9a9e180a8 Move Init back to where it was to prevent UI init issues 2023-06-27 15:02:13 -04:00
a8dfaf6239 Fix MyEntities init 2023-06-27 13:04:52 -04:00
bbdd1c7e01 Update package dependency version 2023-06-21 22:41:31 -04:00
e70e1ca4e6 Fix NRE in MyGameService static constructor 2023-06-18 01:06:22 -04:00
zznty
d65c20a05d update se to 1.202.120 2023-06-13 22:42:35 +07:00
f21976cf2d Depot tool is still broken 2023-06-12 22:50:44 -04:00
0c918106bc Update package dependency 2023-05-29 12:46:40 -04:00
6c9ec57d87 Update for latest SE version 2023-05-29 12:32:49 -04:00
zznty
b0f491ac88 do not exit without autostart 2023-04-25 16:32:52 +07:00
zznty
a426ad9e02 fix steam redist missing on automatic download 2023-04-22 21:22:46 +07:00
zznty
ba75b1583a do not copy dlls in service mode as it can mess up with runtimes 2023-04-22 18:30:02 +07:00
zznty
45068ea932 remove requirement o sta thread in no gui scenarios 2023-04-22 02:51:29 +07:00
zznty
181e9297a1 fix packaging 2023-04-14 11:36:04 +07:00
zznty
e0417d3235 breaking: bump to v2 lmao 2023-04-14 11:15:57 +07:00
zznty
17a244a536 update nuget package and use autoversioning 2023-04-14 11:13:34 +07:00
zznty
bd27360655 update to new se 2023-04-14 11:05:36 +07:00
zznty
b24eee3ecf remove beta from depot tool install 2023-03-27 16:03:15 +07:00
zznty
9068558a53 fix patcher compat with __local thing 2023-03-24 14:49:42 +07:00
zznty
9c22948ce9 fix keen compiler assemblies fuckery 2023-02-21 22:43:30 +07:00
zznty
2b1a5d4c6e fix script compiler compat with event block mods 2023-02-19 19:44:00 +07:00
zznty
2860dda41b windows moment 2023-02-17 16:32:48 +07:00
zznty
5483728a4e use depot downloader instead of steamcmd because its having some troubles with branching 2023-02-17 16:11:35 +07:00
zznty
32d318be5e fix auto-updates and crash handler restart 2023-02-17 15:47:44 +07:00
zznty
f349366b58 add a bit more configuration for steam cmd updates 2023-02-17 12:47:39 +07:00
zznty
73ce979b54 update packages to new se version
keen has thrown a bunch of new static ctors so factory patch cannot be revied :(
2023-02-17 12:43:45 +07:00
zznty
73b95472bc remove harmony compat warning 2023-02-17 12:26:16 +07:00
zznty
9b832a998d use beta for steamcmd 2023-02-17 12:25:05 +07:00
zznty
b1087822c9 gitignore moment 2023-02-08 21:50:23 +07:00
31 changed files with 840 additions and 633 deletions

View File

@@ -2,56 +2,60 @@ name: Release
on: on:
push: push:
tags: branches: [master]
- '*'
jobs: jobs:
build: build:
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
TORCH_VERSION: ${{ github.ref_name }}
BUILD_CONFIGURATION: Release BUILD_CONFIGURATION: Release
DOTNET_NOLOGO: true DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_CLI_TELEMETRY_OPTOUT: true
steps: steps:
- uses: actions/checkout@master - uses: actions/checkout@master
name: Checkout name: Checkout
with:
ref: ${{ github.head_ref }}
fetch-depth: 0
- uses: actions/setup-dotnet@v3 - uses: actions/setup-dotnet@v3
name: Setup dotnet name: Setup dotnet
with: with:
dotnet-version: '7.0.x' dotnet-version: '7.0.x'
- name: Add Gh Packages Nuget Source - 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 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 - name: Restore dependencies
run: dotnet restore Torch.Server/Torch.Server.csproj --locked-mode run: dotnet restore Torch.Server/Torch.Server.csproj --locked-mode
- name: Git Version
id: version
uses: codacy/git-version@2.7.1
- name: Build - 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 - name: Publish
run: dotnet publish Torch.Server/Torch.Server.csproj --no-build -r win-x64 --sc -c ${{ env.BUILD_CONFIGURATION }} -o ./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 - uses: vimtor/action-zip@v1
name: Zip Release name: Zip Release
with: with:
files: publish/ files: publish/
dest: release.zip 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 - name: Create release
id: create_release id: create_release
uses: actions/create-release@v1 uses: actions/create-release@v1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
tag_name: ${{ env.TORCH_VERSION }} tag_name: ${{ steps.version.outputs.version }}
release_name: Release v${{ env.TORCH_VERSION }} release_name: Release v${{ steps.version.outputs.version }}
body: ${{ steps.github_release.outputs.changelog }} body: ${{ steps.github_release.outputs.changelog }}
draft: true draft: true
prerelease: false prerelease: false
- name: Upload release asset - name: Upload release asset
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
@@ -61,16 +65,16 @@ jobs:
asset_path: release.zip asset_path: release.zip
asset_name: torch-server.zip asset_name: torch-server.zip
asset_content_type: application/zip asset_content_type: application/zip
- name: Publish release
uses: StuYarrow/publish-release@v1 - uses: eregon/publish-release@v1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: 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.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=${{ env.TORCH_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=${{ env.TORCH_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/${{ 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: 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 - run: dotnet nuget push ./pack/*.nupkg -s github

4
.gitignore vendored
View File

@@ -159,10 +159,6 @@ publish/
# NuGet Packages # NuGet Packages
*.nupkg *.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed # Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config #!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files # NuGet v3's project.json files produces more ignoreable files

View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
using Torch.API.Managers; using Torch.API.Managers;
using Torch.API.Session; using Torch.API.Session;
using VRage.Game.ModAPI; using VRage.Game.ModAPI;
@@ -26,6 +27,11 @@ namespace Torch.API
/// </summary> /// </summary>
ITorchConfig Config { get; } ITorchConfig Config { get; }
/// <summary>
/// Extended Configuration for the current instance.
/// </summary>
IConfiguration Configuration { get; }
/// <inheritdoc cref="IPluginManager"/> /// <inheritdoc cref="IPluginManager"/>
[Obsolete] [Obsolete]
IPluginManager Plugins { get; } IPluginManager Plugins { get; }

View File

@@ -14,6 +14,9 @@ namespace Torch.API.Managers
/// <summary> /// <summary>
/// Fired when plugins are loaded. /// Fired when plugins are loaded.
/// </summary> /// </summary>
/// <remarks>
/// Fired when plugins are loaded and immediately if subscribed after the plugins are loaded.
/// </remarks>
event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded; event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded;
/// <summary> /// <summary>

View File

@@ -17,11 +17,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" /> <PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
<PackageReference Include="NLog" Version="5.1.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="NuGet.Commands" Version="6.4.0" /> <PackageReference Include="NLog" Version="5.2.0" />
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.4.0" /> <PackageReference Include="NuGet.Commands" Version="6.6.1" />
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.6.1" />
<PackageReference Include="SemanticVersioning" Version="2.0.2" /> <PackageReference Include="SemanticVersioning" Version="2.0.2" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13"> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile</IncludeAssets> <IncludeAssets>compile</IncludeAssets>
</PackageReference> </PackageReference>

View File

@@ -8,31 +8,42 @@
"resolved": "0.9.0", "resolved": "0.9.0",
"contentHash": "xCqODS+wzpUXNtg4bMMvXG5PLbP0iTwRzRn2R+zWHKm83E6tbV2bCagawXp1EnZeNpd5OXpMxehulZWns8efzQ==" "contentHash": "xCqODS+wzpUXNtg4bMMvXG5PLbP0iTwRzRn2R+zWHKm83E6tbV2bCagawXp1EnZeNpd5OXpMxehulZWns8efzQ=="
}, },
"Microsoft.Extensions.Configuration.Binder": {
"type": "Direct",
"requested": "[7.0.4, )",
"resolved": "7.0.4",
"contentHash": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
}
},
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.1.0, )", "requested": "[5.2.0, )",
"resolved": "5.1.0", "resolved": "5.2.0",
"contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ==" "contentHash": "uYBgseY0m/9lQUbZYGsQsTBFOWrfs3iaekzzYMH6vFmpoOAvV8/bp1XxG/suZkwB5h8nAiTJAp7VENWRDKtKPA=="
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Direct", "type": "Direct",
"requested": "[6.4.0, )", "requested": "[6.6.1, )",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "j3ma45boGZADsHpJcu3Y2yq+n2luicC6ezd61TXTTzbOzA452oAPaSsFGUB1stIsuP/DVoqkTzjHXjaCHuJKPQ==", "contentHash": "D1b7gTk1wp7sxscLhS8O/yoErsRVbR4zJvLVD4jo1sgxh42ZOWKpMkhznPUxpvmCxBhw9hAy8/yWrRH91SfdEQ==",
"dependencies": { "dependencies": {
"NuGet.Credentials": "6.4.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"NuGet.ProjectModel": "6.4.0" "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.6.1",
"NuGet.ProjectModel": "6.6.1"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Direct", "type": "Direct",
"requested": "[6.4.0, )", "requested": "[6.6.1, )",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "AKomZEKuhQlshujuiHbKvwl2cZNGq3SHsXFbpjCfCjMFMLwwA8saJGQQZp1lzsqQWcQWa6hLOcPtm7T3rd0SVg==", "contentHash": "K+EXXLU37PBnwLGx6WnVGxlfWYkdedvUUOeDMERXelNgjg20irtKf3hk+wGB7NmxAdNY9/gGcOgSDOV+M0w3Jg==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.4.0", "NuGet.Configuration": "6.6.1",
"NuGet.LibraryModel": "6.4.0", "NuGet.LibraryModel": "6.6.1",
"NuGet.Protocol": "6.4.0" "NuGet.Protocol": "6.6.1"
} }
}, },
"SemanticVersioning": { "SemanticVersioning": {
@@ -43,9 +54,9 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
"requested": "[1.201.13, )", "requested": "[1.202.120, )",
"resolved": "1.201.13", "resolved": "1.202.120",
"contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==", "contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
"dependencies": { "dependencies": {
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
} }
@@ -64,6 +75,32 @@
"resolved": "6.0.0", "resolved": "6.0.0",
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg=="
}, },
"Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==",
"dependencies": {
"Microsoft.Extensions.Primitives": "7.0.0"
}
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
"dependencies": {
"Microsoft.Extensions.Primitives": "6.0.0"
}
},
"Microsoft.Extensions.FileSystemGlobbing": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw=="
},
"Microsoft.Extensions.Primitives": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
},
"Newtonsoft.Json": { "Newtonsoft.Json": {
"type": "Transitive", "type": "Transitive",
"resolved": "13.0.1", "resolved": "13.0.1",
@@ -71,75 +108,75 @@
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "srECugLk+LB1bXelDCDhHoi6do/EYTXzuntKhjHraS4roVB3NfWohEdCSiAPdpSV9M40Q6jo6MV2Srml9e+jHQ==", "contentHash": "hW5NtShErO3qbdkyv7doCRsFNK9Rlcc7mVjYM+hg1sOAWheTh/oo95DzNbsZthiqyHZfaioopfWtzmoxNw9h4g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.4.0" "NuGet.Frameworks": "6.6.1"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "vPjauG9AoacEjiZWGIs+d11FCRVmseqAw78FIApfLvZrYMEbbwc9vc0LdC3PpoW5FxYkktyZSiiXVKXGLu+gXw==", "contentHash": "9WbK8wgwPfRpSwuG+ZhMshE48qUYvPIw7VNLCncrq/in4vE6SGsuawPSxPJkkLBtcKTGbPMez5JDvUf6vEBgKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.4.0", "NuGet.Common": "6.6.1",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "tebsxclknVz3D4FrvE2MzVcsOyf6PffjGNQ77X9Yvbj9x5YpVWfumVPetqETcdsNEgiN0bBzfMre33lhrY7Itw==", "contentHash": "TuOlXcE1ajwdtfnQaUjDv2xO2u/WDS56/b5jHfEBZetKfcpT0W3iNOqInVPO0qxRxXK5/HXUKVr2Pya1LsVVnA==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.4.0" "NuGet.Protocol": "6.6.1"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "qcufbjJIDtyY/Hah7JJfcRVpRYM3scgPqYBnukjO9kfADCFGr2azvVBozuwzljA6w/cR3w8bXLq6vW5xGrsmHw==" "contentHash": "iRtDhL0zPqVw037fHEK9bQljTKPuOHhfIkz86/IH2P8eetr910HTTe5G8lJTuzZHh592Ze/sYhh173HIFjPSfg=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "K6ROQpWr34Aje81G0HfipiznLTB8vD4BO8sF6FEwx1KjJVdFkSmGZPmAhc6L1vZPs8TKY5BqoH72zG13zVzW2w==", "contentHash": "B0KH19sNNUq56YfEozIsIpk8EOyolG0LRT+hqG1/mhuXlQFiP9BgT6pZgwLQVLUl9YBDx3+KWQQbl6pz8Yh/Sw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.4.0", "NuGet.Common": "6.6.1",
"NuGet.Versioning": "6.4.0" "NuGet.Versioning": "6.6.1"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "aR10aYqcUMGC2mwMGH5rls/MGaz3EVH8DKTTHQ/EC91hXNtrCTTAQonaRR+v1EItcoxtQeZ/WQOorv4z270Tgg==", "contentHash": "GwhFi2Ep4YzAGQFYz1OsMVNfiJ1M46nyCgHQ7xjJSMvxDYFgodR1RqVugWFMbIUUq6I8iYASwp5lpHXvITeuIQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.1", "Newtonsoft.Json": "13.0.1",
"NuGet.Configuration": "6.4.0", "NuGet.Configuration": "6.6.1",
"NuGet.Versioning": "6.4.0", "NuGet.Versioning": "6.6.1",
"System.Security.Cryptography.Cng": "5.0.0", "System.Security.Cryptography.Cng": "5.0.0",
"System.Security.Cryptography.Pkcs": "5.0.0" "System.Security.Cryptography.Pkcs": "5.0.0"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "eW9Q7vPk8cpXDd5b+vtIPkl8dSDCPkPJPrjXPTfZGxhstldnhJrj1XPaonsDZLQ24YY7LrYCzC0BiHh3iO5zUA==", "contentHash": "CEyRXXvgIoEQBWn3WZupjkIVC6rPcGUAO5p4Gz+fnF8kcefWQOXHfnOE+UKZ0WwAJG5iMWRvXBKAGOuFiFhNpQ==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.4.0" "NuGet.DependencyResolver.Core": "6.6.1"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "KIPjsWP0P3EMsDsXaa6YBCTvYKur/zI0luS1kO5G37ci8mHs2kJFsuG5qaMhGvgyHASu54sxlic1n1oza2Pcbw==", "contentHash": "HhKLsK6Q0NNp6qb0T26GLR5gCTRZu+gzqDVK4xqXHZmsolaDVIdIYpn44b2etaVYLzNJCvgRkw+I422u2bIvMw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.4.0" "NuGet.Packaging": "6.6.1"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "YE8p3TpX4jIw+Gb24maE8YRDoqWA4imLmCbdOj5IvslLrZJXQ8akeFOGOplxICNVevON1g1SFYT2+cq4yy0nQQ==" "contentHash": "Wm/AOFICTIrCgbVxv9dNWusraTzcggbo5W4ao7hD8NNVq911an9TGwW+uNuYc8I5PkpTeMuSXneV2u6hbi1P4w=="
}, },
"protobuf-net": { "protobuf-net": {
"type": "Transitive", "type": "Transitive",

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata> <metadata>
<id>Torch.Server.ReferenceAssemblies.net7</id> <id>Torch.Server.ReferenceAssemblies.net7</id>
<version>1.0.1</version> <version>torchVersion</version>
<title>Torch Server Reference Assemblies</title> <title>Torch Server Reference Assemblies</title>
<authors>zznty</authors> <authors>zznty</authors>
<owners>zznty</owners> <owners>zznty</owners>
@@ -11,7 +11,7 @@
<repository type="git" url="https://github.com/PveTeam/Torch" /> <repository type="git" url="https://github.com/PveTeam/Torch" />
<dependencies> <dependencies>
<group targetFramework="net7.0-windows7.0"> <group targetFramework="net7.0-windows7.0">
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.201.13" /> <dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.202.120" />
<dependency id="Torch.Server" version="torchVersion" /> <dependency id="Torch.Server" version="torchVersion" />
</group> </group>
</dependencies> </dependencies>

View File

@@ -17,8 +17,8 @@
</PropertyGroup> </PropertyGroup>
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> --> <!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="NLog" Version="5.1.0" /> <PackageReference Include="NLog" Version="5.2.0" />
<PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit" Version="2.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -16,6 +16,7 @@ using Microsoft.Extensions.Configuration;
using NLog; using NLog;
using NLog.Targets; using NLog.Targets;
using Sandbox.Engine.Utils; using Sandbox.Engine.Utils;
using SpaceEngineers.Game;
using Torch.Utils; using Torch.Utils;
using VRage.FileSystem; using VRage.FileSystem;
@@ -27,10 +28,11 @@ namespace Torch.Server
private static readonly Logger Log = LogManager.GetLogger(nameof(Initializer)); private static readonly Logger Log = LogManager.GetLogger(nameof(Initializer));
private bool _init; private bool _init;
private const string STEAMCMD_DIR = "steamcmd"; private const string TOOL_DIR = "tool";
private const string STEAMCMD_ZIP = "temp.zip"; private const string TOOL_ZIP = "temp.zip";
private static readonly string STEAMCMD_EXE = "steamcmd.exe"; private static readonly string TOOL_EXE = "DepotDownloader.exe";
private const string STEAMCMD_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 +quit"; private const string TOOL_ARGS = "-app 298740 -depot {1} -dir \"{0}\" -manifest {2}";
private static readonly int[] Depots = { 298741, 1004 };
private TorchServer _server; private TorchServer _server;
internal Persistent<TorchConfig> ConfigPersistent { get; } internal Persistent<TorchConfig> ConfigPersistent { get; }
@@ -56,8 +58,8 @@ namespace Torch.Server
Log.Debug("Debug logging enabled."); Log.Debug("Debug logging enabled.");
#endif #endif
if (!configuration.GetValue("noupdate", false)) if (configuration.GetValue("getGameUpdates", true) && !configuration.GetValue("noupdate", false))
RunSteamCmd(configuration); RunSteamCmdAsync(configuration).Wait();
var processPid = configuration.GetValue<int>("waitForPid"); var processPid = configuration.GetValue<int>("waitForPid");
if (processPid != 0) if (processPid != 0)
@@ -83,9 +85,9 @@ namespace Torch.Server
return true; return true;
} }
public void Run() public void Run(IConfiguration configuration)
{ {
_server = new TorchServer(Config, ApplicationContext.Current.InstanceDirectory.FullName, ApplicationContext.Current.InstanceName); _server = new TorchServer(Config, ApplicationContext.Current.InstanceDirectory.FullName, ApplicationContext.Current.InstanceName, configuration);
if (ApplicationContext.Current.IsService || Config.NoGui) if (ApplicationContext.Current.IsService || Config.NoGui)
{ {
@@ -102,78 +104,86 @@ namespace Torch.Server
} }
#endif #endif
var gameThread = new Thread(() =>
{
_server.Init(); _server.Init();
if (Config.Autostart || Config.TempAutostart) var uiThread = new Thread(() =>
{ {
Config.TempAutostart = false;
_server.Start();
}
});
gameThread.Start();
var ui = new TorchUI(_server); var ui = new TorchUI(_server);
SynchronizationContext.SetSynchronizationContext( SynchronizationContext.SetSynchronizationContext(
new DispatcherSynchronizationContext(Dispatcher.CurrentDispatcher)); new DispatcherSynchronizationContext(Dispatcher.CurrentDispatcher));
ui.ShowDialog(); ui.ShowDialog();
} });
}
public static void RunSteamCmd(IConfiguration configuration) uiThread.SetApartmentState(ApartmentState.STA);
uiThread.Start();
if (Config.Autostart || Config.TempAutostart)
{ {
var log = LogManager.GetLogger("SteamCMD"); Config.TempAutostart = false;
_server.Start();
}
var path = configuration.GetValue<string>("steamCmdPath") ?? ApplicationContext.Current.TorchDirectory uiThread.Join();
.CreateSubdirectory(STEAMCMD_DIR).FullName; }
}
public static async Task RunSteamCmdAsync(IConfiguration configuration)
{
var log = LogManager.GetLogger("SteamTool");
var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
.CreateSubdirectory(TOOL_DIR).FullName;
if (!Directory.Exists(path)) if (!Directory.Exists(path))
{ {
Directory.CreateDirectory(path); Directory.CreateDirectory(path);
} }
var steamCmdExePath = Path.Combine(path, STEAMCMD_EXE); var steamCmdExePath = Path.Combine(path, TOOL_EXE);
if (!File.Exists(steamCmdExePath)) if (!File.Exists(steamCmdExePath))
{ {
try try
{ {
log.Info("Downloading SteamCMD."); log.Info("Downloading Steam Tool.");
using (var client = new HttpClient()) using (var client = new HttpClient())
using (var file = File.Create(STEAMCMD_ZIP)) await using (var file = File.Create(TOOL_ZIP))
using (var stream = client.GetStreamAsync("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip").Result) await using (var stream = await client.GetStreamAsync("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip"))
stream.CopyTo(file); await stream.CopyToAsync(file);
ZipFile.ExtractToDirectory(STEAMCMD_ZIP, path); ZipFile.ExtractToDirectory(TOOL_ZIP, path);
File.Delete(STEAMCMD_ZIP); File.Delete(TOOL_ZIP);
log.Info("SteamCMD downloaded successfully!"); log.Info("Steam Tool downloaded successfully!");
} }
catch (Exception e) catch (Exception e)
{ {
log.Error(e, "Failed to download SteamCMD, unable to update the DS."); log.Error(e, "Failed to download Steam Tool, unable to update the DS.");
return; return;
} }
} }
log.Info("Checking for DS updates."); log.Info("Checking for DS updates.");
foreach (var depot in Depots)
{
await DownloadDepot(depot);
}
async Task DownloadDepot(int depotId)
{
var steamCmdProc = new ProcessStartInfo(steamCmdExePath) var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
{ {
Arguments = string.Format(STEAMCMD_ARGS, configuration.GetValue("gamePath", "../")), Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId, "3111493184861426002"),
WorkingDirectory = path, WorkingDirectory = path,
UseShellExecute = false, RedirectStandardOutput = true
RedirectStandardOutput = true,
StandardOutputEncoding = Encoding.ASCII
}; };
var cmd = Process.Start(steamCmdProc); var cmd = Process.Start(steamCmdProc)!;
// ReSharper disable once PossibleNullReferenceException
while (!cmd.HasExited) while (!cmd.HasExited)
{ {
log.Info(cmd.StandardOutput.ReadLine()); if (await cmd.StandardOutput.ReadLineAsync() is { } line)
Thread.Sleep(100); log.Info(line);
}
} }
} }
} }

View File

@@ -7,6 +7,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Havok; using Havok;
using NLog; using NLog;
@@ -35,7 +36,45 @@ namespace Torch.Server.Managers
{ {
private const string CONFIG_NAME = "SpaceEngineers-Dedicated.cfg"; private const string CONFIG_NAME = "SpaceEngineers-Dedicated.cfg";
public event Action<ConfigDedicatedViewModel> InstanceLoaded; private Action<ConfigDedicatedViewModel> _instanceLoaded;
/// <summary>
/// Gets or sets the instance loaded event.
/// </summary>
/// <remarks>
/// Called when the instance is loaded and immediately if subscribed after the instance is loaded.
/// </remarks>
public event Action<ConfigDedicatedViewModel> InstanceLoaded
{
add
{
var action = _instanceLoaded;
Action<ConfigDedicatedViewModel> action2;
do
{
action2 = action;
var action3 = (Action<ConfigDedicatedViewModel>)Delegate.Combine(action2, value);
action = Interlocked.CompareExchange(ref _instanceLoaded, action3, action2);
}
while (action != action2);
if (DedicatedConfig is not null)
value(DedicatedConfig);
}
remove
{
var action = _instanceLoaded;
Action<ConfigDedicatedViewModel> action2;
do
{
action2 = action;
var action3 = (Action<ConfigDedicatedViewModel>)Delegate.Remove(action2, value);
action = Interlocked.CompareExchange(ref _instanceLoaded, action3, action2);
}
while (action != action2);
}
}
public ConfigDedicatedViewModel DedicatedConfig { get; set; } public ConfigDedicatedViewModel DedicatedConfig { get; set; }
private static readonly Logger Log = LogManager.GetLogger(nameof(InstanceManager)); private static readonly Logger Log = LogManager.GetLogger(nameof(InstanceManager));
[Dependency] [Dependency]
@@ -102,7 +141,7 @@ namespace Torch.Server.Managers
SelectWorld(DedicatedConfig.LoadWorld ?? DedicatedConfig.Worlds.First().WorldPath, false); SelectWorld(DedicatedConfig.LoadWorld ?? DedicatedConfig.Worlds.First().WorldPath, false);
InstanceLoaded?.Invoke(DedicatedConfig); _instanceLoaded?.Invoke(DedicatedConfig);
} }
public void SelectCreatedWorld(string worldPath) public void SelectCreatedWorld(string worldPath)

View File

@@ -32,7 +32,7 @@ namespace Torch.Server.Managers
{ {
if (newstate == TorchGameState.Loading && MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey)) if (newstate == TorchGameState.Loading && MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
{ {
var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey); var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiIP, MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
LogManager.GetCurrentClassLogger().Info($"Remote API started on port {myRemoteServer.Port}"); LogManager.GetCurrentClassLogger().Info($"Remote API started on port {myRemoteServer.Port}");
} }
} }

View File

@@ -12,7 +12,7 @@ namespace Torch.Server
{ {
internal static class Program internal static class Program
{ {
[STAThread] [MTAThread]
public static void Main(string[] args) public static void Main(string[] args)
{ {
var configurationBuilder = new ConfigurationBuilder() var configurationBuilder = new ConfigurationBuilder()
@@ -39,7 +39,7 @@ namespace Torch.Server
context.GameBinariesDirectory.FullName); context.GameBinariesDirectory.FullName);
#endif #endif
initializer.Run(); initializer.Run(configuration);
} }
private static void SetupLogging(IApplicationContext context, IConfiguration configuration) private static void SetupLogging(IApplicationContext context, IConfiguration configuration)

View File

@@ -34,24 +34,23 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoCompleteTextBox" Version="1.6.0" /> <PackageReference Include="AutoCompleteTextBox" Version="1.6.0" />
<PackageReference Include="Ben.Demystifier" Version="0.4.1" /> <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
<PackageReference Include="ControlzEx" Version="5.0.2" /> <PackageReference Include="ControlzEx" Version="6.0.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.9" /> <PackageReference Include="MahApps.Metro" Version="2.4.9" />
<PackageReference Include="MdXaml" Version="1.16.2" /> <PackageReference Include="MdXaml" Version="1.20.1" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.2.343001" /> <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.4.416101" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="7.0.0" />
<PackageReference Include="NLog" Version="5.1.0" /> <PackageReference Include="NLog" Version="5.2.0" />
<PackageReference Include="PropertyChanged.Fody" Version="4.0.3" PrivateAssets="all" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.1.0"> <PackageReference Include="Steamworks.NET" Version="20.1.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile</IncludeAssets> <IncludeAssets>compile</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Management" Version="7.0.0" /> <PackageReference Include="System.Management" Version="7.0.2" />
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" /> <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13"> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile</IncludeAssets> <IncludeAssets>compile</IncludeAssets>
</PackageReference> </PackageReference>

View File

@@ -8,6 +8,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using Microsoft.Diagnostics.Runtime; using Microsoft.Diagnostics.Runtime;
using Microsoft.Extensions.Configuration;
using NLog; using NLog;
using PropertyChanged; using PropertyChanged;
using Sandbox; using Sandbox;
@@ -46,8 +47,9 @@ namespace Torch.Server
//Here to trigger rebuild //Here to trigger rebuild
/// <inheritdoc /> /// <inheritdoc />
public TorchServer(ITorchConfig config, string instancePath, string instanceName) : base(config) public TorchServer(ITorchConfig config, string instancePath, string instanceName, IConfiguration configuration) : base(config)
{ {
Configuration = configuration;
InstancePath = instancePath; InstancePath = instancePath;
InstanceName = instanceName; InstanceName = instanceName;
DedicatedInstance = new InstanceManager(this); DedicatedInstance = new InstanceManager(this);
@@ -57,7 +59,7 @@ namespace Torch.Server
AddManager(new RemoteAPIManager(this)); AddManager(new RemoteAPIManager(this));
var sessionManager = Managers.GetManager<ITorchSessionManager>(); var sessionManager = Managers.GetManager<ITorchSessionManager>();
sessionManager.AddFactory(x => new MultiplayerManagerDedicated(this)); sessionManager.AddFactory(_ => new MultiplayerManagerDedicated(this));
sessionManager.SessionStateChanged += OnSessionStateChanged; sessionManager.SessionStateChanged += OnSessionStateChanged;
// Needs to be done at some point after MyVRageWindows.Init // Needs to be done at some point after MyVRageWindows.Init
@@ -134,6 +136,8 @@ namespace Torch.Server
Log.Info($"Initialized server '{InstanceName}' at '{InstancePath}'"); Log.Info($"Initialized server '{InstanceName}' at '{InstancePath}'");
} }
public override IConfiguration Configuration { get; }
/// <inheritdoc /> /// <inheritdoc />
public override void Start() public override void Start()
{ {

View File

@@ -32,9 +32,25 @@ internal class UnhandledExceptionHandler
{ {
Console.WriteLine("Restarting in 5 seconds."); Console.WriteLine("Restarting in 5 seconds.");
Thread.Sleep(5000); Thread.Sleep(5000);
var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe"); var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
Process.Start(exe, $"-waitForPid {Environment.ProcessId} {_config}"); var args = Environment.GetCommandLineArgs();
for (var i = 0; i < args.Length; i++)
{
if (args[i].Contains(' '))
args[i] = $"\"{args[i]}\"";
if (!args[i].Contains("--tempAutostart", StringComparison.InvariantCultureIgnoreCase) &&
!args[i].Contains("--waitForPid", StringComparison.InvariantCultureIgnoreCase))
continue;
args[i] = string.Empty;
args[++i] = string.Empty;
}
Process.Start(exe, $"--waitForPid {Environment.ProcessId} --tempAutostart true {string.Join(" ", args)}");
} }
else else
{ {

View File

@@ -19,12 +19,12 @@
}, },
"ControlzEx": { "ControlzEx": {
"type": "Direct", "type": "Direct",
"requested": "[5.0.2, )", "requested": "[6.0.0, )",
"resolved": "5.0.2", "resolved": "6.0.0",
"contentHash": "f724LoDJ36LxaLR62G4ek9ZAJI8BiiYRJJ04furC/qjXSeIwU0qmHFIe19xB1/FwxyZjevdFguEr9ZUjf3dZgw==", "contentHash": "MEaqj6ienvKR4E7QJ3vwzo2vrdy2Kqw9Z3CudY5iUixR5iMYeLoMlks7EiABsz4WqDsgVLd9u7fixmCOGU+4ow==",
"dependencies": { "dependencies": {
"Microsoft.Xaml.Behaviors.Wpf": "1.1.31", "Microsoft.Xaml.Behaviors.Wpf": "1.1.39",
"System.Text.Json": "5.0.1" "System.Text.Json": "5.0.2"
} }
}, },
"MahApps.Metro": { "MahApps.Metro": {
@@ -38,34 +38,25 @@
}, },
"MdXaml": { "MdXaml": {
"type": "Direct", "type": "Direct",
"requested": "[1.16.2, )", "requested": "[1.20.1, )",
"resolved": "1.16.2", "resolved": "1.20.1",
"contentHash": "UxYWJaXugQ+v4txS7K8sw26bxS6xvjSW+f79U/oMBtm+cVvZSmBGRZkB77rzaoXAyrbixX0Vk0U+1f22TT2uWg==", "contentHash": "fx64BBFK7yO2MHBxMAMV4/b3x24rQ7Gfn64CISaw4dS7Wvr0HGc4vHNyrMY+/CgEpOEATLVgtM1a9liQ+QOesA==",
"dependencies": { "dependencies": {
"AvalonEdit": "6.0.0", "AvalonEdit": "6.0.0",
"MdXaml.Plugins": "1.16.2" "MdXaml.Plugins": "1.20.1"
} }
}, },
"Microsoft.Diagnostics.Runtime": { "Microsoft.Diagnostics.Runtime": {
"type": "Direct", "type": "Direct",
"requested": "[2.2.343001, )", "requested": "[2.4.416101, )",
"resolved": "2.2.343001", "resolved": "2.4.416101",
"contentHash": "nVwXLEJiXbnnNkQPcWy64DMWNBvMg9XKWpfBBNMVs1gbEJ9HUVTcAA862mOjgyKryAtvGVKkeQ/9cW6pK8YAiA==", "contentHash": "BUGBGNmjLWnRJ+Oqj23aDKjulOqDk6q62oQzeg9FghfphhhuTwlNLGHV88vKKldx+NHjWUzF3eUPUFxhROrcyQ==",
"dependencies": { "dependencies": {
"Microsoft.Diagnostics.NETCore.Client": "0.2.251802", "Microsoft.Diagnostics.NETCore.Client": "0.2.251802",
"System.Collections.Immutable": "5.0.0", "System.Collections.Immutable": "5.0.0",
"System.Runtime.CompilerServices.Unsafe": "5.0.0" "System.Runtime.CompilerServices.Unsafe": "5.0.0"
} }
}, },
"Microsoft.Extensions.Configuration.Binder": {
"type": "Direct",
"requested": "[7.0.0, )",
"resolved": "7.0.0",
"contentHash": "tgU4u7bZsoS9MKVRiotVMAwHtbREHr5/5zSEV+JPhg46+ox47Au84E3D2IacAaB0bk5ePNaNieTlPrfjbbRJkg==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
}
},
"Microsoft.Extensions.Configuration.CommandLine": { "Microsoft.Extensions.Configuration.CommandLine": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.0, )", "requested": "[7.0.0, )",
@@ -101,30 +92,30 @@
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.1.0, )", "requested": "[5.2.0, )",
"resolved": "5.1.0", "resolved": "5.2.0",
"contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ==" "contentHash": "uYBgseY0m/9lQUbZYGsQsTBFOWrfs3iaekzzYMH6vFmpoOAvV8/bp1XxG/suZkwB5h8nAiTJAp7VENWRDKtKPA=="
}, },
"nulastudio.NetCoreBeauty": { "nulastudio.NetCoreBeauty": {
"type": "Direct", "type": "Direct",
"requested": "[1.2.9.3, )", "requested": "[1.2.9.5, )",
"resolved": "1.2.9.3", "resolved": "1.2.9.5",
"contentHash": "ToUOoX/sNCg6oeMcSrHYBBRPjKp1gDS7I5WNnY+59t7iNFPcAojpc2lYmgCm3hxwXW/xCxyQIV4k5agegqc3fg==" "contentHash": "0w2QtE3ir6z9J4fZpW1s3/V93dnceUmVm/E1ADhbt0WJ8z1Q3UhYe0Z7rXCy7Pl3y+zRQwERSV9N0aBuGABLjw=="
}, },
"PropertyChanged.Fody": { "PropertyChanged.Fody": {
"type": "Direct", "type": "Direct",
"requested": "[4.0.3, )", "requested": "[4.1.0, )",
"resolved": "4.0.3", "resolved": "4.1.0",
"contentHash": "vRxEDydahhcetswKaoUug7mQywgpZpHoeHZWa7Opb+H+eWPUQo+f+v37Jy+rrG1RVOCkyziTgCkNetXzNlUXJw==", "contentHash": "6v+f9cI8YjnZH2WBHuOqWEAo8DFFNGFIdU8xD3AsL6fhV6Y8oAmVWd7XKk49t8DpeUBwhR/X+97+6Epvek0Y3A==",
"dependencies": { "dependencies": {
"Fody": "6.6.3" "Fody": "6.6.4"
} }
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
"requested": "[1.201.13, )", "requested": "[1.202.120, )",
"resolved": "1.201.13", "resolved": "1.202.120",
"contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==", "contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
"dependencies": { "dependencies": {
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
} }
@@ -143,9 +134,9 @@
}, },
"System.Management": { "System.Management": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.0, )", "requested": "[7.0.2, )",
"resolved": "7.0.0", "resolved": "7.0.2",
"contentHash": "A4jed4QUviDOm7fJNKAJObEAEkEUXmkGL/w0iyCYTzrl1rezTj8LGFHfsVst4Vb9JwFcTpboiDrvdST48avBpw==", "contentHash": "/qEUN91mP/MUQmJnM5y5BdT7ZoPuVrtxnFlbJ8a3kBJGhe2wCzBfnPFtK2wTtEEcf3DMGR9J00GZZfg6HRI6yA==",
"dependencies": { "dependencies": {
"System.CodeDom": "7.0.0" "System.CodeDom": "7.0.0"
} }
@@ -157,15 +148,15 @@
}, },
"Fody": { "Fody": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.6.3", "resolved": "6.6.4",
"contentHash": "X1WKKgSNYVtLzdO8dK3YWmfmljA4L0soePcWNouq9X6WbVF4bmivuJdlhTZx/2L3ml6tMvhFe8skIbVQ24PAYA==" "contentHash": "vLZS+oa+ndUHYPlx/8n9bBTT3dHkCF0riml4paKq4D663+cZd47x1uagQo32D/gKFZ/sfmV1oqKaLmH0elxq4A=="
}, },
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.10.2-prerelease.3", "resolved": "2.10.2-prerelease.4",
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==", "contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"dependencies": { "dependencies": {
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1" "MonoModReorg.RuntimeDetour": "23.3.22.1"
} }
}, },
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": { "JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
@@ -175,8 +166,8 @@
}, },
"MdXaml.Plugins": { "MdXaml.Plugins": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.16.2", "resolved": "1.20.1",
"contentHash": "EOMENHbLkpRk7+UItuutDuETiJpSCZgBATBRk7WSuxO16NUfzrS39ja4RhIQ0Ax8u0RH1wCAS0VINYPZqxfJeg==" "contentHash": "+pLkHJ8LuTVdZ0FM5c9ftjaebN4L7I4ShhXideTSos8rfULFSzLFuBWZot22A9yljuEpn5FbPw04Jrrs/il9ng=="
}, },
"Microsoft.Bcl.AsyncInterfaces": { "Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive", "type": "Transitive",
@@ -185,29 +176,27 @@
}, },
"Microsoft.CodeAnalysis.Analyzers": { "Microsoft.CodeAnalysis.Analyzers": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.3.3", "resolved": "3.3.4",
"contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g=="
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.4.0", "resolved": "4.6.0",
"contentHash": "JfHupS/B7Jb5MZoYkFFABn3mux0wQgxi2D8F/rJYZeRBK2ZOyk7TjQ2Kq9rh6W/DCh0KNbbSbn5qoFar+ueHqw==", "contentHash": "N3uLvekc7DjvE1BX8YW7UH7ldjA4ps/Tun2YmOoSIItJrh1gnQIMKUbK1c3uQUx2NHbLibVZI4o/VB9xb4B7tA==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.3", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "6.0.0", "System.Collections.Immutable": "7.0.0",
"System.Memory": "4.5.5", "System.Reflection.Metadata": "7.0.0",
"System.Reflection.Metadata": "5.0.0",
"System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encoding.CodePages": "7.0.0"
"System.Threading.Tasks.Extensions": "4.5.4"
} }
}, },
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.4.0", "resolved": "4.6.0",
"contentHash": "eD2w0xHRoaqK07hjlOKGR9eLNy3nimiGNeCClNax1NDgS/+DBtBqCjXelOa+TNy99kIB3nHhUqDmr46nDXy/RQ==", "contentHash": "9pyFZUN2Lyu3C0Xfs49kezfH+CzQHMibGsQeQPu0P+GWyH2XXDwmyZ6jAaKQGNUXOJfC2OK01hWMJTJY315uDQ==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Common": "[4.4.0]" "Microsoft.CodeAnalysis.Common": "[4.6.0]"
} }
}, },
"Microsoft.Diagnostics.NETCore.Client": { "Microsoft.Diagnostics.NETCore.Client": {
@@ -236,6 +225,14 @@
"Microsoft.Extensions.Primitives": "7.0.0" "Microsoft.Extensions.Primitives": "7.0.0"
} }
}, },
"Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive",
"resolved": "7.0.4",
"contentHash": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
}
},
"Microsoft.Extensions.Configuration.FileExtensions": { "Microsoft.Extensions.Configuration.FileExtensions": {
"type": "Transitive", "type": "Transitive",
"resolved": "7.0.0", "resolved": "7.0.0",
@@ -308,8 +305,8 @@
}, },
"Microsoft.Xaml.Behaviors.Wpf": { "Microsoft.Xaml.Behaviors.Wpf": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.31", "resolved": "1.1.39",
"contentHash": "LZpuf82ACZWldmfMuv3CTUMDh3o0xo0uHUaybR5HgqVLDBJJ9RZLykplQ/bTJd0/VDt3EhD4iDgUgbdIUAM+Kg==" "contentHash": "8PZKqw9QOcu42xk8puY4P1+EXHL9YGOR9b7qhaYx5cILHul456H073tj99vyPcCt0W0781T9RwHqkx507ZyUpQ=="
}, },
"Mono.Cecil": { "Mono.Cecil": {
"type": "Transitive", "type": "Transitive",
@@ -318,48 +315,48 @@
}, },
"MonoModReorg.Backports": { "MonoModReorg.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==", "contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"dependencies": { "dependencies": {
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"MonoModReorg.Core": { "MonoModReorg.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==", "contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"MonoModReorg.ILHelpers": { "MonoModReorg.ILHelpers": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA==" "contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
}, },
"MonoModReorg.RuntimeDetour": { "MonoModReorg.RuntimeDetour": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==", "contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.1.2-prerelease.1", "MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"MonoModReorg.Utils": { "MonoModReorg.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==", "contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"Newtonsoft.Json": { "Newtonsoft.Json": {
@@ -369,107 +366,112 @@
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "j3ma45boGZADsHpJcu3Y2yq+n2luicC6ezd61TXTTzbOzA452oAPaSsFGUB1stIsuP/DVoqkTzjHXjaCHuJKPQ==", "contentHash": "D1b7gTk1wp7sxscLhS8O/yoErsRVbR4zJvLVD4jo1sgxh42ZOWKpMkhznPUxpvmCxBhw9hAy8/yWrRH91SfdEQ==",
"dependencies": { "dependencies": {
"NuGet.Credentials": "6.4.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"NuGet.ProjectModel": "6.4.0" "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.6.1",
"NuGet.ProjectModel": "6.6.1"
} }
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "srECugLk+LB1bXelDCDhHoi6do/EYTXzuntKhjHraS4roVB3NfWohEdCSiAPdpSV9M40Q6jo6MV2Srml9e+jHQ==", "contentHash": "hW5NtShErO3qbdkyv7doCRsFNK9Rlcc7mVjYM+hg1sOAWheTh/oo95DzNbsZthiqyHZfaioopfWtzmoxNw9h4g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.4.0" "NuGet.Frameworks": "6.6.1"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "vPjauG9AoacEjiZWGIs+d11FCRVmseqAw78FIApfLvZrYMEbbwc9vc0LdC3PpoW5FxYkktyZSiiXVKXGLu+gXw==", "contentHash": "9WbK8wgwPfRpSwuG+ZhMshE48qUYvPIw7VNLCncrq/in4vE6SGsuawPSxPJkkLBtcKTGbPMez5JDvUf6vEBgKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.4.0", "NuGet.Common": "6.6.1",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "tebsxclknVz3D4FrvE2MzVcsOyf6PffjGNQ77X9Yvbj9x5YpVWfumVPetqETcdsNEgiN0bBzfMre33lhrY7Itw==", "contentHash": "TuOlXcE1ajwdtfnQaUjDv2xO2u/WDS56/b5jHfEBZetKfcpT0W3iNOqInVPO0qxRxXK5/HXUKVr2Pya1LsVVnA==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.4.0" "NuGet.Protocol": "6.6.1"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "AKomZEKuhQlshujuiHbKvwl2cZNGq3SHsXFbpjCfCjMFMLwwA8saJGQQZp1lzsqQWcQWa6hLOcPtm7T3rd0SVg==", "contentHash": "K+EXXLU37PBnwLGx6WnVGxlfWYkdedvUUOeDMERXelNgjg20irtKf3hk+wGB7NmxAdNY9/gGcOgSDOV+M0w3Jg==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.4.0", "NuGet.Configuration": "6.6.1",
"NuGet.LibraryModel": "6.4.0", "NuGet.LibraryModel": "6.6.1",
"NuGet.Protocol": "6.4.0" "NuGet.Protocol": "6.6.1"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "qcufbjJIDtyY/Hah7JJfcRVpRYM3scgPqYBnukjO9kfADCFGr2azvVBozuwzljA6w/cR3w8bXLq6vW5xGrsmHw==" "contentHash": "iRtDhL0zPqVw037fHEK9bQljTKPuOHhfIkz86/IH2P8eetr910HTTe5G8lJTuzZHh592Ze/sYhh173HIFjPSfg=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "K6ROQpWr34Aje81G0HfipiznLTB8vD4BO8sF6FEwx1KjJVdFkSmGZPmAhc6L1vZPs8TKY5BqoH72zG13zVzW2w==", "contentHash": "B0KH19sNNUq56YfEozIsIpk8EOyolG0LRT+hqG1/mhuXlQFiP9BgT6pZgwLQVLUl9YBDx3+KWQQbl6pz8Yh/Sw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.4.0", "NuGet.Common": "6.6.1",
"NuGet.Versioning": "6.4.0" "NuGet.Versioning": "6.6.1"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "aR10aYqcUMGC2mwMGH5rls/MGaz3EVH8DKTTHQ/EC91hXNtrCTTAQonaRR+v1EItcoxtQeZ/WQOorv4z270Tgg==", "contentHash": "GwhFi2Ep4YzAGQFYz1OsMVNfiJ1M46nyCgHQ7xjJSMvxDYFgodR1RqVugWFMbIUUq6I8iYASwp5lpHXvITeuIQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.1", "Newtonsoft.Json": "13.0.1",
"NuGet.Configuration": "6.4.0", "NuGet.Configuration": "6.6.1",
"NuGet.Versioning": "6.4.0", "NuGet.Versioning": "6.6.1",
"System.Security.Cryptography.Cng": "5.0.0", "System.Security.Cryptography.Cng": "5.0.0",
"System.Security.Cryptography.Pkcs": "5.0.0" "System.Security.Cryptography.Pkcs": "5.0.0"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "eW9Q7vPk8cpXDd5b+vtIPkl8dSDCPkPJPrjXPTfZGxhstldnhJrj1XPaonsDZLQ24YY7LrYCzC0BiHh3iO5zUA==", "contentHash": "CEyRXXvgIoEQBWn3WZupjkIVC6rPcGUAO5p4Gz+fnF8kcefWQOXHfnOE+UKZ0WwAJG5iMWRvXBKAGOuFiFhNpQ==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.4.0" "NuGet.DependencyResolver.Core": "6.6.1"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "KIPjsWP0P3EMsDsXaa6YBCTvYKur/zI0luS1kO5G37ci8mHs2kJFsuG5qaMhGvgyHASu54sxlic1n1oza2Pcbw==", "contentHash": "HhKLsK6Q0NNp6qb0T26GLR5gCTRZu+gzqDVK4xqXHZmsolaDVIdIYpn44b2etaVYLzNJCvgRkw+I422u2bIvMw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.4.0" "NuGet.Packaging": "6.6.1"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "YE8p3TpX4jIw+Gb24maE8YRDoqWA4imLmCbdOj5IvslLrZJXQ8akeFOGOplxICNVevON1g1SFYT2+cq4yy0nQQ==" "contentHash": "Wm/AOFICTIrCgbVxv9dNWusraTzcggbo5W4ao7hD8NNVq911an9TGwW+uNuYc8I5PkpTeMuSXneV2u6hbi1P4w=="
}, },
"protobuf-net": { "protobuf-net": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.1.26", "resolved": "3.2.26",
"contentHash": "iy+VROYtWZEqDvkUjS6FfzKZNpWRoVGc5h0cupGQT/37Ox0LxPblRKLnw6V0RT1MPclLo8nZp7E2M0f7PNn/Tw==", "contentHash": "zBzBiKs4yP+tzQOsRA5WbI/zayS6eFv8g0KIKNPI7/RUY1nk9Oe+STmtbUYkNUkO3T3SidEoZv+tF1nmgTSutQ==",
"dependencies": { "dependencies": {
"protobuf-net.Core": "3.1.26" "protobuf-net.Core": "3.2.26"
} }
}, },
"protobuf-net.Core": { "protobuf-net.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.1.26", "resolved": "3.2.26",
"contentHash": "fuKoDWgAf5ju+ixbJoasVFhnUaT0oWUgrWh1AZ5D0Y5keKHpA93vQB5g6aQNtB4zgeQ4hGEeh0MY9bIbAUPgEw==" "contentHash": "s8oJW9dBVxix4p8uqMbeG++DIGjgzOFAKoP2i5wayeeFOKBqG+cCBO2S/CAC4MAFlb5m1Os2m/miLcqRCgqJ7Q==",
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -491,11 +493,8 @@
}, },
"System.Collections.Immutable": { "System.Collections.Immutable": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ=="
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}, },
"System.Formats.Asn1": { "System.Formats.Asn1": {
"type": "Transitive", "type": "Transitive",
@@ -510,15 +509,13 @@
"Microsoft.Bcl.AsyncInterfaces": "6.0.0" "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
} }
}, },
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
},
"System.Reflection.Metadata": { "System.Reflection.Metadata": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.0", "resolved": "7.0.0",
"contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==" "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
@@ -556,21 +553,13 @@
}, },
"System.Text.Encoding.CodePages": { "System.Text.Encoding.CodePages": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ=="
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}, },
"System.Text.Json": { "System.Text.Json": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.1", "resolved": "5.0.2",
"contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ==" "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
},
"System.Threading.Tasks.Extensions": {
"type": "Transitive",
"resolved": "4.5.4",
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
}, },
"Torch.SixLabors.ImageSharp": { "Torch.SixLabors.ImageSharp": {
"type": "Transitive", "type": "Transitive",
@@ -584,26 +573,27 @@
"torch": { "torch": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"ControlzEx": "[5.0.2, )", "ControlzEx": "[6.0.0, )",
"HarmonyX": "[2.10.2-prerelease.3, )", "HarmonyX": "[2.10.2-prerelease.4, )",
"MahApps.Metro": "[2.4.9, )", "MahApps.Metro": "[2.4.9, )",
"Microsoft.CodeAnalysis.CSharp": "[4.4.0, )", "Microsoft.CodeAnalysis.CSharp": "[4.6.0, )",
"Microsoft.CodeAnalysis.Common": "[4.4.0, )", "Microsoft.CodeAnalysis.Common": "[4.6.0, )",
"MonoModReorg.RuntimeDetour": "[23.1.2-prerelease.1, )", "MonoModReorg.RuntimeDetour": "[23.3.22.1, )",
"NLog": "[5.1.0, )", "NLog": "[5.2.0, )",
"System.ComponentModel.Annotations": "[5.0.0, )", "System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )", "Torch.API": "[1.0.0, )",
"Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )", "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )",
"protobuf-net": "[3.1.26, )" "protobuf-net": "[3.2.26, )"
} }
}, },
"torch.api": { "torch.api": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )", "JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
"NLog": "[5.1.0, )", "Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
"NuGet.Commands": "[6.4.0, )", "NLog": "[5.2.0, )",
"NuGet.DependencyResolver.Core": "[6.4.0, )", "NuGet.Commands": "[6.6.1, )",
"NuGet.DependencyResolver.Core": "[6.6.1, )",
"SemanticVersioning": "[2.0.2, )", "SemanticVersioning": "[2.0.2, )",
"System.Linq.Async": "[6.0.1, )" "System.Linq.Async": "[6.0.1, )"
} }
@@ -618,9 +608,9 @@
}, },
"System.Management": { "System.Management": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.0, )", "requested": "[7.0.2, )",
"resolved": "7.0.0", "resolved": "7.0.2",
"contentHash": "A4jed4QUviDOm7fJNKAJObEAEkEUXmkGL/w0iyCYTzrl1rezTj8LGFHfsVst4Vb9JwFcTpboiDrvdST48avBpw==", "contentHash": "/qEUN91mP/MUQmJnM5y5BdT7ZoPuVrtxnFlbJ8a3kBJGhe2wCzBfnPFtK2wTtEEcf3DMGR9J00GZZfg6HRI6yA==",
"dependencies": { "dependencies": {
"System.CodeDom": "7.0.0" "System.CodeDom": "7.0.0"
} }
@@ -648,11 +638,8 @@
}, },
"System.Text.Encoding.CodePages": { "System.Text.Encoding.CodePages": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ=="
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
} }
} }
} }

View File

@@ -17,8 +17,8 @@
</PropertyGroup> </PropertyGroup>
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> --> <!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="NLog" Version="5.1.0" /> <PackageReference Include="NLog" Version="5.2.0" />
<PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit" Version="2.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -58,21 +58,25 @@ namespace Torch.Managers
if (!File.Exists(source)) if (!File.Exists(source))
return; return;
try
{
File.Delete(source);
}
catch (Exception e) when (e is IOException or UnauthorizedAccessException)
{
var tempFilePath = Path.Combine(path, file + ".old"); var tempFilePath = Path.Combine(path, file + ".old");
if (File.Exists(tempFilePath)) if (File.Exists(tempFilePath))
File.Delete(tempFilePath); File.Delete(tempFilePath);
var errorCode = Rename(source, tempFilePath); try
if (Marshal.GetExceptionForHR(errorCode) is { } exception) {
throw exception; File.Move(source, tempFilePath);
}
catch (UnauthorizedAccessException)
{
// ignore
}
}
} }
[LibraryImport("msvcrt", SetLastError = true, EntryPoint = "rename")]
[UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
private static partial int Rename(
[MarshalAs(UnmanagedType.LPWStr)]
string oldpath,
[MarshalAs(UnmanagedType.LPWStr)]
string newpath);
} }
} }

View File

@@ -133,6 +133,12 @@ namespace Torch.Managers.PatchManager.MSIL
case double @double when Operand is MsilOperandInline.MsilOperandDouble operandDouble: case double @double when Operand is MsilOperandInline.MsilOperandDouble operandDouble:
operandDouble.Value = @double; operandDouble.Value = @double;
break; 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(); Labels = instruction.labels.Select(b => new MsilLabel(b)).ToHashSet();
@@ -153,7 +159,10 @@ namespace Torch.Managers.PatchManager.MSIL
MsilOperandInline.MsilOperandDouble msilOperandDouble => msilOperandDouble.Value, MsilOperandInline.MsilOperandDouble msilOperandDouble => msilOperandDouble.Value,
MsilOperandInline.MsilOperandInt32 msilOperandInt32 => msilOperandInt32.Value, MsilOperandInline.MsilOperandInt32 msilOperandInt32 => msilOperandInt32.Value,
MsilOperandInline.MsilOperandInt64 msilOperandInt64 => msilOperandInt64.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.MsilOperandSignature msilOperandSignature => msilOperandSignature.Value,
MsilOperandInline.MsilOperandSingle msilOperandSingle => msilOperandSingle.Value, MsilOperandInline.MsilOperandSingle msilOperandSingle => msilOperandSingle.Value,
MsilOperandInline.MsilOperandString msilOperandString => msilOperandString.Value, MsilOperandInline.MsilOperandString msilOperandString => msilOperandString.Value,

View File

@@ -109,8 +109,15 @@ namespace Torch.Managers
else else
{ {
_fsManager.SoftDelete(extractPath, file.FullName); _fsManager.SoftDelete(extractPath, file.FullName);
try
{
file.ExtractToFile(targetFile, true); file.ExtractToFile(targetFile, true);
} }
catch (Exception e)
{
_log.Warn(e, "unable to extract {0}", targetFile);
}
}
} }
//zip.ExtractToDirectory(extractPath); //throws exceptions sometimes? //zip.ExtractToDirectory(extractPath); //throws exceptions sometimes?

View File

@@ -0,0 +1,162 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using NLog;
using Torch.API;
using Torch.API.Managers;
using Torch.API.WebAPI.Plugins;
using Torch.Managers;
using Torch.Utils;
namespace Torch.Packages;
public class PackageManager : Manager, IPackageManager
{
private readonly PluginManager _pluginManager;
private static readonly ILogger Log = LogManager.GetCurrentClassLogger();
private IPackageResolver? _packageResolver;
public PackageManager(ITorchBase torchInstance, PluginManager pluginManager) : base(torchInstance)
{
_pluginManager = pluginManager;
}
private AssemblyLoadContext? _loadContext;
private ImmutableHashSet<Package> _packages = ImmutableHashSet<Package>.Empty;
private ImmutableDictionary<Package,Assembly[]> _packageAssemblies = ImmutableDictionary<Package, Assembly[]>.Empty;
private DirectoryInfo? _packagesDirectory;
public IReadOnlySet<Package> Packages => _packages;
public bool TryGetPackageAssemblies(Package package, out Assembly[]? assemblies)
{
if (!Packages.Contains(package))
throw new InvalidOperationException($"Package {package.Name} does not exist");
return _packageAssemblies.TryGetValue(package, out assemblies);
}
internal async void LoadAsync(SemaphoreSlim semaphore)
{
_packagesDirectory = Directory.CreateDirectory(Path.Combine(Torch.InstancePath, "Packages"));
_packageResolver = new PackageResolver(new[]
{ // TODO make this configurable
new PackageSource("nuget", "https://api.nuget.org/v3/index.json", new[] { "*" }, PackageSourceType.NuGet)
}, _packagesDirectory);
try
{
var packages =
Torch.Config.Packages.ToImmutableDictionary(b => b[..b.IndexOf(':')], b => b[(b.IndexOf(':') + 1)..]);
await ResolvePackagesAsync(packages);
var resolvedPackages = await _packages.ToAsyncEnumerable()
.SelectAwait(async b =>
{
var reader = await _packageResolver!.GetPackageAsync(b);
var items = await reader.GetItemsAsync();
return (b, items);
}).ToDictionaryAsync(b => b.b.Name, b => b,
StringComparer.OrdinalIgnoreCase);
var dependencies = new Dictionary<PackageDependency, IEnumerable<IPackageItem>>(
resolvedPackages.Values.SelectMany(b => b.items.Dependencies)
.Where(b => !resolvedPackages.ContainsKey(b.Key.Name))
.GroupBy(b => b.Key.Name)
.Select(b => b.MaxBy(c => c.Key.Version)));
_loadContext = new("PackageManager Context");
var dependencyAssemblies = await dependencies.ToAsyncEnumerable().SelectAwait(async pair =>
{
var (dep, items) = pair;
var assemblies = await LoadAssembliesFromItems(items);
return (dep, assemblies);
}).ToDictionaryAsync(b => b.dep, b => b.assemblies);
var packageAssemblies = await resolvedPackages.Values.ToAsyncEnumerable().SelectAwait(async b =>
{
var assemblies = await LoadAssembliesFromItems(b.items.Root);
return (b.b, assemblies);
}).ToDictionaryAsync(b => b.b, b => b.assemblies);
foreach (var assembly in dependencyAssemblies.Values.Concat(packageAssemblies.Values).SelectMany(b => b))
{
TorchLauncher.RegisterAssembly(assembly);
}
foreach (var (package, assemblies) in packageAssemblies)
{
using var hash = MD5.Create();
hash.Initialize();
var guid = new Guid(hash.ComputeHash(Encoding.UTF8.GetBytes(package.Name)));
_pluginManager.InstantiatePlugin(new()
{
Name = package.Name,
Version = package.Version.ToString(),
Guid = guid
}, assemblies);
}
_packageAssemblies = packageAssemblies.ToImmutableDictionary();
}
finally
{
semaphore.Release();
}
}
private async Task<Assembly[]> LoadAssembliesFromItems(IEnumerable<IPackageItem> items)
{
var dictionary = items.ToImmutableDictionary(b => b.FileName, StringComparer.OrdinalIgnoreCase);
var assemblies = await dictionary
.Where(b => Path.GetExtension(b.Key)
.Equals("dll", StringComparison.OrdinalIgnoreCase))
.ToAsyncEnumerable()
.SelectAwait(async b =>
{
dictionary.TryGetValue(
Path.ChangeExtension(b.Key, "pdb"), out var pdbItem);
return await LoadFromStream(b.Key, b.Value, pdbItem);
}).ToArrayAsync();
return assemblies;
}
private async ValueTask<Assembly> LoadFromStream(string key, IPackageItem dllItem, IPackageItem? pdbItem)
{
if (_loadContext is null)
throw new InvalidOperationException("Load Context should be initialized before calling the method");
Log.Trace("Loading {0}", key);
await using var dll = await dllItem.OpenFileAsync();
if (pdbItem is null)
return _loadContext.LoadFromStream(dll);
await using var pdb = await pdbItem.OpenFileAsync();
return _loadContext.LoadFromStream(dll, pdb);
}
private async Task ResolvePackagesAsync(IReadOnlyDictionary<string, string> requestedPackages)
{
Log.Info("Resolving packages");
var packages = await _packageResolver!.ResolvePackagesAsync(requestedPackages);
_packages = packages.ToImmutableHashSet();
Log.Info("Got {0} packages", _packages.Count);
}
}

View File

@@ -10,6 +10,7 @@ using Torch.Managers.PatchManager;
using Torch.Managers.PatchManager.MSIL; using Torch.Managers.PatchManager.MSIL;
using Torch.Utils; using Torch.Utils;
using VRage.Game; using VRage.Game;
using VRage.GameServices;
namespace Torch.Patches namespace Torch.Patches
{ {
@@ -31,7 +32,7 @@ namespace Torch.Patches
} }
public static void Postfix(MyWorkshop.ResultData __result, List<MyObjectBuilder_Checkpoint.ModItem> mods) public static void Postfix(MyWorkshop.ResultData __result, List<MyObjectBuilder_Checkpoint.ModItem> mods)
{ {
if (__result.Success) return; if (__result.Result is MyGameServiceCallResult.OK) return;
_log.Warn("Missing Mods:"); _log.Warn("Missing Mods:");
var mismatchMods = mods.Where(b => __result.Mods.All(c => b.PublishedFileId != c.Id)); var mismatchMods = mods.Where(b => __result.Mods.All(c => b.PublishedFileId != c.Id));
foreach (var mod in mismatchMods) foreach (var mod in mismatchMods)

View File

@@ -1,139 +0,0 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.CompilerServices;
using Sandbox;
using Sandbox.Game.Entities;
using Torch.Utils;
using VRage.Game.Common;
using VRage.Game.Components;
using VRage.Game.Entity;
using VRage.ObjectBuilders;
using VRage.Plugins;
using VRage.Utils;
namespace Torch.Patches
{
/// <summary>
/// There are places in static ctors where the registered assembly depends on the <see cref="Assembly.GetCallingAssembly"/>
/// or <see cref="MyPlugins"/>. Here we force those registrations with the proper assemblies to ensure they work correctly.
/// </summary>
internal static class ObjectFactoryInitPatch
{
#pragma warning disable 649
[ReflectedGetter(Name = "m_objectFactory", TypeName = "Sandbox.Game.Entities.MyEntityFactory, Sandbox.Game")]
private static Func<MyObjectFactory<MyEntityTypeAttribute, MyEntity>> EntityFactoryObjectFactory;
#pragma warning restore 649
internal static void ForceRegisterAssemblies()
{
var userAssemblies = MyPlugins.UserAssemblies;
// static MyEntities() called by MySandboxGame.ForceStaticCtor
RuntimeHelpers.RunClassConstructor(typeof(MyEntities).TypeHandle);
{
MyObjectFactory<MyEntityTypeAttribute, MyEntity> factory = EntityFactoryObjectFactory();
ObjectFactory_RegisterFromAssemblySafe(factory, typeof(MySandboxGame).Assembly); // calling assembly
ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.GameAssembly);
ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.SandboxAssembly);
//ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.UserAssembly);
if (userAssemblies != null)
{
foreach (var assembly in userAssemblies)
{
ObjectFactory_RegisterFromAssemblySafe(factory, assembly);
}
}
}
// static MyGuiManager():
// MyGuiControlsFactory.RegisterDescriptorsFromAssembly();
// static MyComponentTypeFactory() called by MyComponentContainer.Add
RuntimeHelpers.RunClassConstructor(typeof(MyComponentTypeFactory).TypeHandle);
{
ComponentTypeFactory_RegisterFromAssemblySafe(typeof(MyComponentContainer).Assembly); // calling assembly
ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxAssembly);
ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.GameAssembly);
ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxGameAssembly);
//ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.UserAssembly);
if (userAssemblies != null)
{
foreach (var assembly in userAssemblies)
{
ComponentTypeFactory_RegisterFromAssemblySafe(assembly);
}
}
}
MyEntities.Orchestrator = new MyParallelEntityUpdateOrchestrator();
// static MyObjectPoolManager()
// Render, so should be fine.
}
#region MyObjectFactory Adders
private static void ObjectFactory_RegisterDescriptorSafe<TAttribute, TCreatedObjectBase>(
MyObjectFactory<TAttribute, TCreatedObjectBase> factory, TAttribute descriptor, Type type) where TAttribute : MyFactoryTagAttribute where TCreatedObjectBase : class
{
if (factory.Attributes.TryGetValue(type, out _))
return;
if (descriptor.ObjectBuilderType != null && factory.TryGetProducedType(descriptor.ObjectBuilderType) != null)
return;
if (typeof(MyObjectBuilder_Base).IsAssignableFrom(descriptor.ProducedType) &&
factory.TryGetProducedType(descriptor.ProducedType) != null)
return;
factory.RegisterDescriptor(descriptor, type);
}
private static void ObjectFactory_RegisterFromAssemblySafe<TAttribute, TCreatedObjectBase>(MyObjectFactory<TAttribute, TCreatedObjectBase> factory, Assembly assembly) where TAttribute : MyFactoryTagAttribute where TCreatedObjectBase : class
{
if (assembly == null)
{
return;
}
foreach (Type type in assembly.GetTypes())
{
foreach (TAttribute descriptor in type.GetCustomAttributes<TAttribute>())
{
ObjectFactory_RegisterDescriptorSafe(factory, descriptor, type);
}
}
}
#endregion
#region MyComponentTypeFactory Adders
[ReflectedGetter(Name = "m_idToType", Type = typeof(MyComponentTypeFactory))]
private static Func<Dictionary<MyStringId, Type>> ComponentTypeFactoryIdToType = null!;
[ReflectedGetter(Name = "m_typeToId", Type = typeof(MyComponentTypeFactory))]
private static Func<Dictionary<Type, MyStringId>> ComponentTypeFactoryTypeToId = null!;
[ReflectedGetter(Name = "m_typeToContainerComponentType", Type = typeof(MyComponentTypeFactory))]
private static Func<Dictionary<Type, Type>> ComponentTypeFactoryContainerComponentType = null!;
private static void ComponentTypeFactory_RegisterFromAssemblySafe(Assembly assembly)
{
if (assembly == null)
return;
foreach (Type type in assembly.GetTypes())
if (typeof(MyComponentBase).IsAssignableFrom(type))
{
ComponentTypeFactory_AddIdSafe(type, MyStringId.GetOrCompute(type.Name));
ComponentTypeFactory_RegisterComponentTypeAttributeSafe(type);
}
}
private static void ComponentTypeFactory_RegisterComponentTypeAttributeSafe(Type type)
{
Type componentType = type.GetCustomAttribute<MyComponentTypeAttribute>(true)?.ComponentType;
if (componentType != null)
ComponentTypeFactoryContainerComponentType()[type] = componentType;
}
private static void ComponentTypeFactory_AddIdSafe(Type type, MyStringId id)
{
ComponentTypeFactoryIdToType()[id] = type;
ComponentTypeFactoryTypeToId()[type] = id;
}
#endregion
}
}

View File

@@ -58,10 +58,10 @@ namespace Torch.Patches
typeof(TypeConverter).Assembly.Location, typeof(TypeConverter).Assembly.Location,
typeof(System.Diagnostics.TraceSource).Assembly.Location, typeof(System.Diagnostics.TraceSource).Assembly.Location,
typeof(System.Security.Policy.Evidence).Assembly.Location, typeof(System.Security.Policy.Evidence).Assembly.Location,
typeof(ProtoBuf.Meta.RuntimeTypeModel).Assembly.Location, Path.Combine(baseDir, "System.Xml.ReaderWriter.dll"),
typeof(ProtoContractAttribute).Assembly.Location,
Path.Combine(baseDir, "netstandard.dll"), Path.Combine(baseDir, "netstandard.dll"),
Path.Combine(baseDir, "System.Runtime.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.Game.dll"),
Path.Combine(MyFileSystem.ExePath, "Sandbox.Common.dll"), Path.Combine(MyFileSystem.ExePath, "Sandbox.Common.dll"),
Path.Combine(MyFileSystem.ExePath, "Sandbox.Graphics.dll"), Path.Combine(MyFileSystem.ExePath, "Sandbox.Graphics.dll"),
@@ -83,14 +83,6 @@ namespace Torch.Patches
using var batch = MyScriptCompiler.Static.Whitelist.OpenBatch(); using var batch = MyScriptCompiler.Static.Whitelist.OpenBatch();
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(ConcurrentQueue<>)); 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; return false;
} }

View File

@@ -52,7 +52,39 @@ namespace Torch.Managers
/// <inheritdoc /> /// <inheritdoc />
public IReadOnlyDictionary<Guid, ITorchPlugin> Plugins => _plugins.AsReadOnlyObservable(); public IReadOnlyDictionary<Guid, ITorchPlugin> Plugins => _plugins.AsReadOnlyObservable();
public event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded; private Action<IReadOnlyCollection<ITorchPlugin>> _pluginsLoaded;
private bool _loaded;
public event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded
{
add
{
var action = _pluginsLoaded;
Action<IReadOnlyCollection<ITorchPlugin>> action2;
do
{
action2 = action;
var action3 = (Action<IReadOnlyCollection<ITorchPlugin>>)Delegate.Combine(action2, value);
action = Interlocked.CompareExchange(ref _pluginsLoaded, action3, action2);
}
while (action != action2);
if (_loaded)
value(_plugins.Values.AsReadOnly());
}
remove
{
var action = _pluginsLoaded;
Action<IReadOnlyCollection<ITorchPlugin>> action2;
do
{
action2 = action;
var action3 = (Action<IReadOnlyCollection<ITorchPlugin>>)Delegate.Remove(action2, value);
action = Interlocked.CompareExchange(ref _pluginsLoaded, action3, action2);
}
while (action != action2);
}
}
public PluginManager(ITorchBase torchInstance) : base(torchInstance) public PluginManager(ITorchBase torchInstance) : base(torchInstance)
{ {
@@ -145,7 +177,8 @@ namespace Torch.Managers
plugin.Init(Torch); plugin.Init(Torch);
} }
_log.Info($"Loaded {_plugins.Count} plugins."); _log.Info($"Loaded {_plugins.Count} plugins.");
PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly()); _loaded = true;
_pluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
return; return;
} }
@@ -220,7 +253,8 @@ namespace Torch.Managers
plugin.Init(Torch); plugin.Init(Torch);
} }
_log.Info($"Loaded {_plugins.Count} plugins."); _log.Info($"Loaded {_plugins.Count} plugins.");
PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly()); _loaded = true;
_pluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
} }
//debug flag is set when the user asks us to run with a specific plugin for plugin development debug //debug flag is set when the user asks us to run with a specific plugin for plugin development debug
@@ -386,11 +420,7 @@ namespace Torch.Managers
} }
var harmonyAssembly = assemblies.FirstOrDefault(b => b.FullName?.StartsWith("0Harmony") == true); var harmonyAssembly = assemblies.FirstOrDefault(b => b.FullName?.StartsWith("0Harmony") == true);
if (harmonyAssembly is { }) if (harmonyAssembly is { }) assemblies.Remove(harmonyAssembly);
{
_log.Warn($"Plugin {item.Manifest.Name} is using harmony library, logic collision between plugins could be encountered!");
assemblies.Remove(harmonyAssembly);
}
RegisterAllAssemblies(assemblies); RegisterAllAssemblies(assemblies);
InstantiatePlugin(item.Manifest, assemblies); InstantiatePlugin(item.Manifest, assemblies);

View File

@@ -49,8 +49,6 @@ namespace Torch.Session
public TorchSessionManager(ITorchBase torchInstance) : base(torchInstance) public TorchSessionManager(ITorchBase torchInstance) : base(torchInstance)
{ {
_overrideMods = new Dictionary<ulong, MyObjectBuilder_Checkpoint.ModItem>(); _overrideMods = new Dictionary<ulong, MyObjectBuilder_Checkpoint.ModItem>();
if (Torch.Config.UgcServiceType == UGCServiceType.Steam)
_overrideMods.Add(ModCommunication.MOD_ID, ModItemUtils.Create(ModCommunication.MOD_ID));
} }
/// <inheritdoc/> /// <inheritdoc/>
@@ -193,6 +191,8 @@ namespace Torch.Session
MySession.AfterLoading += SessionLoaded; MySession.AfterLoading += SessionLoaded;
MySession.OnUnloading += SessionUnloading; MySession.OnUnloading += SessionUnloading;
MySession.OnUnloaded += SessionUnloaded; MySession.OnUnloaded += SessionUnloaded;
if (Torch.Config.UgcServiceType == UGCServiceType.Steam)
_overrideMods.Add(ModCommunication.MOD_ID, ModItemUtils.Create(ModCommunication.MOD_ID));
} }

View File

@@ -23,19 +23,19 @@
<Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" /> <Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" />
<ItemGroup> <ItemGroup>
<PackageReference Include="ControlzEx" Version="5.0.2" /> <PackageReference Include="ControlzEx" Version="6.0.0" />
<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="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" />
<PackageReference Include="MahApps.Metro" Version="2.4.9" /> <PackageReference Include="MahApps.Metro" Version="2.4.9" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.6.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.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="NLog" Version="5.2.0" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
<PackageReference Include="protobuf-net" Version="3.1.26" /> <PackageReference Include="protobuf-net" Version="3.2.26" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" /> <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13"> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile</IncludeAssets> <IncludeAssets>compile</IncludeAssets>
</PackageReference> </PackageReference>

View File

@@ -5,6 +5,7 @@ using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
using NLog; using NLog;
using Sandbox; using Sandbox;
using Sandbox.Game; using Sandbox.Game;
@@ -59,6 +60,8 @@ namespace Torch
/// <inheritdoc /> /// <inheritdoc />
public ITorchConfig Config { get; protected set; } public ITorchConfig Config { get; protected set; }
public abstract IConfiguration Configuration { get; }
/// <inheritdoc /> /// <inheritdoc />
public SemanticVersioning.Version TorchVersion { get; } public SemanticVersioning.Version TorchVersion { get; }
public string InstancePath { get; protected init;} public string InstancePath { get; protected init;}
@@ -114,9 +117,9 @@ namespace Torch
#pragma warning restore CS0618 #pragma warning restore CS0618
var sessionManager = new TorchSessionManager(this); var sessionManager = new TorchSessionManager(this);
sessionManager.AddFactory((x) => Sync.IsServer ? new ChatManagerServer(this) : new ChatManagerClient(this)); sessionManager.AddFactory(_ => Sync.IsServer ? new ChatManagerServer(this) : new ChatManagerClient(this));
sessionManager.AddFactory((x) => Sync.IsServer ? new CommandManager(this) : null); sessionManager.AddFactory(_ => Sync.IsServer ? new CommandManager(this) : null);
sessionManager.AddFactory((x) => new EntityManager(this)); sessionManager.AddFactory(_ => new EntityManager(this));
Managers.AddManager(sessionManager); Managers.AddManager(sessionManager);
Managers.AddManager(new PatchManager(this)); Managers.AddManager(new PatchManager(this));
@@ -133,13 +136,7 @@ namespace Torch
GameStateChanged += (game, state) => GameStateChanged += (game, state) =>
{ {
if (state == TorchGameState.Created) if (state == TorchGameState.Created)
{
// If the attached assemblies change (MySandboxGame.ctor => MySandboxGame.ParseArgs => MyPlugins.RegisterFromArgs)
// attach assemblies to object factories again.
ObjectFactoryInitPatch.ForceRegisterAssemblies();
// safe to commit here; all important static ctors have run
PatchManager.CommitInternal(); PatchManager.CommitInternal();
}
}; };
var harmonyLog = LogManager.GetLogger("HarmonyX"); var harmonyLog = LogManager.GetLogger("HarmonyX");
@@ -259,7 +256,6 @@ namespace Torch
public virtual void Init() public virtual void Init()
{ {
Debug.Assert(!_init, "Torch instance is already initialized."); Debug.Assert(!_init, "Torch instance is already initialized.");
ObjectFactoryInitPatch.ForceRegisterAssemblies();
VRageGame.SetupVersionInfo(); VRageGame.SetupVersionInfo();
Debug.Assert(MyPerGameSettings.BasicGameInfo.GameVersion != null, "MyPerGameSettings.BasicGameInfo.GameVersion != null"); Debug.Assert(MyPerGameSettings.BasicGameInfo.GameVersion != null, "MyPerGameSettings.BasicGameInfo.GameVersion != null");

View File

@@ -47,7 +47,7 @@ namespace Torch.Utils
private static void CopyNative() 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"); Log.Warn("Torch directory is readonly. You should copy steam_api64.dll, Havok.dll from bin manually");
return; return;

View File

@@ -8,6 +8,7 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Havok; using Havok;
using Microsoft.Extensions.Configuration;
using NLog; using NLog;
using NLog.Fluent; using NLog.Fluent;
using Sandbox; using Sandbox;
@@ -30,6 +31,7 @@ using VRage.Dedicated;
using VRage.EOS; using VRage.EOS;
using VRage.FileSystem; using VRage.FileSystem;
using VRage.Game; using VRage.Game;
using VRage.Game.ModAPI;
using VRage.Game.ObjectBuilder; using VRage.Game.ObjectBuilder;
using VRage.Game.SessionComponents; using VRage.Game.SessionComponents;
using VRage.GameServices; using VRage.GameServices;
@@ -165,11 +167,14 @@ namespace Torch
_tweakGameSettings(); _tweakGameSettings();
MyFileSystem.Reset(); MyFileSystem.Reset();
MyInitializer.InvokeBeforeRun(_appSteamId, _appName, _userDataPath); MyInitializer.InvokeBeforeRun(_appSteamId, _appName, MyVRage.Platform.System.GetRootPath(), _userDataPath);
_log.Info("Loading Dedicated Config"); _log.Info("Loading Dedicated Config");
// object created in SpaceEngineersGame.SetupPerGameSettings() // object created in SpaceEngineersGame.SetupPerGameSettings()
MySandboxGame.ConfigDedicated.Load(); MySandboxGame.ConfigDedicated.Load();
ApplyConfiguration(MySandboxGame.ConfigDedicated);
MyPlatformGameSettings.CONSOLE_COMPATIBLE = MySandboxGame.ConfigDedicated.ConsoleCompatibility; MyPlatformGameSettings.CONSOLE_COMPATIBLE = MySandboxGame.ConfigDedicated.ConsoleCompatibility;
//Type.GetType("VRage.Steam.MySteamService, VRage.Steam").GetProperty("IsActive").GetSetMethod(true).Invoke(service, new object[] {SteamAPI.Init()}); //Type.GetType("VRage.Steam.MySteamService, VRage.Steam").GetProperty("IsActive").GetSetMethod(true).Invoke(service, new object[] {SteamAPI.Init()});
@@ -193,7 +198,7 @@ namespace Torch
{ {
service = MyEOSService.Create(); service = MyEOSService.Create();
MyEOSService.InitNetworking(dedicated, MyEOSService.InitNetworking(dedicated, true, //true because using Eos
"Space Engineers", "Space Engineers",
service, service,
"xyza7891A4WeGrpP85BTlBa3BSfUEABN", "xyza7891A4WeGrpP85BTlBa3BSfUEABN",
@@ -225,7 +230,8 @@ namespace Torch
MyGameService.WorkshopService.AddAggregate(MyModIoService.Create(service, "spaceengineers", "264", MyGameService.WorkshopService.AddAggregate(MyModIoService.Create(service, "spaceengineers", "264",
"1fb4489996a5e8ffc6ec1135f9985b5b", "331", "f2b64abe55452252b030c48adc0c1f0e", "1fb4489996a5e8ffc6ec1135f9985b5b", "331", "f2b64abe55452252b030c48adc0c1f0e",
MyPlatformGameSettings.UGC_TEST_ENVIRONMENT, true)); MyPlatformGameSettings.UGC_TEST_ENVIRONMENT, true, MyPlatformGameSettings.MODIO_PLATFORM,
MyPlatformGameSettings.MODIO_PORTAL));
if (!isEos && !MyGameService.HasGameServer) if (!isEos && !MyGameService.HasGameServer)
{ {
@@ -300,6 +306,18 @@ namespace Torch
MyGlobalTypeMetadata.Static.Init(false); MyGlobalTypeMetadata.Static.Init(false);
} }
private void ApplyConfiguration(IMyConfigDedicated dedicated)
{
var config = _torch.Configuration.GetSection("DedicatedServer");
dedicated.ServerPort = config.GetValue("Port", dedicated.ServerPort);
dedicated.ConsoleCompatibility = config.GetValue("ConsoleCompatibility", dedicated.ConsoleCompatibility);
dedicated.IP = config.GetValue("Ip", dedicated.IP);
dedicated.WorldName = config.GetValue("WorldName", dedicated.WorldName);
dedicated.ServerName = config.GetValue("ServerName", dedicated.ServerName);
dedicated.ServerDescription = config.GetValue("ServerDescription", dedicated.ServerDescription);
}
private void Destroy() private void Destroy()
{ {
_game.Dispose(); _game.Dispose();

View File

@@ -4,21 +4,21 @@
"net7.0-windows7.0": { "net7.0-windows7.0": {
"ControlzEx": { "ControlzEx": {
"type": "Direct", "type": "Direct",
"requested": "[5.0.2, )", "requested": "[6.0.0, )",
"resolved": "5.0.2", "resolved": "6.0.0",
"contentHash": "f724LoDJ36LxaLR62G4ek9ZAJI8BiiYRJJ04furC/qjXSeIwU0qmHFIe19xB1/FwxyZjevdFguEr9ZUjf3dZgw==", "contentHash": "MEaqj6ienvKR4E7QJ3vwzo2vrdy2Kqw9Z3CudY5iUixR5iMYeLoMlks7EiABsz4WqDsgVLd9u7fixmCOGU+4ow==",
"dependencies": { "dependencies": {
"Microsoft.Xaml.Behaviors.Wpf": "1.1.31", "Microsoft.Xaml.Behaviors.Wpf": "1.1.39",
"System.Text.Json": "5.0.1" "System.Text.Json": "5.0.2"
} }
}, },
"HarmonyX": { "HarmonyX": {
"type": "Direct", "type": "Direct",
"requested": "[2.10.2-prerelease.3, )", "requested": "[2.10.2-prerelease.4, )",
"resolved": "2.10.2-prerelease.3", "resolved": "2.10.2-prerelease.4",
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==", "contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"dependencies": { "dependencies": {
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1" "MonoModReorg.RuntimeDetour": "23.3.22.1"
} }
}, },
"InfoOf.Fody": { "InfoOf.Fody": {
@@ -41,46 +41,44 @@
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Direct", "type": "Direct",
"requested": "[4.4.0, )", "requested": "[4.6.0, )",
"resolved": "4.4.0", "resolved": "4.6.0",
"contentHash": "JfHupS/B7Jb5MZoYkFFABn3mux0wQgxi2D8F/rJYZeRBK2ZOyk7TjQ2Kq9rh6W/DCh0KNbbSbn5qoFar+ueHqw==", "contentHash": "N3uLvekc7DjvE1BX8YW7UH7ldjA4ps/Tun2YmOoSIItJrh1gnQIMKUbK1c3uQUx2NHbLibVZI4o/VB9xb4B7tA==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.3", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "6.0.0", "System.Collections.Immutable": "7.0.0",
"System.Memory": "4.5.5", "System.Reflection.Metadata": "7.0.0",
"System.Reflection.Metadata": "5.0.0",
"System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encoding.CodePages": "7.0.0"
"System.Threading.Tasks.Extensions": "4.5.4"
} }
}, },
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Direct", "type": "Direct",
"requested": "[4.4.0, )", "requested": "[4.6.0, )",
"resolved": "4.4.0", "resolved": "4.6.0",
"contentHash": "eD2w0xHRoaqK07hjlOKGR9eLNy3nimiGNeCClNax1NDgS/+DBtBqCjXelOa+TNy99kIB3nHhUqDmr46nDXy/RQ==", "contentHash": "9pyFZUN2Lyu3C0Xfs49kezfH+CzQHMibGsQeQPu0P+GWyH2XXDwmyZ6jAaKQGNUXOJfC2OK01hWMJTJY315uDQ==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Common": "[4.4.0]" "Microsoft.CodeAnalysis.Common": "[4.6.0]"
} }
}, },
"MonoModReorg.RuntimeDetour": { "MonoModReorg.RuntimeDetour": {
"type": "Direct", "type": "Direct",
"requested": "[23.1.2-prerelease.1, )", "requested": "[23.3.22.1, )",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==", "contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.1.2-prerelease.1", "MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.1.0, )", "requested": "[5.2.0, )",
"resolved": "5.1.0", "resolved": "5.2.0",
"contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ==" "contentHash": "uYBgseY0m/9lQUbZYGsQsTBFOWrfs3iaekzzYMH6vFmpoOAvV8/bp1XxG/suZkwB5h8nAiTJAp7VENWRDKtKPA=="
}, },
"PropertyChanged.Fody": { "PropertyChanged.Fody": {
"type": "Direct", "type": "Direct",
@@ -93,18 +91,18 @@
}, },
"protobuf-net": { "protobuf-net": {
"type": "Direct", "type": "Direct",
"requested": "[3.1.26, )", "requested": "[3.2.26, )",
"resolved": "3.1.26", "resolved": "3.2.26",
"contentHash": "iy+VROYtWZEqDvkUjS6FfzKZNpWRoVGc5h0cupGQT/37Ox0LxPblRKLnw6V0RT1MPclLo8nZp7E2M0f7PNn/Tw==", "contentHash": "zBzBiKs4yP+tzQOsRA5WbI/zayS6eFv8g0KIKNPI7/RUY1nk9Oe+STmtbUYkNUkO3T3SidEoZv+tF1nmgTSutQ==",
"dependencies": { "dependencies": {
"protobuf-net.Core": "3.1.26" "protobuf-net.Core": "3.2.26"
} }
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
"requested": "[1.201.13, )", "requested": "[1.202.120, )",
"resolved": "1.201.13", "resolved": "1.202.120",
"contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==", "contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
"dependencies": { "dependencies": {
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
} }
@@ -142,13 +140,47 @@
}, },
"Microsoft.CodeAnalysis.Analyzers": { "Microsoft.CodeAnalysis.Analyzers": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.3.3", "resolved": "3.3.4",
"contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g=="
},
"Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==",
"dependencies": {
"Microsoft.Extensions.Primitives": "7.0.0"
}
},
"Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive",
"resolved": "7.0.4",
"contentHash": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
}
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
"dependencies": {
"Microsoft.Extensions.Primitives": "6.0.0"
}
},
"Microsoft.Extensions.FileSystemGlobbing": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw=="
},
"Microsoft.Extensions.Primitives": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
}, },
"Microsoft.Xaml.Behaviors.Wpf": { "Microsoft.Xaml.Behaviors.Wpf": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.31", "resolved": "1.1.39",
"contentHash": "LZpuf82ACZWldmfMuv3CTUMDh3o0xo0uHUaybR5HgqVLDBJJ9RZLykplQ/bTJd0/VDt3EhD4iDgUgbdIUAM+Kg==" "contentHash": "8PZKqw9QOcu42xk8puY4P1+EXHL9YGOR9b7qhaYx5cILHul456H073tj99vyPcCt0W0781T9RwHqkx507ZyUpQ=="
}, },
"Mono.Cecil": { "Mono.Cecil": {
"type": "Transitive", "type": "Transitive",
@@ -157,36 +189,36 @@
}, },
"MonoModReorg.Backports": { "MonoModReorg.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==", "contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"dependencies": { "dependencies": {
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"MonoModReorg.Core": { "MonoModReorg.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==", "contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1", "MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1" "MonoModReorg.Utils": "23.3.22.1"
} }
}, },
"MonoModReorg.ILHelpers": { "MonoModReorg.ILHelpers": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA==" "contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
}, },
"MonoModReorg.Utils": { "MonoModReorg.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "23.1.2-prerelease.1", "resolved": "23.3.22.1",
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==", "contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1", "MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1" "MonoModReorg.ILHelpers": "23.3.22.1"
} }
}, },
"Newtonsoft.Json": { "Newtonsoft.Json": {
@@ -196,99 +228,104 @@
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "j3ma45boGZADsHpJcu3Y2yq+n2luicC6ezd61TXTTzbOzA452oAPaSsFGUB1stIsuP/DVoqkTzjHXjaCHuJKPQ==", "contentHash": "D1b7gTk1wp7sxscLhS8O/yoErsRVbR4zJvLVD4jo1sgxh42ZOWKpMkhznPUxpvmCxBhw9hAy8/yWrRH91SfdEQ==",
"dependencies": { "dependencies": {
"NuGet.Credentials": "6.4.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"NuGet.ProjectModel": "6.4.0" "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.6.1",
"NuGet.ProjectModel": "6.6.1"
} }
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "srECugLk+LB1bXelDCDhHoi6do/EYTXzuntKhjHraS4roVB3NfWohEdCSiAPdpSV9M40Q6jo6MV2Srml9e+jHQ==", "contentHash": "hW5NtShErO3qbdkyv7doCRsFNK9Rlcc7mVjYM+hg1sOAWheTh/oo95DzNbsZthiqyHZfaioopfWtzmoxNw9h4g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.4.0" "NuGet.Frameworks": "6.6.1"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "vPjauG9AoacEjiZWGIs+d11FCRVmseqAw78FIApfLvZrYMEbbwc9vc0LdC3PpoW5FxYkktyZSiiXVKXGLu+gXw==", "contentHash": "9WbK8wgwPfRpSwuG+ZhMshE48qUYvPIw7VNLCncrq/in4vE6SGsuawPSxPJkkLBtcKTGbPMez5JDvUf6vEBgKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.4.0", "NuGet.Common": "6.6.1",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "tebsxclknVz3D4FrvE2MzVcsOyf6PffjGNQ77X9Yvbj9x5YpVWfumVPetqETcdsNEgiN0bBzfMre33lhrY7Itw==", "contentHash": "TuOlXcE1ajwdtfnQaUjDv2xO2u/WDS56/b5jHfEBZetKfcpT0W3iNOqInVPO0qxRxXK5/HXUKVr2Pya1LsVVnA==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.4.0" "NuGet.Protocol": "6.6.1"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "AKomZEKuhQlshujuiHbKvwl2cZNGq3SHsXFbpjCfCjMFMLwwA8saJGQQZp1lzsqQWcQWa6hLOcPtm7T3rd0SVg==", "contentHash": "K+EXXLU37PBnwLGx6WnVGxlfWYkdedvUUOeDMERXelNgjg20irtKf3hk+wGB7NmxAdNY9/gGcOgSDOV+M0w3Jg==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.4.0", "NuGet.Configuration": "6.6.1",
"NuGet.LibraryModel": "6.4.0", "NuGet.LibraryModel": "6.6.1",
"NuGet.Protocol": "6.4.0" "NuGet.Protocol": "6.6.1"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "qcufbjJIDtyY/Hah7JJfcRVpRYM3scgPqYBnukjO9kfADCFGr2azvVBozuwzljA6w/cR3w8bXLq6vW5xGrsmHw==" "contentHash": "iRtDhL0zPqVw037fHEK9bQljTKPuOHhfIkz86/IH2P8eetr910HTTe5G8lJTuzZHh592Ze/sYhh173HIFjPSfg=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "K6ROQpWr34Aje81G0HfipiznLTB8vD4BO8sF6FEwx1KjJVdFkSmGZPmAhc6L1vZPs8TKY5BqoH72zG13zVzW2w==", "contentHash": "B0KH19sNNUq56YfEozIsIpk8EOyolG0LRT+hqG1/mhuXlQFiP9BgT6pZgwLQVLUl9YBDx3+KWQQbl6pz8Yh/Sw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.4.0", "NuGet.Common": "6.6.1",
"NuGet.Versioning": "6.4.0" "NuGet.Versioning": "6.6.1"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "aR10aYqcUMGC2mwMGH5rls/MGaz3EVH8DKTTHQ/EC91hXNtrCTTAQonaRR+v1EItcoxtQeZ/WQOorv4z270Tgg==", "contentHash": "GwhFi2Ep4YzAGQFYz1OsMVNfiJ1M46nyCgHQ7xjJSMvxDYFgodR1RqVugWFMbIUUq6I8iYASwp5lpHXvITeuIQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.1", "Newtonsoft.Json": "13.0.1",
"NuGet.Configuration": "6.4.0", "NuGet.Configuration": "6.6.1",
"NuGet.Versioning": "6.4.0", "NuGet.Versioning": "6.6.1",
"System.Security.Cryptography.Cng": "5.0.0", "System.Security.Cryptography.Cng": "5.0.0",
"System.Security.Cryptography.Pkcs": "5.0.0" "System.Security.Cryptography.Pkcs": "5.0.0"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "eW9Q7vPk8cpXDd5b+vtIPkl8dSDCPkPJPrjXPTfZGxhstldnhJrj1XPaonsDZLQ24YY7LrYCzC0BiHh3iO5zUA==", "contentHash": "CEyRXXvgIoEQBWn3WZupjkIVC6rPcGUAO5p4Gz+fnF8kcefWQOXHfnOE+UKZ0WwAJG5iMWRvXBKAGOuFiFhNpQ==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.4.0" "NuGet.DependencyResolver.Core": "6.6.1"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "KIPjsWP0P3EMsDsXaa6YBCTvYKur/zI0luS1kO5G37ci8mHs2kJFsuG5qaMhGvgyHASu54sxlic1n1oza2Pcbw==", "contentHash": "HhKLsK6Q0NNp6qb0T26GLR5gCTRZu+gzqDVK4xqXHZmsolaDVIdIYpn44b2etaVYLzNJCvgRkw+I422u2bIvMw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.4.0" "NuGet.Packaging": "6.6.1"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.4.0", "resolved": "6.6.1",
"contentHash": "YE8p3TpX4jIw+Gb24maE8YRDoqWA4imLmCbdOj5IvslLrZJXQ8akeFOGOplxICNVevON1g1SFYT2+cq4yy0nQQ==" "contentHash": "Wm/AOFICTIrCgbVxv9dNWusraTzcggbo5W4ao7hD8NNVq911an9TGwW+uNuYc8I5PkpTeMuSXneV2u6hbi1P4w=="
}, },
"protobuf-net.Core": { "protobuf-net.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.1.26", "resolved": "3.2.26",
"contentHash": "fuKoDWgAf5ju+ixbJoasVFhnUaT0oWUgrWh1AZ5D0Y5keKHpA93vQB5g6aQNtB4zgeQ4hGEeh0MY9bIbAUPgEw==" "contentHash": "s8oJW9dBVxix4p8uqMbeG++DIGjgzOFAKoP2i5wayeeFOKBqG+cCBO2S/CAC4MAFlb5m1Os2m/miLcqRCgqJ7Q==",
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -305,11 +342,8 @@
}, },
"System.Collections.Immutable": { "System.Collections.Immutable": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ=="
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}, },
"System.Formats.Asn1": { "System.Formats.Asn1": {
"type": "Transitive", "type": "Transitive",
@@ -324,15 +358,13 @@
"Microsoft.Bcl.AsyncInterfaces": "6.0.0" "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
} }
}, },
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
},
"System.Reflection.Metadata": { "System.Reflection.Metadata": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.0", "resolved": "7.0.0",
"contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==" "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
@@ -363,29 +395,22 @@
}, },
"System.Text.Encoding.CodePages": { "System.Text.Encoding.CodePages": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ=="
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}, },
"System.Text.Json": { "System.Text.Json": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.1", "resolved": "5.0.2",
"contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ==" "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
},
"System.Threading.Tasks.Extensions": {
"type": "Transitive",
"resolved": "4.5.4",
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
}, },
"torch.api": { "torch.api": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )", "JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
"NLog": "[5.1.0, )", "Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
"NuGet.Commands": "[6.4.0, )", "NLog": "[5.2.0, )",
"NuGet.DependencyResolver.Core": "[6.4.0, )", "NuGet.Commands": "[6.6.1, )",
"NuGet.DependencyResolver.Core": "[6.6.1, )",
"SemanticVersioning": "[2.0.2, )", "SemanticVersioning": "[2.0.2, )",
"System.Linq.Async": "[6.0.1, )" "System.Linq.Async": "[6.0.1, )"
} }