From 439b2f874a7867fcdbc23aa75c11fd4f7e7d27b1 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Mon, 17 Apr 2017 19:46:00 -0700
Subject: [PATCH 1/3] Tests enabled, added signing support

---
 Directory.Build.props                 |  31 ++-----
 build.proj                            |   8 +-
 dirs.proj                             |   7 +-
 src/SDKs/dirs.proj                    |  36 +++++---
 src/dirs.proj                         |   7 +-
 tools/buildTargets/additional.targets |  59 ++++++++++++
 tools/buildTargets/common.targets     | 126 +++++++++++++-------------
 tools/buildTargets/common.tasks       |  15 ++-
 tools/buildTargets/signing.targets    | 124 +++++++++++++++++++++++++
 9 files changed, 292 insertions(+), 121 deletions(-)
 create mode 100644 tools/buildTargets/additional.targets
 create mode 100644 tools/buildTargets/signing.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 935e3f26069d1..e9e74da69838b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>  
 	<Import Project="dirs.proj" />
 	
   
@@ -17,6 +17,12 @@
 		<NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
 		<ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
 	</PropertyGroup>
+  <PropertyGroup>
+    <!--OnPremiseBuildTasks is not a good name, but CI server is using that, will update across soon-->
+    <CIToolsPath>$(OnPremiseBuildTasks)</CIToolsPath>
+    <OnPremiseBuild Condition=" Exists($(OnPremiseBuildTasks)) ">true</OnPremiseBuild>
+    <OnPremiseBuild Condition=" ! Exists($(OnPremiseBuildTasks)) ">false</OnPremiseBuild>
+  </PropertyGroup>
 	
 	<PropertyGroup>
 		<BuildInParallel>true</BuildInParallel>
@@ -37,17 +43,6 @@
     <SdkCommonRootDir>$(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime</SdkCommonRootDir>
   </PropertyGroup>
 
-  
-  <!--
-  <Import Project="tools\buildTargets\common.Build.props"/>
-  <Import Project="tools\buildTargets\common.NugetPackage.props" />
-  <Import Project="tools\buildTargets\common.targets" />
-  <Import Project="tools\buildTargets\testTargets\test.Build.props" Condition=" '$(TestProjectType)' == 'true' "/>
-  -->
-
-  
-  
-  
     <Target Name="PublishLocal">
 			<Exec Command="$(NuGetCommand) push &quot;$(PackageOutputDir)\%(SdkNuGetPackage.Identity).%(SdkNuGetPackage.PackageVersion).nupkg&quot; $(NuGetKey)$(ActualSource)"
 			  IgnoreExitCode="true"
@@ -59,15 +54,3 @@
 	<Import Project="tools\buildTargets\common.Build.props"/>
 	<Import Project="tools\buildTargets\common.NugetPackage.props" />	
 </Project>
-
-<!--
-<Import Project="$([MSBuild]::GetPathOfFileAbove('reference.props'))" />
-<Set this true only if you want to test the code sign workflow locally>
-		<DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-<FxTargetList>portable;net40;net45</FxTargetList>
-		<FxTargetList Condition=" '$(Scope)' == 'authentication' ">net45</FxTargetList>
-		<ZipExeFolder>$(LibraryToolsFolder)\7-Zip</ZipExeFolder>
-		<ZipExe>$(ZipExeFolder)\7z.exe</ZipExe>
-		<NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
--->
\ No newline at end of file
diff --git a/build.proj b/build.proj
index 9ece2c6f4bd59..827e30dcdda4d 100644
--- a/build.proj
+++ b/build.proj
@@ -8,11 +8,5 @@
 	<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
 	<Target Name="Build" DependsOnTargets="Restore;$(BuildTraversedProjectsDependsOn)" />
 	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-
-	<!--
-	<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />  
-	<Target Name="Build" DependsOnTargets="$(RestoreTraversedProjectsDependsOn);$(BuildTraversedProjectsDependsOn)" />
-	<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
-	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  -->
+	<Target Name="FullBuild" DependsOnTargets="Rebuild;Test" />
 </Project>
diff --git a/dirs.proj b/dirs.proj
index 874496a36a243..960befb44d0d5 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -1,4 +1,3 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="src\dirs.proj" />
-  <!-- Import Condition="Exists('\dir.proj')" Project="\dir.proj" / -->
-</Project>
+<Project>  
+  <Import Project="src\dirs.proj" />
+</Project>
\ No newline at end of file
diff --git a/src/SDKs/dirs.proj b/src/SDKs/dirs.proj
index ccee42c715cc1..01c84e3bc4191 100644
--- a/src/SDKs/dirs.proj
+++ b/src/SDKs/dirs.proj
@@ -1,8 +1,9 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 	<ItemGroup Label="SDKProject">
-		<ProjectToBuild Include="$(MSBuildThisFileDirectory)AnalysisServices\Management.Analysis\Microsoft.Azure.Management.Analysis.csproj" />		
+		<ProjectToBuild Include="$(MSBuildThisFileDirectory)AnalysisServices\Management.Analysis\Microsoft.Azure.Management.Analysis.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Authorization\Management.Authorization\Microsoft.Azure.Management.Authorization.csproj" />		
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Automation\Management.Automation\Microsoft.Azure.Management.Automation.csproj" />
+    
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Batch\Management\Management.Batch\Microsoft.Azure.Management.Batch.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Billing\Management.Billing\Microsoft.Azure.Management.Billing.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Cdn\Management.Cdn\Microsoft.Azure.Management.Cdn.csproj" />
@@ -42,22 +43,21 @@
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Storage\Management.Storage\Microsoft.Azure.Management.Storage.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)TrafficManager\Management.TrafficManager\Microsoft.Azure.Management.TrafficManager.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)WebSites\Management.Websites\Microsoft.Azure.Management.Websites.csproj" />
-		
-		<!--		
-		
-		
-		
+    
+		<!--	
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Automation\Management.Automation\Microsoft.Azure.Management.Automation.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Authorization\Management.Authorization\Microsoft.Azure.Management.Sql.csproj" />		
-		
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)\Authorization.Tests\Microsoft.Rest.ClientRuntime.Azure.csproj" />
 		-->
 	</ItemGroup>
 
