From 0a362965d43b8ee068c495f5da85b468e647ed11 Mon Sep 17 00:00:00 2001
From: Werner van Deventer <werner@deventerprise.com>
Date: Mon, 10 May 2021 14:03:19 +0200
Subject: [PATCH] Copyright year and package update. Updates for next release
 and build fixes.

---
 .../Properties/AssemblyInfo.cs                      |  2 +-
 src/Brutal.Dev.StrongNameSigner.Setup/EULA.txt      |  2 +-
 .../StrongNameSigner.nuspec                         |  1 +
 .../Brutal.Dev.StrongNameSigner.Tests.csproj        |  8 ++++----
 .../packages.config                                 |  2 +-
 .../Properties/AssemblyInfo.cs                      |  2 +-
 .../AutomaticBuildTask.cs                           |  7 ++++---
 .../Brutal.Dev.StrongNameSigner.csproj              | 13 +------------
 .../Properties/AssemblyInfo.cs                      |  2 +-
 9 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/Brutal.Dev.StrongNameSigner.Console/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner.Console/Properties/AssemblyInfo.cs
index a0aebc7..6db694a 100644
--- a/src/Brutal.Dev.StrongNameSigner.Console/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner.Console/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("https://brutaldev.com")]
 [assembly: AssemblyProduct("Brutal.Dev.StrongNameSigner.Console")]
