From 010b2e91bc532e6fd119e9f5e6c851f90874e43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Del=20Rinc=C3=B3n=20L=C3=B3pez?=
 <alexdrl@outlook.com>
Date: Wed, 26 Sep 2018 14:00:46 +0200
Subject: [PATCH] Port StrongNamer to a .NET Standard MSBuild task.

---
 common/CommonAssemblyInfo.cs                  |  32 -----
 src/StrongNamer/Properties/AssemblyInfo.cs    |   6 -
 src/StrongNamer/StrongNamer.csproj            | 113 ++++++++----------
 src/StrongNamer/{ => build}/SharedKey.snk     | Bin
 src/StrongNamer/build/StrongNamer.props       |   7 ++
 .../{ => build}/StrongNamer.targets           |  18 +--
 .../buildMultiTargeting/StrongNamer.props     |   7 ++
 src/StrongNamer/packages.config               |   4 -
 src/StrongNamer/project.json                  |  13 --
 9 files changed, 75 insertions(+), 125 deletions(-)
 delete mode 100644 common/CommonAssemblyInfo.cs
 delete mode 100644 src/StrongNamer/Properties/AssemblyInfo.cs
 rename src/StrongNamer/{ => build}/SharedKey.snk (100%)
 create mode 100644 src/StrongNamer/build/StrongNamer.props
 rename src/StrongNamer/{ => build}/StrongNamer.targets (69%)
 create mode 100644 src/StrongNamer/buildMultiTargeting/StrongNamer.props
 delete mode 100644 src/StrongNamer/packages.config
 delete mode 100644 src/StrongNamer/project.json

