Skip to content
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.

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

Update WPF to build against newest released version of the SDK (.NET 6.0 Preview1) #4123

Merged
merged 12 commits into from
Feb 3, 2021
Merged
Prev Previous commit
Next Next commit
Update WpfSdk v5.0 to v6.0. Fix WinForms accessibility reference.
ryalanms committed Feb 2, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit b70474f7c1ff30b966140a5414a697fba3a23f13
2 changes: 1 addition & 1 deletion eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)'!='' And
'$(NoTargets)'!='true' And
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')">$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimeFrameworkVersion>
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0')">$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimeFrameworkVersion>
</PropertyGroup>

<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
4 changes: 2 additions & 2 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
Condition="'$(MicrosoftNETCoreAppRefVersion)'!=''
And '$(NoTargets)'!='true'
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0')
And '$(MSBuildProjectExtension)'!='.vcxproj'">
<TargetingPackVersion>$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
</FrameworkReference>
@@ -30,6 +30,6 @@

<PropertyGroup>
<!-- If TargetFramework is not one of the supported .NET Core versions, then reset RuntimeFrameworkVersion -->
<RuntimeFrameworkVersion Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp') Or ('$(TargetFrameworkVersion)' != 'v3.0' And '$(TargetFrameworkVersion)' != 'v3.1' And '$(TargetFrameworkVersion)' == 'v5.0')" />
<RuntimeFrameworkVersion Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp') Or ('$(TargetFrameworkVersion)' != 'v3.0' And '$(TargetFrameworkVersion)' != 'v3.1' And '$(TargetFrameworkVersion)' == 'v6.0')" />
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions eng/WpfArcadeSdk/tools/SdkReferences.targets
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
GeneratePathProperty="True"
Condition="'$(MSBuildProjectExtension)'!='.vcxproj'
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0')
And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/>

<!--
@@ -122,7 +122,7 @@
Condition="'@(MicrosoftDotNetWpfGitHubReference)'!=''
And '$(MSBuildProjectExtension)' != '.vcxproj'
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0')
and '$(DoNotLimitMicrosoftDotNetWpfGitHubReferences)'!='true'">
<!--
In your project, Add a references to WPF GitHub transport package like this:
@@ -205,7 +205,7 @@
<Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\netcoreapp5.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
Condition="!Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')
And $(TargetFramework) == 'net6.0'
And Exists('$(PkgMicrosoft_Private_Winforms)\ref\netcoreapp6.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
And Exists('$(PkgMicrosoft_Private_Winforms)\ref\netcoreapp5.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
<NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
</Reference>
</ItemGroup>
2 changes: 1 addition & 1 deletion eng/WpfArcadeSdk/tools/WpfProjectReference.targets
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
GeneratePathProperty="True"
Condition="'$(MSBuildProjectExtension)'!='.vcxproj'
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0')
And '$(NoAutoMicrosoftDotNetWpfGitHubPackageReference)'!='true'
And '$(MicrosoftDotNetWpfGitHubPackage)'!=''"/>