Skip to content

Updates for .NET 10 #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dremin merged 1 commit into from
Jun 22, 2026
Merged

Updates for .NET 10 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/managedshell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
buildconfig: [ Release ]

runs-on: windows-2022
runs-on: windows-2025

env:
project: src\ManagedShell\ManagedShell.csproj
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning">
<Version>3.5.108</Version>
<Version>3.9.50</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ManagedShell
![ManagedShell](https://github.com/cairoshell/ManagedShell/workflows/ManagedShell/badge.svg) [![Nuget](https://img.shields.io/nuget/v/ManagedShell?color=informational)](https://www.nuget.org/packages/ManagedShell/)

A library for creating Windows shell replacements using .NET, written in C#.
A library for creating Windows shell replacements using .NET and WPF, written in C#.

## Features
- Tasks service that provides taskbar functionality
Expand All @@ -15,4 +15,5 @@ A library for creating Windows shell replacements using .NET, written in C#.
Visit the [ManagedShell Wiki](https://github.com/cairoshell/ManagedShell/wiki) for usage documentation.

## Example implementations
- [Cairo Shell](https://github.com/cairoshell/cairoshell)
- [RetroBar](https://github.com/dremin/RetroBar)
2 changes: 1 addition & 1 deletion src/ManagedShell.AppBar/ManagedShell.AppBar.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ManagedShell.Common/Helpers/KeyboardLayoutHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static bool SetKeyboardLayout(int layoutId)
return NativeMethods.PostMessage(0xffff,
(uint) NativeMethods.WM.INPUTLANGCHANGEREQUEST,
0,
NativeMethods.LoadKeyboardLayout(layoutId.ToString("x8"), (uint)(NativeMethods.KLF.SUBSTITUTE_OK | NativeMethods.KLF.ACTIVATE)));
(long)NativeMethods.LoadKeyboardLayout(layoutId.ToString("x8"), (uint)(NativeMethods.KLF.SUBSTITUTE_OK | NativeMethods.KLF.ACTIVATE)));
}
}
}
4 changes: 2 additions & 2 deletions src/ManagedShell.Common/ManagedShell.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<LangVersion>12</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Data.OleDb" Version="6.0.0" />
<PackageReference Include="System.Data.OleDb" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ManagedShell.Interop/ManagedShell.Interop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/ManagedShell.ShellFolders/ManagedShell.ShellFolders.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net471'">
<ItemGroup Condition="'$(TargetFramework)' == 'net480'">
<Reference Include="Microsoft.VisualBasic" />
</ItemGroup>

Expand Down
25 changes: 20 additions & 5 deletions src/ManagedShell.UWPInterop/ManagedShell.UWPInterop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
<UseWPF>True</UseWPF>
</PropertyGroup>

<PropertyGroup>
<LangVersion>9</LangVersion>
<LangVersion>12</LangVersion>
<CsWinRTEmbedded>true</CsWinRTEmbedded>
<CsWinRTWindowsMetadata>10.0.19041.0</CsWinRTWindowsMetadata>
<CsWinRTWindowsMetadata>10.0.26100.0</CsWinRTWindowsMetadata>
</PropertyGroup>

<ItemGroup>
<PackageReference Condition="'$(TargetFramework)' == 'net6.0-windows'" Include="Microsoft.Windows.CsWinRT" Version="1.6.4" />
<PackageReference Condition="'$(TargetFramework)' != 'net6.0-windows'" Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
<PackageReference Condition="'$(TargetFramework)' != 'net480'" Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
<PackageReference Condition="'$(TargetFramework)' == 'net480'" Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
</ItemGroup>

Expand All @@ -25,14 +25,28 @@

<PropertyGroup>
<CsWinRTIncludes>
Windows.ApplicationModel.AppExecutionContext;
Windows.ApplicationModel.AddResourcePackageOptions;
Windows.ApplicationModel.AppDisplayInfo;
Windows.ApplicationModel.AppInfo;
Windows.ApplicationModel.AppInstallerInfo;
Windows.ApplicationModel.AppInstallerPolicySource;
Windows.ApplicationModel.Core.AppDisplayInfo;
Windows.ApplicationModel.Core.AppListEntry;
Windows.ApplicationModel.Core.IAppListEntry;
Windows.ApplicationModel.FindRelatedPackagesOptions;
Windows.ApplicationModel.IAppDisplayInfo;
Windows.ApplicationModel.IAppInfo;
Windows.ApplicationModel.IAppInfo2;
Windows.ApplicationModel.IAppInfo3;
Windows.ApplicationModel.IAppInfo4;
Windows.ApplicationModel.IAppInfoMethods;
Windows.ApplicationModel.IAppInfoStatics;
Windows.ApplicationModel.IAppInfoStaticsMethods;
Windows.ApplicationModel.IAppInstallerInfo;
Windows.ApplicationModel.IFindRelatedPackagesOptions;
Windows.ApplicationModel.IFindRelatedPackagesOptionsFactory;
Windows.ApplicationModel.IFindRelatedPackagesOptionsMethods;
Windows.ApplicationModel.IPackage;
Windows.ApplicationModel.IPackageCatalog;
Windows.ApplicationModel.Package;
Expand All @@ -50,6 +64,7 @@
<CsWinRTExcludes>
Windows.Foundation.Diagnostics;
Windows.Foundation.PropertyType;
Windows.Foundation.Rect;
Windows.Storage.BulkAccess;
Windows.Storage.Provider;
</CsWinRTExcludes>
Expand Down
2 changes: 1 addition & 1 deletion src/ManagedShell.WindowsTasks/ManagedShell.WindowsTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ManagedShell.WindowsTray/ManagedShell.WindowsTray.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/ManagedShell/ManagedShell.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net471;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net480;net6.0-windows;net10.0-windows</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<UseWPF>true</UseWPF>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
Expand All @@ -24,10 +24,10 @@
<ProjectReference Include="..\ManagedShell.UWPInterop\ManagedShell.UWPInterop.csproj" PrivateAssets="all" />
<ProjectReference Include="..\ManagedShell.WindowsTasks\ManagedShell.WindowsTasks.csproj" PrivateAssets="all" />
<ProjectReference Include="..\ManagedShell.WindowsTray\ManagedShell.WindowsTray.csproj" PrivateAssets="all" />
<PackageReference Include="System.Data.OleDb" Version="6.0.0" />
<PackageReference Include="System.Data.OleDb" Version="8.0.1" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
Expand Down
Loading