Multitargeting updates

Kinnara · Sep 21, 2020 · 868583d · 868583d · ShankarBUS · Sep 22, 2020
1 parent acf30b7
commit 868583d
Show file tree

Hide file tree

Showing 27 changed files with 105 additions and 89 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-preview.8.20417.9
+        dotnet-version: 5.0.100-rc.1.20452.10
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.9.2-debug.200915.0</Version>
+    <Version>0.9.2-preview.200922.0</Version>
     <Authors>Yimeng Wu</Authors>
     <Product>ModernWPF UI Library</Product>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,62 @@
+<Project>
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.6.1')) or
+                            '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <DefineConstants>$(DefineConstants);NET461_OR_NEWER</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.6.2')) or
+                            '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <DefineConstants>$(DefineConstants);NET462_OR_NEWER</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.7')) or
+                            '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <DefineConstants>$(DefineConstants);NET47_OR_NEWER</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.7.2')) or
+                            '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <DefineConstants>$(DefineConstants);NET472_OR_NEWER</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.8')) or
+                            '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <DefineConstants>$(DefineConstants);NET48_OR_NEWER</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0'))">
+    <DefineConstants>$(DefineConstants);NET5_0_OR_NEWER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(SupportedOSPlatform)' != '' and $([MSBuild]::VersionGreaterThan($(SupportedOSPlatform), '7.0'))">
+    <SupportedOSPlatform>7.0</SupportedOSPlatform>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(UseWinRT)' == 'true'">
+      <Choose>
+        <When Condition="$(DefineConstants.Contains('NET5_0_OR_NEWER'))" />
+        <When Condition="$(DefineConstants.Contains('NET461_OR_NEWER'))">
+          <ItemGroup>
+            <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" />
+          </ItemGroup>
+        </When>
+        <Otherwise>
+          <ItemGroup>
+            <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0" />
+            <Reference Include="Windows">
+              <HintPath>$(MSBuildThisFileDirectory)WinMD\Windows.WinMD</HintPath>
+              <IsWinMDFile>true</IsWinMDFile>
+              <Private>false</Private>
+            </Reference>
+            <Reference Include="Windows.Foundation.FoundationContract">
+              <HintPath>$(MSBuildThisFileDirectory)WinMD\Windows.Foundation.FoundationContract.winmd</HintPath>
+              <IsWinMDFile>true</IsWinMDFile>
+              <Private>false</Private>
+            </Reference>
+            <Reference Include="Windows.Foundation.UniversalApiContract">
+              <HintPath>$(MSBuildThisFileDirectory)WinMD\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+              <IsWinMDFile>true</IsWinMDFile>
+              <Private>false</Private>
+            </Reference>
+          </ItemGroup>
+        </Otherwise>
+      </Choose>
+    </When>
+  </Choose>
+</Project>
diff --git a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyoutToolBar.cs b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyoutToolBar.cs
@@ -336,7 +336,7 @@ void UpdateFlowsFromAndFlowsTo()
             // Ensure the SizeOfSet and PositionInSet automation properties
             // for the primary commands and the MoreButton account for the
             // potential MoreButton.
-#if NETCOREAPP
+#if NET48_OR_NEWER
             EnsureAutomationSetCountAndPosition();
 #endif
 
@@ -615,7 +615,7 @@ void UpdateTemplateSettings()
             }
         }
 
