Solution cleanup (#23)

* Update solution to build on cmd line and VS2017, and hopefully in build pipeline. * Fix versions * Project build order; Update .gitignore ; Include SQL in Release builds * Verify signing on .nupkg files only. * Don't rev version numbers for a build environment cleanup. No code changed.
2019-06-13 18:10:46 -07:00 · 2019-06-13 18:10:46 -07:00 · 1b31b0c069
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,4 @@
 msbuild.*
 obj/
 /packages/
+.binaries/
--- a/.nuget/NuGet.targets
+++ b/.nuget/NuGet.targets
@ -58,7 +58,7 @@
        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>

-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir)"</PaddedSolutionDir>
        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>

        <!-- Commands -->
--- a/Microsoft.Aspnet.SessionState.sln
+++ b/Microsoft.Aspnet.SessionState.sln
@ -17,6 +17,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SessionSta
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test", "test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test.csproj", "{2AF89ACA-3545-432D-8D99-C5230E8643A8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{78F4C27F-37B4-4D27-B198-F601359EC691}"
+	ProjectSection(SolutionItems) = preProject
+		tools\CosmosDBSessionStateProviderAsync.settings.targets = tools\CosmosDBSessionStateProviderAsync.settings.targets
+		tools\MicrosoftAspNetSessionState.settings.targets = tools\MicrosoftAspNetSessionState.settings.targets
+		tools\SessionStateModule.settings.targets = tools\SessionStateModule.settings.targets
+		tools\SqlSessionStateProviderAsync.settings.targets = tools\SqlSessionStateProviderAsync.settings.targets
+		tools\version.targets = tools\version.targets
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packages", "src\packages\Packages.csproj", "{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7238F90D-3BCE-4F40-A5BA-EA36AD484BD6} = {7238F90D-3BCE-4F40-A5BA-EA36AD484BD6}
+		{493B0482-572A-4465-BD52-4094351C2647} = {493B0482-572A-4465-BD52-4094351C2647}
+		{4CFB2896-D5C1-4E96-A3DA-D57C58539209} = {4CFB2896-D5C1-4E96-A3DA-D57C58539209}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -26,6 +42,7 @@ Global
 		{493B0482-572A-4465-BD52-4094351C2647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{493B0482-572A-4465-BD52-4094351C2647}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{493B0482-572A-4465-BD52-4094351C2647}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{493B0482-572A-4465-BD52-4094351C2647}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4CFB2896-D5C1-4E96-A3DA-D57C58539209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4CFB2896-D5C1-4E96-A3DA-D57C58539209}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4CFB2896-D5C1-4E96-A3DA-D57C58539209}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -42,6 +59,10 @@ Global
 		{2AF89ACA-3545-432D-8D99-C5230E8643A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2AF89ACA-3545-432D-8D99-C5230E8643A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2AF89ACA-3545-432D-8D99-C5230E8643A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -52,6 +73,7 @@ Global
 		{7238F90D-3BCE-4F40-A5BA-EA36AD484BD6} = {58E8143E-86D8-4CA3-AAC3-1CF253D91207}
 		{CBB00B6C-8A44-43F0-BE73-0B0E8565F8A2} = {93AD624B-85A6-4EE9-B40E-42914D40C0CF}
 		{2AF89ACA-3545-432D-8D99-C5230E8643A8} = {93AD624B-85A6-4EE9-B40E-42914D40C0CF}
+		{7EC5863F-7FF1-41C7-A384-8FFF81531E7A} = {58E8143E-86D8-4CA3-AAC3-1CF253D91207}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4853AD21-0DCE-40D8-A3B9-19081B71C364}
--- a/MicrosoftAspNetSessionState.msbuild
+++ b/MicrosoftAspNetSessionState.msbuild
@ -1,11 +1,11 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="tools\MicrosoftAspNetSessionState.settings.targets"/>  

  <ItemGroup>
    <AssemblyProject Include="src\SessionStateModule\Microsoft.AspNet.SessionState.SessionStateModule.csproj" />
    <AssemblyProject Include="src\SqlSessionStateProviderAsync\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj" />
    <AssemblyProject Include="src\CosmosDBSessionStateProviderAsync\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.csproj" />
  </ItemGroup>
+
  <ItemGroup>
    <TestProject Include="test\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj" />
    <TestProject Include="test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test.csproj" />
@ -15,18 +15,33 @@
  </ItemGroup>
  
  <Target Name="Build" DependsOnTargets="BuildAssemblies;UnitTest;BuildPackages" />
-  <Target Name="Clean" DependsOnTargets="CleanPackages;CleanAssemblies" />
+  <Target Name="BuildAll" DependsOnTargets="BuildAssemblies;BuildSamples;UnitTest;BuildPackages" />
+  <Target Name="Clean" DependsOnTargets="CleanPackages;CleanSamples;CleanTests;CleanAssemblies" />
  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
  
  <Target Name="BuildAssemblies" DependsOnTargets="RestorePackages">
