Merge branch 'dev' into release

Mutagen-Modding · Mar 5, 2021 · 5e85e77 · 5e85e77
2 parents 98f8321 + 2077c6b
commit 5e85e77
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/Mutagen.Bethesda.Synthesis/Internal/ReflectionSettingsTarget.cs b/Mutagen.Bethesda.Synthesis/Internal/ReflectionSettingsTarget.cs
@@ -1,3 +1,4 @@
+using Mutagen.Bethesda.Json;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System;
@@ -28,6 +29,7 @@ static ReflectionSettingsTarget()
         {
             JsonSettings = new JsonSerializerSettings();
             JsonSettings.Converters.Add(new StringEnumConverter());
+            JsonSettings.AddMutagenConverters();
         }
 
         public ReflectionSettingsTarget(

diff --git a/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj b/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
@@ -39,9 +39,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.26.2" />
-    <PackageReference Include="Mutagen.Bethesda.Core.Windows" Version="0.26.2" />
-    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.26.2" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.26.3" />
+    <PackageReference Include="Mutagen.Bethesda.Core.Windows" Version="0.26.3" />
+    <PackageReference Include="Mutagen.Bethesda.Json" Version="0.26.3" />
+    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.26.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Noggog.CSharpExt" Version="2.7" />
     <PackageReference Include="NuGetizer" Version="0.6.0">

diff --git a/Synthesis.Bethesda.Execution/Synthesis.Bethesda.Execution.csproj b/Synthesis.Bethesda.Execution/Synthesis.Bethesda.Execution.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
@@ -45,7 +45,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis" Version="3.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.8.0" />
-    <PackageReference Include="Mutagen.Bethesda.Core" Version="0.26.2" />
+    <PackageReference Include="Mutagen.Bethesda.Core" Version="0.26.3" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj b/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj
@@ -55,10 +55,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
-    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
     <PackageReference Include="Loqui" Version="2.7" />
     <PackageReference Include="Loqui.Generation" Version="2.7" />
-    <PackageReference Include="Mutagen.Bethesda.WPF" Version="0.26.2" />
+    <PackageReference Include="Mutagen.Bethesda.WPF" Version="0.26.3" />
     <PackageReference Include="Noggog.CSharpExt" Version="2.7" />
     <PackageReference Include="Noggog.WPF" Version="2.7" />
     <PackageReference Include="NuGetizer" Version="0.6.0">

diff --git a/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj b/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
@@ -20,7 +20,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.26.2" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.26.3" />
     <PackageReference Include="Noggog.CSharpExt" Version="2.7" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Synthesis.Bethesda/Synthesis.Bethesda.csproj b/Synthesis.Bethesda/Synthesis.Bethesda.csproj
@@ -39,7 +39,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.26.2" />
+    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.26.3" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>