Add .NET 5.0 support

Kinnara · Aug 2, 2020 · 53f752b · 53f752b
1 parent 3f46db9
commit 53f752b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 22 deletions.
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>netcoreapp3.0;net45;net462</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetDocumentationFile</TargetsForTfmSpecificBuildOutput>
@@ -22,7 +22,7 @@
     <None Include="Properties\DesignTimeResources.xaml" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/ModernWpf.Controls/ModernWpfUI.nuspec b/ModernWpf.Controls/ModernWpfUI.nuspec
@@ -12,20 +12,27 @@
     <description>Modern styles and controls for your WPF applications.</description>
     <tags>$tags$</tags>
     <dependencies>
-      <group targetFramework=".NETFramework4.5">
+      <group targetFramework="net45">
         <dependency id="System.Runtime.WindowsRuntime" version="4.7.0" exclude="Build,Analyzers" />
         <dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework=".NETFramework4.6.2">
+      <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" />
       </group>
-      <group targetFramework=".NETCoreApp3.0">
+      <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" />
+      </group>
     </dependencies>
     <frameworkReferences>
-      <group targetFramework=".NETCoreApp3.0">
+      <group targetFramework="netcoreapp3.0">
+        <frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
+      </group>
+      <group targetFramework="net5.0">
         <frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
       </group>
     </frameworkReferences>

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</TargetFrameworks>
+    <TargetFrameworks>net452;net46;net462;net47;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -19,11 +19,11 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-
+	
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.1.1" />
   </ItemGroup>
-
+	
   <ItemGroup>
     <ProjectReference Include="..\ModernWpf\ModernWpf.csproj">
       <PrivateAssets>all</PrivateAssets>

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

diff --git a/ModernWpf/ModernWpf.csproj b/ModernWpf/ModernWpf.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net45;net462</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.0;net5.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
+  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
-  <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>
@@ -30,6 +30,11 @@
       <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" />

diff --git a/samples/FluentRibbonSample/FluentRibbonSample.csproj b/samples/FluentRibbonSample/FluentRibbonSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>

diff --git a/samples/MahAppsSample/MahAppsSample.csproj b/samples/MahAppsSample/MahAppsSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net5.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <LangVersion>8.0</LangVersion>

diff --git a/samples/SamplesCommon/SamplesCommon.csproj b/samples/SamplesCommon/SamplesCommon.csproj
@@ -1,24 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net45;net462</TargetFrameworks>
+    <TargetFrameworks>net45;net462;netcoreapp3.1;net5.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>
     <Page Remove="Properties\DesignTimeResources.xaml" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\ModernWpf.Controls\ModernWpf.Controls.csproj" />
     <ProjectReference Include="..\..\ModernWpf\ModernWpf.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0'">
+    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
     <Reference Include="Windows">
       <HintPath>..\..\ModernWpf\WinMD\Windows.WinMD</HintPath>
       <IsWinMDFile>true</IsWinMDFile>
@@ -35,6 +32,11 @@
       <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>
     <None Include="Properties\DesignTimeResources.xaml">