-    <MSBuild Targets="Build" Projects="@(AssemblyProject);@(TestProject)" />
+    <MSBuild Targets="Build" Projects="@(AssemblyProject)" />
+  </Target> 
+
+  <Target Name="BuildTests" DependsOnTargets="RestorePackages">
+    <MSBuild Targets="Build" Projects="@(TestProject)" />
+  </Target>
+
+  <Target Name="BuildSamples" DependsOnTargets="RestorePackages">
+    <MSBuild Targets="Build" Projects="@(SampleProject)" />
  </Target>

  <Target Name="CleanAssemblies">
-    <MSBuild Targets="Clean" Projects="Microsoft.Aspnet.SessionState.sln" />
+    <MSBuild Targets="Clean" Projects="@(AssemblyProject)" />
  </Target>

-  <Target Name="RebuildAssemblies" DependsOnTargets="Clean;Build" />
+  <Target Name="CleanTests">
+    <MSBuild Targets="Clean" Projects="@(TestProject)" />
+  </Target>
+
+  <Target Name="CleanSamples">
+    <MSBuild Targets="Clean" Projects="@(SampleProject)" />
+  </Target>

  <!-- Packages build -->

@ -45,9 +60,8 @@
  </Target>

  
-  <Target Name="UnitTest">
+  <Target Name="UnitTest" DependsOnTargets="BuildTests">
    <MSBuild Targets="XunitTest" Projects="@(TestProject)" />
  </Target>

-  <Import Project="tools\MicrosoftAspNetSessionState.targets"/>
 </Project>
--- a/build.cmd
+++ b/build.cmd
@ -1,12 +1,20 @@
@ECHO OFF

 setlocal
+set EnableNuGetPackageRestore=true

-set logOptions=/flp:Summary;Verbosity=m;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
+set MSBUILDEXE=msbuild.exe
+
+set cfgOption=/p:Configuration=Release
+REM set cfgOption=/p:Configuration=Debug
+REM set cfgOption=/p:Configuration=Debug;Release
+if not "%1"=="" set cfgOption=/p:Configuration=
+
+set logOptions=/v:n /flp:Summary;Verbosity=diag;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err

 echo Please build from VS 2015(or newer version) Developer Command Prompt

 :BUILD
-msbuild "%~dp0\MicrosoftAspNetSessionState.msbuild" %logOptions% /v:m /maxcpucount /nodeReuse:false %*
+%MSBUILDEXE% "%~dp0\MicrosoftAspNetSessionState.msbuild" /t:BuildAll %logOptions% /maxcpucount /nodeReuse:false %cfgOption%%*

 endlocal
--- a/clean.cmd
+++ b/clean.cmd
@ -0,0 +1,22 @@
+@ECHO OFF
+
+setlocal
+
+set MSBUILDEXE=msbuild.exe
+
+set cfgOption=/p:Configuration=Release
+REM set cfgOption=/p:Configuration=Debug
+REM set cfgOption=/p:Configuration=Debug;Release
+if not "%1"=="" set cfgOption=/p:Configuration=
+
+set logOptions=/v:n /flp:Summary;Verbosity=diag;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
+
+echo Please build from VS 2015(or newer version) Developer Command Prompt
+
+:BUILD
+%MSBUILDEXE% "%~dp0\MicrosoftAspNetSessionState.msbuild" /t:Clean %logOptions% /maxcpucount /nodeReuse:false %cfgOption%%*
+del /F msbuild.log
+del /F msbuild.wrn
+del /F msbuild.err
+
+endlocal
--- a/src/CosmosDBSessionStateProviderAsync/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.csproj
+++ b/src/CosmosDBSessionStateProviderAsync/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.csproj
@ -2,7 +2,6 @@
 <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')" />
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\CosmosDBSessionStateProviderAsync.settings.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -89,11 +88,11 @@
    </EmbeddedResource>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets'))" />
  </Target>
+  <Import Project="..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets')" />
 </Project>
--- a/src/SessionStateModule/Microsoft.AspNet.SessionState.SessionStateModule.csproj
+++ b/src/SessionStateModule/Microsoft.AspNet.SessionState.SessionStateModule.csproj
@ -2,7 +2,6 @@
 <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')" />
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SessionStateModule.settings.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -81,11 +80,4 @@
    <None Include="35MSSharedLib1024.snk" />
  </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>
-  -->
 </Project>
--- a/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
+++ b/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
@ -2,7 +2,6 @@
 <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')" />
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SqlSessionStateProviderAsync.settings.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -94,18 +93,10 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
  </Target>
-  <!-- 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>
-  -->
 </Project>
--- a/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuproj
+++ b/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuproj
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\CosmosDBSessionStateProviderAsync.settings.targets" />
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
    <PropertyGroup>
        <AssemblyName>$(MSBuildProjectName)</AssemblyName>
        <NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
--- a/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuspec
+++ b/src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuspec
@ -6,17 +6,19 @@
    <authors>Microsoft</authors>
    <owners>Microsoft</owners>
    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-    <dependencies>
