Merge branch 'vr' into release

Mutagen-Modding · Nov 5, 2020 · 6f4930e · 6f4930e
2 parents f399cf4 + 8c9acca
commit 6f4930e
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 8 deletions.
diff --git a/Mutagen.Bethesda.Synthesis/Extensions/WjTranslation.cs b/Mutagen.Bethesda.Synthesis/Extensions/WjTranslation.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Wabbajack.Common;
@@ -14,6 +14,7 @@ public static Game ToWjGame(this GameRelease release)
                 GameRelease.Oblivion => Game.Oblivion,
                 GameRelease.SkyrimLE => Game.Skyrim,
                 GameRelease.SkyrimSE => Game.SkyrimSpecialEdition,
+                GameRelease.SkyrimVR => Game.SkyrimVR,
                 _ => throw new NotImplementedException()
             };
         }

diff --git a/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj b/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj
@@ -29,8 +29,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.19.5" />
-    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.19.5" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.19.7" />
+    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.19.7" />
     <PackageReference Include="NuGetizer" Version="0.4.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Synthesis.Bethesda.Execution/Synthesis.Bethesda.Execution.csproj b/Synthesis.Bethesda.Execution/Synthesis.Bethesda.Execution.csproj
@@ -36,7 +36,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis" Version="3.7.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.7.0" />
-    <PackageReference Include="Mutagen.Bethesda.Core" Version="0.19.5" />
+    <PackageReference Include="Mutagen.Bethesda.Core" Version="0.19.7" />
     <PackageReference Include="NuGetizer" Version="0.4.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Synthesis.Bethesda.GUI/Resources/ResourceConstants.cs b/Synthesis.Bethesda.GUI/Resources/ResourceConstants.cs
@@ -1,4 +1,4 @@
-using Mutagen.Bethesda;
+using Mutagen.Bethesda;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,13 +14,15 @@ public static class ResourceConstants
         public static readonly string OblivionLargeIcon = Path.Combine(ResourceFolder, "Oblivion.png");
         public static readonly string SkyrimLeLargeIcon = Path.Combine(ResourceFolder, "SkyrimLE.png");
         public static readonly string SkyrimSseLargeIcon = Path.Combine(ResourceFolder, "SkyrimSSE.png");
+        public static readonly string SkyrimVrLargeIcon = Path.Combine(ResourceFolder, "SkyrimVR.png");
         public static string GetIcon(GameRelease release)
         {
             return release switch
             {
                 GameRelease.Oblivion => OblivionLargeIcon,
                 GameRelease.SkyrimLE => SkyrimLeLargeIcon,
                 GameRelease.SkyrimSE => SkyrimSseLargeIcon,
+                GameRelease.SkyrimVR => SkyrimVrLargeIcon,
                 _ => throw new NotImplementedException()
             };
         }

diff --git a/Synthesis.Bethesda.GUI/Resources/SkyrimVR.png b/Synthesis.Bethesda.GUI/Resources/SkyrimVR.png
diff --git a/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj b/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj
@@ -28,6 +28,7 @@
     <None Remove="Resources\Oblivion.png" />
     <None Remove="Resources\SkyrimLE.png" />
     <None Remove="Resources\SkyrimSSE.png" />
+    <None Remove="Resources\SkyrimVR.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -79,6 +80,7 @@
     <Resource Include="Resources\Oblivion.png" />
     <Resource Include="Resources\SkyrimLE.png" />
     <Resource Include="Resources\SkyrimSSE.png" />
+    <Resource Include="Resources\SkyrimVR.png" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Synthesis.Bethesda.GUI/Views/Profiles/GameTypeClickerView.xaml b/Synthesis.Bethesda.GUI/Views/Profiles/GameTypeClickerView.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Synthesis.Bethesda.GUI.Views.GameTypeClickerView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -51,6 +51,9 @@
                         <DataTrigger Binding="{Binding}" Value="{x:Static muta:GameRelease.SkyrimSE}">
                             <Setter Property="Source" Value="../../Resources/SkyrimSSE.png" />
                         </DataTrigger>
+                        <DataTrigger Binding="{Binding}" Value="{x:Static muta:GameRelease.SkyrimVR}">
+                            <Setter Property="Source" Value="../../Resources/SkyrimVR.png" />
+                        </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </Image.Style>

diff --git a/Synthesis.Bethesda.UnitTests/GameReleaseTests.cs b/Synthesis.Bethesda.UnitTests/GameReleaseTests.cs
@@ -0,0 +1,22 @@
+using Mutagen.Bethesda;
+using Mutagen.Bethesda.Synthesis;
+using Noggog;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace Synthesis.Bethesda.UnitTests
+{
+    public class GameReleaseTests
+    {
+        [Fact]
+        public void ToWjGame()
+        {
+            foreach (var rel in EnumExt.GetValues<GameRelease>())
+            {
+                rel.ToWjGame();
+            }
+        }
+    }
+}
diff --git a/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj b/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj
@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.19.5" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.19.7" />
     <PackageReference Include="NuGetizer" Version="0.4.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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