Skip to content

Updated packages for .NET 10 support #44

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

Open
newky2k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated packages for .NET 10 support #44

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 DSoft.System.Mvvm.Hosting/DSoft.System.Mvvm.Hosting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Compile Include="**\*.shared.*.cs" />
<Compile Include="HostMode.cs" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.Equals('netstandard2.0'))">
Expand Down
2 changes: 1 addition & 1 deletion DSoft.System.Mvvm.UI.MAUI/DSoft.System.Mvvm.UI.MAUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
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 @@ -13,7 +13,7 @@
<Owners>newky2k</Owners>
<LangVersion>Latest</LangVersion>
<Configurations>Debug;Release</Configurations>
<NoWarn>1701;1702;CS8002</NoWarn>
<NoWarn>1701;1702;CS8002;NETSDK1206;</NoWarn>
<PackageReleaseNotes>Updated to .NET 9.0 and latest packages</PackageReleaseNotes>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion MVVMSample/MVVMSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion MauiSample/MauiSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
31 changes: 5 additions & 26 deletions System.Mvvm.UI.WinUI/DSoft.System.Mvvm.UI.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,8 @@
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows10')) ">
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<RootNamespace>System.Mvvm.Ui</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64;win10-arm</RuntimeIdentifiers>
<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows10')) ">
<PropertyGroup Condition=" $(TargetFramework.Contains('windows10')) ">
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
<RootNamespace>System.Mvvm.Ui</RootNamespace>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;</RuntimeIdentifiers>
Expand All @@ -40,28 +34,13 @@
<Compile Include="**\*.shared.*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows10')) ">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<ItemGroup Condition=" $(TargetFramework.Contains('windows10')) ">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
<Compile Include="**\*.uwp.cs" />
<Compile Include="**\*.uwp.*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0-windows10')) ">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<Compile Include="**\*.uwp.cs" />
<Compile Include="**\*.uwp.*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0-windows10')) ">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<Compile Include="**\*.uwp.cs" />
<Compile Include="**\*.uwp.*.cs" />
</ItemGroup>


<ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
<Compile Include="**\*.uwp.cs" />
<Compile Include="**\*.uwp.*.cs" />
Expand All @@ -70,6 +49,6 @@
<ItemGroup>
<ProjectReference Include="..\System.Mvvm.Ui\DSoft.System.Mvvm.UI.csproj" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion System.Mvvm.UI.Wpf/DSoft.System.Mvvm.UI.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<None Include="readme.md" Pack="true" PackagePath="\" />
<ProjectReference Include="..\System.Mvvm.Ui\DSoft.System.Mvvm.UI.csproj" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion System.Mvvm.Ui/DSoft.System.Mvvm.Ui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ItemGroup>
<None Include="readme.md" Pack="true" PackagePath="\" />
<ProjectReference Include="..\System.Mvvm\DSoft.System.Mvvm.csproj" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="System.Mvvm.UI.WinUI, PublicKey=002400000480000094000000060200000024000052534131000400000100010085529aa44bb5b76cfba9f8f376ec13c1503e7e38ee7b236b946df8c17b6f24d11609eea05229320dd531dc92211156f2b9b7843b7791a680221bd4a358fb785b180fcd35731dc1b7cfaf2fc314b102b20896af562662dacd08d7d2d830a4a4cb84c6df91d7af56a6e5b46f0b65db4259bcac25bc7828791d65dfcefaefac7aad" />
Expand Down
2 changes: 1 addition & 1 deletion ...Mvvm.VisualStudio.Extensibility.UI/DSoft.System.Mvvm.VisualStudio.Extensibility.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Extensibility.Framework" Version="17.14.2098" />
<PackageReference Include="Nerdbank.Streams" Version="2.11.90" />
<PackageReference Include="Nerdbank.Streams" Version="2.13.16" />
</ItemGroup>

</Project>