-      <dependency id="Microsoft.AspNet.SessionState.SessionStateModule" version="$SessionStateModuleNuGetPackageVersion$" />
-      <dependency id="Microsoft.Azure.DocumentDB" version="$DocumentDBNuGetPackageVersion$" />
-    </dependencies>    
    <title>Microsoft ASP.NET Async CosmosDBSessionStateProvider Provider</title>
    <description>In .Net 4.6.2, asp.net enables developer plug in async version of SessionState module which is a good fit for the non-in-memory SessionState data store. This SessionState provider uses CosmosDB as the data store and leverages async database operation to provide better scability.</description>
    <summary>Async version CosmosDBSessionState provider</summary>
    <language>en-US</language>
    <projectUrl>http://www.asp.net/</projectUrl>
+    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
    <licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_ENU.htm</licenseUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <tags>ASP.NET Async SessionState Provider</tags>
+
+    <dependencies>
+      <dependency id="Microsoft.AspNet.SessionState.SessionStateModule" version="$SessionStateModuleNuGetPackageVersion$" />
+      <dependency id="Microsoft.Azure.DocumentDB" version="$DocumentDBNuGetPackageVersion$" />
+    </dependencies>    
  </metadata>
 </package>
--- a/src/packages/SessionStateModule.nupkg/Microsoft.AspNet.SessionState.SessionStateModule.nuproj
+++ b/src/packages/SessionStateModule.nupkg/Microsoft.AspNet.SessionState.SessionStateModule.nuproj
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SessionStateModule.settings.targets" />
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
    <PropertyGroup>
        <AssemblyName>$(MSBuildProjectName)</AssemblyName>
        <NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
--- a/src/packages/SqlSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuproj
+++ b/src/packages/SqlSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.nuproj
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SqlSessionStateProviderAsync.settings.targets" />
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
    <PropertyGroup>
        <AssemblyName>$(MSBuildProjectName)</AssemblyName>
        <NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
--- a/test/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test.csproj
+++ b/test/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test.csproj
@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
  <Import Project="..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props')" />
  <Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
  <Import Project="..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\CosmosDBSessionStateProviderAsync.settings.targets" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -15,6 +16,8 @@
    <AssemblyName>Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test</AssemblyName>
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
  </PropertyGroup>
@ -39,7 +42,7 @@
    <SignAssembly>true</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <PropertyGroup>
    <DelaySign>true</DelaySign>
--- a/test/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test/Properties/AssemblyInfo.cs
+++ b/test/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test/Properties/AssemblyInfo.cs
@ -24,16 +24,3 @@ using System.Runtime.InteropServices;

 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("2af89aca-3545-432d-8d99-c5230e8643a8")]
-
-// 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.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj
+++ b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj
@ -4,8 +4,8 @@
  <Import Project="..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
  <Import Project="..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props')" />
  <Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SqlSessionStateProviderAsync.settings.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -110,7 +110,6 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
--- a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj.bak
+++ b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj.bak
@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props')" />
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SqlSessionStateProviderAsync.settings.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CBB00B6C-8A44-43F0-BE73-0B0E8565F8A2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider.Test</RootNamespace>
-    <AssemblyName>Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DelaySign>true</DelaySign>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Moq, Version=4.5.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.5.0\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <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" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="SqlCommandHelperTest.cs" />
-    <Compile Include="SqlSessionStateAsyncProviderTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="35MSSharedLib1024.snk" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SessionStateModule\Microsoft.AspNet.SessionState.SessionStateModule.csproj">
-      <Project>{7238f90d-3bce-4f40-a5ba-ea36ad484bd6}</Project>
-      <Name>Microsoft.AspNet.SessionState.SessionStateModule</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\SqlSessionStateProviderAsync\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj">
-      <Project>{493b0482-572a-4465-bd52-4094351c2647}</Project>
-      <Name>Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.targets'))" />
-  </Target>
-  <Import Project="..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.targets" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.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>
-  -->
-</Project>
--- a/tools/.verif.whitelist
+++ b/tools/.verif.whitelist
@ -0,0 +1 @@
+*\lib\*\*.xml,ignore xmldoc files
--- a/tools/CosmosDBSessionStateProviderAsync.settings.targets
+++ b/tools/CosmosDBSessionStateProviderAsync.settings.targets
@ -1,15 +1,17 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
  <PropertyGroup>
    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
-    <VersionStartYear>2017</VersionStartYear>
    <VersionMajor>1</VersionMajor>
    <VersionMinor>0</VersionMinor>
    <VersionRelease>0</VersionRelease>
-    <VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
  </PropertyGroup>

  <PropertyGroup Label="NuGet package dependencies">
    <SessionStateModuleNuGetPackageVersion>1.1.0</SessionStateModuleNuGetPackageVersion>
    <DocumentDBNuGetPackageVersion>1.15.0</DocumentDBNuGetPackageVersion>
  </PropertyGroup>
