GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Newtonsoft.Json to 13.0.2 and .Net 7

Browse Source
This commit is contained in:
Wojciech Figat
2022-12-17 13:38:30 +01:00
parent 889eb7d846
commit 84a68c5977
10 changed files with 547 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Tools/Flax.Build/Deps/Dependencies/NewtonsoftJson.cs
View File

@@ -49,13 +49,13 @@ namespace Flax.Deps.Dependencies
"Newtonsoft.Json.pdb",
"Newtonsoft.Json.xml",
};
var binFolder = Path.Combine(root, "Src", "Newtonsoft.Json", "bin", configuration, "net45");
var binFolder = Path.Combine(root, "Src", "Newtonsoft.Json", "bin", configuration, "net7.0");
// Get the source
CloneGitRepo(root, "https://github.com/FlaxEngine/Newtonsoft.Json.git");
// Default build
GitCheckout(root, "master");
GitCheckout(root, "flax-net70");
Deploy.VCEnvironment.BuildSolution(solutionPath, configuration, buildPlatform);
foreach (var platform in options.Platforms)
{
@@ -74,8 +74,8 @@ namespace Flax.Deps.Dependencies
}
}
// AOT build
GitCheckout(root, "aot");
// AOT build (disabled codegen)
Utilities.ReplaceInFile(Path.Combine(root, "Src", "Newtonsoft.Json", "Newtonsoft.Json.csproj"), "HAVE_RUNTIME_SERIALIZATION;", ";");
Deploy.VCEnvironment.BuildSolution(solutionPath, configuration, buildPlatform);
foreach (var platform in options.Platforms)
{