Add code signing with strong name key and restructure project file

src/Wpf.Converters/UnitTestSupport.cs

@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+// Enable unit testing of internal classes
+[assembly: InternalsVisibleTo("NKristek.Wpf.Converters.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001001df2364b10fe41409045a07d4129a3ee48450f6fbaea5101c19d951829863321ba5e0a5f33dffb6118cd89b2aea49263dd6fb7be71025f76093ea089a17c367a2e673f5b3c5399c0c0c4a46ab77cd25a4202e56924a677be2e93b33a7f6fc9848e5655755ca8a6ccaacfe58d4de56f2997879ab5deb87cee59db9fdc794effcb")]

src/Wpf.Converters/Wpf.Converters.csproj

@@ -1,49 +1,73 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <!-- Build settings -->
   <PropertyGroup>
     <TargetFrameworks>net35;net40;netcoreapp3.0</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <LangVersion>8.0</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
-    <RootNamespace>NKristek.Wpf.Converters</RootNamespace>
-    <AssemblyName>NKristek.Wpf.Converters</AssemblyName>
-    <Version>2.0</Version>
-    <Description>A collection of often used converters to write a WPF based application</Description>
+    <Features>strict</Features>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <!-- Package metadata -->
+  <PropertyGroup>
+    <Version>2.0.1</Version>
     <Company>nkristek</Company>
     <Authors>nkristek</Authors>
+    <RootNamespace>NKristek.Wpf.Converters</RootNamespace>
+    <AssemblyName>NKristek.Wpf.Converters</AssemblyName>
     <PackageId>NKristek.Wpf.Converters</PackageId>
+    <Description>A collection of often used converters to write a WPF based application</Description>
+    <PackageTags>Converter IValueConverter IMultiValueConverter WPF XAML</PackageTags>
     <Copyright>Copyright © 2019 Niclas Kristek</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/nkristek/Wpf.Converters</PackageProjectUrl>
     <RepositoryUrl>https://github.com/nkristek/Wpf.Converters.git</RepositoryUrl>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <RepositoryType>git</RepositoryType>
-    <PackageTags>Converter IValueConverter IMultiValueConverter WPF XAML</PackageTags>
-    <PackageReleaseNotes>This release adds support for .NET Core 3.0 and C#8 nullable reference types.</PackageReleaseNotes>
     <NeutralLanguage>en</NeutralLanguage>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <!-- Package Icon -->
+  <!--<ItemGroup>
+    <None Include="..\..\resources\icon-256x256.png" Pack="true" Visible="false" PackagePath="\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <PackageIcon>icon-256x256.png</PackageIcon>
+  </PropertyGroup>-->
+
+  <!-- Code Signing -->
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>Wpf.Converters.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <!-- Don't reference assemblies not needed by .NET Core 3.0 or are not available in .NET Framework 3.5 -->
   <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'net35' And '$(TargetFramework)' != 'netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0' And '$(TargetFramework)' != 'net35'">
     <Reference Include="System.Xaml" />
   </ItemGroup>
-
+
+  <!-- Replace inheritdoc tags -->
   <ItemGroup>
     <PackageReference Include="SauceControl.InheritDoc" Version="0.4.0" PrivateAssets="all"/>
   </ItemGroup>
 
+  <!-- Disable warning, that no inheritdoc documentation was replaced -->
   <PropertyGroup>
     <NoWarn>$(NoWarn);IDT004</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net35'">
+  <!-- Fix no documentation found for .NET Framework 3.5 -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net35'">
     <NoWarn>$(NoWarn);IDT002</NoWarn>
     <FrameworkPathOverride>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
   </PropertyGroup>

test/Wpf.Converters.Tests/Wpf.Converters.Tests.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <!-- Build settings -->
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
-
+    <Features>strict</Features>
     <IsPackable>false</IsPackable>
-
-    <AssemblyName>NKristek.Smaragd.Tests</AssemblyName>
-    <RootNamespace>NKristek.Smaragd.Tests</RootNamespace>
+    <AssemblyName>NKristek.Wpf.Converters.Tests</AssemblyName>
+    <RootNamespace>NKristek.Wpf.Converters.Tests</RootNamespace>
   </PropertyGroup>
 
+  <!-- Reference unit test dependencies -->
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
@@ -20,8 +20,15 @@
     </PackageReference>
   </ItemGroup>
 
+  <!-- Reference to assembly to test -->
   <ItemGroup>
     <ProjectReference Include="..\..\src\Wpf.Converters\Wpf.Converters.csproj" />
   </ItemGroup>
 
+  <!-- Code Signing (needed for InternalsVisibleTo) -->
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>Wpf.Converters.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
 </Project>