Skip to content

W
wpf

dotNET Platform / wpf
12 个月 前同步成功

通知 1
Star 1
Fork 0
W
wpf

体验新版 GitCode，发现更多精彩内容 >>

提交 8910a31c 编写于 作者: R Ryland Alaniz
浏览文件
操作

Merge branch 'master' into Nirmal4g/WinFXFix

上级 41e0b780 d4b22baf
显示空白变更内容
内联 并排
Showing with 128 addition and 123 deletion
eng/Version.Details.xml
浏览文件 @ 8910a31c
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.7.20307.1">
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.7.20309.5">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>705f5eaa3cbe54e80c277b4c37117efa228ce7b4</Sha>
<Sha>46f1d69fb11c8169ccb1859ef839569c02a6b4f4</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.AccessControl" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
......@@ -67,29 +67,29 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-preview.7.20308.2">
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-preview.7.20310.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>aa44e416a93dcf7762bb8d140db4c15b684df8cc</Sha>
<Sha>63d7af8eb1af1cb88ab655ae02fde4e264b67d96</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19562.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>d5bb8bf2437d447750cf0203dd55bb5160ff36b8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
......@@ -103,13 +103,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.7.20306.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.7.20308.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4b339d8ba42a03cd8624adc0c3cbe73817a76b77</Sha>
<Sha>80553e8d49479b775409dd70803b541c81cc39d9</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @ 8910a31c
......@@ -4,40 +4,40 @@
<VersionPrefix>5.0.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>7</PreReleaseVersionIteration>
<SystemIOPackagingVersion>5.0.0-preview.7.20306.3</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>5.0.0-preview.7.20306.3</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>5.0.0-preview.7.20308.8</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>5.0.0-preview.7.20308.8</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>5.0.0-preview.7.20307.1</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>5.0.0-preview.7.20309.5</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20306.3</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20306.3</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20308.8</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20308.8</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppInternalVersion>5.0.0-preview.7.20306.3</MicrosoftNETCoreAppInternalVersion>
<MicrosoftNETCorePlatformsVersion>5.0.0-preview.7.20306.3</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>5.0.0-preview.7.20306.3</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>5.0.0-preview.7.20306.3</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>5.0.0-preview.7.20306.3</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppInternalVersion>5.0.0-preview.7.20308.8</MicrosoftNETCoreAppInternalVersion>
<MicrosoftNETCorePlatformsVersion>5.0.0-preview.7.20308.8</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>5.0.0-preview.7.20308.8</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>5.0.0-preview.7.20308.8</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>5.0.0-preview.7.20308.8</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.7.20306.3</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>5.0.0-preview.7.20306.3</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>5.0.0-preview.7.20306.3</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.7.20306.3</SystemDiagnosticsEventLogPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.7.20308.8</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>5.0.0-preview.7.20308.8</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>5.0.0-preview.7.20308.8</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.7.20308.8</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>5.0.0-preview.7.20306.3</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.7.20306.3</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.7.20306.3</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.7.20306.3</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.7.20306.3</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>5.0.0-preview.7.20308.8</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.7.20308.8</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.7.20308.8</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.7.20308.8</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.7.20308.8</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
......@@ -96,6 +96,6 @@
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetWpfDncEngVersion>5.0.0-preview.7.20308.2</MicrosoftDotNetWpfDncEngVersion>
<MicrosoftDotNetWpfDncEngVersion>5.0.0-preview.7.20310.2</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup>
</Project>
packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
浏览文件 @ 8910a31c
<Project>
<PropertyGroup>
<_MicrosoftNetSdkWindowsDesktop>true</_MicrosoftNetSdkWindowsDesktop>
<EnableDefaultPageItems Condition="'$(EnableDefaultPageItems)' == ''">true</EnableDefaultPageItems>
<EnableDefaultApplicationDefinition Condition="'$(EnableDefaultApplicationDefinition)' == ''">true</EnableDefaultApplicationDefinition>
</PropertyGroup>
<PropertyGroup>
<!--
WindowsDesktop SDK supports WPF and WinForms on
- .NET Core 3.0 and greater
- .NET Framework 3.0 and greater
Note that on .NET Framework versions < 4.0, additional workarounds may be required to build applications
using the SDK style projects. For e.g., see https://github.com/microsoft/msbuild/issues/1333
Irrespective of whether '$(TargetFrameworkIdentifier)' is '.NETCoreApp' or '.NETFramework',
the minimum value of $(_TargetFrameworkVersionValue) we will be testing for is '3.0'
-->
<_WindowsDesktopSdkTargetFrameworkVersionFloor>3.0</_WindowsDesktopSdkTargetFrameworkVersionFloor>
<!--
Represents an undefined TFV value. This will be used in comparisons of _TargetFrameworkVersionValue (defined in Microsoft.NET.WindowsDesktop.targets)
to identify when a TFV is undefined
-->
<_UndefinedTargetFrameworkVersion>0.0</_UndefinedTargetFrameworkVersion>
<!--
Initial/Default value set to 'undefined'. Updated in Microsoft.NET.WindowsDesktop.targets
-->
<_TargetFrameworkVersionValue>$(_UndefinedTargetFrameworkVersion)</_TargetFrameworkVersionValue>
</PropertyGroup>
<ItemGroup Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And
('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
<ItemGroup Condition=" '$(_EnableWindowsDesktopGlobbing)' == 'true' ">
<ApplicationDefinition Include="App.xaml"
Condition="'$(EnableDefaultApplicationDefinition)' != 'false' And Exists('$(MSBuildProjectDirectory)/App.xaml') And '$(MSBuildProjectExtension)' == '.csproj'">
<Generator>MSBuild:Compile</Generator>
......@@ -66,10 +32,7 @@
</ItemGroup>
<ItemGroup Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And
('$(TargetFrameworkIdentifier)' == '.NETCoreApp') And
('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
<ItemGroup Condition=" '$(_EnableWindowsDesktopNetCoreFrameworkReferences)' == 'true' ">
<FrameworkReference Include="Microsoft.WindowsDesktop.App" IsImplicitlyDefined="true"
Condition="('$(UseWPF)' == 'true') And ('$(UseWindowsForms)' == 'true')"/>
......@@ -103,9 +66,7 @@
System.Windows.Controls.Ribbon
-->
<ItemGroup Condition="('$(TargetFrameworkIdentifier)' == '.NETFramework') And
('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
<ItemGroup Condition=" '$(_EnableWindowsDesktopNETFrameworkImplicitReference)' == 'true' ">
<!--
The following 3 _WpfCommonNetFxReference items normally require Condition="'$(_TargetFrameworkVersionValue)' >= '3.0'", since
......@@ -129,10 +90,7 @@
<_WpfCommonNetFxReference Include="System.Windows.Controls.Ribbon" Condition="'$(_TargetFrameworkVersionValue)' >= '4.5'" />
</ItemGroup>
<ItemGroup Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And
('$(TargetFrameworkIdentifier)' == '.NETFramework') And
('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
<ItemGroup Condition=" '$(_EnableWindowsDesktopNETFrameworkImplicitReference)' == 'true' ">
<_SDKImplicitReference Include="@(_WpfCommonNetFxReference)"
Condition="'$(UseWPF)' == 'true'"/>
......@@ -204,6 +162,4 @@
<SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework);@(_UnsupportedNETFrameworkTargetFramework)" />
</ItemGroup>
<Import Project="Microsoft.WinFX.props" />
</Project>
packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
浏览文件 @ 8910a31c
<Project>
<PropertyGroup>
<_MicrosoftNetSdkWindowsDesktop>true</_MicrosoftNetSdkWindowsDesktop>
<EnableDefaultPageItems Condition="'$(EnableDefaultPageItems)' == ''">true</EnableDefaultPageItems>
<EnableDefaultApplicationDefinition Condition="'$(EnableDefaultApplicationDefinition)' == ''">true</EnableDefaultApplicationDefinition>
</PropertyGroup>
<PropertyGroup>
<!--
WindowsDesktop SDK supports WPF and WinForms on
- .NET Core 3.0 and greater
- .NET Framework 3.0 and greater
Note that on .NET Framework versions < 4.0, additional workarounds may be required to build applications
using the SDK style projects. For e.g., see https://github.com/microsoft/msbuild/issues/1333
Irrespective of whether '$(TargetFrameworkIdentifier)' is '.NETCoreApp' or '.NETFramework',
the minimum value of $(_TargetFrameworkVersionValue) we will be testing for is '3.0'
-->
<_WindowsDesktopSdkTargetFrameworkVersionFloor>3.0</_WindowsDesktopSdkTargetFrameworkVersionFloor>
<!--
Represents an undefined TFV value. This will be used in comparisons of _TargetFrameworkVersionValue (defined in Microsoft.NET.WindowsDesktop.targets)
to identify when a TFV is undefined
-->
<_UndefinedTargetFrameworkVersion>0.0</_UndefinedTargetFrameworkVersion>
</PropertyGroup>
<!--
$(TargetFrameworkVersion), $(_TargetFrameworkVersionWithoutV) etc. are defined in
Microsoft.NET.Sdk\targets\Microsoft.NET.TargetFrameworkInference.targets.
......@@ -23,6 +52,25 @@
<_TargetFrameworkVersionValue>$([MSBuild]::ValueOrDefault('$(_TargetFrameworkVersionWithoutV)', '$(_UndefinedTargetFrameworkVersion)'))</_TargetFrameworkVersionValue>
</PropertyGroup>
<!-- PropertyGroup flags control if Itemgroups in Microsoft.NET.Sdk.WindowsDesktop.props file is being imported -->
<PropertyGroup>
<_EnableWindowsDesktopGlobbing Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And
('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">true</_EnableWindowsDesktopGlobbing>
<_EnableWindowsDesktopNetCoreFrameworkReferences Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And
('$(TargetFrameworkIdentifier)' == '.NETCoreApp') And
('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">true</_EnableWindowsDesktopNetCoreFrameworkReferences>
<_EnableWindowsDesktopNETFrameworkImplicitReference Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And
('$(TargetFrameworkIdentifier)' == '.NETFramework') And
('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">true</_EnableWindowsDesktopNETFrameworkImplicitReference>
<_EnableWindowsDesktopSupportUnsupportedTargetFramework Condition="('$(UseWPF)' == 'true' Or '$(UseWindowsForms)' == 'true') And
'$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)' And
'$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)'">true</_EnableWindowsDesktopSupportUnsupportedTargetFramework>
</PropertyGroup>
<Import Project="Microsoft.WinFX.targets" />
<ItemGroup Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
......
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.props
浏览文件 @ 8910a31c
<Project>
<PropertyGroup>
<_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_PresentationBuildTasksTfm>
<_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</_PresentationBuildTasksTfm>
<_PresentationBuildTasksAssembly Condition="'$(_PresentationBuildTasksAssembly)'==''">$([MSBuild]::Unescape($([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\$(_PresentationBuildTasksTfm)\PresentationBuildTasks.dll'))))</_PresentationBuildTasksAssembly>
</PropertyGroup>
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.MarkupCompilePass1" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.UidManager" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.ResourcesGenerator" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.FileClassifier" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.MarkupCompilePass2" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.GenerateTemporaryTargetAssembly" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.MergeLocalizationDirectives" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
</Project>
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
浏览文件 @ 8910a31c
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_PresentationBuildTasksTfm>
<_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</_PresentationBuildTasksTfm>
<_PresentationBuildTasksAssembly Condition="'$(_PresentationBuildTasksAssembly)'==''">$([MSBuild]::Unescape($([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\$(_PresentationBuildTasksTfm)\PresentationBuildTasks.dll'))))</_PresentationBuildTasksAssembly>
</PropertyGroup>
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.MarkupCompilePass1" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.UidManager" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.ResourcesGenerator" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.FileClassifier" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.MarkupCompilePass2" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.GenerateTemporaryTargetAssembly" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.Build.Tasks.Windows.MergeLocalizationDirectives" AssemblyFile="$(_PresentationBuildTasksAssembly)" />
<PropertyGroup>
<AlwaysCompileMarkupFilesInSeparateDomain Condition="'$(BuildingInsideVisualStudio)' == 'true' and '$(AlwaysCompileMarkupFilesInSeparateDomain)' == ''">true</AlwaysCompileMarkupFilesInSeparateDomain>
<AlwaysCompileMarkupFilesInSeparateDomain Condition="'$(AlwaysCompileMarkupFilesInSeparateDomain)' == '' ">true</AlwaysCompileMarkupFilesInSeparateDomain>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或