diff --git a/LAUNCH compile.cmd b/LAUNCH compile.cmd index 08bdfa2..0bd872c 100644 --- a/LAUNCH compile.cmd +++ b/LAUNCH compile.cmd @@ -126,7 +126,7 @@ set TESTBUILD=1 @echo %NL% # VMF Merging  -extras\vmfii "%targetvmf%" "%targetvmf%" --fgd "%FGDS%" >> %mapfolder%\%mapname%.log +extras\vmfii "%targetvmf%" "%targetvmf%" --instancedir "%mapfolder%" --fgd "%FGDS%" >> %mapfolder%\%mapname%.log @if ERRORLEVEL 1 goto failed diff --git a/extras/vmfii.deps.json b/extras/vmfii.deps.json new file mode 100644 index 0000000..d50fb40 --- /dev/null +++ b/extras/vmfii.deps.json @@ -0,0 +1,70 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "vmfii/1.0.0": { + "dependencies": { + "Sledge.Formats.GameData": "1.1.3" + }, + "runtime": { + "vmfii.dll": {} + } + }, + "Sledge.Formats/1.1.0": { + "dependencies": { + "System.Numerics.Vectors": "4.5.0" + }, + "runtime": { + "lib/netstandard2.0/Sledge.Formats.dll": { + "assemblyVersion": "1.1.0.0", + "fileVersion": "1.1.0.0" + } + } + }, + "Sledge.Formats.GameData/1.1.3": { + "dependencies": { + "Sledge.Formats": "1.1.0" + }, + "runtime": { + "lib/netstandard2.0/Sledge.Formats.GameData.dll": { + "assemblyVersion": "1.1.3.0", + "fileVersion": "1.1.3.0" + } + } + }, + "System.Numerics.Vectors/4.5.0": {} + } + }, + "libraries": { + "vmfii/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Sledge.Formats/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kf+U49o8m1UBayCUtJs3NPcOOIUdh6qoNbXmTWaN7puyq2oe0i2DEqb3TzXyI7m0kpdFHUhUu8Dnw+5qMmPytA==", + "path": "sledge.formats/1.1.0", + "hashPath": "sledge.formats.1.1.0.nupkg.sha512" + }, + "Sledge.Formats.GameData/1.1.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-qjAFs19K6E7oo8UmHNElFHcGF6Q34sRmDuVDJDRHBZ0y7Oc84Sx88UymtFajBzwB9vCwhB6/aeBrzn6EtS2HeQ==", + "path": "sledge.formats.gamedata/1.1.3", + "hashPath": "sledge.formats.gamedata.1.1.3.nupkg.sha512" + }, + "System.Numerics.Vectors/4.5.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==", + "path": "system.numerics.vectors/4.5.0", + "hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/extras/vmfii.dll b/extras/vmfii.dll new file mode 100644 index 0000000..f370661 Binary files /dev/null and b/extras/vmfii.dll differ diff --git a/extras/vmfii.exe b/extras/vmfii.exe index dfb8289..5eafa1c 100644 Binary files a/extras/vmfii.exe and b/extras/vmfii.exe differ diff --git a/extras/vmfii.runtimeconfig.json b/extras/vmfii.runtimeconfig.json new file mode 100644 index 0000000..74da05a --- /dev/null +++ b/extras/vmfii.runtimeconfig.json @@ -0,0 +1,13 @@ +{ + "runtimeOptions": { + "tfm": "net8.0", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "8.0.0" + }, + "configProperties": { + "System.Reflection.Metadata.MetadataUpdater.IsSupported": false, + "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false + } + } +} \ No newline at end of file