+  
 	<ItemGroup Label="TestSDKProject">
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)AnalysisServices\**\*Tests.csproj" ProjectType="Test"/>
+    
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Authorization\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Automation\**\*Tests.csproj" ProjectType="Test"/>
+    
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Batch\Management\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Billing\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Cdn\**\*Tests.csproj" ProjectType="Test"/>
@@ -77,19 +77,18 @@
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)MachineLearning\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Logic\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Media\**\*Tests.csproj" ProjectType="Test"/>
-		<!-- <ProjectToBuild Include="$(MSBuildThisFileDirectory)Monitor\**\*Tests.csproj" ProjectType="Test"/> -->
+	
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Network\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)NotificationHubs\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)OperationalInsights\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)PowerBIEmbedded\Management.PowerBIEmbedded\**\*Tests.csproj" ProjectType="Test"/>
-		<!-- <ProjectToBuild Include="$(MSBuildThisFileDirectory)RecoveryServices\**\*Tests.csproj" ProjectType="Test"/> -->
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)RecoveryServices.Backup\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)RedisCache\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Relay\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Resource\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Scheduler\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Search\Management\**\*Tests.csproj" ProjectType="Test"/>
-		<!-- <ProjectToBuild Include="$(MSBuildThisFileDirectory)Search\DataPlane\**\*Tests.csproj" ProjectType="Test"/> -->
+		
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)ServerManagement\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)ServiceBus\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)ServiceFabric\**\*Tests.csproj" ProjectType="Test"/>
@@ -98,5 +97,18 @@
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)TrafficManager\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)WebSites\**\*Tests.csproj" ProjectType="Test"/>
 		
-	</ItemGroup> 
+	</ItemGroup>
+  
+  <!--
+  	<ProjectToBuild Include="$(MSBuildThisFileDirectory)Monitor\**\*Tests.csproj" ProjectType="Test"/>
+    <ProjectToBuild Include="$(MSBuildThisFileDirectory)RecoveryServices\**\*Tests.csproj" ProjectType="Test"/>
+    <ProjectToBuild Include="$(MSBuildThisFileDirectory)Search\DataPlane\**\*Tests.csproj" ProjectType="Test"/>
+  -->
+
+  <ItemGroup>
+    <DoNotRunTests Include="$(MSBuildThisFileDirectory)Authorization\**\*Tests.csproj" />
+    <DoNotRunTests Include="$(MSBuildThisFileDirectory)Automation\**\*Tests.csproj" ProjectType="Test"/>
+    <DoNotRunTests Include="$(MSBuildThisFileDirectory)RedisCache\**\*Tests.csproj" ProjectType="Test"/>
+  </ItemGroup>
 </Project>
+
diff --git a/src/dirs.proj b/src/dirs.proj
index 17eb6ce35482f..57c5d00229703 100644
--- a/src/dirs.proj
+++ b/src/dirs.proj
@@ -1,9 +1,4 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<!--<Import Project="SdkCommon\dirs.proj" />-->
 	<Import Project="Sdks\dirs.proj" />
-<!--
-<Import Project="SdkCommon\dirs.proj" />
-	<Import Condition="Exists('Profiles\dir.proj')" Project="Profiles\dirs.proj" />
-	<Import Condition="Exists('SdkCommon\dir.proj')" Project="SdkCommon\dirs.proj" />
-	<Import Condition="Exists('SDKs\dir.proj')" Project="SDKs\dirs.proj" />
-	-->
 </Project>
diff --git a/tools/buildTargets/additional.targets b/tools/buildTargets/additional.targets
new file mode 100644
index 0000000000000..92f7d9da69c89
--- /dev/null
+++ b/tools/buildTargets/additional.targets
@@ -0,0 +1,59 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+  <Import Project="$(MSBuildExtensionsPath)\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets"/>
+  <Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />
+  <Import Project="$(MSBuildExtensionsPath)\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Sdks\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets" />
+  -->
+  <Target Name="PreBuildStaticAnalysis" DependsOnTargets="$(PreBuildStaticAnalysisTargets)">
+    <!--
+    <MSBuild Targets="GetPackageReferences"
+            Projects="@(ProjectToBuild)"
+            ContinueOnError="ErrorAndStop">
+      <Output TaskParameter="TargetOutputs" ItemName="OtherProjectReferences" />
+    </MSBuild>
+    
+    <MSBuild Targets="GetOutputPath"
+            Projects="@(SDKProject)"
+            ContinueOnError="ErrorAndStop">
+      <Output TaskParameter="TargetOutputs" ItemName="OutPutFilesToSign" />
+    </MSBuild>
+  
+    <ItemGroup>
+      <FilesToSign Include="@(OutPutFilesToSign)"/>
+    </ItemGroup>
+    
+    <Message Text="@(OutPutFilesToSign)" />
+    <Message Text="@(OtherProjectReferences)" />
+    -->
+    <!--<Error Condition=" '@(OtherProjectReferences)' != '' " Text="Contains Project References, build cannot continue. Please remove all Project references from CI builds" />-->
+
+
+  </Target>
+
+
+
+  <Target Name="GetPackageReferences" Returns="@(ProjectReference)" />
+  <Target Name="GetOutputPath" Returns="$(OutputPath)\$(AssemblyName).dll" />
+
+
+  <Target Name="PrintStuff">
+    <Message Text="ProgFiles .... $(ProgramFiles)" />
+    <Message Text="$(MSBuildExtensionsPath)" />
+    <!--
+    <Message Text="%(VsIDENugetPackageReference.Identity) and %(VsIDENugetPackageReference.Version) "/>
+    <Message Text="%(VsIDEProjectReference.Identity) "/>
+-->
+
+  </Target>
+
+  <Target Name="GetWellKnownProperties">
+
+  </Target>
+
+  <!--
+  <Target Name="_SplitProjectReferencesByFileExistence">
+	
+</Target>
+-->
+</Project>
\ No newline at end of file
diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets
index ed5feadc80ebe..da6faa64254d7 100644
--- a/tools/buildTargets/common.targets
+++ b/tools/buildTargets/common.targets
@@ -1,14 +1,18 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<!--
-  <Import Project="$(MSBuildExtensionsPath)\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets"/>
-  <Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />
-  <Import Project="$(MSBuildExtensionsPath)\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Sdks\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets" />
-  -->
-  
+  <Import Project="common.tasks"/>
+  <Import Project="signing.targets"/>
+  <PropertyGroup>
+    <NetFx452>net452</NetFx452>
+    <NetStd14>netstandard1.4</NetStd14>
+  </PropertyGroup>
+  <!--<ItemGroup>
+    <FilesToSign/>
+  </ItemGroup>-->
   
   <PropertyGroup>
     <PreBuildStaticAnalysisTargets>
+      BuildCiSign;
+      BuildMsBuildTask;
       CategorizeProjects;
     </PreBuildStaticAnalysisTargets>
   </PropertyGroup>
