diff --git a/ApiVersioning.sln b/ApiVersioning.sln
index 25c0a5b7..920ed5ff 100644
--- a/ApiVersioning.sln
+++ b/ApiVersioning.sln
@@ -29,6 +29,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{915BB224-B1D0-4E27-A348-67FCC77AAA44}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webapi", "webapi", "{F446ED94-368F-4F67-913B-16E82CA80DFC}"
+	ProjectSection(SolutionItems) = preProject
+		samples\webapi\directory.build.targets = samples\webapi\directory.build.targets
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnetcore", "aspnetcore", "{900DD210-8500-4D89-A05D-C9526935A719}"
 EndProject
@@ -102,6 +105,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.ApiExplorer", "src\C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808-14AF-4209-9842-1D6E76A99C3F}"
 	ProjectSection(SolutionItems) = preProject
+		after.apiversioning.sln.targets = after.apiversioning.sln.targets
 		build\code-analysis.props = build\code-analysis.props
 		build\common.props = build\common.props
 		build\file-version.targets = build\file-version.targets
@@ -109,6 +113,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808
 		build\nuget.targets = build\nuget.targets
 		build\resource.targets = build\resource.targets
 		build\signing.props = build\signing.props
+		build\signing.targets = build\signing.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3BDDAF5E-4148-4D7F-9B9A-EA11D0110FEB}"
diff --git a/README.md b/README.md
index 46e82174..321a6334 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![VSTS Build Status](https://mrtechnocal.visualstudio.com/_apis/public/build/definitions/f0b1168c-671a-4dd1-ac55-2f0e25c4a405/1/badge)](https://mrtechnocal.visualstudio.com/ApiVersioning/_build/index?definitionId=1)
+[![VSTS Build Status](https://microsoft.visualstudio.com/_apis/public/build/definitions/8d47e068-03c8-4cdc-aa9b-fc6929290322/25012/badge)
 
 # ASP.NET API Versioning
 
diff --git a/after.apiversioning.sln.targets b/after.apiversioning.sln.targets
new file mode 100644
index 00000000..6075abd9
--- /dev/null
+++ b/after.apiversioning.sln.targets
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="build\signing.targets" />
+
+  <Target Name="AfterSolutionBuild" AfterTargets="Build">
+
+    <PropertyGroup>
+      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+      <BuildProperties>Configuration=$(Configuration)</BuildProperties>
+      <BuildProperties Condition=" ('$(Platform)' != '') AND ('$(Platform)' != 'AnyCPU') AND ('$(Platform)' != 'Any CPU') ">$(BuildProperties);Platform=$(Platform)</BuildProperties>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Projects Include="src\**\*.csproj" />
+    </ItemGroup>
+
+    <MSBuild Projects="@(Projects)" Targets="GetTargetPath" Properties="$(BuildProperties)" UnloadProjectsOnCompletion="true">
+      <Output TaskParameter="TargetOutputs" ItemName="TargetFiles" />
+    </MSBuild>
+
+    <PropertyGroup>
+      <!-- transform list to pipe-separated values so we can forward it as a parameter using a build property -->
+      <SigningProperties>
+        SourceDir=$(MSBuildThisFileDirectory)\src;
+        FilesToSign=@(TargetFiles->'%(Identity)','|')
+      </SigningProperties>
+    </PropertyGroup>
+
+    <MSBuild Projects ="$(MSBuildThisFileFullPath)" Targets="WriteCodeSigningFileList" Properties="$(SigningProperties)" />
+
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/build/common.props b/build/common.props
index ab05ca0c..f69d871b 100644
--- a/build/common.props
+++ b/build/common.props
@@ -3,8 +3,8 @@
 
  <PropertyGroup Label="Common">
   <Company>Microsoft Corporation</Company>
-  <Authors>$(Company)</Authors>
-  <Copyright>Copyright © 2016. $(Company). All rights reserved.</Copyright>
+  <Authors>Microsoft</Authors>
+  <Copyright>© $(Company). All rights reserved.</Copyright>
   <NeutralLanguage>en</NeutralLanguage>
   <DefaultLanguage>en-US</DefaultLanguage>
  </PropertyGroup>
diff --git a/build/file-version.targets b/build/file-version.targets
index 60e0530a..4f6f27a3 100644
--- a/build/file-version.targets
+++ b/build/file-version.targets
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
- <PropertyGroup Label="File Version">
-  <!-- replicates the behavior of 1.0.* -->
-  <MajorAndMinorVersion>$(AssemblyVersion.Split(`.`)[0]).$(AssemblyVersion.Split(`.`)[1])</MajorAndMinorVersion>
-  <DaylightSavingTime>$([System.DateTime]::Now.IsDaylightSavingTime())</DaylightSavingTime>
-  <FileBuildNumber>$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse("1/1/2000"))).ToString("%d"))</FileBuildNumber>
-  <FileBuildRevision Condition=" '$(DaylightSavingTime)'=='True' " >$([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.Subtract($([System.TimeSpan]::FromHours(1.0))).TotalSeconds),2))))</FileBuildRevision>
-  <FileBuildRevision Condition=" '$(DaylightSavingTime)'=='False' " >$([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.TotalSeconds),2))))</FileBuildRevision>
-  <FileVersion>$(MajorAndMinorVersion).$(FileBuildNumber).$(FileBuildRevision)</FileVersion>
- </PropertyGroup>
+  <PropertyGroup Label="File Version">
+    <!-- replicates the behavior of 1.0.* -->
+    <AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">1.0.0.0</AssemblyVersion>
+    <MajorAndMinorVersion>$(AssemblyVersion.Split(`.`)[0]).$(AssemblyVersion.Split(`.`)[1])</MajorAndMinorVersion>
+    <DaylightSavingTime>$([System.DateTime]::Now.IsDaylightSavingTime())</DaylightSavingTime>
+    <FileBuildNumber>$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse("1/1/2000"))).ToString("%d"))</FileBuildNumber>
+    <FileBuildRevision Condition=" '$(DaylightSavingTime)'=='True' " >$([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.Subtract($([System.TimeSpan]::FromHours(1.0))).TotalSeconds),2))))</FileBuildRevision>
+    <FileBuildRevision Condition=" '$(DaylightSavingTime)'=='False' " >$([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.TotalSeconds),2))))</FileBuildRevision>
+    <FileVersion>$(MajorAndMinorVersion).$(FileBuildNumber).$(FileBuildRevision)</FileVersion>
+  </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/build/nuget.props b/build/nuget.props
index edfa238e..8cbdd4f9 100644
--- a/build/nuget.props
+++ b/build/nuget.props
@@ -12,7 +12,7 @@
   <IncludeSource>true</IncludeSource>
   <IncludeBuildOutput>true</IncludeBuildOutput>
   <MinClientVersion>2.5</MinClientVersion>