+
+  <Import Project="MicrosoftAspNetSessionState.settings.targets" />
+
 </Project>
--- a/tools/MicrosoftAspNetSessionState.Extensions.settings.targets
+++ b/tools/MicrosoftAspNetSessionState.Extensions.settings.targets
@ -1,30 +0,0 @@
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <RepositoryRootEx Condition="'$(RepositoryRootEx)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\</RepositoryRootEx>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
-    <BinPath>$(RepositoryRootEx)bin\</BinPath>
-    <ObjPath>$(RepositoryRootEx)obj\</ObjPath>
-    <OutputPath>$(BinPath)$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>$(ObjPath)$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TestRoot>$(RepositoryRoot)\test\Microsoft.AspNet.SessionState.AsyncProviders.SqlSessionStateProviderAsync.Test</TestRoot>
-    <BuildingTestProject Condition="$(MSBuildProjectDirectory.ToLower().Contains($(TestRoot.ToLower())))">true</BuildingTestProject>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)CI\CITask.targets" Condition="Exists('$(MSBuildThisFileDirectory)CI\CITask.targets')"/>
-
-  <PropertyGroup>
-    <AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
-    <AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <CustomAfterProjectTargets>$(MSBuildThisFileDirectory)MicrosoftAspNetSessionState.Extensions.targets</CustomAfterProjectTargets>
-  </PropertyGroup>
-</Project>
--- a/tools/MicrosoftAspNetSessionState.Extensions.targets
+++ b/tools/MicrosoftAspNetSessionState.Extensions.targets
@ -1,8 +0,0 @@
-<Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Update NuGet Package version for nightly build-->
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.nuproj'">
-    <NuGetPackageVersion Condition="'$(UpdateNightlyPackages)' == 'true'">$(NuGetPackageVersion)-b$(VersionBuild)</NuGetPackageVersion>
-  </PropertyGroup>
-
-</Project>
--- a/tools/MicrosoftAspNetSessionState.settings.targets
+++ b/tools/MicrosoftAspNetSessionState.settings.targets
@ -1,37 +1,106 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CustomBeforeProjectTargets>$(MSBuildThisFileDirectory)MicrosoftAspNetSessionState.Extensions.settings.targets</CustomBeforeProjectTargets>
-  </PropertyGroup>
-  <Import Project="$(CustomBeforeProjectTargets)" Condition="Exists('$(CustomBeforeProjectTargets)')" Label="Pre-targets Build Extensibility Point"/>
-
-  <!-- Default properties -->

  <PropertyGroup>
-    <RepositoryRoot Condition="'$(RepositoryRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Microsoft.Aspnet.SessionState.sln))\</RepositoryRoot>
+    <CustomAfterMicrosoftCommonTargets>$(MSBuildThisFileDirectory)version.targets;$(MSBuildThisFileDirectory)signing.targets</CustomAfterMicrosoftCommonTargets>
+    <CustomAfterNuGetProjTargets>$(MSBuildThisFileDirectory)signing.targets</CustomAfterNuGetProjTargets>
+    <RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Microsoft.Aspnet.SessionState.sln))\</RepositoryRoot>
    <SolutionDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Microsoft.Aspnet.SessionState.sln))\</SolutionDir>
  </PropertyGroup>

-  <PropertyGroup Label="Common Configuration">
-    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
-    <OutputPath>$(RepositoryRoot)bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>$(RepositoryRoot)obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
-  </PropertyGroup>
+  <Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props"
+      Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props')" />
+  <Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets"
+      Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets')" />
+
+  <!-- Configurable properties-->

  <PropertyGroup>
+    <!-- Versioning:
+            Major:	'Major' for Assembly, File, Info, and Package.
+            Minor:	'Minor' for Assembly, File, Info, and Package.
+            Build:	Third (auto-generated) for File and Info. (Assembly is always 0)
+            Revision:	'Revision' for Assembly and File. Strategy - Try to leave this 0 and only rev Major/Minor for big changes and Release for non-dependency-breaking changes.
+            Release:	Third for Info and Package.
+         Update package and file without touching assembly, except for major releases.
+
+         Some of these are already set in each project's individual settings file.
+    -->
+    <BuildQuality Condition="'$(BuildQuality)' == ''">beta</BuildQuality>
+    <VersionStartYear Condition="'$(VersionStartYear)' == ''">2019</VersionStartYear>
+    <VersionMajor Condition="'$(VersionMajor)' == ''">1</VersionMajor>
+    <VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
+    <VersionRevision Condition="'$(VersionRevision)' == ''">0</VersionRevision>
+    <VersionRelease Condition="'$(VersionRelease)' == ''">0</VersionRelease>
+    <VersionBuild Condition="'$(VersionBuild)' == '' OR '$(VersionBuild)' == '0'">$([MSBuild]::Add(1, $([MSBuild]::Subtract($([System.DateTime]::Now.Year), $(VersionStartYear)))))$([System.DateTime]::Now.ToString("MMdd"))</VersionBuild>
+    <NuGetPackageVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease)</NuGetPackageVersion>
+  </PropertyGroup>
+
+  <!-- Add release type for non-RTM releases. -->
+  <PropertyGroup Label="Prerelease version adjustments" Condition="'$(BuildQuality)' != 'rtm'">
+    <VersionRelease>$(VersionRelease)-$(BuildQuality)</VersionRelease>
+    <NuGetPackageVersion>$(NuGetPackageVersion)-$(BuildQuality)</NuGetPackageVersion>
+  </PropertyGroup>
+
+  <!-- Additionaly, add date stamp to 'preview' releases. -->
+  <PropertyGroup Label="Prerelease version adjustments" Condition="'$(BuildQuality)' == 'preview'">
+    <NuGetPackageVersion>$(NuGetPackageVersion)$(VersionBuild)</NuGetPackageVersion>
+  </PropertyGroup>
+
+  <!-- Default properties -->
+
+  <PropertyGroup Label="Common Configuration">
+    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
+    <OutputPath>$(RepositoryRoot).binaries\bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>$(RepositoryRoot).binaries\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
+    <AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
    <AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>