@@ -19,11 +23,14 @@
       PreBuildStaticAnalysis;
       <!-- RestoreLatestProjects; -->
       BuildLatestProjects;
+      PreSign;
+      Sign;
+      PostSign;
       Package
     </BuildTraversedProjectsDependsOn>
 	
 	<RestoreTraversedProjectsDependsOn>
-		RestoreLatestProjects;
+		<!--RestoreLatestProjects;-->
 	</RestoreTraversedProjectsDependsOn>
 
     <CleanTraversedProjectsDependsOn>
@@ -72,24 +79,51 @@
 	<!-- $(MSBuildProjectDefaultTargets)-->
       <LatestProjectDefaultBuildTarget Condition=" '$(LatestProjectDefaultBuildTarget)' == '' ">Build</LatestProjectDefaultBuildTarget>
     </PropertyGroup>
-	
 	  
-	  <Message Text="Building SDK Projects ..... @(SDKProject)" />
-    <MSBuild Targets="$(LatestProjectDefaultBuildTarget)"
-         Projects="@(SDKProject)"
-		BuildInParallel="$(BuildInParallel)"
-         ContinueOnError="ErrorAndStop" />
+	  <Message Text="Building SDK Projects ..... @(SDKProject)" />    
+    <MSBuild Targets="Build"
+             Projects="@(SDKProject)"
+             Properties="TargetFramework=$(NetFx452)"
+             BuildInParallel="$(BuildInParallel)"
+             ContinueOnError="ErrorAndStop">
+      <Output TaskParameter="TargetOutputs" ItemName="net452Assemblies" />
+    </MSBuild>
+
+    <MSBuild Targets="Build" 
+             Projects="@(SDKProject)" 
+             Properties="TargetFramework=$(NetStd14)"
+             BuildInParallel="$(BuildInParallel)" 
+             ContinueOnError="ErrorAndStop">
+      <Output TaskParameter="TargetOutputs" ItemName="netStd14Assemblies" />
+    </MSBuild>
+
+    <!--BuildInParallel="$(BuildInParallel)"-->
+    <!--<Properties="GeneratePackageOnBuild=true;IncludeSymbols=true">-->
+    <ItemGroup>
+      <FilesToSign Include="@(net452Assemblies);@(netStd14Assemblies)" />
+    </ItemGroup>    
     
     <Message Text="Building SDKTest Projects ....... @(SDKTestProject)" />
     <MSBuild Targets="$(LatestProjectDefaultBuildTarget)"
          Projects="@(SDKTestProject)"
          Condition=" '$(SkipBuildingTestProjects)' != 'false' "
-         ContinueOnError="ErrorAndStop" />
-        
-         <!--<Properties="GeneratePackageOnBuild=true;IncludeSymbols=true">-->
-         
+         ContinueOnError="ErrorAndStop">
+    </MSBuild>         
   </Target>
 
+  <Target Name="Test" DependsOnTargets="PreBuildStaticAnalysis">
+    <Message Text="Executing Tests......"/>
+    <ItemGroup>
+      <FinalTestsToRun Include="@(SDKTestProject)"/>
+      <FinalTestsToRun Remove="@(DoNotRunTests)" />
+    </ItemGroup>
+    <Message Text="Final Tests to run.... @(FinalTestsToRun)" />    
+    <Exec Command="dotnet test %(FinalTestsToRun.Identity) -l trx;LogFileName=$(LibraryRoot)TestResults\%(FinalTestsToRun.Filename).trx --no-build" Condition="@(FinalTestsToRun) != ''" ContinueOnError="false" WorkingDirectory="%(FinalTestsToRun.RootDir)%(FinalTestsToRun.Directory)" />
+  </Target>
+  
+  <!--
+   $(LibraryRoot)\TestResults\%(SDKTestProject.Filename).trx
+  -->
   <Target Name="Package">
     <Message Text="Packaging..... @(SDKProject)"/>
     <MSBuild
@@ -105,54 +139,16 @@
 
   </Target>
   
-  <Target Name="PublishNugetPackage">
-    
-  </Target>
-
-  <Target Name="PreBuildStaticAnalysis" DependsOnTargets="$(PreBuildStaticAnalysisTargets)">
-  <!--
-    <MSBuild Targets="GetPackageReferences"
-            Projects="@(ProjectToBuild)"
-            ContinueOnError="ErrorAndStop">
-      <Output TaskParameter="TargetOutputs" ItemName="OtherProjectReferences" />
-    </MSBuild>
-  
-    <Error Condition=" '@(OtherProjectReferences)' != '' " Text="Contains Project References, build cannot continue. Please remove all Project references from CI builds" />
-  -->
-  </Target>
-  
-  <Target Name="GetPackageReferences" Returns="@(ProjectReference)" />
-  
   <Target Name="CategorizeProjects">
