Merge pull request #64 from /issues/63

.NET 6 and VS 2022

.github/workflows/dotnet-core.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 6.0.100-rc.2.21505.57
     - name: Update version number
       if: github.ref != 'refs/heads/release'
       shell: pwsh

Livet.Test/Livet.Test.csproj

@@ -1,34 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
-    <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
-    <UseWpf>true</UseWpf>
-    <IsPackable>false</IsPackable>
-    <RootNamespace>Livet.NUnit</RootNamespace>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<ServerGarbageCollection>true</ServerGarbageCollection>
+		<ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
+	</PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0-windows;netcoreapp3.1;net452</TargetFrameworks>
+		<UseWpf>true</UseWpf>
+		<IsPackable>false</IsPackable>
+		<RootNamespace>Livet.NUnit</RootNamespace>
+		<LangVersion>10</LangVersion>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
-
-  <!-- Conditionally obtain references for the .NET Framework 4.5 target -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="PresentationCore" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Xaml" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="nunit" Version="3.12.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\LivetCask.StatefulModel\LivetCask.StatefulModel.csproj" />
-    <ProjectReference Include="..\LivetCask\LivetCask.csproj" />
-  </ItemGroup>
+	<!-- Conditionally obtain references for the .NET Framework 4.5 target -->
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+		<Reference Include="PresentationCore" />
+		<Reference Include="WindowsBase" />
+		<Reference Include="PresentationFramework" />
+		<Reference Include="System.Xaml" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\LivetCask.StatefulModel\LivetCask.StatefulModel.csproj" />
+		<ProjectReference Include="..\LivetCask\LivetCask.csproj" />
+	</ItemGroup>
 
 </Project>

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.3.2</Version>
+    <Version>4.0.0</Version>
     <PackageVersion>$(Version)</PackageVersion>
   </PropertyGroup>
 </Project>

Livet.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29025.244
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31808.319
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LivetSnk", "LivetSnk", "{37550EC5-43CF-49E4-A463-85072B1C4B8D}"
 	ProjectSection(SolutionItems) = preProject
@@ -102,7 +102,6 @@ Global
 		Livet.Annotations\Livet.Annotations.projitems*{443f4fe1-5c3b-4847-bcba-5f8e56f63df6}*SharedItemsImports = 5
 		Livet.Annotations\Livet.Annotations.projitems*{6d6d481b-c134-4fa5-8eb3-16982a100913}*SharedItemsImports = 5
 		Livet.Annotations\Livet.Annotations.projitems*{7bd47b69-e85c-40bf-b2b8-4ef1e3dacf9f}*SharedItemsImports = 5
-		Livet.Annotations\Livet.Annotations.projitems*{7c69d055-0538-4f7c-a11f-623dfeeab1a7}*SharedItemsImports = 4
 		LivetCask.Generated.Converters\LivetCask.Generated.Converters.projitems*{9190f512-1964-4c9f-8e48-4f1f51dd0cdf}*SharedItemsImports = 13
 		Livet.Annotations\Livet.Annotations.projitems*{a0bba5c9-cb69-480e-96ec-9359214ddc5a}*SharedItemsImports = 5
 		Livet.Annotations\Livet.Annotations.projitems*{ae6f03f5-0f2f-4528-83ff-c4b2b2d6b86a}*SharedItemsImports = 5

LivetCask.Behaviors/LivetCask.Behaviors.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.SDK.WindowsDesktop">
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet.Behaviors</RootNamespace>
     <AssemblyName>Livet.Behaviors</AssemblyName>
@@ -37,7 +37,7 @@ This package is for useful behaviors for MVVM pattern.
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3">
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31">
     </PackageReference>
   </ItemGroup>
 

LivetCask.Collections/LivetCask.Collections.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.SDK.WindowsDesktop">
+<Project Sdk="Microsoft.NET.SDK">
   <Import Project="..\Livet.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;netcoreapp3.1;net452</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>Livet.Collections</RootNamespace>
     <AssemblyName>Livet.Collections</AssemblyName>