amacocian/WpfExtended
1
0
Fork 0
mirror of https://github.com/AlexMacocian/WpfExtended.git synced 2026-07-15 14:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to .net 10

Browse Source
This commit is contained in:
Alexandru Victor Macocian
2026-01-06 16:26:06 +01:00
parent 4b3002b164
commit fc6cb11880
6 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WpfExtended.Blazor/Launch/BlazorHostWindow.xaml
+1 -1
View File
@@ -2,7 +2,7 @@
x:Class="WpfExtended.Blazor.Launch.BlazorHostWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:blazor="http://schemas.microsoft.com/winfx/2006/xaml/presentation/blazor"
xmlns:blazor="clr-namespace:Microsoft.AspNetCore.Components.WebView.Wpf;assembly=Microsoft.AspNetCore.Components.WebView.Wpf"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WpfExtended.Blazor.Launch"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
WpfExtended.Blazor/Launch/BlazorHostWindow.xaml.cs
+5 -2
View File
@@ -95,7 +95,7 @@ public partial class BlazorHostWindow : Window
private void BlazorWebView_BlazorWebViewInitialized(object? sender, BlazorWebViewInitializedEventArgs args)
{
this.BlazorWebView.WebView.CoreWebView2InitializationCompleted += this.CoreWebView2_InitializationCompleted;
args.WebView.CoreWebView2InitializationCompleted += this.CoreWebView2_InitializationCompleted;
this.BlazorWebViewInitialized?.Invoke(this, args);
}
@@ -113,6 +113,9 @@ public partial class BlazorHostWindow : Window
return;
}
this.CoreWebView2Initialized?.Invoke(this, this.BlazorWebView.WebView.CoreWebView2);
if (sender is Microsoft.Web.WebView2.Wpf.WebView2 webView2)
{
this.CoreWebView2Initialized?.Invoke(this, webView2.CoreWebView2);
}
}
}
WpfExtended.Blazor/WpfExtended.Blazor.csproj
+25 -5
View File
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFrameworks>net9.0-windows</TargetFrameworks>
<TargetFrameworks>net10.0-windows10.0.17763.0</TargetFrameworks>
<UseWPF>true</UseWPF>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>0.8.1</Version>
<Version>0.9.0</Version>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<Description>
@@ -12,12 +12,32 @@
</Description>
<Authors>Alexandru Macocian</Authors>
<RepositoryUrl>https://github.com/AlexMacocian/WpfExtended</RepositoryUrl>
<!-- Disable static web asset props file generation for consumers -->
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
<GenerateStaticWebAssetsManifest>false</GenerateStaticWebAssetsManifest>
<GenerateStaticWebAssetEndpointsManifest>false</GenerateStaticWebAssetEndpointsManifest>
<GenerateStaticWebAssetEndpointsPropsFile>false</GenerateStaticWebAssetEndpointsPropsFile>
<DisableStaticWebAssetsBuildPropsFileGeneration>true</DisableStaticWebAssetsBuildPropsFileGeneration>
<IncludeStaticWebAssetsPackItems>false</IncludeStaticWebAssetsPackItems>
</PropertyGroup>
<!-- Remove auto-generated build props/targets from the NuGet package -->
<Target Name="RemoveStaticWebAssetsPropsFromPackage" BeforeTargets="GenerateNuspec">
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="9.0.90" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3351.48" />
<_PackageFiles Remove="@(_PackageFiles)"
Condition="'%(Identity)' != '' And $([System.String]::new('%(Identity)').Contains('StaticWebAssets'))" />
<_PackageFiles Remove="@(_PackageFiles)"
Condition="'%(Identity)' != '' And $([System.String]::new('%(Identity)').EndsWith('.props'))" />
<_PackageFiles Remove="@(_PackageFiles)"
Condition="'%(Identity)' != '' And $([System.String]::new('%(Identity)').EndsWith('.targets'))" />
</ItemGroup>
</Target>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="10.0.20" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3650.58" />
</ItemGroup>
<ItemGroup>
WpfExtended.SourceGeneration/WpfExtended.SourceGeneration.csproj
+4 -4
View File
@@ -7,7 +7,7 @@
<Authors>Alexandru Macocian</Authors>
<Description>Source generator library.</Description>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Version>0.3.0</Version>
<Version>0.3.1</Version>
<LangVersion>latest</LangVersion>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
@@ -16,11 +16,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all">
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
<PackageReference Include="Sybil" Version="0.6.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Sybil" Version="0.8.4" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
WpfExtended.Test/WpfExtended.Tests.csproj
+8 -8
View File
@@ -2,20 +2,20 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<StartupObject>WpfExtended.Tests.Launcher</StartupObject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
<PackageReference Include="FluentAssertions" Version="8.5.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.TestPlatform" Version="17.14.1" />
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.14.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.10.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.10.0" />
<PackageReference Include="FluentAssertions" Version="8.8.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.TestPlatform" Version="18.0.1" />
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="18.0.1" />
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
<PackageReference Include="SystemExtensions.NetStandard" Version="1.6.12" />
</ItemGroup>
WpfExtended/WpfExtended.csproj
+4 -4
View File
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0-windows</TargetFrameworks>
<TargetFrameworks>net10.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>0.8.1</Version>
<Version>0.9.0</Version>
<LangVersion>latest</LangVersion>
<Description>Extension library for Windows Presentation Platform.
@@ -83,8 +83,8 @@ http://www.java2s.com/Open-Source/CSharp_Free_Code/Windows_Presentation_Foundati
<ItemGroup>
<PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.1" />
<PackageReference Include="Slim" Version="1.11.2" />
<PackageReference Include="Slim.Integration" Version="1.0.4" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />