Change Win32 controls to use 4.6.2

4.6.2 is the minimum required that supports `DPIChangedEvent` required for WebView high DPI scenarios.
This commit is contained in:
Richard Murillo 2018-04-30 13:04:52 -07:00
Родитель c8a056fbc8
Коммит 57932512da
10 изменённых файлов: 15 добавлений и 11 удалений

Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
<System.Windows.Forms.ApplicationConfigurationSection>
<add key="DpiAwareness" value="PerMonitorV2"/>

Просмотреть файл

@ -22,7 +22,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>Microsoft.Toolkit.Win32.Samples.WPF.WebView</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Win32.Samples.WPF.WebView</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile />
</PropertyGroup>

Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
<System.Windows.Forms.ApplicationConfigurationSection>
<add key="DpiAwareness" value="PerMonitorV2"/>

Просмотреть файл

@ -19,7 +19,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>Microsoft.Toolkit.Win32.Samples.WinForms.WebView</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Win32.Samples.WinForms.WebView</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetPlatformVersion>10.0</TargetPlatformVersion>
<ApplicationManifest>app.manifest</ApplicationManifest>
@ -38,6 +38,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

Просмотреть файл

@ -9,6 +9,9 @@
//------------------------------------------------------------------------------
namespace Microsoft.Toolkit.Win32.Samples.WinForms.WebView.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@ -36,7 +39,7 @@ namespace Microsoft.Toolkit.Win32.Samples.WinForms.WebView.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WebViewTest.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Win32.Samples.WinForms.WebView.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net47</TargetFramework>
<TargetFramework>net462</TargetFramework>
<RootNamespace>Microsoft.Toolkit.Win32.UI.Controls</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Win32.UI.Controls</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

Просмотреть файл

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Toolkit.Win32.UI.Controls.Test.WebView.Shared</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Win32.UI.Controls.Test.WebView.Shared</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>

Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Toolkit.Win32.UI.Controls.Test.WPF.WebView</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Win32.UI.Controls.Test.WPF.WebView</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>

Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Toolkit.Win32.UI.Controls.Test.WinForms.WebView</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Win32.UI.Controls.Test.WinForms.WebView</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>

Просмотреть файл

@ -27,7 +27,7 @@ Unless specified otherwise in this article, the documentation for the [WebViewCo
:heavy_check_mark: Windows 10 Insider Preview Build 17110 or a later release.
:heavy_check_mark: .NET Framework 4.7 or a later release.
:heavy_check_mark: .NET Framework 4.6.2 or a later release.
:heavy_check_mark: Configure your application for high DPI support. To learn how, see [this section](#high-dpi) of the guide.