-[assembly: AssemblyCopyright("Copyright © 2013-2020")]
+[assembly: AssemblyCopyright("Copyright © 2013-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/src/Brutal.Dev.StrongNameSigner.Setup/EULA.txt b/src/Brutal.Dev.StrongNameSigner.Setup/EULA.txt
index 9273b39..00ff0e9 100644
--- a/src/Brutal.Dev.StrongNameSigner.Setup/EULA.txt
+++ b/src/Brutal.Dev.StrongNameSigner.Setup/EULA.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2020 Werner van Deventer (werner@brutaldev.com)
+Copyright (c) 2013-2021 Werner van Deventer (werner@brutaldev.com)
 All rights reserved.
 
 * Redistribution of source code is strictly prohibited by means of reverse engineering or otherwise.
diff --git a/src/Brutal.Dev.StrongNameSigner.Setup/StrongNameSigner.nuspec b/src/Brutal.Dev.StrongNameSigner.Setup/StrongNameSigner.nuspec
index 720919d..dc3e5b3 100644
--- a/src/Brutal.Dev.StrongNameSigner.Setup/StrongNameSigner.nuspec
+++ b/src/Brutal.Dev.StrongNameSigner.Setup/StrongNameSigner.nuspec
@@ -21,6 +21,7 @@ The tool will also re-write the assembly references (as well as any InternalsVis
     </description>
     <summary>Automatic strong-name signing of referenced assemblies. Utility software to strong-name sign .NET assemblies, including assemblies you do not have the source code for.</summary>
     <releaseNotes>- Update to the latest Mono Cecil which fixes a number of issues that can only make things better.
+- Fix null reference error when signing ReferenceAssemblyAnnotator (issue #62).
     </releaseNotes>
     <copyright>Werner van Deventer (https://brutaldev.com)</copyright>
     <language>en-US</language>
diff --git a/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj b/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj
index 78ef40d..863fe6f 100644
--- a/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj
+++ b/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\NUnit.3.13.2\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.13.2\build\NUnit.props')" />
   <Import Project="..\..\packages\Shouldly.4.0.3\build\Shouldly.props" Condition="Exists('..\..\packages\Shouldly.4.0.3\build\Shouldly.props')" />
-  <Import Project="..\..\packages\NUnit.3.13.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.13.1\build\NUnit.props')" />
   <Import Project="..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -51,8 +51,8 @@
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework, Version=3.13.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.13.1\lib\net40\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.13.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.3.13.2\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -199,8 +199,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
     <Error Condition="!Exists('..\..\packages\Shouldly.4.0.0\build\Shouldly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Shouldly.4.0.0\build\Shouldly.targets'))" />
-    <Error Condition="!Exists('..\..\packages\NUnit.3.13.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.13.1\build\NUnit.props'))" />
     <Error Condition="!Exists('..\..\packages\Shouldly.4.0.3\build\Shouldly.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Shouldly.4.0.3\build\Shouldly.props'))" />
+    <Error Condition="!Exists('..\..\packages\NUnit.3.13.2\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.13.2\build\NUnit.props'))" />
   </Target>
   <Import Project="..\..\packages\Shouldly.4.0.0\build\Shouldly.targets" Condition="Exists('..\..\packages\Shouldly.4.0.0\build\Shouldly.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Brutal.Dev.StrongNameSigner.Tests/packages.config b/src/Brutal.Dev.StrongNameSigner.Tests/packages.config
index 6430ef1..4bc2c48 100644
--- a/src/Brutal.Dev.StrongNameSigner.Tests/packages.config
+++ b/src/Brutal.Dev.StrongNameSigner.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.13.1" targetFramework="net40" />
+  <package id="NUnit" version="3.13.2" targetFramework="net40" />
   <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net40" />
   <package id="Shouldly" version="4.0.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/Brutal.Dev.StrongNameSigner.UI/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner.UI/Properties/AssemblyInfo.cs
index 3d6764c..f008278 100644
--- a/src/Brutal.Dev.StrongNameSigner.UI/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner.UI/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("https://brutaldev.com")]
 [assembly: AssemblyProduct("Brutal.Dev.StrongNameSigner.UI")]
-[assembly: AssemblyCopyright("Copyright © 2013-2020")]
+[assembly: AssemblyCopyright("Copyright © 2013-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/src/Brutal.Dev.StrongNameSigner/AutomaticBuildTask.cs b/src/Brutal.Dev.StrongNameSigner/AutomaticBuildTask.cs
index f318065..ee4feb4 100644
--- a/src/Brutal.Dev.StrongNameSigner/AutomaticBuildTask.cs
+++ b/src/Brutal.Dev.StrongNameSigner/AutomaticBuildTask.cs
@@ -43,7 +43,7 @@ public override bool Execute()
           Log.LogError("Task parameter 'OutputPath' not provided.");
           return false;
         }
-        
+
         SignedAssembliesToReference = new ITaskItem[References.Length];
 
         string signedAssemblyFolder = Path.GetFullPath(Path.Combine(OutputPath.ItemSpec, "StrongNameSigner"));
@@ -94,7 +94,8 @@ public override bool Execute()
             if (!signedAssembly.IsSigned)
             {
               signedAssembly = SignSingleAssembly(References[i].ItemSpec, snkFilePath, signedAssemblyFolder, probingPaths);
-              if(signedAssembly != null)
+
+              if (signedAssembly != null)
               {
                 chagesMade = true;
               }
@@ -262,7 +263,7 @@ private void RemoveInvalidFriendAssemblyReferences(string assemblyPath, string k
         Log.LogWarningFromException(ex, false);
       }
       catch (Exception ex)
-      { 
+      {
         Log.LogErrorFromException(ex, true, true, assemblyPath);
       }
     }
diff --git a/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj b/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj
index f69184f..750ac3a 100644
--- a/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj
+++ b/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj
@@ -93,9 +93,6 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(OS)' != 'Unix'">if /I "$(ConfigurationName)" == "Release" "$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\msbuild.exe" /p:CleanIntermediates=True /p:Configuration=Release "$(SolutionDir)Brutal.Dev.StrongNameSigner.Docs\Documentation.shfbproj"</PostBuildEvent>
-  </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Import Project="..\..\packages\StyleCop.MSBuild.6.2.0\build\StyleCop.MSBuild.targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.6.2.0\build\StyleCop.MSBuild.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -104,12 +101,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.6.2.0\build\StyleCop.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.6.2.0\build\StyleCop.MSBuild.targets'))" />
   </Target>
-  <PropertyGroup>
-    <PostBuildEvent>REM requires installing nuget commandline.  example using chocolatey: 
-REM choco install nuget.commandline
-REM note: output dir cannot end in slash
-if /I "$(ConfigurationName)" == "Release" nuget.exe pack $(ProjectDir)..\Brutal.Dev.StrongNameSigner.Setup\StrongNameSigner.nuspec -Properties "Configuration=$(Configuration)" -NonInteractive -OutputDirectory "$(ProjectDir)bin\$(ConfigurationName)
-
-if /I "$(ConfigurationName)" == "Release" "$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\msbuild.exe" /p:CleanIntermediates=True /p:Configuration=Release "$(SolutionDir)Brutal.Dev.StrongNameSigner.Docs\Documentation.shfbproj"</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Brutal.Dev.StrongNameSigner/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner/Properties/AssemblyInfo.cs
index 7cdbb73..16f7e57 100644
--- a/src/Brutal.Dev.StrongNameSigner/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("https://brutaldev.com")]
 [assembly: AssemblyProduct("Brutal.Dev.StrongNameSigner")]
-[assembly: AssemblyCopyright("Copyright © 2013-2020")]
+[assembly: AssemblyCopyright("Copyright © 2013-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]