Merge branch 'master' into integration-test-fix

ParadoxGameConverters · Oct 19, 2024 · aa3f208 · aa3f208
2 parents aa2ef78 + ed46fae
commit aa3f208
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Fronter.NET b/Fronter.NET
diff --git a/ImperatorToCK3/ImperatorToCK3.csproj b/ImperatorToCK3/ImperatorToCK3.csproj
@@ -38,11 +38,11 @@
         <PackageReference Include="DotLiquid" Version="2.2.692" />
         <PackageReference Include="FSharp.Core" Version="8.0.401" /> <!-- Needed for CWTools -->
         <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.0.0"/>
-        <PackageReference Include="Meziantou.Analyzer" Version="2.0.169">
+        <PackageReference Include="Meziantou.Analyzer" Version="2.0.172">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="PGCG.commonItems" Version="14.1.2" />
+        <PackageReference Include="PGCG.commonItems" Version="14.1.4" />
         <PackageReference Include="PGCG.commonItems.SourceGenerators" Version="1.0.7"/>
         <PackageReference Include="Polly" Version="8.4.2" />
         <PackageReference Include="Roslynator.Analyzers" Version="4.12.8">

diff --git a/InnoDependencyInstaller b/InnoDependencyInstaller
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12",
+    "version": "9.0.100-rc.2.24474.11",
     "allowPrerelease": true,
     "rollForward": "disable"
   }
+2 −0		Fronter.NET.sln.DotSettings.user
+4 −3		Fronter.NET/Fronter.csproj
+1 −1		Fronter.NET/Models/Configuration/Options/CheckBoxSelector.cs
+14 −3		Fronter.NET/Models/Configuration/Options/DateSelector.cs
+1 −1		Fronter.NET/Models/Configuration/Options/RadioSelector.cs
+0 −5		Fronter.NET/Models/Configuration/Options/Selector.cs
+2 −2		Fronter.NET/Models/Configuration/Options/TextSelector.cs
+14 −8		Fronter.NET/Views/OptionsView.axaml
+1 −1		Updater
+1 −1		global.json