-#if NETCOREAPP
+#if NET48_OR_NEWER
         void EnsureAutomationSetCountAndPosition()
         {
             var moreButton = m_moreButton;

diff --git a/ModernWpf.Controls/Flyout/Flyout.cs b/ModernWpf.Controls/Flyout/Flyout.cs
@@ -110,7 +110,7 @@ private void PlayOpenAnimation()
 
             if (animateFrom != AnimateFrom.None)
             {
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
                 var bitmapCache = new BitmapCache(VisualTreeHelper.GetDpi(presenter).PixelsPerDip);
 #else
                 var bitmapCache = s_bitmapCacheMode;

diff --git a/ModernWpf.Controls/Flyout/FlyoutPresenter.cs b/ModernWpf.Controls/Flyout/FlyoutPresenter.cs
@@ -62,7 +62,7 @@ protected override void OnKeyDown(KeyEventArgs e)
             }
         }
 
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
         protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
         {
             base.OnDpiChanged(oldDpi, newDpi);

diff --git a/ModernWpf.Controls/ModernWpf.Controls.csproj b/ModernWpf.Controls/ModernWpf.Controls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0-windows10.0.18362.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetDocumentationFile</TargetsForTfmSpecificBuildOutput>
@@ -22,7 +22,7 @@
     <None Include="Properties\DesignTimeResources.xaml" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
+  <ItemGroup Condition="!$(DefineConstants.Contains('NET47_OR_NEWER'))">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/ModernWpf.Controls/ModernWpfUI.nuspec b/ModernWpf.Controls/ModernWpfUI.nuspec
@@ -13,29 +13,29 @@
     <tags>$tags$</tags>
     <dependencies>
       <group targetFramework="net45">
-        <dependency id="System.Runtime.WindowsRuntime" version="4.7.0" exclude="Build,Analyzers" />
+        <dependency id="System.Runtime.WindowsRuntime" version="4.6.0" exclude="Build,Analyzers" />
         <dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net462">
-        <dependency id="System.Runtime.WindowsRuntime" version="4.7.0" exclude="Build,Analyzers" />
         <dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.18362.2005" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="netcoreapp3.0">
-        <dependency id="System.Runtime.WindowsRuntime" version="4.7.0" exclude="Build,Analyzers" />
-      </group>
-      <group targetFramework="net5.0">
-        <dependency id="Microsoft.Windows.CsWinRT" version="0.1.0-prerelease.200629.3" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Windows.SDK.NET" version="10.0.18362.3-preview" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Windows.SDK.Contracts" version="10.0.18362.2005" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="net5.0-windows10.0.18362" />
     </dependencies>
     <frameworkReferences>
       <group targetFramework="netcoreapp3.0">
         <frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net5.0-windows10.0.18362">
         <frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
       </group>
     </frameworkReferences>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="netstandard" targetFramework="net472" />
+    </frameworkAssemblies>
   </metadata>
   <files>
     <file src="bin\$configuration$\**\ModernWpf*.dll" target="lib" />

diff --git a/ModernWpf.Controls/NavigationView/NavigationView.cs b/ModernWpf.Controls/NavigationView/NavigationView.cs
@@ -244,7 +244,7 @@ public NavigationView()
             m_navigationViewItemsFactory = new NavigationViewItemsFactory();
 
             m_bitmapCache = new BitmapCache();
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
             m_bitmapCache.RenderAtScale = VisualTreeHelper.GetDpi(this).PixelsPerDip;
 #endif
         }
@@ -5536,7 +5536,7 @@ DependencyObject IControlProtected.GetTemplateChild(string childName)
             return GetTemplateChild(childName);
         }
 
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
         protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
         {
             base.OnDpiChanged(oldDpi, newDpi);

diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItemAutomationPeer.cs b/ModernWpf.Controls/NavigationView/NavigationViewItemAutomationPeer.cs
@@ -77,7 +77,7 @@ protected override AutomationControlType GetAutomationControlTypeCore()
             }
         }
 
-#if NETCOREAPP || NET48
+#if NET48_OR_NEWER
         protected override int GetPositionInSetCore()
         {
             int positionInSet = 0;

diff --git a/ModernWpf.Controls/RadioButtons/RadioButtons.cs b/ModernWpf.Controls/RadioButtons/RadioButtons.cs
@@ -428,7 +428,7 @@ void OnRepeaterElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPrepare
                         Select(args.Index);
                     }
                 }