-    <NuGetOutputPath>$(AssemblyPath)Packages</NuGetOutputPath>
-    <NuGetSymbolsOutputPath>$(AssemblyPath)\SymbolPackages</NuGetSymbolsOutputPath>
    <TestOutputPath>$(OutputPath)test\</TestOutputPath>
  </PropertyGroup>

-  <PropertyGroup>
-    <ReferencePackagesPath>$(RepositoryRoot)packages\</ReferencePackagesPath>
+  <PropertyGroup Label="Nuget Configuration">
+    <NuGetOutputPath>$(RepositoryRoot).binaries\Packages\$(Configuration)</NuGetOutputPath>
+    <!-- <NuGetSymbolsOutputPath>$(RepositoryRoot).binaries\SymbolPackages\$(Configuration)</NuGetSymbolsOutputPath> -->
    <NuGetPackSymbols Condition="'$(NuGetPackSymbols)' == ''">true</NuGetPackSymbols>
+    <ReferencePackagesPath>$(RepositoryRoot)packages\</ReferencePackagesPath>
    <SourceRootFullPath>$(RepositoryRoot)\src\$(MSBuildProjectName)\</SourceRootFullPath>
+    <NuGetScriptDirectory>$(MSBuildProjectDirectory)\tools\Net471</NuGetScriptDirectory>
+    <NuGetSharedScriptDirectory>$(MSBuildProjectDirectory)\shared\tools\Net471</NuGetSharedScriptDirectory>
+    <NuGetProcessedScriptSubDirectory>pp</NuGetProcessedScriptSubDirectory>
  </PropertyGroup>

+  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.nuproj'">
+    <NuGetScriptFiles Include="$(NuGetScriptDirectory)\*.ps1" />
+    <NuGetSharedScriptFiles Include="$(NuGetSharedScriptDirectory)\*.ps1" />
+  </ItemGroup>
+
  <PropertyGroup>
-    <CustomAfterMicrosoftCommonTargets>$(RepositoryRoot)tools\MicrosoftAspNetSessionState.targets</CustomAfterMicrosoftCommonTargets>
-    <CustomAfterNuGetProjTargets>$(CustomAfterMicrosoftCommonTargets)</CustomAfterNuGetProjTargets>
+    <TestRoot>$(RepositoryRoot)\test\Microsoft.AspNet.SessionState.AsyncProviders.SqlSessionStateProviderAsync.Test</TestRoot>
+    <BuildingTestProject Condition="$(MSBuildProjectDirectory.ToLower().Contains($(TestRoot.ToLower())))">true</BuildingTestProject>
  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)version.targets" Condition="'$(MSBuildProjectExtension)' == '.nuproj'"/>
+
+  <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuSpecFile">
+    <PropertyGroup>
+      <NuSpecProperties>
+          NuGetPackageVersion=$(NuGetPackageVersion);
+          NuGetPackageId=$(NuGetPackageId);
+          SessionStateModuleNuGetPackageVersion=$(SessionStateModuleNuGetPackageVersion);
+          DocumentDBNuGetPackageVersion=$(DocumentDBNuGetPackageVersion)
+      </NuSpecProperties>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="SuperClean" AfterTargets="Clean"  Condition="'$(MSBuildProjectExtension)' != '.nuproj'">
+    <RemoveDir Directories="$(OutputPath)" />
+    <RemoveDir Directories="$(IntermediateOutputRoot)" />
+  </Target>
+
+  <Target Name="SuperCleanPackage" AfterTargets="Clean" Condition="'$(MSBuildProjectExtension)' == '.nuproj'">
+    <RemoveDir Directories="$(NuGetOutputPath)" />
+    <RemoveDir Directories="$(NuGetSymbolsOutputPath)" />
+    <RemoveDir Directories="$(NuGetScriptDirectory)\$(NuGetProcessedScriptSubDirectory)" />
+    <RemoveDir Directories="$(NuGetSharedScriptDirectory)\$(NuGetProcessedScriptSubDirectory)" />
+  </Target>
+
 </Project>