-  <Message Text="Categorizing...."/>
-    <ItemGroup>
-      <SDKProject Include="%(ProjectToBuild.Identity)" Condition=" '%(ProjectToBuild.ProjectType)' != 'Test' "/>
-      <SDKTestProject Include="%(ProjectToBuild.Identity)" Condition=" '%(ProjectToBuild.ProjectType)' == 'Test' "/>
-    </ItemGroup>
-    
-	<Message Text="Building SDK Projects ..... @(SDKProject)" />
-	
-	<Message Text="Building Test Projects ..... @(SDKTestProject)" />
-	
-  </Target>
-
-  <Target Name="PrintStuff">
-    <Message Text="ProgFiles .... $(ProgramFiles)" />
-    <Message Text="$(MSBuildExtensionsPath)" />
-    <!--
-    <Message Text="%(VsIDENugetPackageReference.Identity) and %(VsIDENugetPackageReference.Version) "/>
-    <Message Text="%(VsIDEProjectReference.Identity) "/>
--->
-    
+    <Message Text="Categorizing...."/>
+      <ItemGroup>
+        <SDKProject Include="%(ProjectToBuild.Identity)" Condition=" '%(ProjectToBuild.ProjectType)' != 'Test' "/>
+        <SDKTestProject Include="%(ProjectToBuild.Identity)" Condition=" '%(ProjectToBuild.ProjectType)' == 'Test' "/>
+      </ItemGroup>
+  	<Message Text="Building SDK Projects ..... @(SDKProject)" />
+	  <Message Text="Building Test Projects ..... @(SDKTestProject)" />
   </Target>
 
-  <Target Name="GetWellKnownProperties">
-    
+  <Target Name="PreBuildStaticAnalysis" DependsOnTargets="$(PreBuildStaticAnalysisTargets)">    
   </Target>
-  
-  <Target Name="_SplitProjectReferencesByFileExistence">
-	<!-- Noop --> 
-</Target>
-
-
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tools/buildTargets/common.tasks b/tools/buildTargets/common.tasks
index 7f86b642c6c84..dfb2a2120f35b 100644
--- a/tools/buildTargets/common.tasks
+++ b/tools/buildTargets/common.tasks
@@ -1,10 +1,19 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
+<Project>
   <UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
   <UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
   <UsingTask TaskName="BuildProjectTemplatesTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
   <UsingTask Condition=" $(OnPremiseBuild) " TaskName="CodeSigningTask" AssemblyFile="$(CIToolsPath)\Microsoft.WindowsAzure.Tools.Build.Tasks.OnPremise.dll" />
 	<UsingTask Condition=" $(OnPremiseBuild) " TaskName="CorporateValidation" AssemblyFile="$(CIToolsPath)\Microsoft.WindowsAzure.Tools.Build.Tasks.OnPremise.dll" />
-	
+  <UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />  
+  <UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll"  />
+  <UsingTask TaskName="BuildProjectTemplatesTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll"  />
+  <UsingTask TaskName="DebugTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll"  />
+
+  <UsingTask Condition=" $(OnPremiseBuild) " TaskName="CodeSigningTask" AssemblyFile="$(CIToolsPath)\Microsoft.WindowsAzure.Tools.Build.Tasks.OnPremise.dll" />
+  <UsingTask Condition=" $(OnPremiseBuild) " TaskName="CorporateValidation" AssemblyFile="$(CIToolsPath)\Microsoft.WindowsAzure.Tools.Build.Tasks.OnPremise.dll" />
+  
+  <Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />
+  
   
 </Project>
