Merge branch 'master' of https://github.com/runceel/Livet

.github/workflows/dotnet-core.yml

@@ -0,0 +1,56 @@
+name: Build and Release
+
+on:
+  push:
+    branches: [ master, pre-release, release ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.301
+    - name: Update version number
+      if: github.ref != 'refs/heads/release'
+      shell: pwsh
+      run: |
+        $doc = [XML](Get-Content 'Livet.props')
+        $doc.Project.PropertyGroup.PackageVersion = $doc.Project.PropertyGroup.Version
+        $doc.Project.PropertyGroup.PackageVersion += '-pre' + (Get-Date).ToString("yyyyMMddHHmm")
+        $doc.Save('Livet.props')
+    - name: Install dependencies
+      run: dotnet restore Livet.Code.sln
+    - name: Package
+      run: |
+        dotnet build Livet.Code.sln -p:Configuration=Release -p:Platform="Any CPU"
+        dotnet pack Livet.Code.sln -p:Configuration=Release -p:Platform="Any CPU"
+    - name: Test
+      run: dotnet test Livet.Test\Livet.Test.csproj --verbosity normal
+    - name: Copy package files
+      run: |
+        mkdir dist
+        Copy-Item (Get-ChildItem -Path "**/Livet*.nupkg" -Recurse) -Destination dist
+        Copy-Item (Get-ChildItem -Path "**/Livet*.snupkg" -Recurse) -Destination dist
+      shell: pwsh
+    - name: Archive NuGet packages
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist
+        path: dist
+
+  release-to-nuget:
+    runs-on: windows-latest
+    needs: [build]
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/pre-release' || github.ref == 'refs/heads/release')
+    steps:
+      - name: Download archives
+        uses: actions/download-artifact@v2
+        with:
+          name: dist
+      - name: Publish packages
+        run: dotnet nuget push **/*.nupkg --skip-duplicate -k ${{ secrets.NUGET_APIKEY }} -s https://api.nuget.org/v3/index.json

Livet.Test/Livet.Test.csproj

@@ -4,7 +4,7 @@
     <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <IsPackable>false</IsPackable>
     <RootNamespace>Livet.NUnit</RootNamespace>

Livet.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Version>3.2.2.2</Version>
+    <Version>3.2.3</Version>
     <PackageVersion>$(Version)</PackageVersion>
   </PropertyGroup>
 </Project>

LivetCask.Behaviors/LivetCask.Behaviors.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.SDK.WindowsDesktop">
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet.Behaviors</RootNamespace>
     <AssemblyName>Livet.Behaviors</AssemblyName>
@@ -10,7 +10,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later and .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later and .NET Core 3.1, and licensed as zlib/libpng.
 This package is for useful behaviors for MVVM pattern.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>

LivetCask.Collections/LivetCask.Collections.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.SDK.WindowsDesktop">
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet.Collections</RootNamespace>
     <AssemblyName>Livet.Collections</AssemblyName>
@@ -10,7 +10,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later and .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later and .NET Core 3.1, and licensed as zlib/libpng.
 This package is for basic collections for MVVM pattern.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>

LivetCask.Converters/LivetCask.Converters.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\Livet.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet.Converters</RootNamespace>
     <AssemblyName>Livet.Converters</AssemblyName>
@@ -11,7 +11,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later and .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later and .NET Core 3.1, and licensed as zlib/libpng.
 This package is for useful converters for MVVM pattern.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>

LivetCask.Core/LivetCask.Core.csproj

@@ -10,7 +10,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later and .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later and .NET Core 3.1, and licensed as zlib/libpng.
 This package is for core features for Livet.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>

LivetCask.EventListeners/LivetCask.EventListeners.csproj

@@ -10,7 +10,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later and .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later and .NET Core 3.1, and licensed as zlib/libpng.
 This package is for useful event listeners using weak event pattern for MVVM pattern.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>

LivetCask.Extensions/LivetCask.Extensions.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\Livet.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>Livet</RootNamespace>

LivetCask.Generated.Converters/LivetCask.Generated.Converters.projitems

@@ -40,7 +40,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)ColumnSpaceDistributionAndBooleanConverter.generated.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CompressionOptionAndBooleanConverter.generated.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ContentRightAndBooleanConverter.generated.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)CursorTypeAndBooleanConverter.generated.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)D3DResourceTypeAndBooleanConverter.generated.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DataGridClipboardCopyModeAndBooleanConverter.generated.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DataGridEditActionAndBooleanConverter.generated.cs" />

LivetCask.Messaging/LivetCask.Messaging.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\Livet.Annotations\Livet.Annotations.projitems" Label="Shared" />
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet</RootNamespace>
     <AssemblyName>Livet.Messaging</AssemblyName>
@@ -11,7 +11,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later and .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later and .NET Core 3.1, and licensed as zlib/libpng.
 This package is for useful messaging features between View layer and ViewModel layer for MVVM pattern.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>

LivetCask.Mvvm/LivetCask.Mvvm.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet</RootNamespace>
     <AssemblyName>Livet.Mvvm</AssemblyName>
     <PackageId>LivetCask.Mvvm</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Livet Project</Authors>
     <Description>Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later, .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later, .NET Core 3.1, and licensed as zlib/libpng.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>
     <PackageLicenseFile>license-en.txt</PackageLicenseFile>

LivetCask.StatefulModel/LivetCask.StatefulModel.csproj

@@ -10,7 +10,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later, .NET Core 3.0 and .NET Standard 2.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later, .NET Core 3.1 and .NET Standard 2.0, and licensed as zlib/libpng.
 This package is for useful collections for MVVM pattern.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>

LivetCask/LivetCask.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet</RootNamespace>
     <AssemblyName>Livet</AssemblyName>
     <PackageId>LivetCask</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Livet Project</Authors>
     <Description>Livet is the infrastructure of MVVM pattern on WPF.
-It supports .NET Framework 4.5.2 or later, .NET Core 3.0, and licensed as zlib/libpng.
+It supports .NET Framework 4.5.2 or later, .NET Core 3.1, and licensed as zlib/libpng.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>
     <PackageLicenseFile>license-en.txt</PackageLicenseFile>

LivetCask2/LivetCask2.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet</RootNamespace>
     <AssemblyName>Livet</AssemblyName>
@@ -10,7 +10,7 @@
     <Authors>Livet Project</Authors>
     <Description>
       Livet is the infrastructure of MVVM pattern on WPF.
-      It supports .NET Framework 4.5.2 or later, .NET Core 3.0, and licensed as zlib/libpng. If you would like to use LivetCask.StatefulModel instead of LivetCask.Collections, then please use LivetCask2 instead of LivetCask.
+      It supports .NET Framework 4.5.2 or later, .NET Core 3.1, and licensed as zlib/libpng. If you would like to use LivetCask.StatefulModel instead of LivetCask.Collections, then please use LivetCask2 instead of LivetCask.
     </Description>
     <Copyright>Copyright (c) 2010-2019 Livet Project</Copyright>
     <PackageLicenseFile>license-en.txt</PackageLicenseFile>

LivetEnumAndBooleanConverterGenerator/Program.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Text;
 using System.Windows;
+using System.Windows.Input;
 
 namespace LivetEnumAndBooleanConverterGenerator
 {
@@ -12,6 +13,11 @@ internal class Program
         // ReSharper disable once UnusedParameter.Local
         private static void Main(string[] args)
         {
+            var excludeTypes = new[]
+            {
+                typeof(CursorType),
+            };
+
             var assemblies =
                 new[]
                     {
@@ -37,6 +43,7 @@ private static void Main(string[] args)
 
             var enumsT4 = assemblies.SelectMany(a => a?.GetTypes())
                 .Where(t => t != null && t.IsEnum && t.IsPublic)
+                .Where(x => !excludeTypes.Contains(x))
                 .Select(t => new EnumToBooleanConverter {TypeName = t.Name, EnumMemberNames = t.GetEnumNames()});
 
             if (!Directory.Exists("Output")) Directory.CreateDirectory("Output");