--- a/tools/MicrosoftAspNetSessionState.targets
+++ b/tools/MicrosoftAspNetSessionState.targets
@ -1,30 +0,0 @@
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <!-- Build order -->
-    <PropertyGroup>
-        <BuildDependsOn>SetNuSpecProperties;$(BuildDependsOn)</BuildDependsOn>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)version.targets"/>
-
-    <!-- Post-targets computed properties. -->
-
-    <PropertyGroup>
-        <SatelliteContractVersion Condition="'$(SatelliteContractVersion)' == ''">$(AssemblyVersion)</SatelliteContractVersion>
-    </PropertyGroup>
-
-    <Import Project="$(CustomAfterProjectTargets)" Condition="Exists('$(CustomAfterProjectTargets)')" Label="Post-targets Build Extensibility Point" />
-
-    <!-- Target definitions -->
-
-    <Target Name="SetNuSpecProperties">
-        <PropertyGroup>
-            <NuSpecProperties>
-                NuGetPackageVersion=$(NuGetPackageVersion);
-                NuGetPackageId=$(NuGetPackageId);
-		SessionStateModuleNuGetPackageVersion=$(SessionStateModuleNuGetPackageVersion);
-		DocumentDBNuGetPackageVersion=$(DocumentDBNuGetPackageVersion)
-            </NuSpecProperties>
-        </PropertyGroup>
-    </Target>
-</Project>
--- a/tools/NuGet.targets
+++ b/tools/NuGet.targets
@ -58,7 +58,7 @@
        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>

-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir)"</PaddedSolutionDir>
        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>

        <!-- Commands -->
--- a/tools/NuGetProj.targets
+++ b/tools/NuGetProj.targets
@ -269,7 +269,7 @@ NuGetPack: Creates a nuget package.
    <PropertyGroup>
      <NuSpecProperties>@(NuSpecProperties)</NuSpecProperties>
      <NuGetPackOptions Condition="'$(NuGetPackOptions)' == '' AND '$(NuGetPackSymbols)' != 'true'">-NoPackageAnalysis</NuGetPackOptions>
-      <NuGetPackOptions Condition="'$(NuGetPackOptions)' == '' AND '$(NuGetPackSymbols)' == 'true'">-NoPackageAnalysis -symbols</NuGetPackOptions>
+      <NuGetPackOptions Condition="'$(NuGetPackOptions)' == '' AND '$(NuGetPackSymbols)' == 'true'">-NoPackageAnalysis -NoDefaultExcludes -symbols</NuGetPackOptions>
      <!-- BuildCommand is defined in nuget.targets file -->
      <BuildCommand>$(BuildCommand.Replace('-symbols', ''))</BuildCommand>
      <BuildCommand>$(BuildCommand.Replace('/symbols', ''))</BuildCommand>
@ -304,10 +304,12 @@ GetNuGetProjectOutputs: Reads build-generated files from outputs file.
  <Target Name="GetNuGetProjectOutputs">
    <PropertyGroup>
      <NuGetPackTargetFile>$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).nupkg</NuGetPackTargetFile>
-      <NuGetPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetPackTargetFile>
+      <NuGetSymbolPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetSymbolPackTargetFile>
    </PropertyGroup>
    <ItemGroup>
      <NuGetProjectOutput Include="$(NuGetPackTargetFile)" />
+      <NuGetProjectOutput Include="$(NuGetSymbolPackTargetFile)" Condition="'$(NuGetSymbolPackTargetFile)' != ''" />
+
      <NuGetProjectOutput Include="$(NuGetProjectOutputsFile)" />
    </ItemGroup>
  </Target>
