Merge branch 'master' into feat/ck3-1.18

IhateTrains · IhateTrains · commit 384306758e2f · 2025-12-22T23:26:07.000+01:00
diff --git a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
diff --git a/ImperatorToCK3.iss b/ImperatorToCK3.iss
@@ -58,8 +58,8 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang
 [Code]
 function InitializeSetup: Boolean;
 begin
-  // Install .NET 9 runtime if it is not already installed.
-  Dependency_AddDotNet90;
+  // Install .NET 10 runtime if it is not already installed.
+  Dependency_AddDotNet100;
 
   Result := True;
 end;
diff --git a/ImperatorToCK3/ImperatorToCK3.csproj b/ImperatorToCK3/ImperatorToCK3.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <RuntimeIdentifiers>win-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
         <ApplicationIcon>thumbnail.ico</ApplicationIcon>
diff --git a/ImperatorToCK3/Properties/PublishProfiles/linux-x64.pubxml b/ImperatorToCK3/Properties/PublishProfiles/linux-x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>../Publish/ImperatorToCK3/</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
diff --git a/ImperatorToCK3/Properties/PublishProfiles/osx-arm64.pubxml b/ImperatorToCK3/Properties/PublishProfiles/osx-arm64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Publish\ImperatorToCK3\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
diff --git a/ImperatorToCK3/Properties/PublishProfiles/win-x64.pubxml b/ImperatorToCK3/Properties/PublishProfiles/win-x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Publish\ImperatorToCK3\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.200",
-    "allowPrerelease": true,
+    "version": "10.0.100",
+    "allowPrerelease": false,
     "rollForward": "minor"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.200",`
`4`		`- "allowPrerelease": true,`
	`3`	`+ "version": "10.0.100",`
	`4`	`+ "allowPrerelease": false,`
`5`	`5`	`"rollForward": "minor"`
`6`	`6`	`}`
`7`	`7`	`}`