Migrate to .NET 10 and update GitHub workflows (#1346)

psmulovics · web-flow · commit 6e579b641c4f · 2026-06-15T10:18:07.000+02:00
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        dotnet-version: [ '8.0.x' ]
+        dotnet-version: [ '10.0.x' ]
         node-version: [ '24.x' ]
     steps:
     - name: Checkout
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        dotnet-version: [ '8.0.x' ]
+        dotnet-version: [ '10.0.x' ]
         node-version: [ '24.x' ]
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,7 +29,7 @@
     </PropertyGroup>
 	
 	<PropertyGroup>
-		<TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
+		<TargetFrameworkVersion>net10.0</TargetFrameworkVersion>
 		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
 		<LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
diff --git a/examples/fdc3-appdirectory/apps-with-intents.json b/examples/fdc3-appdirectory/apps-with-intents.json
@@ -6,7 +6,7 @@
       "type": "native",
       "description":  "This is an example WPF application",
       "details": {
-        "path": "..\\..\\..\\..\\..\\..\\..\\..\\examples\\dotnet-diagnostics\\DiagnosticsExample\\bin\\Debug\\net8.0-windows\\DiagnosticsExample.exe"
+        "path": "..\\..\\..\\..\\..\\..\\..\\..\\examples\\dotnet-diagnostics\\DiagnosticsExample\\bin\\Debug\\net10.0-windows\\DiagnosticsExample.exe"
       },
       "hostManifests": {
         "sail": { "inject-api": "2.0" },
diff --git a/prototypes/process-explorer/dotnet/test/MorganStanley.ComposeUI.ProcessExplorer.Core.Tests/Processes/WindowsProcessInfoManager.Tests.cs b/prototypes/process-explorer/dotnet/test/MorganStanley.ComposeUI.ProcessExplorer.Core.Tests/Processes/WindowsProcessInfoManager.Tests.cs
@@ -229,14 +229,14 @@ private static string GetTestApplicationPath()
     {
         var folder = GetEnvironmentFolder();
 
-        return Path.GetFullPath($@"../../../../MorganStanley.ComposeUI.TestConsoleApp/bin/{folder}/net8.0/MorganStanley.ComposeUI.TestConsoleApp.exe");
+        return Path.GetFullPath($@"../../../../MorganStanley.ComposeUI.TestConsoleApp/bin/{folder}/net10.0/MorganStanley.ComposeUI.TestConsoleApp.exe");
     }
 
     private static string GetSimpleTestApplicationPath()
     {
         var folder = GetEnvironmentFolder();
 
-        return Path.GetFullPath($"../../../../MorganStanley.ComposeUI.TestConsoleApp2/bin/{folder}/net8.0/MorganStanley.ComposeUI.TestConsoleApp2.exe");
+        return Path.GetFullPath($"../../../../MorganStanley.ComposeUI.TestConsoleApp2/bin/{folder}/net10.0/MorganStanley.ComposeUI.TestConsoleApp2.exe");
     }
 
     private static string GetEnvironmentFolder()
diff --git a/prototypes/process-explorer/dotnet/test/MorganStanley.ComposeUI.TestConsoleApp/Program.cs b/prototypes/process-explorer/dotnet/test/MorganStanley.ComposeUI.TestConsoleApp/Program.cs
@@ -25,7 +25,7 @@
 var folder = isDebug ? "Debug" : "Release";
 Console.WriteLine(folder);
 
-var childProcess = Process.Start(Path.GetFullPath($"../../../../MorganStanley.ComposeUI.TestConsoleApp2/bin/{folder}/net8.0/MorganStanley.ComposeUI.TestConsoleApp2.exe"));
+var childProcess = Process.Start(Path.GetFullPath($"../../../../MorganStanley.ComposeUI.TestConsoleApp2/bin/{folder}/net10.0/MorganStanley.ComposeUI.TestConsoleApp2.exe"));
 
 var sum = 0;
 for (int i = 0; i < 50000000; i++)
diff --git a/src/fdc3/dotnet/DesktopAgent.Client/test/IntegrationTests/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.IntegrationTests.csproj b/src/fdc3/dotnet/DesktopAgent.Client/test/IntegrationTests/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
diff --git a/src/fdc3/dotnet/DesktopAgent.Client/test/IntegrationTests/testAppDirectory.json b/src/fdc3/dotnet/DesktopAgent.Client/test/IntegrationTests/testAppDirectory.json
@@ -69,7 +69,7 @@
       "name": "app1",
       "type": "native",
       "details": {
-        "path": "..\\..\\..\\..\\TestHelpers\\DesktopAgentClientConsoleApp\\bin\\Release\\net8.0\\DesktopAgentClientConsoleApp.exe"
+        "path": "..\\..\\..\\..\\TestHelpers\\DesktopAgentClientConsoleApp\\bin\\Release\\net10.0\\DesktopAgentClientConsoleApp.exe"
       },
       "interop": {
         "intents": {
diff --git a/src/fdc3/dotnet/DesktopAgent.Client/test/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.Tests/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.Tests.csproj b/src/fdc3/dotnet/DesktopAgent.Client/test/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.Tests/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
diff --git a/src/fdc3/dotnet/DesktopAgent.Client/test/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.Tests/testAppDirectory.json b/src/fdc3/dotnet/DesktopAgent.Client/test/MorganStanley.ComposeUI.Fdc3.DesktopAgent.Client.Tests/testAppDirectory.json
@@ -69,7 +69,7 @@
       "name": "app1",
       "type": "native",
       "details": {
-        "path": "..\\..\\..\\..\\TestHelpers\\DesktopAgentClientConsoleApp\\bin\\Release\\net8.0\\DesktopAgentClientConsoleApp.exe"
+        "path": "..\\..\\..\\..\\TestHelpers\\DesktopAgentClientConsoleApp\\bin\\Release\\net10.0\\DesktopAgentClientConsoleApp.exe"
       },
       "interop": {
         "intents": {
diff --git a/src/fdc3/dotnet/DesktopAgent.Client/test/TestHelpers/DesktopAgentClientConsoleApp/DesktopAgentClientConsoleApp.csproj b/src/fdc3/dotnet/DesktopAgent.Client/test/TestHelpers/DesktopAgentClientConsoleApp/DesktopAgentClientConsoleApp.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
diff --git a/src/messaging/dotnet/src/MessageRouterAdapter/MorganStanley.ComposeUI.Messaging.MessageRouterAdapter.csproj b/src/messaging/dotnet/src/MessageRouterAdapter/MorganStanley.ComposeUI.Messaging.MessageRouterAdapter.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
 		<Nullable>enable</Nullable>
 		<Description>
 			Provides an adapter for integrating with the ComposeUI Message Router, enabling .NET applications to send and receive messages using the ComposeUI messaging infrastructure.
diff --git a/src/module-loader/dotnet/tests/MorganStanley.ComposeUI.ModuleLoader.Tests/Runners/NativeModuleRunnerTests.cs b/src/module-loader/dotnet/tests/MorganStanley.ComposeUI.ModuleLoader.Tests/Runners/NativeModuleRunnerTests.cs
@@ -40,9 +40,9 @@ public async Task ModuleIsLaunchedWithProvidedArguments()
         var details = new NativeManifestDetails()
         {
 #if DEBUG
-            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net8.0\NativeRunnerTestApp.exe")),
+            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net10.0\NativeRunnerTestApp.exe")),
 #else
-            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net8.0\NativeRunnerTestApp.exe")),
+            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net10.0\NativeRunnerTestApp.exe")),
 #endif
 
             Arguments = new[] { "Hello", "ComposeUI!", "I am", randomString }
@@ -74,9 +74,9 @@ public async Task AbsolutePathModuleIsLaunchedWithEnvironmentVariablesFromManife
         var details = new NativeManifestDetails()
         {
 #if DEBUG
-            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net8.0\NativeRunnerTestApp.exe")),
+            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net10.0\NativeRunnerTestApp.exe")),
 #else
-            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net8.0\NativeRunnerTestApp.exe")),
+            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net10.0\NativeRunnerTestApp.exe")),
 #endif
             EnvironmentVariables = new Dictionary<string, string> { { variableName, randomString } }
         };
@@ -107,9 +107,9 @@ public async Task RelativePathModuleIsLaunchedWithEnvironmentVariablesFromManife
         var details = new NativeManifestDetails()
         {
 #if DEBUG
-            Path = new Uri(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net8.0\NativeRunnerTestApp.exe", UriKind.Relative),
+            Path = new Uri(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net10.0\NativeRunnerTestApp.exe", UriKind.Relative),
 #else
-            Path = new Uri(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net8.0\NativeRunnerTestApp.exe", UriKind.Relative),
+            Path = new Uri(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net10.0\NativeRunnerTestApp.exe", UriKind.Relative),
 #endif
             EnvironmentVariables = new Dictionary<string, string> { { variableName, randomString } }
         };
@@ -140,9 +140,9 @@ public async Task ModuleIsLaunchedWithEnvironmentVariablesFromPipeline()
         var details = new NativeManifestDetails()
         {
 #if DEBUG
-            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net8.0\NativeRunnerTestApp.exe")),
+            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Debug\net10.0\NativeRunnerTestApp.exe")),
 #else
-            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net8.0\NativeRunnerTestApp.exe")),
+            Path = new Uri(Path.GetFullPath(@"..\..\..\..\NativeRunnerTestApp\bin\Release\net10.0\NativeRunnerTestApp.exe")),
 #endif
             EnvironmentVariables = new Dictionary<string, string> { { variableName, randomString } }
         };
diff --git a/src/shell/dotnet/add-to-path.ps1 b/src/shell/dotnet/add-to-path.ps1
@@ -3,7 +3,7 @@
 
 $path = [System.Environment]::GetEnvironmentVariable("PATH", [EnvironmentVariableTarget]::User)
 $paths = $path -split ";"
-$shellPath = Resolve-Path -Path "./src/Shell/bin/Debug/net8.0-windows"
+$shellPath = Resolve-Path -Path "./src/Shell/bin/Debug/net10.0-windows"
 
 if ($paths.indexof($shellPath.Path) -ne -1) { exit }
 
diff --git a/src/shell/dotnet/examples/module-catalog.json b/src/shell/dotnet/examples/module-catalog.json
@@ -90,7 +90,7 @@
     "Name": "Diagnostics WPF",
     "ModuleType": "native",
     "Details": {
-      "Path": "..\\..\\..\\..\\examples\\dotnet-diagnostics\\DiagnosticsExample\\bin\\Debug\\net8.0-windows\\DiagnosticsExample.exe",
+      "Path": "..\\..\\..\\..\\examples\\dotnet-diagnostics\\DiagnosticsExample\\bin\\Debug\\net10.0-windows\\DiagnosticsExample.exe",
       "EnvironmentVariables": { "CUSTOM_GREETINGS": "Hello ComposeUI!" },
       "InitialModulePosition": "Floating",
       "Width": 280.5,
diff --git a/src/shell/dotnet/src/Shell/Shell.csproj b/src/shell/dotnet/src/Shell/Shell.csproj
@@ -78,7 +78,7 @@
 
 	<Target Name="CopyDesktopAgentClientConsoleApp" AfterTargets="Build">
 		<ItemGroup>
-			<DesktopAgentClientExe Include="$(SolutionDir)..\..\..\examples\dotnet-diagnostics\DiagnosticsExample\bin\$(Configuration)\net8.0-windows\DiagnosticsExample.exe" />
+			<DesktopAgentClientExe Include="$(SolutionDir)..\..\..\examples\dotnet-diagnostics\DiagnosticsExample\bin\$(Configuration)\net10.0-windows\DiagnosticsExample.exe" />
 		</ItemGroup>
 		<Copy SourceFiles="@(DesktopAgentClientExe)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
 	</Target>

Original file line number	Diff line number	Diff line change
`@@ -229,14 +229,14 @@ private static string GetTestApplicationPath()`
`229`	`229`	`{`
`230`	`230`	`var folder = GetEnvironmentFolder();`
`231`	`231`
`232`		`- return Path.GetFullPath($@"../../../../MorganStanley.ComposeUI.TestConsoleApp/bin/{folder}/net8.0/MorganStanley.ComposeUI.TestConsoleApp.exe");`
	`232`	`+ return Path.GetFullPath($@"../../../../MorganStanley.ComposeUI.TestConsoleApp/bin/{folder}/net10.0/MorganStanley.ComposeUI.TestConsoleApp.exe");`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`private static string GetSimpleTestApplicationPath()`
`236`	`236`	`{`
`237`	`237`	`var folder = GetEnvironmentFolder();`
`238`	`238`
`239`		`- return Path.GetFullPath($"../../../../MorganStanley.ComposeUI.TestConsoleApp2/bin/{folder}/net8.0/MorganStanley.ComposeUI.TestConsoleApp2.exe");`
	`239`	`+ return Path.GetFullPath($"../../../../MorganStanley.ComposeUI.TestConsoleApp2/bin/{folder}/net10.0/MorganStanley.ComposeUI.TestConsoleApp2.exe");`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`private static string GetEnvironmentFolder()`