--- a/tools/NuProj.targets
+++ b/tools/NuProj.targets
@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--
-      DEFAULTS
-
-      Those can be overriden.
-  -->
-
-  <PropertyGroup>
-    <OutDir Condition=" '$(OutDir)' == ''" >$(MSBuildProjectDirectory)\bin\</OutDir>
-    <IntermediateOutputPath Condition=" '$(IntermediateOutputPath)' == '' ">$(MSBuildProjectDirectory)\obj\</IntermediateOutputPath>
-    <NuSpecPath Condition=" '$(NuSpecPath)' == '' ">$(IntermediateOutputPath)$(Id).nuspec</NuSpecPath>
-
-    <NuProjTasksPath Condition=" '$(NuProjTasksPath)' == '' ">$(MSBuildThisFileDirectory)NuProj.Tasks.dll</NuProjTasksPath>
-    <NuGetToolPath Condition=" '$(NuGetToolPath)' == '' ">$(MSBuildThisFileDirectory)</NuGetToolPath>
-    <NuGetToolExe Condition=" '$(NuGetToolExe)' == '' ">NuGet.exe</NuGetToolExe>
-  </PropertyGroup>
-
-  <!--
-      OUPUT PATH
-
-      This property isn't passed to NuGet.exe - it's implicit. However, we need to know the ouput path
-      at several occasions (e.g. incremental build or clean up) so we want a central spot to capture it.
-  -->
-
-  <PropertyGroup>
-    <NuGetOuputPath>$(OutDir)$(Id).$(Version).nupkg</NuGetOuputPath>
-  </PropertyGroup>
-
-  <!--
-      MSBuildAllProjects is used to keep track of all projects the build depends on.
-      We make all targets depending on it to make sure everything rebuilds.
-  -->
-
-  <PropertyGroup>
-    <MSBuildAllProjects Condition="Exists('$(MSBuildProjectFullPath)')">$(MSBuildAllProjects);$(MSBuildProjectFullPath)</MSBuildAllProjects>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-
-  <!--
-      CUSTOM TASKS
-  -->
-
-  <UsingTask TaskName="GenerateNuSpec" AssemblyFile="$(NuProjTasksPath)" />
-  <UsingTask TaskName="NuGetPack" AssemblyFile="$(NuProjTasksPath)" />
-
-  <!--
-      CONVERT ITEMS
-  -->
-
-  <Target Name="ConvertItems">
-    <CreateItem Include="@(Library)"
-                AdditionalMetadata="TargetPath=lib\%(Library.TargetFramework)">
-      <Output TaskParameter="Include"
-              ItemName="File"/>
-    </CreateItem>
-    <CreateItem Include="@(Content)"
-                AdditionalMetadata="TargetPath=content\%(Content.TargetPath)">
-      <Output TaskParameter="Include"
-              ItemName="File"/>
-    </CreateItem>
-  </Target>
-
-  <!--
-      GENERATE NU SPEC
-  -->
-
-  <Target Name="GenerateNuSpec"
-          Inputs="$(MSBuildAllProjects)"
-          Outputs="$(NuSpecPath)"
-          DependsOnTargets="ConvertItems">
-    <GenerateNuSpec OutputFileName="$(NuSpecPath)"
-                    Id="$(Id)"
-                    Version="$(Version)"
-                    Title="$(Title)"
-                    Authors="$(Authors)"
-                    Owners="$(Owners)"
-                    Description="$(Description)"
-                    ReleaseNotes="$(ReleaseNotes)"
-                    Summary="$(Summary)"
-                    Language="$(Language)"
-                    ProjectUrl="$(ProjectUrl)"
-                    IconUrl="$(IconUrl)"
-                    LicenseUrl="$(LicenseUrl)"
-                    Copyright="$(Copyright)"
-                    RequireLicenseAcceptance="$(RequireLicenseAcceptance)"
-                    Tags="$(Tags)"
-                    Dependencies="@(Dependency)"
-                    References="@(Reference)"
-                    FrameworkReferences="@(FrameworkReference)"
-                    Files="@(File)"/>
-  </Target>
-
-  <!--
-      CREATE PACKAGE
-  -->
-
-  <Target Name="CreatePackage"
-          Inputs="$(MSBuildAllProjects);
-                  $(NuSpecPath);
-                  @(File)"
-          Outputs="$(NuGetOuputPath)"
-          DependsOnTargets="GenerateNuSpec">
-    <MakeDir Directories="$(OutDir)"
-             Condition="!Exists('$(OutDir)')" />
-    <NuGetPack OutputDirectory="$(OutDir)"
-               ToolPath="$(NuGetToolPath)"
-               ToolExe="$(NuGetToolExe)"
-               NuSpecPath="$(NuSpecPath)"/>
-  </Target>
-
-  <!--
-      STANDARD BUILD TARGETS
-  -->
-
-  <Target Name="Clean">
-    <ItemGroup>
-      <_ToBeDeleted Include="$(NuSpecPath)" />
-      <_ToBeDeleted Include="$(NuGetOuputPath)" />
-    </ItemGroup>
-    <Delete Files="@(_ToBeDeleted)" />
-  </Target>
-
-  <Target Name="Build" DependsOnTargets="CreatePackage" />
-
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-
-</Project>
--- a/tools/SessionStateModule.settings.targets
+++ b/tools/SessionStateModule.settings.targets
@ -1,10 +1,11 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
  <PropertyGroup>
    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
-    <VersionStartYear>2016</VersionStartYear>
    <VersionMajor>1</VersionMajor>
    <VersionMinor>1</VersionMinor>
    <VersionRelease>0</VersionRelease>
-    <VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
  </PropertyGroup>
+
+  <Import Project="MicrosoftAspNetSessionState.settings.targets" />
 </Project>
--- a/tools/SqlSessionStateProviderAsync.settings.targets
+++ b/tools/SqlSessionStateProviderAsync.settings.targets
@ -1,14 +1,16 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
  <PropertyGroup>
    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