+
diff --git a/tools/buildTargets/signing.targets b/tools/buildTargets/signing.targets
new file mode 100644
index 0000000000000..56cd56deea691
--- /dev/null
+++ b/tools/buildTargets/signing.targets
@@ -0,0 +1,124 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <StrongNameToken Condition=" '$(StrongNameToken)' == '' ">31bf3856ad364e35</StrongNameToken>
+  </PropertyGroup>
+
+  <Target Name="PreSign">
+    <GetFrameworkSdkPath>
+      <Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
+    </GetFrameworkSdkPath>
+
+    <ItemGroup>
+      <!--<DelaySignedAssembliesToValidate Include="binaries\$(LibraryFxTarget)\unsigned\*.dll" />-->
+      <DelaySignedAssembliesToValidate Include="@(FilesToSign)" />      
+    </ItemGroup>
+
+    <Message Text="Unsigned files .... @(DelaySignedAssembliesToValidate)" />
+
+    <Message Importance="high" Text="Contains no files. Code sign will skip."
+				 Condition="'@(DelaySignedAssembliesToValidate)' == ''" />
+
+    <Message Text="@(DelaySignedAssembliesToValidate)" />
+    <Message Text="Iterate %(DelaySignedAssembliesToValidate.Identity)" />
+    <Message Text="Iterate %(DelaySignedAssembliesToValidate.RootDir)%(DelaySignedAssembliesToValidate.Directory)" />
+
+
+
+    <ValidateStrongNameSignatureTask
+			WindowsSdkPath="$(WindowsSdkPath)"
+			Assembly="%(DelaySignedAssembliesToValidate.Identity)"
+			ExpectedTokenSignature="$(StrongNameToken)"
+			ExpectedDelaySigned="true"
+			ContinueOnError="false"
+			Condition="'@(DelaySignedAssembliesToValidate)' != ''"/>
+    
+    <CodeSigningTask
+			Description="Microsoft Azure SDK"
+			Keywords="Microsoft Azure .NET SDK"
+			UnsignedFiles="@(DelaySignedAssembliesToValidate)"
+			DestinationPath="%(DelaySignedAssembliesToValidate.RootDir)%(DelaySignedAssembliesToValidate.Directory)"
+			SigningLogPath="binaries\$(LibraryFxTarget)\signing.log"
+			ToolsPath="$(CIToolsPath)"
+			Condition="'$(CodeSign)' == 'true' and '@(DelaySignedAssembliesToValidate)' != ''" />
+    
+    <!-- If we are testing locally then we copy the binaries and do not submit to the code sign server-->
+    <!--Copy SourceFiles="@(DelaySignedAssembliesToValidate)" DestinationFolder="binaries\$(LibraryFxTarget)" Condition="$(DelaySign)" /-->
+    
+    <ItemGroup>
+      <AfterSignedAssembliesToValidate Include="binaries\$(LibraryFxTarget)\*.dll" />
+    </ItemGroup>
+    <ValidateStrongNameSignatureTask
+			WindowsSdkPath="$(WindowsSdkPath)"
+			Assembly="%(AfterSignedAssembliesToValidate.Identity)"
+			ExpectedTokenSignature="$(StrongNameToken)"
+			ExpectedDelaySigned="false"
+			ContinueOnError="false"
+			Condition="'$(CodeSign)' == 'true' and '@(DelaySignedAssembliesToValidate)' != ''"/>
+
+    <!--
+    <RemoveDir Directories="binaries\$(LibraryFxTarget)\unsigned;" ContinueOnError="true" />
+    -->
+    
+  </Target>
+
+  <Target Name="Sign">
+    
+  </Target>
+
+  <Target Name="PostSign">
+    
+  </Target>
+
+  <!--
+	Pre-build the tasks file used for validating strong name signatures,
+	providing date-based build numbers, and processing regular expression
+	replacements in files such as NuGet specs.
+	-->
+  <Target Name="BuildMsBuildTask">
+    <Exec Command="$(NuGetCommand) restore $(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks\Microsoft.WindowsAzure.Build.Tasks.sln -PackagesDirectory $(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks\packages"/>
+    <MSBuild Projects="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks\Microsoft.WindowsAzure.Build.Tasks.csproj"
+				 Targets="Build"
+				 Properties="Configuration=Debug;Platform=AnyCPU" />
+  </Target>
+
+  <Target Name="BuildCiSign" Condition=" '$(CodeSign)' == 'true' ">
+    <ItemGroup>
+      <OnPremiseBuildProj Include="$(CIToolsPath)\**\*.csproj" />
+      <OnPremiseBuildFile Include="$(CIToolsPath)\*Tools.Build.*.dll" />
+    </ItemGroup>
+    <!--<Exec Command="msbuild /v:q @(OnPremiseBuildProj)"  />-->
+
+    <MSBuild Targets="Build"
+         Projects="@(OnPremiseBuildProj)"
+         Condition="'$(OnPremiseBuild)' == 'true'"
+         ContinueOnError="ErrorAndStop" Properties="" />
+    <Error Condition="!Exists('@(OnPremiseBuildFile)')" Text="Unable to Create CI Sign binaries ...." ContinueOnError="false"/>
+    <Message Condition="Exists('@(OnPremiseBuildFile)')" Text="Successfully created CI Sign binaries ...."/>
+  </Target>
+
+
+  <Target Name="DisableSN" >
+    <!-- Check for admin privs -->
+    <Exec Command="net session" IgnoreExitCode="true" StandardErrorImportance="Low">
+      <Output PropertyName="isadmin" TaskParameter="ExitCode" />
+    </Exec>
+
+    <!-- Disable strong name checking -->
+    <Exec Command='"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\sn.exe" -Vr *' Condition="$(isadmin) != 0"/>
+    <Exec Command='"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\sn.exe" -Vr *' Condition="$(isadmin) != 0"/>
+  </Target>
+
+  <Target Name="EnableSN" >
+    <!-- Check for admin privs -->
+    <Exec Command="net session" IgnoreExitCode="true" StandardErrorImportance="Low">
+      <Output PropertyName="isadmin" TaskParameter="ExitCode" />
+    </Exec>
+
+    <!-- Enable strong name checking -->
+    <Exec Command='$(WindowsSDK_ExecutablePath_x86)\sn.exe -Vx *' Condition="$(isadmin) != 0"/>
+    <Exec Command='$(WindowsSDK_ExecutablePath_x64)\sn.exe -Vx *' Condition="$(isadmin) != 0"/>
+  </Target>
+
+
+</Project>
+

