Merge 41f0341 into 61d6c80

amaitland · web-flow · commit e19b9fa31c8c · 2025-07-03T11:13:07.000Z
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj
@@ -36,8 +36,9 @@
     <AssemblyName>CefSharp.BrowserSubprocess.Core</AssemblyName>
     <RootNamespace>CefSharpBrowserSubprocessCore</RootNamespace>
     <Keyword>NetCoreCProj</Keyword>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="..\CefSharp.props" />
diff --git a/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj b/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj
@@ -12,8 +12,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
-        <TargetFrameworks Condition="'$(VisualStudioVersion)'=='17.0'">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows</TargetFrameworks>
         <RootNamespace>CefSharp.BrowserSubprocess</RootNamespace>
         <AssemblyName>CefSharp.BrowserSubprocess</AssemblyName>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.RefAssembly.netcore.csproj b/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.RefAssembly.netcore.csproj
@@ -10,7 +10,7 @@
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 	
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>CefSharp.Core</RootNamespace>
         <AssemblyName>CefSharp.Core.Runtime</AssemblyName>
         <DocumentationFile>$(BaseOutputPath)$(PlatformTarget)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj
@@ -36,7 +36,8 @@
     <AssemblyName>CefSharp.Core.Runtime</AssemblyName>
     <RootNamespace>CefSharp</RootNamespace>
     <Keyword>NetCoreCProj</Keyword>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="..\CefSharp.props" />
diff --git a/CefSharp.Core/CefSharp.Core.netcore.csproj b/CefSharp.Core/CefSharp.Core.netcore.csproj
@@ -10,7 +10,7 @@
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
     
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>CefSharp.Core</RootNamespace>
         <AssemblyName>CefSharp.Core</AssemblyName>
         <DocumentationFile>$(BaseOutputPath)$(PlatformTarget)$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
diff --git a/CefSharp.Example/CefSharp.Example.netcore.csproj b/CefSharp.Example/CefSharp.Example.netcore.csproj
@@ -7,10 +7,10 @@
     <BaseOutputPath>bin.netcore\</BaseOutputPath>
   </PropertyGroup>
 
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>CefSharp.Example</RootNamespace>
     <AssemblyName>CefSharp.Example</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
@@ -95,5 +95,5 @@
     </PackageReference>
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj
@@ -11,8 +11,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
-        <TargetFrameworks Condition="'$(VisualStudioVersion)'=='17.0'">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows</TargetFrameworks>
         <RootNamespace>CefSharp.OffScreen.Example</RootNamespace>
         <AssemblyName>CefSharp.OffScreen.Example</AssemblyName>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/CefSharp.OffScreen/CefSharp.OffScreen.netcore.csproj b/CefSharp.OffScreen/CefSharp.OffScreen.netcore.csproj
@@ -7,10 +7,10 @@
     <BaseOutputPath>bin.netcore\</BaseOutputPath>
   </PropertyGroup>
 
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>CefSharp.OffScreen</RootNamespace>
     <AssemblyName>CefSharp.OffScreen</AssemblyName>
     <DocumentationFile>$(BaseOutputPath)$(PlatformTarget)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -53,5 +53,5 @@
     <Compile Include="..\CefSharp\Internals\Partial\ChromiumWebBrowser.Partial.cs" Link="ChromiumWebBrowser.Partial.cs" />
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp.Test/CefSharp.Test.netcore.csproj b/CefSharp.Test/CefSharp.Test.netcore.csproj
@@ -7,10 +7,10 @@
     <BaseOutputPath>bin.netcore\</BaseOutputPath>
   </PropertyGroup>
 
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>CefSharp.Test</RootNamespace>
     <AssemblyName>CefSharp.Test</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
@@ -66,5 +66,5 @@
   </ItemGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\CefSharp.AfterBuild.targets" />
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj
@@ -7,12 +7,11 @@
         <BaseOutputPath>bin.netcore\</BaseOutputPath>
     </PropertyGroup>
 
-    <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+    <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
-        <TargetFrameworks Condition="'$(VisualStudioVersion)'=='17.0'">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows</TargetFrameworks>
         <RootNamespace>CefSharp.WinForms.Example</RootNamespace>
         <AssemblyName>CefSharp.WinForms.Example</AssemblyName>
         <UseWindowsForms>true</UseWindowsForms>
@@ -67,5 +66,5 @@
     </ItemGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)..\CefSharp.AfterBuild.targets" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp.WinForms/CefSharp.WinForms.netcore.csproj b/CefSharp.WinForms/CefSharp.WinForms.netcore.csproj
@@ -7,10 +7,10 @@
     <BaseOutputPath>bin.netcore\</BaseOutputPath>
   </PropertyGroup>
 
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>CefSharp.WinForms</RootNamespace>
     <AssemblyName>CefSharp.WinForms</AssemblyName>
     <DocumentationFile>$(BaseOutputPath)$(PlatformTarget)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -20,7 +20,7 @@
     <AssemblyOriginatorKeyFile>..\CefSharp.snk</AssemblyOriginatorKeyFile>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
 	<DefineConstants>WINFORMS</DefineConstants>
