.NET Core 3 support

.gitignore

@@ -189,4 +189,5 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 .nuget/nuget.exe.old
-*.DotSettings
+*.DotSettings
+/1.0/FirstFloor.ModernUI/Build/Output

1.0/FirstFloor.ModernUI/.editorconfig

@@ -0,0 +1,7 @@
+[*]
+indent_size = 4
+end_of_line = crlf
+indent_style = space
+
+[*{.csproj,msbuild,nuspec}]
+indent_size = 2

1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <id>ModernUI.WPF</id>
-    <version>1.0.9</version>
+    <id>ModernUI.WPFCore</id>
+    <version>2.0.0</version>
     <title>ModernUI for WPF</title>
     <authors>First Floor Software</authors>
     <owners>First Floor Software</owners>
-    <licenseUrl>https://github.com/firstfloorsoftware/mui/blob/master/LICENSE.md</licenseUrl>
+    <!-->licenseUrl>https://github.com/firstfloorsoftware/mui/blob/master/LICENSE.md</licenseUrl-->
+    <license type="file">License.txt</license>
     <iconUrl>http://firstfloorsoftware.com/media/github/mui/mui-icon.png</iconUrl>
+    <!--icon>Icon.png</icon-->
     <projectUrl>https://github.com/firstfloorsoftware/mui</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A set of controls and styles converting your WPF application into a great looking Modern UI app.</description>
@@ -16,10 +18,17 @@
     <tags>modern ui, metro, wpf</tags>
   </metadata>
   <files>
-    <file src="Output\Temp\FirstFloor.ModernUI.dll" target="lib\net45\FirstFloor.ModernUI.dll" />
-    <file src="Output\Temp\FirstFloor.ModernUI.XML" target="lib\net45\FirstFloor.ModernUI.XML" />
-    <file src="Output\Temp\net40\FirstFloor.ModernUI.dll" target="lib\net40\FirstFloor.ModernUI.dll" />
-    <file src="Output\Temp\net40\FirstFloor.ModernUI.XML" target="lib\net40\FirstFloor.ModernUI.XML" />
-    <file src="Output\Temp\net40\Microsoft.Windows.Shell.dll" target="lib\net40\Microsoft.Windows.Shell.dll" />
+    <file src="Output\Temp\License\License.txt" target="License.txt" />
+    <!--file src="Output\Temp\License\mui-icon.png" target="Icon.png" /-->
+    <file src="Output\Temp\net45\FirstFloor.ModernUI.dll" target="lib\net45\FirstFloor.ModernUI.dll" />
+    <file src="Output\Temp\net45\FirstFloor.ModernUI.pdb" target="lib\net45\FirstFloor.ModernUI.pdb" />
+    <file src="Output\Temp\net45\FirstFloor.ModernUI.XML" target="lib\net45\FirstFloor.ModernUI.XML" />
+    <file src="Output\Temp\netcoreapp3.0\FirstFloor.ModernUI.dll" target="lib\netcoreapp3.0\FirstFloor.ModernUI.dll" />
+    <file src="Output\Temp\netcoreapp3.0\FirstFloor.ModernUI.pdb" target="lib\netcoreapp3.0\FirstFloor.ModernUI.pdb" />
+    <file src="Output\Temp\netcoreapp3.0\FirstFloor.ModernUI.XML" target="lib\netcoreapp3.0\FirstFloor.ModernUI.XML" />
+    <file src="Output\Temp\net4\FirstFloor.ModernUI.dll" target="lib\net4\FirstFloor.ModernUI.pdb" />
+    <file src="Output\Temp\net4\FirstFloor.ModernUI.dll" target="lib\net4\FirstFloor.ModernUI.dll" />
+    <file src="Output\Temp\net4\FirstFloor.ModernUI.XML" target="lib\net4\FirstFloor.ModernUI.XML" />
+    <file src="Output\Temp\net4\Microsoft.Windows.Shell.dll" target="lib\net4\Microsoft.Windows.Shell.dll" />
   </files>
 </package>

1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild

@@ -10,9 +10,10 @@
     <Configuration Condition="'$(Configuration)'==''" >Release</Configuration>
     <Platform>Any CPU</Platform>
 
+    <!--MSBuildExtensions>$(BinariesDir)\MSBuild.Community.Tasks.dll</MSBuildExtensions-->
     <MSBuildExtensions>$(BinariesDir)\MSBuild.Community.Tasks.dll</MSBuildExtensions>
     <NuGetApp>NuGet.exe</NuGetApp>