From 593f58c21f9416a3d282c4cdd6b641c3f5e99a68 Mon Sep 17 00:00:00 2001
From: Fx Code Sign <fxsign@microsoft.com>
Date: Mon, 17 Apr 2017 22:56:43 -0700
Subject: [PATCH 2/3] enabling restore

---
 tools/buildTargets/common.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets
index da6faa64254d7..e1e82f709b2c0 100644
--- a/tools/buildTargets/common.targets
+++ b/tools/buildTargets/common.targets
@@ -30,7 +30,7 @@
     </BuildTraversedProjectsDependsOn>
 	
 	<RestoreTraversedProjectsDependsOn>
-		<!--RestoreLatestProjects;-->
+		RestoreLatestProjects;
 	</RestoreTraversedProjectsDependsOn>
 
     <CleanTraversedProjectsDependsOn>

From 0ecb647bc92849acd9863ed735d5b9e8dbe89436 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Mon, 17 Apr 2017 23:10:08 -0700
Subject: [PATCH 3/3] fixing xml namespaces

---
 Directory.Build.props                           | 2 +-
 dirs.proj                                       | 2 +-
 src/SDKs/dirs.proj                              | 2 +-
 tools/buildTargets/common.tasks                 | 2 +-
 tools/buildTargets/testTargets/test.Build.props | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e9e74da69838b..936f6fdb1e7a2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project>  
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="dirs.proj" />
 	
   
diff --git a/dirs.proj b/dirs.proj
index 960befb44d0d5..8c986b8d4dd5f 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -1,3 +1,3 @@
-<Project>  
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="src\dirs.proj" />
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/dirs.proj b/src/SDKs/dirs.proj
index 01c84e3bc4191..78029e9682035 100644
--- a/src/SDKs/dirs.proj
+++ b/src/SDKs/dirs.proj
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="SDKProject">
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)AnalysisServices\Management.Analysis\Microsoft.Azure.Management.Analysis.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Authorization\Management.Authorization\Microsoft.Azure.Management.Authorization.csproj" />		
diff --git a/tools/buildTargets/common.tasks b/tools/buildTargets/common.tasks
index dfb2a2120f35b..309954e0e49f6 100644
--- a/tools/buildTargets/common.tasks
+++ b/tools/buildTargets/common.tasks
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
   <UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
   <UsingTask TaskName="BuildProjectTemplatesTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />
diff --git a/tools/buildTargets/testTargets/test.Build.props b/tools/buildTargets/testTargets/test.Build.props
index a1e11705aee13..40d8d5fd78cce 100644
--- a/tools/buildTargets/testTargets/test.Build.props
+++ b/tools/buildTargets/testTargets/test.Build.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="dirs.proj" />
 	<PropertyGroup>    
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>