SwissLife-OSS · nscheibe · Jul 29, 2022 · Dec 28, 2021 · Dec 28, 2021 · Jan 7, 2022
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/global.json b/global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.302"
+    "version": "6.0.100",
+    "rollForward": "latestMinor"
   }
 }
diff --git a/nuget.config b/nuget.config
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <config>
-    <add key="DefaultPushSource" value="https://api.nuget.org/v3/index.json" />
-  </config>
-  <packageRestore>
-    <add key="enabled" value="True" />
-    <add key="automatic" value="True" />
-  </packageRestore>
-  <activePackageSource>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </activePackageSource>
   <packageSources>
-    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
-</configuration>
+</configuration>
diff --git a/samples/Snapshooter.Examples.Xunit/Snapshooter.Examples.Xunit.csproj b/samples/Snapshooter.Examples.Xunit/Snapshooter.Examples.Xunit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>Snapshooter.Examples.Xunit</AssemblyName>
     <RootNamespace>Snapshooter.Examples.Xunit</RootNamespace>

diff --git a/samples/Snapshooter.Tests.Data/Snapshooter.Tests.Data.csproj b/samples/Snapshooter.Tests.Data/Snapshooter.Tests.Data.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <AssemblyName>Snapshooter.Tests.Data</AssemblyName>
     <RootNamespace>Snapshooter.Tests.Data</RootNamespace>
     <IsPackable>false</IsPackable>

diff --git a/src/Dependencies.props b/src/Dependencies.props
@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup Label="Package Versions">
+    <xUnitVersion>2.4.1</xUnitVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Framework Versions">
+    <TestProjectTargetFrameworks>netcoreapp3.1;net6.0</TestProjectTargetFrameworks>
+    <ResourceProjectTargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0</ResourceProjectTargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -4,9 +4,14 @@
     <CCSettingsProps>$([System.IO.Path]::Combine($(CCSourceDirectory), 'Settings.props'))</CCSettingsProps>
     <CCVersionProps>$([System.IO.Path]::Combine($(CCSourceDirectory), 'Version.props'))</CCVersionProps>
     <CCPackageProps>$([System.IO.Path]::Combine($(CCSourceDirectory), 'Package.props'))</CCPackageProps>
+    <CCTestProjectProps>$([System.IO.Path]::Combine($(CCSourceDirectory), 'TestProject.props'))</CCTestProjectProps>
+    <CCResourceProjectProps>$([System.IO.Path]::Combine($(CCSourceDirectory), 'ResourceProject.props'))</CCResourceProjectProps>
+    <CCDependenciesProps>$([System.IO.Path]::Combine($(CCSourceDirectory), 'Dependencies.props'))</CCDependenciesProps>
   </PropertyGroup>
 
+  <Import Project="$(CCDependenciesProps)" Condition="Exists('$(CCDependenciesProps)')"/>
   <Import Project="$(CCSettingsProps)" Condition="Exists('$(CCSettingsProps)')"/>
   <Import Project="$(CCVersionProps)" Condition="Exists('$(CCVersionProps)')"/>
   <Import Project="$(CCPackageProps)" Condition="Exists('$(CCPackageProps)')"/>
+
 </Project>
diff --git a/src/Package.props b/src/Package.props
@@ -12,6 +12,7 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageIconUrl>https://github.com/SwissLife-OSS/snapshooter/raw/master/logo.png</PackageIconUrl>
     <IsPackable>false</IsPackable>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/ResourceProject.props b/src/ResourceProject.props
@@ -0,0 +1,24 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFrameworks>$(ResourceProjectTargetFrameworks)</TargetFrameworks>
+    <RootNamespace>Snapshooter</RootNamespace>
+    <IsPackable>true</IsPackable>
+	<LangVersion>10.0</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>pdbonly</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="xunit.core" Version="$(xUnitVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Settings.props b/src/Settings.props
diff --git a/src/Snapshooter.Json.Tests/Snapshooter.Json.Tests.csproj b/src/Snapshooter.Json.Tests/Snapshooter.Json.Tests.csproj
@@ -1,20 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
+  <Import Project="$(CCTestProjectProps)" Condition="Exists('$(CCTestProjectProps)')" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Snapshooter.Json.Tests</AssemblyName>
     <RootNamespace>Snapshooter.Json.Tests</RootNamespace>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Snapshooter.Json\Snapshooter.Json.csproj" />
     <ProjectReference Include="..\Snapshooter.Tests.Data\Snapshooter.Tests.Data.csproj" />
