Skip to content

Commit 40e0a0d

Browse files
authored
Merge pull request #6 from sharpninja/claude/magical-ritchie
Upgrade to .NET 10 and Avalonia 12.0.0
2 parents dbcd57c + 59ac67c commit 40e0a0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+94
-131
lines changed

build/Build.BuildAndDeployTargets.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private string ExecuteDotnetToolPipeline(
128128
var outputDirectory = Path.IsPathRooted(nupkgDirectory) ? nupkgDirectory : Path.Combine(RepoRootPath, nupkgDirectory);
129129
EnsureDirectoryExists(outputDirectory);
130130

131-
var targetFramework = ResolveTargetFramework(projectPath, "net9.0");
131+
var targetFramework = ResolveTargetFramework(projectPath, "net10.0");
132132
var publishDirectory = Path.Combine(Path.GetDirectoryName(projectPath)!, "bin", Configuration, targetFramework, "publish");
133133
var projectDocument = XDocument.Load(projectPath);
134134
var propertyGroups = projectDocument.Root?.Elements().Where(x => x.Name.LocalName == "PropertyGroup").ToList() ?? new List<XElement>();
@@ -280,7 +280,7 @@ private string ExecuteDotnetToolPipeline(
280280
private string BuildAndroidPackageCore()
281281
{
282282
var projectPath = Path.Combine(RepoRootPath, "src", "McpServerManager.Android", "McpServerManager.Android.csproj");
283-
var targetFramework = ResolveTargetFramework(projectPath, "net9.0-android");
283+
var targetFramework = ResolveTargetFramework(projectPath, "net10.0-android");
284284
var version = ResolveVersionDetails(PackageVersion);
285285
var artifactsDirectory = ArtifactsDirectoryPath;
286286
EnsureDirectoryExists(artifactsDirectory);
@@ -354,7 +354,7 @@ private string BuildAndroidPackageCore()
354354
private void DeployAndroidCore(string deviceSerial)
355355
{
356356
var projectPath = Path.Combine(RepoRootPath, "src", "McpServerManager.Android", "McpServerManager.Android.csproj");
357-
var targetFramework = ResolveTargetFramework(projectPath, "net9.0-android");
357+
var targetFramework = ResolveTargetFramework(projectPath, "net10.0-android");
358358

359359
if (!ShouldExecuteAction($"Deploy Android app to {deviceSerial}"))
360360
{
@@ -430,7 +430,7 @@ private string BuildDesktopDebCore(bool installAfterBuild)
430430
"-r",
431431
runtimeId,
432432
"-f",
433-
"net9.0",
433+
"net10.0",
434434
"--self-contained",
435435
"true",
436436
"-p:PublishSingleFile=true",

build/Build.MsixPackaging.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private sealed class MsixDesktopConfiguration
1717
public string PackageDisplayName { get; set; } = "McpServerManager";
1818
public string Publisher { get; set; } = string.Empty;
1919
public string DesktopProjectPath { get; set; } = Path.Combine("src", "McpServerManager.Desktop", "McpServerManager.Desktop.csproj");
20-
public string DesktopFramework { get; set; } = "net9.0";
20+
public string DesktopFramework { get; set; } = "net10.0";
2121
public string DesktopSubDirectory { get; set; } = "desktop";
2222
public string DesktopAppId { get; set; } = "McpServerManagerDesktop";
2323
public string DesktopDescription { get; set; } = "Avalonia desktop app for browsing and analyzing Copilot request/session logs";

build/Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>

lib/Markdown.Avalonia

lib/McpServer

Submodule McpServer updated 109 files

msix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package:
44

55
desktop:
66
path: src/McpServerManager.Desktop/McpServerManager.Desktop.csproj
7-
framework: net9.0
7+
framework: net10.0
88
subDir: desktop
99
displayName: McpServerManager
1010
appId: McpServerManagerDesktop

src/McpServer.Director/McpServer.Director.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<RootNamespace>McpServerManager.Director</RootNamespace>

src/McpServer.UI.Core/McpServer.UI.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<RootNamespace>McpServerManager.UI.Core</RootNamespace>
@@ -18,7 +18,7 @@
1818
<IsPackable>true</IsPackable>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Avalonia" Version="11.3.12" />
21+
<PackageReference Include="Avalonia" Version="12.0.0" />
2222
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
2323
</ItemGroup>
2424
<ItemGroup>

src/McpServer.VsExtension.McpTodo.Vsix/McpServer.VsExtension.McpTodo.Vsix.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<UseWpf>true</UseWpf>
66
<GeneratePkgDefFile>true</GeneratePkgDefFile>
77
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>

src/McpServer.Web/McpServer.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<RootNamespace>McpServerManager.Web</RootNamespace>

0 commit comments

Comments
 (0)