-#if NETCOREAPP
+#if NET48_OR_NEWER
                 var repeater = m_repeater;
                 if (repeater != null)
                 {
@@ -470,7 +470,7 @@ void OnRepeaterElementIndexChanged(ItemsRepeater sender, ItemsRepeaterElementInd
             var element = args.Element;
             if (element != null)
             {
-#if NETCOREAPP
+#if NET48_OR_NEWER
                 element.SetValue(AutomationProperties.PositionInSetProperty, args.NewIndex + 1);
 #endif
                 // When the selected item's index changes, update selection to match
@@ -486,7 +486,7 @@ void OnRepeaterElementIndexChanged(ItemsRepeater sender, ItemsRepeaterElementInd
 
         void OnRepeaterCollectionChanged(object sender, object args)
         {
-#if NETCOREAPP
+#if NET48_OR_NEWER
             var repeater = m_repeater;
             if (repeater != null)
             {

diff --git a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs
@@ -305,7 +305,7 @@ public override void OnApplyTemplate()
 
                 if (_bitmapCache == null)
                 {
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
                     _bitmapCache = new BitmapCache(VisualTreeHelper.GetDpi(this).PixelsPerDip);
 #else
                     _bitmapCache = new BitmapCache(2);
@@ -344,7 +344,7 @@ protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
             }
         }
 
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
         protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
         {
             base.OnDpiChanged(oldDpi, newDpi);

diff --git a/ModernWpf.MahApps/ModernWpf.MahApps.csproj b/ModernWpf.MahApps/ModernWpf.MahApps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net452;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5.0-windows10.0.18362.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj b/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net45;net462;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;netcoreapp3.1;net5.0-windows10.0.18362.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
     <LangVersion>8.0</LangVersion>

diff --git a/ModernWpf.sln b/ModernWpf.sln
@@ -12,6 +12,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1387DCAB-42A4-4F47-9E85-16998E2D9C71}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		Settings.XamlStyler = Settings.XamlStyler
 	EndProjectSection
 EndProject
@@ -41,7 +42,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NavigationView_TestUI", "te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAppUtils", "test\TestAppUtils\TestAppUtils.csproj", "{48F790D9-2231-477E-839B-C4F5C6A20595}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiThreadingSample", "samples\MultiThreadingSample\MultiThreadingSample.csproj", "{4067F104-92D9-4609-AC0A-D02AC5BD444B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiThreadingSample", "samples\MultiThreadingSample\MultiThreadingSample.csproj", "{4067F104-92D9-4609-AC0A-D02AC5BD444B}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution

diff --git a/ModernWpf/Controls/Primitives/MaximizedWindowFixer.cs b/ModernWpf/Controls/Primitives/MaximizedWindowFixer.cs
@@ -70,7 +70,7 @@ private void SetWindow(Window window)
             _hwnd = new WindowInteropHelper(window).Handle;
 
             _window.StateChanged += WindowStateChanged;
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
             _window.DpiChanged += WindowDpiChanged;
 #endif
             _window.Closed += WindowClosed;
@@ -96,7 +96,7 @@ private void UnsubscribeWindowEvents()
             {
                 _window.SourceInitialized -= WindowSourceInitialized;
                 _window.StateChanged -= WindowStateChanged;
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
                 _window.DpiChanged -= WindowDpiChanged;
 #endif
                 _window.Closed -= WindowClosed;
@@ -129,7 +129,7 @@ private void WindowStateChanged(object sender, EventArgs e)
             UpdateWindowPadding();
         }
 
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
         private void WindowDpiChanged(object sender, DpiChangedEventArgs e)
         {
             InvalidateMaximizedWindowBorder();
@@ -217,7 +217,7 @@ private Thickness GetMaximizedWindowBorder()
             }
 
             double dpiScaleX, dpiScaleY;
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
             DpiScale dpi = VisualTreeHelper.GetDpi(_window);
             dpiScaleX = dpi.DpiScaleX;
             dpiScaleY = dpi.DpiScaleY;

diff --git a/ModernWpf/Controls/Primitives/ThemeShadowChrome.cs b/ModernWpf/Controls/Primitives/ThemeShadowChrome.cs
@@ -26,7 +26,7 @@ static ThemeShadowChrome()
 
         public ThemeShadowChrome()
         {
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
             _bitmapCache = new BitmapCache(VisualTreeHelper.GetDpi(this).PixelsPerDip);
 #else
             _bitmapCache = new BitmapCache();
@@ -281,7 +281,7 @@ protected override Size ArrangeOverride(Size arrangeSize)
             return base.ArrangeOverride(arrangeSize);
         }
 
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
         protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
         {
             base.OnDpiChanged(oldDpi, newDpi);

diff --git a/ModernWpf/Media/Animation/NavigationAnimation.cs b/ModernWpf/Media/Animation/NavigationAnimation.cs
@@ -58,7 +58,7 @@ private void OnCompleted(object sender, EventArgs e)
 
         private BitmapCache GetBitmapCache()
         {
-#if NETCOREAPP || NET462
+#if NET462_OR_NEWER
             return new BitmapCache(VisualTreeHelper.GetDpi(_element).PixelsPerDip);
 #else
             return _defaultBitmapCache;

diff --git a/ModernWpf/ModernWpf.csproj b/ModernWpf/ModernWpf.csproj
@@ -1,41 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0-windows10.0.18362.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <LangVersion>8.0</LangVersion>
+    <UseWinRT>true</UseWinRT>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
+  <ItemGroup Condition="!$(DefineConstants.Contains('NET47_OR_NEWER'))">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0'">
-    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
-    <Reference Include="Windows">
-      <HintPath>WinMD\Windows.WinMD</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>WinMD\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>WinMD\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />
-    <PackageReference Include="Microsoft.Windows.SDK.NET" Version="10.0.18362.3-preview" />
-  </ItemGroup>
-
   <ItemGroup>
     <Page Remove="Properties\DesignTimeResources.xaml" />
   </ItemGroup>

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Modern styles and controls for your WPF applications.
 
 * [Additional controls](https://github.com/Kinnara/ModernWpf/wiki/Controls#additional-controls) to help you build modern applications. Some are ported from the [Windows UI Library](https://github.com/microsoft/microsoft-ui-xaml).
 
-* Targets .NET Framework 4.5 and .NET Core 3. Runs on Windows Vista SP2 and above.
+* Targets .NET Framework 4.5+, .NET Core 3+, and .NET 5. Runs on Windows Vista SP2 and above.
 
 ![Overview of controls (light theme)](docs/images/Controls.Light.png "Overview of controls (light theme)")
 

diff --git a/...ndows.Foundation.FoundationContract.winmd → ...ndows.Foundation.FoundationContract.winmd b/...ndows.Foundation.FoundationContract.winmd → ...ndows.Foundation.FoundationContract.winmd
diff --git a/...ows.Foundation.UniversalApiContract.winmd → ...ows.Foundation.UniversalApiContract.winmd b/...ows.Foundation.UniversalApiContract.winmd → ...ows.Foundation.UniversalApiContract.winmd
diff --git a/ModernWpf/WinMD/Windows.WinMD → WinMD/Windows.WinMD b/ModernWpf/WinMD/Windows.WinMD → WinMD/Windows.WinMD