(MahAppsGH-3709) Add TargetFramework .NET Core 3.1

mmarkwort · Dec 5, 2019 · 567f528 · 567f528
1 parent 59f9f16
commit 567f528
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -265,3 +265,6 @@ src/MahApps.Metro/Styles/Themes/*.xaml
 
 # cake
 tools/
+
+# XamlStyler
+!XamlStyler/
diff --git a/appveyor.yml b/appveyor.yml
@@ -22,7 +22,7 @@ image: Visual Studio 2019
 test: off
 
 install:
-  - cinst dotnetcore-sdk
+  - cinst dotnetcore-sdk --version=3.1.100
 
 pull_requests:
   do_not_increment_build_number: false

diff --git a/build.cake b/build.cake
@@ -217,6 +217,7 @@ void SignFiles(IEnumerable<FilePath> files, string description)
 }
 
 Task("Sign")
+    .WithCriteria(() => !isPullRequest)
     .ContinueOnError()
     .Does(() =>
 {
@@ -228,6 +229,7 @@ Task("Sign")
 });
 
 Task("SignNuGet")
+    .WithCriteria(() => !isPullRequest)
     .ContinueOnError()
     .Does(() =>
 {

diff --git a/readme.md b/readme.md
@@ -6,6 +6,9 @@
   <p>
     A toolkit for creating metro-style WPF applications. Lots of goodness out-of-the box.
   </p>
+  <p>
+    Supporting .NET Framework (4.5+) and .NET Core (3.0 and 3.1)
+  </p>
   <a href="https://gitter.im/MahApps/MahApps.Metro">
     <img src="https://img.shields.io/badge/Gitter-Join%20Chat-green.svg?style=flat-square">
   </a>

diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props
@@ -1,10 +1,10 @@
 <Project>
     <!-- Project properties -->
     <PropertyGroup>
-        <TargetFrameworks>net45;net46;net47;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>net45;net46;net47;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
         <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
         <GenerateDocumentationFile>false</GenerateDocumentationFile>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <AutoGenerateBindingRedirects Condition=" $(TargetFramework.StartsWith('net4')) ">true</AutoGenerateBindingRedirects>
         <LangVersion>7.3</LangVersion>
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.csproj
@@ -5,7 +5,7 @@
         <TargetFrameworks>net45;net46;net47</TargetFrameworks>
         <AssemblyName>MahApps.Metro.Caliburn.Demo</AssemblyName>
         <RootNamespace>Caliburn.Metro.Demo</RootNamespace>
-        <DisableFody Condition="'$(Configuration)' == 'Debug' or '$(TargetFramework)' == 'netcoreapp3.0'">true</DisableFody>
+        <DisableFody Condition=" '$(Configuration)' == 'Debug' or $(TargetFramework.StartsWith('netcoreapp')) ">true</DisableFody>
     </PropertyGroup>
     <PropertyGroup>
         <OutputType>WinExe</OutputType>

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj
@@ -5,7 +5,7 @@
         <TargetFrameworks>net45;net46;net47</TargetFrameworks>
         <AssemblyName>MahApps.Metro.Demo</AssemblyName>
         <RootNamespace>MetroDemo</RootNamespace>
-        <DisableFody Condition="'$(Configuration)' == 'Debug' or '$(TargetFramework)' == 'netcoreapp3.0'">true</DisableFody>
+        <DisableFody Condition=" '$(Configuration)' == 'Debug' or $(TargetFramework.StartsWith('netcoreapp')) ">true</DisableFody>
     </PropertyGroup>
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
@@ -16,7 +16,7 @@
     <ItemGroup>
         <ProjectReference Include="..\..\MahApps.Metro\MahApps.Metro.csproj" />
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
         <Reference Include="System.ComponentModel.DataAnnotations" />
     </ItemGroup>
     <ItemGroup>

diff --git a/src/MahApps.Metro/Directory.Build.Targets b/src/MahApps.Metro/Directory.Build.Targets
@@ -1,17 +1,25 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+    <ItemGroup>
+      <None Include="..\..\mahapps.metro.logo.png">
+        <Pack>True</Pack>
+        <PackagePath></PackagePath>
+      </None>
+    </ItemGroup>
+
     <!-- NuGet -->
     <PropertyGroup>
         <Authors>Jan Karger, Dennis Daume, Brendan Forster, Paul Jenkins, Jake Ginnivan, Alex Mitchell</Authors>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/MahApps/MahApps.Metro</PackageProjectUrl>
-        <PackageIconUrl>https://raw.githubusercontent.com/MahApps/MahApps.Metro/develop/mahapps.metro.logo.png</PackageIconUrl>
+        <PackageIcon>mahapps.metro.logo.png</PackageIcon>
         <PackageTags>WPF;UI;Metro;Modern;Material;XAML;Toolkit;Library;.NET;OSS;OpenSource</PackageTags>
         <PackageReleaseNotes>https://github.com/MahApps/MahApps.Metro/releases</PackageReleaseNotes>
         <RepositoryUrl>https://github.com/MahApps/MahApps.Metro.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <GenerateLibraryLayout>true</GenerateLibraryLayout>
     </PropertyGroup>
+
     <!-- Sign assembly -->
     <PropertyGroup>
         <SignAssembly>True</SignAssembly>

diff --git a/src/MahApps.Metro/MahApps.Metro.csproj b/src/MahApps.Metro/MahApps.Metro.csproj
@@ -2,22 +2,24 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
     <!-- Project properties -->
     <PropertyGroup>
-        <TargetFrameworks>net45;net46;net47;netcoreapp3.0</TargetFrameworks>
         <AssemblyName>MahApps.Metro</AssemblyName>
         <Title>MahApps.Metro</Title>
         <RootNamespace>MahApps.Metro</RootNamespace>
         <DefaultItemExcludes>$(DefaultItemExcludes);**\*.Template.xaml</DefaultItemExcludes>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
-    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
         <Reference Include="System.ComponentModel.DataAnnotations" />
         <Reference Include="System.Configuration" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="ControlzEx" Version="[4.*, 5.0)" />
         <PackageReference Include="Newtonsoft.Json" Version="12.*" PrivateAssets="All" />
         <PackageReference Include="XamlColorSchemeGenerator" Version="3.0.0.31" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2*" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
     <!-- Items include -->
     <ItemGroup>

diff --git a/src/Mahapps.Metro.Tests/MahApps.Metro.Tests.csproj b/src/Mahapps.Metro.Tests/MahApps.Metro.Tests.csproj
@@ -9,7 +9,7 @@
     <ItemGroup>
         <ProjectReference Include="..\MahApps.Metro\MahApps.Metro.csproj" />
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
         <Reference Include="Microsoft.CSharp" />
         <Reference Include="System.ComponentModel.DataAnnotations" />
     </ItemGroup>

diff --git a/src/global.json b/src/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.0.100"
+        "version": "3.1"
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -265,3 +265,6 @@ src/MahApps.Metro/Styles/Themes/*.xaml @@
     # cake
     tools/
+    # XamlStyler
+    !XamlStyler/