-    
+
     <NuSpecFile>$(MSBuildProjectDirectory)\ModernUI.WPF.nuspec</NuSpecFile>
     <SolutionFile>$(BaseDir)\FirstFloor.ModernUI.sln</SolutionFile>
     <VsixSolutionFile>$(TemplatesDir)\ModernUI.Templates.sln</VsixSolutionFile>
@@ -25,10 +26,10 @@
     <CertificateSha1></CertificateSha1>
     <VsixSignToolPath></VsixSignToolPath>
   </PropertyGroup>
-  
+
   <UsingTask AssemblyFile="$(MSBuildExtensions)" TaskName="MSBuild.Community.Tasks.XmlUpdate" />
   <UsingTask AssemblyFile="$(MSBuildExtensions)" TaskName="MSBuild.Community.Tasks.Zip" />
-  
+
   <Target Name="default" DependsOnTargets="Clean; Compile; CopyOutput; Package; PackageVsix" />
 
   <Target Name="Clean">
@@ -89,60 +90,70 @@
       XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
       Value="" />
   </Target>
-  
+
   <Target Name="Compile" DependsOnTargets="EnableSignAssembly">
     <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(Configuration);Platform=$(Platform)" />
   </Target>
-  
+
   <Target Name="CopyOutput" DependsOnTargets="DisableSignAssembly">
     <!-- copy output to temp dir -->
-    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\FirstFloor.ModernUI.dll" DestinationFolder="$(TempDir)" />
-    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\FirstFloor.ModernUI.xml" DestinationFolder="$(TempDir)" />
-    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.App\Bin\Release\ModernUIDemo.exe" DestinationFolder="$(TempDir)" />
-    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\FirstFloor.ModernUI.dll" DestinationFolder="$(TempDir)\net40" />
-    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\FirstFloor.ModernUI.xml" DestinationFolder="$(TempDir)\net40" />
-    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\Microsoft.Windows.Shell.dll" DestinationFolder="$(TempDir)\net40" />
-
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\net45\FirstFloor.ModernUI.dll" DestinationFolder="$(TempDir)\net45" />
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\net45\FirstFloor.ModernUI.pdb" DestinationFolder="$(TempDir)\net45" />
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\net45\FirstFloor.ModernUI.xml" DestinationFolder="$(TempDir)\net45" />
+
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\netcoreapp3.0\FirstFloor.ModernUI.dll" DestinationFolder="$(TempDir)\netcoreapp3.0" />
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\netcoreapp3.0\FirstFloor.ModernUI.pdb" DestinationFolder="$(TempDir)\netcoreapp3.0" />
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI\Bin\Release\netcoreapp3.0\FirstFloor.ModernUI.xml" DestinationFolder="$(TempDir)\netcoreapp3.0" />
+
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.App\Bin\Release\netcoreapp3.1\ModernUIDemo.exe" DestinationFolder="$(TempDir)\netcoreapp3.0" />
+
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\net4\FirstFloor.ModernUI.dll" DestinationFolder="$(TempDir)\net4" />
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\net4\FirstFloor.ModernUI.pdb" DestinationFolder="$(TempDir)\net4" />
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\net4\FirstFloor.ModernUI.xml" DestinationFolder="$(TempDir)\net4" />
+    <Copy SourceFiles="$(BaseDir)\FirstFloor.ModernUI.WPF4\Bin\Release\net4\Microsoft.Windows.Shell.dll" DestinationFolder="$(TempDir)\net4" />
+
     <!-- include license files -->
     <Copy SourceFiles="$(BaseDir)\License.Icons.txt" DestinationFolder="$(TempDir)\License" />
     <Copy SourceFiles="$(BaseDir)\License.RelativeAnimatingContentControl.txt" DestinationFolder="$(TempDir)\License" />
     <Copy SourceFiles="$(BaseDir)\License.txt" DestinationFolder="$(TempDir)\License" />
-    
-    <!-- include readme -->
+
+    <!-- include readme and icon-->
     <Copy SourceFiles="$(BaseDir)\ReadMe.txt" DestinationFolder="$(TempDir)" />
+    <Copy SourceFiles="$(BaseDir)\mui-icon.png" DestinationFolder="$(TempDir)" />
   </Target>
-  
+
   <Target Name="Package">