-      <LangVersion>9.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -67,5 +67,5 @@
     </PackageReference>
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj
@@ -7,12 +7,11 @@
         <BaseOutputPath>bin.netcore\</BaseOutputPath>
     </PropertyGroup>
 
-    <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+    <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
-        <TargetFrameworks Condition="'$(VisualStudioVersion)'=='17.0'">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows</TargetFrameworks>
         <RootNamespace>CefSharp.Wpf.Example</RootNamespace>
         <AssemblyName>CefSharp.Wpf.Example</AssemblyName>
         <UseWPF>true</UseWPF>
@@ -63,5 +62,5 @@
     </ItemGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)..\CefSharp.AfterBuild.targets" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj b/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj
@@ -7,21 +7,19 @@
         <BaseOutputPath>bin.netcore\</BaseOutputPath>
     </PropertyGroup>
 
-    <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+    <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
-        <TargetFrameworks Condition="'$(VisualStudioVersion)'=='17.0'">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows</TargetFrameworks>
         <RootNamespace>CefSharp.Wpf.HwndHost.Example</RootNamespace>
         <AssemblyName>CefSharp.Wpf.HwndHost.Example</AssemblyName>
         <UseWPF>true</UseWPF>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
         <!-- Builds failing for arm64 on appveyor for some reason-->
-        <!--<Platforms>x86;x64;arm64</Platforms>-->
-        <Platforms>x86;x64</Platforms>
+        <Platforms>x86;x64;arm64</Platforms>
         <!-- Explicitly set the PlatformTarget for arm64, see: https://github.com/dotnet/sdk/issues/15434 -->
         <PlatformTarget Condition="'$(Platform)' == 'arm64'">arm64</PlatformTarget>
         <StartupObject>CefSharp.Wpf.HwndHost.Example.App</StartupObject>
@@ -65,5 +63,5 @@
     </ItemGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)..\CefSharp.AfterBuild.targets" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp.Wpf/CefSharp.Wpf.netcore.csproj b/CefSharp.Wpf/CefSharp.Wpf.netcore.csproj
@@ -7,11 +7,10 @@
     <BaseOutputPath>bin.netcore\</BaseOutputPath>
   </PropertyGroup>
 
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
-    <TargetFrameworks Condition="'$(VisualStudioVersion)'=='17.0'">$(TargetFrameworks);net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <RootNamespace>CefSharp.Wpf</RootNamespace>
     <AssemblyName>CefSharp.Wpf</AssemblyName>
     <DocumentationFile>$(BaseOutputPath)$(PlatformTarget)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -54,5 +53,5 @@
     <Compile Include="..\CefSharp\Internals\Partial\ChromiumWebBrowser.Partial.cs" Link="ChromiumWebBrowser.Partial.cs" />
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/CefSharp/CefSharp.netcore.csproj b/CefSharp/CefSharp.netcore.csproj
@@ -10,7 +10,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
     
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>CefSharp</RootNamespace>
     <AssemblyName>CefSharp</AssemblyName>
     <DocumentationFile>$(BaseOutputPath)$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
diff --git a/CefSharp3.netcore.sln b/CefSharp3.netcore.sln
@@ -246,13 +246,11 @@ Global
 		{A4AFD158-0B6F-4579-AE79-EC386C8BEA58}.Release|x86.ActiveCfg = Release|Any CPU
 		{A4AFD158-0B6F-4579-AE79-EC386C8BEA58}.Release|x86.Build.0 = Release|Any CPU
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Debug|arm64.ActiveCfg = Debug|arm64
-		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Debug|arm64.Build.0 = Debug|arm64
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Debug|x64.ActiveCfg = Debug|x64
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Debug|x64.Build.0 = Debug|x64
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Debug|x86.ActiveCfg = Debug|x86
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Debug|x86.Build.0 = Debug|x86
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Release|arm64.ActiveCfg = Release|arm64
-		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Release|arm64.Build.0 = Release|arm64
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Release|x64.ActiveCfg = Release|x64
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Release|x64.Build.0 = Release|x64
 		{D137B43E-077C-4820-AC4F-34BA074FFCF8}.Release|x86.ActiveCfg = Release|x86
diff --git a/NuGet/PackageReference/CefSharp.Common.NETCore.nuspec b/NuGet/PackageReference/CefSharp.Common.NETCore.nuspec
diff --git a/NuGet/PackageReference/CefSharp.Common.NETCore.targets b/NuGet/PackageReference/CefSharp.Common.NETCore.targets
diff --git a/NuGet/PackageReference/CefSharp.OffScreen.NETCore.nuspec b/NuGet/PackageReference/CefSharp.OffScreen.NETCore.nuspec
diff --git a/NuGet/PackageReference/CefSharp.WinForms.NETCore.nuspec b/NuGet/PackageReference/CefSharp.WinForms.NETCore.nuspec
diff --git a/NuGet/PackageReference/CefSharp.Wpf.HwndHost.nuspec b/NuGet/PackageReference/CefSharp.Wpf.HwndHost.nuspec
diff --git a/NuGet/PackageReference/CefSharp.Wpf.NETCore.nuspec b/NuGet/PackageReference/CefSharp.Wpf.NETCore.nuspec
diff --git a/appveyor.yml b/appveyor.yml
