diff --git a/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.deps.json b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.deps.json new file mode 100644 index 0000000..0893fe4 --- /dev/null +++ b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.deps.json @@ -0,0 +1,23 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v5.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v5.0": { + "BitComparer/1.0.0": { + "runtime": { + "BitComparer.dll": {} + } + } + } + }, + "libraries": { + "BitComparer/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.dll b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.dll new file mode 100644 index 0000000..ab4e402 Binary files /dev/null and b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.dll differ diff --git a/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.exe b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.exe new file mode 100644 index 0000000..668a240 Binary files /dev/null and b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.exe differ diff --git a/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.pdb b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.pdb new file mode 100644 index 0000000..d4579ba Binary files /dev/null and b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.pdb differ diff --git a/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.runtimeconfig.dev.json b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.runtimeconfig.dev.json new file mode 100644 index 0000000..9f0864d --- /dev/null +++ b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.runtimeconfig.dev.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "additionalProbingPaths": [ + "C:\\Users\\leon\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\leon\\.nuget\\packages", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ] + } +} \ No newline at end of file diff --git a/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.runtimeconfig.json b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.runtimeconfig.json new file mode 100644 index 0000000..d54914b --- /dev/null +++ b/BitComparer/BitComparer/bin/Release/net5.0/BitComparer.runtimeconfig.json @@ -0,0 +1,12 @@ +{ + "runtimeOptions": { + "tfm": "net5.0", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "5.0.0" + }, + "configProperties": { + "System.Reflection.Metadata.MetadataUpdater.IsSupported": false + } + } +} \ No newline at end of file diff --git a/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.dgspec.json b/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.dgspec.json index e8795ba..d60d039 100644 --- a/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.dgspec.json +++ b/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.dgspec.json @@ -49,7 +49,8 @@ "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -58,7 +59,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.g.props b/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.g.props index b00b4df..d352743 100644 --- a/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.g.props +++ b/BitComparer/BitComparer/obj/BitComparer.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\leon\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.0.0 + 6.3.0 diff --git a/BitComparer/BitComparer/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs b/BitComparer/BitComparer/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2f7e5ec --- /dev/null +++ b/BitComparer/BitComparer/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v5.0", FrameworkDisplayName = "")] diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.AssemblyInfo.cs b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.AssemblyInfo.cs new file mode 100644 index 0000000..5259292 --- /dev/null +++ b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("BitComparer")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("BitComparer")] +[assembly: System.Reflection.AssemblyTitleAttribute("BitComparer")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Von der MSBuild WriteCodeFragment-Klasse generiert. + diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.AssemblyInfoInputs.cache b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.AssemblyInfoInputs.cache new file mode 100644 index 0000000..2573557 --- /dev/null +++ b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +912be47cfdde2a0fb766e6199d333534ae19ecf1 diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.GeneratedMSBuildEditorConfig.editorconfig b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..4b8f021 --- /dev/null +++ b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,10 @@ +is_global = true +build_property.TargetFramework = net5.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = BitComparer +build_property.ProjectDir = D:\Programmierstuff\FiveM\BitComparer\BitComparer\ diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.assets.cache b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.assets.cache new file mode 100644 index 0000000..b313990 Binary files /dev/null and b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.assets.cache differ diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.AssemblyReference.cache b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.AssemblyReference.cache new file mode 100644 index 0000000..7f55138 Binary files /dev/null and b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.AssemblyReference.cache differ diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.CoreCompileInputs.cache b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..b0195a4 --- /dev/null +++ b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +0c7db1ed2cf5119f3adb4414d6582d10a3dda8cf diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.FileListAbsolute.txt b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..7bce324 --- /dev/null +++ b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.csproj.FileListAbsolute.txt @@ -0,0 +1,16 @@ +D:\Programmierstuff\FiveM\BitComparer\BitComparer\bin\Release\net5.0\BitComparer.exe +D:\Programmierstuff\FiveM\BitComparer\BitComparer\bin\Release\net5.0\BitComparer.deps.json +D:\Programmierstuff\FiveM\BitComparer\BitComparer\bin\Release\net5.0\BitComparer.runtimeconfig.json +D:\Programmierstuff\FiveM\BitComparer\BitComparer\bin\Release\net5.0\BitComparer.runtimeconfig.dev.json +D:\Programmierstuff\FiveM\BitComparer\BitComparer\bin\Release\net5.0\BitComparer.dll +D:\Programmierstuff\FiveM\BitComparer\BitComparer\bin\Release\net5.0\BitComparer.pdb +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.csproj.AssemblyReference.cache +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.GeneratedMSBuildEditorConfig.editorconfig +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.AssemblyInfoInputs.cache +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.AssemblyInfo.cs +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.csproj.CoreCompileInputs.cache +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.dll +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\refint\BitComparer.dll +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.pdb +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\BitComparer.genruntimeconfig.cache +D:\Programmierstuff\FiveM\BitComparer\BitComparer\obj\Release\net5.0\ref\BitComparer.dll diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.dll b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.dll new file mode 100644 index 0000000..ab4e402 Binary files /dev/null and b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.dll differ diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.genruntimeconfig.cache b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.genruntimeconfig.cache new file mode 100644 index 0000000..de45cfe --- /dev/null +++ b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.genruntimeconfig.cache @@ -0,0 +1 @@ +813a4a08a6d962b874d1ca7bfa5c33329212f3ec diff --git a/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.pdb b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.pdb new file mode 100644 index 0000000..d4579ba Binary files /dev/null and b/BitComparer/BitComparer/obj/Release/net5.0/BitComparer.pdb differ diff --git a/BitComparer/BitComparer/obj/Release/net5.0/apphost.exe b/BitComparer/BitComparer/obj/Release/net5.0/apphost.exe new file mode 100644 index 0000000..668a240 Binary files /dev/null and b/BitComparer/BitComparer/obj/Release/net5.0/apphost.exe differ diff --git a/BitComparer/BitComparer/obj/Release/net5.0/ref/BitComparer.dll b/BitComparer/BitComparer/obj/Release/net5.0/ref/BitComparer.dll new file mode 100644 index 0000000..22158e9 Binary files /dev/null and b/BitComparer/BitComparer/obj/Release/net5.0/ref/BitComparer.dll differ diff --git a/BitComparer/BitComparer/obj/Release/net5.0/refint/BitComparer.dll b/BitComparer/BitComparer/obj/Release/net5.0/refint/BitComparer.dll new file mode 100644 index 0000000..22158e9 Binary files /dev/null and b/BitComparer/BitComparer/obj/Release/net5.0/refint/BitComparer.dll differ diff --git a/BitComparer/BitComparer/obj/project.assets.json b/BitComparer/BitComparer/obj/project.assets.json index 22f562e..c84aaf2 100644 --- a/BitComparer/BitComparer/obj/project.assets.json +++ b/BitComparer/BitComparer/obj/project.assets.json @@ -56,7 +56,8 @@ "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -65,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/BitComparer/BitComparer/obj/project.nuget.cache b/BitComparer/BitComparer/obj/project.nuget.cache index 233e715..6a73e83 100644 --- a/BitComparer/BitComparer/obj/project.nuget.cache +++ b/BitComparer/BitComparer/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "Xvk+5CVKGj8h74o6hURhfRaRTKqUh1N0cnPp1KZH+0pSzqUPdiSR53ACej3/CtDIyF6WpCxlSSpkHtRwA6bDww==", + "dgSpecHash": "DIssHXs275wL7OF6SMPckcq6+zt2HKhkDbCax3MlxoVNiuU83gbDG0PmYtc3gtUdY/WnabZl09rmBJSUI1fHsw==", "success": true, "projectFilePath": "D:\\Programmierstuff\\FiveM\\BitComparer\\BitComparer\\BitComparer.csproj", "expectedPackageFiles": [], diff --git a/BitComparer/BitComparer/obj/project.packagespec.json b/BitComparer/BitComparer/obj/project.packagespec.json index 9f1ca50..936ebb7 100644 --- a/BitComparer/BitComparer/obj/project.packagespec.json +++ b/BitComparer/BitComparer/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\Programmierstuff\\FiveM\\BitComparer\\BitComparer\\BitComparer.csproj","projectName":"BitComparer","projectPath":"D:\\Programmierstuff\\FiveM\\BitComparer\\BitComparer\\BitComparer.csproj","outputPath":"D:\\Programmierstuff\\FiveM\\BitComparer\\BitComparer\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\Programmierstuff\\FiveM\\BitComparer\\BitComparer\\BitComparer.csproj","projectName":"BitComparer","projectPath":"D:\\Programmierstuff\\FiveM\\BitComparer\\BitComparer\\BitComparer.csproj","outputPath":"D:\\Programmierstuff\\FiveM\\BitComparer\\BitComparer\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/BitComparer/BitComparer/obj/rider.project.restore.info b/BitComparer/BitComparer/obj/rider.project.restore.info index 713b7bc..aa6a024 100644 --- a/BitComparer/BitComparer/obj/rider.project.restore.info +++ b/BitComparer/BitComparer/obj/rider.project.restore.info @@ -1 +1 @@ -16600860087224431 \ No newline at end of file +16640510030535680 \ No newline at end of file diff --git a/CarCombiner/obj/CarCombiner.csproj.nuget.dgspec.json b/CarCombiner/obj/CarCombiner.csproj.nuget.dgspec.json index a7c3eff..b6ce5cf 100644 --- a/CarCombiner/obj/CarCombiner.csproj.nuget.dgspec.json +++ b/CarCombiner/obj/CarCombiner.csproj.nuget.dgspec.json @@ -59,7 +59,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/CarCombiner/obj/CarCombiner.csproj.nuget.g.props b/CarCombiner/obj/CarCombiner.csproj.nuget.g.props index e48cb87..d352743 100644 --- a/CarCombiner/obj/CarCombiner.csproj.nuget.g.props +++ b/CarCombiner/obj/CarCombiner.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\leon\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.2.0 + 6.3.0 diff --git a/CarCombiner/obj/project.assets.json b/CarCombiner/obj/project.assets.json index 46e4d11..489d03b 100644 --- a/CarCombiner/obj/project.assets.json +++ b/CarCombiner/obj/project.assets.json @@ -66,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/CarCombiner/obj/project.nuget.cache b/CarCombiner/obj/project.nuget.cache index 739b25f..09155ea 100644 --- a/CarCombiner/obj/project.nuget.cache +++ b/CarCombiner/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "On8j12M+sTaQsF78o9aCpBUct4vbq/lWPhT59qKy/lbo9BqNkaw0hW/IWxA3DF+WgEYfxoT3yZ40dWtRU0SxVQ==", + "dgSpecHash": "uW+u8Vn/1rsrV87fyIsbhtL2M/bVlJdGhehnNbEpRUHze7oxfPYY/CxipUNyDaIqwc2v5MaALjSic4CGfvSJxQ==", "success": true, "projectFilePath": "D:\\Programmierstuff\\FiveM\\CarCombiner\\CarCombiner.csproj", "expectedPackageFiles": [], diff --git a/CarCombiner/obj/project.packagespec.json b/CarCombiner/obj/project.packagespec.json index 1ace1e0..9847aa9 100644 --- a/CarCombiner/obj/project.packagespec.json +++ b/CarCombiner/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\Programmierstuff\\FiveM\\CarCombiner\\CarCombiner.csproj","projectName":"CarCombiner","projectPath":"D:\\Programmierstuff\\FiveM\\CarCombiner\\CarCombiner.csproj","outputPath":"D:\\Programmierstuff\\FiveM\\CarCombiner\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.400\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\Programmierstuff\\FiveM\\CarCombiner\\CarCombiner.csproj","projectName":"CarCombiner","projectPath":"D:\\Programmierstuff\\FiveM\\CarCombiner\\CarCombiner.csproj","outputPath":"D:\\Programmierstuff\\FiveM\\CarCombiner\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/CarCombiner/obj/rider.project.restore.info b/CarCombiner/obj/rider.project.restore.info index b3e6a55..076051e 100644 --- a/CarCombiner/obj/rider.project.restore.info +++ b/CarCombiner/obj/rider.project.restore.info @@ -1 +1 @@ -16604921526043020 \ No newline at end of file +16635085020394965 \ No newline at end of file diff --git a/CarConverter/CarConverter.csproj b/CarConverter/CarConverter.csproj index bcad79f..7c82544 100644 --- a/CarConverter/CarConverter.csproj +++ b/CarConverter/CarConverter.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {731B2018-840C-43BF-AC9F-E18B73EB901D} - WinExe + Exe CarConverter CarConverter v4.8 diff --git a/CarConverter/Utils.cs b/CarConverter/Utils.cs index d75f469..b0e7b68 100644 --- a/CarConverter/Utils.cs +++ b/CarConverter/Utils.cs @@ -4,7 +4,6 @@ using CodeWalker.GameFiles; namespace CarConverter { public static class Utils { - public const string ManifestContent = @" fx_version 'cerulean' game 'gta5' @@ -30,41 +29,55 @@ data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta' File.Copy(dlcFile, tempFolder + Path.DirectorySeparatorChar + "dlc.rpf"); var manager = new RpfManager(); - manager.Init(Path.GetDirectoryName(tempFolder), status => Console.WriteLine("STATUS: " + status), error => Console.Error.WriteLine("ERROR: " + error)); - + manager.Init(tempFolder, Console.WriteLine, Console.Error.WriteLine); foreach (var rpf in manager.AllRpfs) { foreach (var entry in rpf.AllEntries) { - if (entry.Path.EndsWith(".rpf")) continue; try { var fentry = entry as RpfFileEntry; if (fentry == null) continue; byte[] data = entry.File.ExtractFile(fentry); - if (compress && !entry.Path.Contains("_manifest.ymf")) - data = ResourceBuilder.Compress(data); - var rrfe = fentry as RpfResourceFileEntry; - if (rrfe != null) + if (rrfe != null) { + if (compress && !entry.Name.EndsWith(".ytd")) { + data = ResourceBuilder.Compress(data); + } + data = ResourceBuilder.AddResourceHeader(rrfe, data); + } if (data != null) { - string outPath = targetFolder + entry.Path.Replace("origdlc" + Path.DirectorySeparatorChar + "dlc.rpf", "").Remove(0, 1); - string folder = Path.GetDirectoryName(outPath); + var info = new FileInfo(entry.Name); + string bpath = targetFolder + "\\" + entry.Path.Substring(0, entry.Path.Length - info.Extension.Length); + string fpath = bpath + info.Extension; + int c = 1; + while (File.Exists(fpath)) { + fpath = bpath + "_" + c + info.Extension; + c++; + } - if (!Directory.Exists(folder)) - Directory.CreateDirectory(folder); + string rfolder = Path.GetDirectoryName(fpath); + if (fpath.EndsWith(".rpf")) { + Directory.CreateDirectory(fpath); + continue; + } - File.WriteAllBytes(outPath, data); + if (!Directory.Exists(rfolder)) + Directory.CreateDirectory(rfolder); + File.WriteAllBytes(fpath, data); + } + else { + throw new NullReferenceException("File data is null"); } } catch (Exception e) { - string err = entry.Name + ": " + e.Message; - manager.ErrorLog.Invoke(err); + Console.WriteLine(e); + throw; } } } - + Directory.Delete(tempFolder, true); } } diff --git a/CarConverter/bin/Release/CarConverter.exe b/CarConverter/bin/Release/CarConverter.exe index 77639eb..98ee24c 100644 Binary files a/CarConverter/bin/Release/CarConverter.exe and b/CarConverter/bin/Release/CarConverter.exe differ diff --git a/CarConverter/bin/Release/CarConverter.pdb b/CarConverter/bin/Release/CarConverter.pdb index 766439a..0f72444 100644 Binary files a/CarConverter/bin/Release/CarConverter.pdb and b/CarConverter/bin/Release/CarConverter.pdb differ diff --git a/CarConverter/obj/Release/CarConverter.exe b/CarConverter/obj/Release/CarConverter.exe index 77639eb..98ee24c 100644 Binary files a/CarConverter/obj/Release/CarConverter.exe and b/CarConverter/obj/Release/CarConverter.exe differ diff --git a/CarConverter/obj/Release/CarConverter.pdb b/CarConverter/obj/Release/CarConverter.pdb index 766439a..0f72444 100644 Binary files a/CarConverter/obj/Release/CarConverter.pdb and b/CarConverter/obj/Release/CarConverter.pdb differ diff --git a/CarConverter/obj/Release/CarConverter_MarkupCompile.cache b/CarConverter/obj/Release/CarConverter_MarkupCompile.cache index 1f17128..5e253a6 100644 --- a/CarConverter/obj/Release/CarConverter_MarkupCompile.cache +++ b/CarConverter/obj/Release/CarConverter_MarkupCompile.cache @@ -1,7 +1,7 @@ CarConverter -winexe +exe C# .cs D:\Programmierstuff\FiveM\CarConverter\obj\Release\ diff --git a/FiveMHelpPrograms.sln b/FiveMHelpPrograms.sln index 8ffab1c..cfa2c07 100644 --- a/FiveMHelpPrograms.sln +++ b/FiveMHelpPrograms.sln @@ -10,6 +10,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MloFinderUI", "MloFinderUI\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MloFinder", "MloFinder\MloFinder.csproj", "{B3764965-2F1B-4F16-AF98-42D66BB628C0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitComparer", "BitComparer\BitComparer\BitComparer.csproj", "{345F97D7-5089-4FDB-862F-1B998E15ADA4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,5 +38,9 @@ Global {B3764965-2F1B-4F16-AF98-42D66BB628C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {B3764965-2F1B-4F16-AF98-42D66BB628C0}.Release|Any CPU.ActiveCfg = Release|Any CPU {B3764965-2F1B-4F16-AF98-42D66BB628C0}.Release|Any CPU.Build.0 = Release|Any CPU + {345F97D7-5089-4FDB-862F-1B998E15ADA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {345F97D7-5089-4FDB-862F-1B998E15ADA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {345F97D7-5089-4FDB-862F-1B998E15ADA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {345F97D7-5089-4FDB-862F-1B998E15ADA4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/MloFinder/bin/Release/net5.0/MloFinder.dll b/MloFinder/bin/Release/net5.0/MloFinder.dll index ce6fd88..8a5d6d2 100644 Binary files a/MloFinder/bin/Release/net5.0/MloFinder.dll and b/MloFinder/bin/Release/net5.0/MloFinder.dll differ diff --git a/MloFinder/bin/Release/net5.0/MloFinder.pdb b/MloFinder/bin/Release/net5.0/MloFinder.pdb index ea85da7..05bae3a 100644 Binary files a/MloFinder/bin/Release/net5.0/MloFinder.pdb and b/MloFinder/bin/Release/net5.0/MloFinder.pdb differ diff --git a/MloFinder/dlc.rpf b/MloFinder/dlc.rpf index a4d444d..29909ed 100644 Binary files a/MloFinder/dlc.rpf and b/MloFinder/dlc.rpf differ diff --git a/MloFinder/obj/MloFinder.csproj.nuget.dgspec.json b/MloFinder/obj/MloFinder.csproj.nuget.dgspec.json index fb4f956..1010278 100644 --- a/MloFinder/obj/MloFinder.csproj.nuget.dgspec.json +++ b/MloFinder/obj/MloFinder.csproj.nuget.dgspec.json @@ -68,7 +68,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/MloFinder/obj/MloFinder.csproj.nuget.g.props b/MloFinder/obj/MloFinder.csproj.nuget.g.props index cd0ee4f..48ce050 100644 --- a/MloFinder/obj/MloFinder.csproj.nuget.g.props +++ b/MloFinder/obj/MloFinder.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\leon\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.2.0 + 6.3.0 diff --git a/MloFinder/obj/Release/net5.0/MloFinder.dll b/MloFinder/obj/Release/net5.0/MloFinder.dll index ce6fd88..8a5d6d2 100644 Binary files a/MloFinder/obj/Release/net5.0/MloFinder.dll and b/MloFinder/obj/Release/net5.0/MloFinder.dll differ diff --git a/MloFinder/obj/Release/net5.0/MloFinder.pdb b/MloFinder/obj/Release/net5.0/MloFinder.pdb index ea85da7..05bae3a 100644 Binary files a/MloFinder/obj/Release/net5.0/MloFinder.pdb and b/MloFinder/obj/Release/net5.0/MloFinder.pdb differ diff --git a/MloFinder/obj/project.assets.json b/MloFinder/obj/project.assets.json index 63a9518..07f4fd8 100644 --- a/MloFinder/obj/project.assets.json +++ b/MloFinder/obj/project.assets.json @@ -16,10 +16,14 @@ "Microsoft.OpenApi/1.2.3": { "type": "package", "compile": { - "lib/netstandard2.0/Microsoft.OpenApi.dll": {} + "lib/netstandard2.0/Microsoft.OpenApi.dll": { + "related": ".pdb;.xml" + } }, "runtime": { - "lib/netstandard2.0/Microsoft.OpenApi.dll": {} + "lib/netstandard2.0/Microsoft.OpenApi.dll": { + "related": ".pdb;.xml" + } } }, "Swashbuckle.AspNetCore/5.6.3": { @@ -40,10 +44,14 @@ "Microsoft.OpenApi": "1.2.3" }, "compile": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {} + "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { + "related": ".pdb;.xml" + } }, "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {} + "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { + "related": ".pdb;.xml" + } }, "frameworkReferences": [ "Microsoft.AspNetCore.App" @@ -55,10 +63,14 @@ "Swashbuckle.AspNetCore.Swagger": "5.6.3" }, "compile": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {} + "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { + "related": ".pdb;.xml" + } }, "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {} + "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { + "related": ".pdb;.xml" + } }, "frameworkReferences": [ "Microsoft.AspNetCore.App" @@ -67,10 +79,14 @@ "Swashbuckle.AspNetCore.SwaggerUI/5.6.3": { "type": "package", "compile": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {} + "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { + "related": ".pdb;.xml" + } }, "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {} + "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { + "related": ".pdb;.xml" + } }, "frameworkReferences": [ "Microsoft.AspNetCore.App" @@ -260,7 +276,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/MloFinder/obj/project.nuget.cache b/MloFinder/obj/project.nuget.cache index e7edcb4..c347d51 100644 --- a/MloFinder/obj/project.nuget.cache +++ b/MloFinder/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "2zrb2Pmt/RKawitTUw1BvExyUdy+FBbQbb7Fi9CphCE7QGVxdV0FTTfQK3JRWq6OdzORTyRfMcu0m/Qx3gNsPA==", + "dgSpecHash": "27j0kjGonQWCmgZiEmpBRt2dYpQGFvbPTkbfVZijJsoVO2wpznOZZvdo67aMjh+RMWVct4xpG1uCY8MtuMEV4w==", "success": true, "projectFilePath": "D:\\Programmierstuff\\FiveM\\MloFinder\\MloFinder.csproj", "expectedPackageFiles": [ diff --git a/MloFinder/obj/project.packagespec.json b/MloFinder/obj/project.packagespec.json index 9519d00..61b6a6c 100644 --- a/MloFinder/obj/project.packagespec.json +++ b/MloFinder/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\Programmierstuff\\FiveM\\MloFinder\\MloFinder.csproj","projectName":"MloFinder","projectPath":"D:\\Programmierstuff\\FiveM\\MloFinder\\MloFinder.csproj","outputPath":"D:\\Programmierstuff\\FiveM\\MloFinder\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.400\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\Programmierstuff\\FiveM\\MloFinder\\MloFinder.csproj","projectName":"MloFinder","projectPath":"D:\\Programmierstuff\\FiveM\\MloFinder\\MloFinder.csproj","outputPath":"D:\\Programmierstuff\\FiveM\\MloFinder\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.401\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/MloFinder/obj/rider.project.restore.info b/MloFinder/obj/rider.project.restore.info index 36cf242..558467a 100644 --- a/MloFinder/obj/rider.project.restore.info +++ b/MloFinder/obj/rider.project.restore.info @@ -1 +1 @@ -16606808232292015 \ No newline at end of file +16635085024174087 \ No newline at end of file diff --git a/MloFinderUI/bin/Release/MloFinderUI.exe b/MloFinderUI/bin/Release/MloFinderUI.exe index 43304c7..76e7df6 100644 Binary files a/MloFinderUI/bin/Release/MloFinderUI.exe and b/MloFinderUI/bin/Release/MloFinderUI.exe differ diff --git a/MloFinderUI/bin/Release/MloFinderUI.pdb b/MloFinderUI/bin/Release/MloFinderUI.pdb index ed5db70..96468ce 100644 Binary files a/MloFinderUI/bin/Release/MloFinderUI.pdb and b/MloFinderUI/bin/Release/MloFinderUI.pdb differ diff --git a/MloFinderUI/obj/Release/MloFinderUI.csproj.GenerateResource.cache b/MloFinderUI/obj/Release/MloFinderUI.csproj.GenerateResource.cache index af9c052..ddddae7 100644 Binary files a/MloFinderUI/obj/Release/MloFinderUI.csproj.GenerateResource.cache and b/MloFinderUI/obj/Release/MloFinderUI.csproj.GenerateResource.cache differ diff --git a/MloFinderUI/obj/Release/MloFinderUI.exe b/MloFinderUI/obj/Release/MloFinderUI.exe index 43304c7..76e7df6 100644 Binary files a/MloFinderUI/obj/Release/MloFinderUI.exe and b/MloFinderUI/obj/Release/MloFinderUI.exe differ diff --git a/MloFinderUI/obj/Release/MloFinderUI.pdb b/MloFinderUI/obj/Release/MloFinderUI.pdb index ed5db70..96468ce 100644 Binary files a/MloFinderUI/obj/Release/MloFinderUI.pdb and b/MloFinderUI/obj/Release/MloFinderUI.pdb differ