-    <VersionStartYear>2016</VersionStartYear>
    <VersionMajor>1</VersionMajor>
    <VersionMinor>1</VersionMinor>
    <VersionRelease>0</VersionRelease>
-    <VersionRelease Condition="'$(BuildQuality)' != 'rtm'">$(VersionRelease)-$(BuildQuality)</VersionRelease>
  </PropertyGroup>

  <PropertyGroup Label="NuGet package dependencies">
    <SessionStateModuleNuGetPackageVersion>1.1.0</SessionStateModuleNuGetPackageVersion>
  </PropertyGroup>
+
+  <Import Project="MicrosoftAspNetSessionState.settings.targets" />
+
 </Project>
--- a/tools/signing.targets
+++ b/tools/signing.targets
@ -0,0 +1,40 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Setup signing for built assemblies. -->
+  <Target Name="GetAssemblyFilesToSign" BeforeTargets="SignFiles" Condition="'$(MSBuildProjectExtension)' != '.nuproj' And '$(SignAssembly)' == 'true'">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
+
+  <!-- Set up signing for nuget packages. -->
+  <Target Name="SignPowerShellScript" BeforeTargets="GetNuGetContentFromProject" AfterTargets="PreprocessNugetScripts" Condition="'$(MSBuildProjectExtension)' == '.nuproj' And '$(SignAssembly)' == 'true'">
+    <ItemGroup>
+      <ScriptFilesToSign Include="$(NuGetScriptDirectory)\$(NuGetProcessedScriptSubDirectory)\*.ps1">
+        <Authenticode>Microsoft400</Authenticode>
+      </ScriptFilesToSign>
+      <SharedScriptFilesToSign Include="$(NuGetSharedScriptDirectory)\$(NuGetProcessedScriptSubDirectory)\*.ps1">
+        <Authenticode>Microsoft400</Authenticode>
+      </SharedScriptFilesToSign>
+    </ItemGroup>
+    <SignFiles Files="@(ScriptFilesToSign)" Type="$(SignType)" BinariesDirectory="$(NuGetScriptDirectory)\$(NuGetProcessedScriptSubDirectory)"
+        IntermediatesDirectory="$(NuGetScriptDirectory)" ESRPSigning="$(ESRPSigning)" UseBearerToken="$(UseBearerToken)" Condition="'@(ScriptFilesToSign->Count())' &gt; 0" />
+    <SignFiles Files="@(SharedScriptFilesToSign)" Type="$(SignType)" BinariesDirectory="$(NuGetSharedScriptDirectory)\$(NuGetProcessedScriptSubDirectory)"
+        IntermediatesDirectory="$(NuGetSharedScriptDirectory)" ESRPSigning="$(ESRPSigning)" UseBearerToken="$(UseBearerToken)" Condition="'@(SharedScriptFilesToSign->Count())' &gt; 0" />
+  </Target>
+
+  <Target Name="GetPackageFilesToSign" BeforeTargets="SignFiles" Condition="'$(MSBuildProjectExtension)' == '.nuproj' And '$(SignAssembly)' == 'true'">
+    <PropertyGroup>
+      <OutDir>$(PackageOutputDir)</OutDir>
+    </PropertyGroup>
+    <ItemGroup>
+      <FilesToSign Include="$(NuGetPackTargetFile)">
+        <Authenticode>NuGet</Authenticode>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
+
+</Project>
--- a/tools/version.targets
+++ b/tools/version.targets
@ -16,7 +16,7 @@ Project global versioning targets.
  </PropertyGroup>

  <PropertyGroup>
-    <VersionStartYear Condition="'$(VersionStartYear)' == ''">2016</VersionStartYear>
+    <VersionStartYear Condition="'$(VersionStartYear)' == ''">2019</VersionStartYear>
    <VersionMajor Condition="'$(VersionMajor)' == ''">INVALID_VersionMajor</VersionMajor>
    <VersionMinor Condition="'$(VersionMinor)' == ''">INVALID_VersionMinor</VersionMinor>
    <VersionBuild Condition="'$(VersionBuild)' == '' OR '$(VersionBuild)' == '0'">$([MSBuild]::Add(1, $([MSBuild]::Subtract($([System.DateTime]::Now.Year), $(VersionStartYear)))))$([System.DateTime]::Now.ToString("MMdd"))</VersionBuild>
@ -38,6 +38,10 @@ Project global versioning targets.
    <NuGetPackageVersion Condition="'$(NuGetPackageVersion)' == ''">$(VersionMajor).$(VersionMinor).$(VersionRelease)</NuGetPackageVersion>
  </PropertyGroup>

+  <PropertyGroup>
+    <SatelliteContractVersion Condition="'$(SatelliteContractVersion)' == ''">$(AssemblyVersion)</SatelliteContractVersion>
+  </PropertyGroup>
+
  <ItemGroup Condition="'$(VersionFileGenerationEnabled)' == 'true'">
    <Compile Include="$(AssemblyVersionFile)" />
  </ItemGroup>