-  <PackageOutputPath>$(MSBuildThisFileDirectory)..\bin</PackageOutputPath>
+  <PackageOutputPath Condition=" $(PackageOutputPath) == '' ">$(MSBuildThisFileDirectory)..\bin</PackageOutputPath>
  </PropertyGroup>
 
  <ItemGroup Label="NuGet">
@@ -20,9 +20,4 @@
   <ReleaseNotes Include="$(BuildReleaseNotes.Split('|'))" />
  </ItemGroup>
 
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' " Label="NuGet">
-  <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- </PropertyGroup>
-
 </Project>
\ No newline at end of file
diff --git a/build/signing.targets b/build/signing.targets
new file mode 100644
index 00000000..bdd30fb6
--- /dev/null
+++ b/build/signing.targets
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- REF: https://microsoft.sharepoint.com/teams/prss/esrp/info/ESRP%20Onboarding%20Wiki/Integrate%20the%20ESRP%20CodeSign%20Task%20into%20VSO.aspx -->
+  <PropertyGroup>
+    <SignConfigPath Condition=" '$(SignConfigPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\bin'))</SignConfigPath>
+  </PropertyGroup>
+
+  <Target Name="WriteCodeSigningFileList">
+
+    <ItemGroup>
+      <FilesToSign Include="$(FilesToSign.Split('|'))" />
+    </ItemGroup>
+
+    <MakeDir Directories="$(SignConfigPath)" Condition="!Exists('$(SignConfigPath)')" />
+    <WriteLinesToFile File="$(SignConfigPath)\signing-file-list.txt" Encoding="ascii" Lines="@(FilesToSign->'%(Identity)'->Substring($(SourceDir.Length)),',')" Overwrite="true" />
+
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/samples/webapi/directory.build.targets b/samples/webapi/directory.build.targets
new file mode 100644
index 00000000..50a7388a
--- /dev/null
+++ b/samples/webapi/directory.build.targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- ASP.NET Web API uses the older project style. Define an empty target for 'Pack' to avoid MSB4057 during solution builds. -->
+  <Target Name="Pack" Condition="false" />
+
+</Project>
\ No newline at end of file
diff --git a/src/directory.build.targets b/src/directory.build.targets
index 11e52442..6de42da9 100644
--- a/src/directory.build.targets
+++ b/src/directory.build.targets
@@ -2,7 +2,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup Label="Common">
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DocumentationFile Condition=" '$(DocumentationFile)' == '' " >bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <ImportGroup Condition=" '$(MSBuildProjectExtension)' != '.shproj' ">
@@ -11,4 +12,6 @@
     <Import Project="..\build\nuget.targets" />
   </ImportGroup>
 
+  <Target Name="GetTargetPath" Outputs="$(TargetPath)" />
+
 </Project>
\ No newline at end of file