Merge branch 'dev' into release

Mutagen-Modding · Mar 27, 2021 · acf33c2 · acf33c2
2 parents b67aef9 + 755e501
commit acf33c2
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 33 deletions.
diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml
@@ -13,10 +13,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.*
     - name: Install dependencies
       run: dotnet restore Synthesis.Bethesda.sln
     - name: Build

diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -13,10 +13,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.*
     - name: Install dependencies
       run: dotnet restore Synthesis.Bethesda.sln
     - name: Build

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
     - name: Install dependencies Synthesis
       run: dotnet restore Synthesis.Bethesda.sln

diff --git a/Mutagen.Bethesda.Synthesis.WPF/Mutagen.Bethesda.Synthesis.WPF.csproj b/Mutagen.Bethesda.Synthesis.WPF/Mutagen.Bethesda.Synthesis.WPF.csproj
@@ -40,13 +40,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda.WPF" Version="0.27.5" />
+    <PackageReference Include="Mutagen.Bethesda.WPF" Version="0.28.0" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="reactiveui" Version="13.1.1" />
-    <PackageReference Include="ReactiveUI.Fody" Version="13.1.1" />
+    <PackageReference Include="reactiveui" Version="13.2.2" />
+    <PackageReference Include="ReactiveUI.Fody" Version="13.2.2" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.2" />
     <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />

diff --git a/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj b/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj
@@ -42,12 +42,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.27.5" />
-    <PackageReference Include="Mutagen.Bethesda.Core.Windows" Version="0.27.5" />
-    <PackageReference Include="Mutagen.Bethesda.Json" Version="0.27.5" />
-    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.27.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Noggog.CSharpExt" Version="2.10.0" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.28.0" />
+    <PackageReference Include="Mutagen.Bethesda.Core.Windows" Version="0.28.0" />
+    <PackageReference Include="Mutagen.Bethesda.Json" Version="0.28.0" />
+    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.28.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Noggog.CSharpExt" Version="2.12.0" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <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
@@ -43,17 +43,17 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
-    <PackageReference Include="Microsoft.Build" Version="16.8.0" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.8.0" />
-    <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.27.5" />
+    <PackageReference Include="Microsoft.Build" Version="16.9.0" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.9.0" />
+    <PackageReference Include="Mutagen.Bethesda.Core" Version="0.28.0" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Noggog.CSharpExt" Version="2.10.0" />
+    <PackageReference Include="Noggog.CSharpExt" Version="2.12.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj b/Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj
@@ -54,17 +54,17 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
-    <PackageReference Include="Loqui" Version="2.10.0" />
-    <PackageReference Include="Loqui.Generation" Version="2.10.0" />
-    <PackageReference Include="Mutagen.Bethesda.WPF" Version="0.27.5" />
-    <PackageReference Include="Noggog.CSharpExt" Version="2.10.0" />
-    <PackageReference Include="Noggog.WPF" Version="2.10.0" />
+    <PackageReference Include="Loqui" Version="2.12.0" />
+    <PackageReference Include="Loqui.Generation" Version="2.12.0" />
+    <PackageReference Include="Mutagen.Bethesda.WPF" Version="0.28.0" />
+    <PackageReference Include="Noggog.CSharpExt" Version="2.12.0" />
+    <PackageReference Include="Noggog.WPF" Version="2.12.0" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="reactiveui" Version="13.1.1" />
-    <PackageReference Include="ReactiveUI.Fody" Version="13.1.1" />
+    <PackageReference Include="reactiveui" Version="13.2.2" />
+    <PackageReference Include="ReactiveUI.Fody" Version="13.2.2" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />

diff --git a/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj b/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj
@@ -20,8 +20,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.27.5" />
-    <PackageReference Include="Noggog.CSharpExt" Version="2.10.0" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.28.0" />
+    <PackageReference Include="Noggog.CSharpExt" Version="2.12.0" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <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
@@ -42,7 +42,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.27.5" />
+    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.28.0" />
     <PackageReference Include="NuGetizer" Version="0.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>