@@ -26,4 +17,19 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="coverlet.collector" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="FluentAssertions" Version="6.7.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Moq" Version="4.18.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Snapshooter.Json/Snapshooter.Json.csproj b/src/Snapshooter.Json/Snapshooter.Json.csproj
@@ -1,29 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(CCResourceProjectProps)" Condition="Exists('$(CCResourceProjectProps)')" />
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Snapshooter.Json</AssemblyName>
     <RootNamespace>Snapshooter.Json</RootNamespace>
     <PackageId>Snapshooter.Json</PackageId>
     <Description>
       Json Snapshooter is a flexible snapshot testing tool for .Net unit tests.
       It creates and asserts json snapshots in unit tests without any .Net test framework required.
     </Description>
-    <IsPackable>true</IsPackable>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Snapshooter\Snapshooter.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Snapshooter.Json/Snapshot.cs b/src/Snapshooter.Json/Snapshot.cs
@@ -162,16 +162,20 @@ private static Snapshooter Snapshooter
         {
             get
             {
+                var snapshotSerializer =
+                    new SnapshotSerializer(new GlobalSnapshotSettingsResolver());
+
                 return
                     new Snapshooter(
                         new SnapshotAssert(
-                            new SnapshotSerializer(new GlobalSnapshotSettingsResolver()),
+                            snapshotSerializer,
                             new SnapshotFileHandler(),
                             new SnapshotEnvironmentCleaner(
                                 new SnapshotFileHandler()),
                             new JsonSnapshotComparer(
                                 new JsonAssert(),
-                                new SnapshotSerializer(new GlobalSnapshotSettingsResolver()))),
+                                snapshotSerializer),
+                            new JsonSnapshotFormatter(snapshotSerializer)),
                         new SnapshotFullNameResolver(
                             new JsonSnapshotFullNameReader()));
             }

diff --git a/src/Snapshooter.NUnit.Tests/Snapshooter.NUnit.Tests.csproj b/src/Snapshooter.NUnit.Tests/Snapshooter.NUnit.Tests.csproj
@@ -1,25 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(CCTestProjectProps)" Condition="Exists('$(CCTestProjectProps)')" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Snapshooter.NUnit.Tests</AssemblyName>
-    <RootNamespace>Snapshooter.NUnit.Tests</RootNamespace>
-    <nullable>enable</nullable>
-    <IsPackable>false</IsPackable>
-    <LangVersion>8.0</LangVersion>
+    <RootNamespace>Snapshooter.NUnit.Tests</RootNamespace>    
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Snapshooter.NUnit\Snapshooter.NUnit.csproj" />
     <ProjectReference Include="..\Snapshooter.Tests.Data\Snapshooter.Tests.Data.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="coverlet.collector" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="FluentAssertions" Version="6.7.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Moq" Version="4.18.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Snapshooter.NUnit/Snapshooter.NUnit.csproj b/src/Snapshooter.NUnit/Snapshooter.NUnit.csproj
@@ -1,36 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(CCResourceProjectProps)" Condition="Exists('$(CCResourceProjectProps)')" />
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Snapshooter.NUnit</AssemblyName>
     <RootNamespace>Snapshooter.NUnit</RootNamespace>
     <PackageId>Snapshooter.NUnit</PackageId>
     <Description>
       NUnit Snapshooter is a flexible snapshot testing tool for .Net unit tests with NUnit.
       It creates and asserts snapshots (json format) within NUnit unit tests.
-    </Description>
-    <IsPackable>true</IsPackable>
+    </Description>    
     <IsTestProject>false</IsTestProject>
-    <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Snapshooter\Snapshooter.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Snapshooter.NUnit/Snapshot.cs b/src/Snapshooter.NUnit/Snapshot.cs
@@ -375,16 +375,20 @@ private static Snapshooter Snapshooter
         {
             get
             {
+                var snapshotSerializer =
+                    new SnapshotSerializer(new GlobalSnapshotSettingsResolver());
+
                 return
                     new Snapshooter(
                         new SnapshotAssert(
-                            new SnapshotSerializer(new GlobalSnapshotSettingsResolver()),
+                            snapshotSerializer,
                             new SnapshotFileHandler(),
                             new SnapshotEnvironmentCleaner(
                                 new SnapshotFileHandler()),
                             new JsonSnapshotComparer(
                                 new NUnitAssert(),
-                                new SnapshotSerializer(new GlobalSnapshotSettingsResolver()))),
+                                snapshotSerializer),
+                            new JsonSnapshotFormatter(snapshotSerializer)),
                         new SnapshotFullNameResolver(
                             new NUnitSnapshotFullNameReader()));
             }