diff --git a/common/CommonAssemblyInfo.cs b/common/CommonAssemblyInfo.cs
deleted file mode 100644
index a6b664a..0000000
--- a/common/CommonAssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//[assembly: AssemblyTitle("PCLStorage")]
-//[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("StrongNamer")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-//  No need to manually update this, build process does it automatically
-[assembly: AssemblyVersion("0.0.8.0")]
-[assembly: AssemblyFileVersion("0.0.8.0")]
diff --git a/src/StrongNamer/Properties/AssemblyInfo.cs b/src/StrongNamer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 30f9fc5..0000000
--- a/src/StrongNamer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("StrongNamer")]
-[assembly: AssemblyDescription("")]
\ No newline at end of file
diff --git a/src/StrongNamer/StrongNamer.csproj b/src/StrongNamer/StrongNamer.csproj
index ce35dbf..7e271a1 100644
--- a/src/StrongNamer/StrongNamer.csproj
+++ b/src/StrongNamer/StrongNamer.csproj
@@ -1,72 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{3BED6CCE-6803-448D-90D7-86EB9699CEA7}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>StrongNamer</RootNamespace>
-    <AssemblyName>StrongNamer</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetRuntimeIdentifier>win-any</NuGetRuntimeIdentifier>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <!-- makes this sample work when compiling on macOS and Linux because .NET Framework is not available -->
+    <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\</PackageOutputPath>
+    <!-- Suppresses the warnings about the package not having assemblies in lib/*/.dll.-->
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <!-- Change the default location where NuGet will put the build output -->
+    <BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
+    <!-- set the version automatically -->
+    <VersionPrefix>0.0.8</VersionPrefix>
+    <VersionSuffix>build$([System.DateTime]::Now.ToString('yyyyMMdd-HHmm'))</VersionSuffix>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <Content Include="build\*" PackagePath="build\">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="buildMultiTargeting\*" PackagePath="buildMultiTargeting\" />
+    <Content Update="build\SharedKey.snk" PackagePath="build\">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\..\common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AddStrongName.cs" />
-    <Compile Include="StrongNamerAssemblyResolver.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
+    <!-- Marks all packages as 'local only' so they don't end up in the nuspec. -->
+    <PackageReference Update="@(PackageReference)" PrivateAssets="All" />
+    <PackageReference Include="Mono.Cecil" Version="0.10.1" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="project.json" />
-    <None Include="SharedKey.snk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="StrongNamer.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
+    <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+
+  <Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">
+    <!--
+  The include needs to happen after output has been copied to build output folder
+  but before NuGet generates a nuspec.
+  From a workaround described at https://github.com/NuGet/Home/issues/5063
   -->
-</Project>
\ No newline at end of file
+    <ItemGroup>
+      <_PackageFiles Include="bin\$(Configuration)\**\Mono.Cecil.dll">
+            <PackagePath>tasks\netstandard2.0\Mono.Cecil.dll</PackagePath>
+            <Visible>false</Visible>
+            <BuildAction>Content</BuildAction>
+      </_PackageFiles>
+      <_PackageFiles Include="bin\$(Configuration)\**\Mono.Cecil.dll">
+            <PackagePath>tasks\net461\Mono.Cecil.dll</PackagePath>
+            <Visible>false</Visible>
+            <BuildAction>Content</BuildAction>
+      </_PackageFiles>
+    </ItemGroup>
+  </Target>
+  
+</Project>
diff --git a/src/StrongNamer/SharedKey.snk b/src/StrongNamer/build/SharedKey.snk
similarity index 100%
rename from src/StrongNamer/SharedKey.snk
rename to src/StrongNamer/build/SharedKey.snk
diff --git a/src/StrongNamer/build/StrongNamer.props b/src/StrongNamer/build/StrongNamer.props
new file mode 100644
index 0000000..06c4d34
--- /dev/null
+++ b/src/StrongNamer/build/StrongNamer.props
@@ -0,0 +1,7 @@
+<!-- 
+  This file is automatically imported by NuGet into a user's project
+  when it targets a single framework, or in classic (pre 2017) csproj projects.
+-->
+<Project>
+
+</Project>
diff --git a/src/StrongNamer/StrongNamer.targets b/src/StrongNamer/build/StrongNamer.targets
similarity index 69%
rename from src/StrongNamer/StrongNamer.targets
rename to src/StrongNamer/build/StrongNamer.targets
index f6859a0..2482939 100644
--- a/src/StrongNamer/StrongNamer.targets
+++ b/src/StrongNamer/build/StrongNamer.targets
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask TaskName="StrongNamer.AddStrongName" AssemblyFile="$(MSBuildThisFileDirectory)StrongNamer.dll" />
+<Project TreatAsLocalProperty="TaskFolder;TaskAssembly">
+
+  <PropertyGroup>
+    <TaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' ">netstandard2.0</TaskFolder>
+    <TaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net461</TaskFolder>
+    <TaskAssembly>$(MSBuildThisFileDirectory)..\tasks\$(TaskFolder)\StrongNamer.dll</TaskAssembly>
+  </PropertyGroup>
+
+  <UsingTask TaskName="StrongNamer.AddStrongName" AssemblyFile="$(TaskAssembly)" />
 
   <Target Name="StrongNamerTarget"
           AfterTargets="AfterResolveReferences"
           Condition="'$(DisableStrongNamer)' != 'true'">
 
     <PropertyGroup>
-	<StrongNamerKeyFile Condition="'$(StrongNamerKeyFile)'==''">$(MSBuildThisFileDirectory)SharedKey.snk</StrongNamerKeyFile>
+      <StrongNamerKeyFile Condition="'$(StrongNamerKeyFile)'==''">$(MSBuildThisFileDirectory)SharedKey.snk</StrongNamerKeyFile>
     </PropertyGroup>
 
     <StrongNamer.AddStrongName
@@ -18,7 +25,6 @@
 
       <Output TaskParameter="SignedAssembliesToReference" ItemName="AssembliesToReference" />
       <Output TaskParameter="NewCopyLocalFiles" ItemName="NewCopyLocalFiles" />
-
     </StrongNamer.AddStrongName>
 
     <ItemGroup>
@@ -28,11 +34,9 @@
       <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" />
       <ReferenceCopyLocalPaths Include="@(NewCopyLocalFiles)" />
     </ItemGroup>
-
   </Target>
 
   <PropertyGroup>
     <ResolveReferencesDependsOn>$(ResolveReferencesDependsOn);StrongNamerTarget</ResolveReferencesDependsOn>
   </PropertyGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/StrongNamer/buildMultiTargeting/StrongNamer.props b/src/StrongNamer/buildMultiTargeting/StrongNamer.props
new file mode 100644
index 0000000..1faea04
--- /dev/null
+++ b/src/StrongNamer/buildMultiTargeting/StrongNamer.props
@@ -0,0 +1,7 @@
+<!-- 
+  This file is automatically imported by NuGet into a user's project
+  when it targets multiple frameworks, e.g. <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
+-->
+<Project>
+  <Import Project="..\build\StrongNamer.targets" />
+</Project>
diff --git a/src/StrongNamer/packages.config b/src/StrongNamer/packages.config
deleted file mode 100644
index e304cab..0000000
--- a/src/StrongNamer/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/src/StrongNamer/project.json b/src/StrongNamer/project.json
deleted file mode 100644
index 5f48ce5..0000000
--- a/src/StrongNamer/project.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "dependencies": {
-    "Mono.Cecil": "0.10.0"
-  },
-  "frameworks": {
-    "net452": {
-      "dependencies": {}
-    }
-  },
-  "runtimes": {
-    "win-any": {}
-  }
-}
\ No newline at end of file