-    <ItemGroup>      
+    <ItemGroup>
       <ReleaseFiles Include="$(TempDir)\**\*.*" />
     </ItemGroup>
 
     <!-- retrieve assembly info from FirstFloor.ModernUI.dll -->
-  	<GetAssemblyIdentity AssemblyFiles="$(TempDir)\FirstFloor.ModernUI.dll">
+    <GetAssemblyIdentity AssemblyFiles="$(TempDir)\net45\FirstFloor.ModernUI.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyInfo" />
     </GetAssemblyIdentity>
-   
+
     <!-- only take major,minor,build part of version-->
     <PropertyGroup>
       <FullVersion>%(AssemblyInfo.Version)</FullVersion>
       <MuiVersion>$(FullVersion.Substring(0, $(FullVersion.LastIndexOf('.'))))</MuiVersion>
     </PropertyGroup>
-    
+
     <!-- insert the version number into the nuspec files -->
     <XmlUpdate
       Namespace="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"
       Prefix="nu"
       XmlFileName="$(NuSpecFile)"
       XPath="/nu:package/nu:metadata/nu:version"
       Value="$(MuiVersion)" />
-      
+
     <!-- create NuGet package -->
     <Exec WorkingDirectory="$(OutputDir)" Command='"$(NuGetApp)" pack "$(NuSpecFile)"' />
-
+    <Exec WorkingDirectory="$(OutputDir)" Command='"$(NuGetApp)" pack "$(NuSpecFile)" -Symbols' />
+
     <!-- create release package -->
     <Zip WorkingDirectory="$(TempDir)" Files="@(ReleaseFiles)" ZipFileName="$(OutputDir)\ModernUI.$(MuiVersion).zip" />
   </Target>
-  
+
   <Target Name="PackageVsix">
     <!-- update version in vsix manifest-->
     <XmlUpdate
@@ -181,16 +192,16 @@
       XmlFileName="$(TemplatesDir)\ModernUI.NavigationApp\ModernUI.NavigationApp.vstemplate"
       XPath="/vs:VSTemplate/vs:WizardData/vs:packages/vs:package/@version"
       Value="$(MuiVersion)" />
-    
+
     <!-- remove old NuGet package from project and remember file name -->
     <ItemGroup>
       <OldNugetFiles Include="$(TemplatesDir)\ModernUI.Templates\Packages\*.nupkg" />
     </ItemGroup>
     <Delete Files="@(OldNugetFiles)" />
-    
+
     <!-- copy NuGet package to vsix template project -->
-    <Copy SourceFiles="$(OutputDir)\ModernUI.WPF.$(MuiVersion).nupkg" DestinationFolder="$(TemplatesDir)\ModernUI.Templates\Packages" />
-    
+    <Copy SourceFiles="$(OutputDir)\ModernUI.WPFCore.$(MuiVersion).nupkg" DestinationFolder="$(TemplatesDir)\ModernUI.Templates\Packages" />
+
     <!-- update vsix project to refer to new nuget package -->
     <XmlUpdate
       Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
@@ -205,7 +216,7 @@
 
     <!-- sign vsix (optional) -->
     <Exec Command='"$(VsixSignToolPath)" sign /f "$(CertificateFilePath)" /p $(CertificatePassword) /fd SHA1 /sha1 $(CertificateSha1) "$(VsixOutputFile)"' Condition="$(CertificateFilePath) != ''" />
-    
+
     <!-- copy vsix to output folder-->
     <Copy SourceFiles="$(VsixOutputFile)" DestinationFolder="$(OutputDir)" />
 

1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.App/App.xaml.cs

@@ -1,27 +1,27 @@
-using FirstFloor.ModernUI.Presentation;
-using FirstFloor.ModernUI.Windows.Controls;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace FirstFloor.ModernUI.App
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-        /// <summary>
-        /// Raises the <see cref="E:System.Windows.Application.Startup"/> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:System.Windows.StartupEventArgs"/> that contains the event data.</param>
-        protected override void OnStartup(StartupEventArgs e)
-        {
-            base.OnStartup(e);
-        }
-    }
-}
+using FirstFloor.ModernUI.Presentation;
+using FirstFloor.ModernUI.Windows.Controls;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace FirstFloor.ModernUI.App
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        /// <summary>
+        /// Raises the <see cref="E:System.Windows.Application.Startup"/> event.
+        /// </summary>
+        /// <param name="e">A <see cref="T:System.Windows.StartupEventArgs"/> that contains the event data.</param>
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            base.OnStartup(e);
+        }
+    }
+}