From 30b50fcab10300813468dfb0afbcceeaf9f6ab6f Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 19 Apr 2017 11:04:14 -0700
Subject: [PATCH 1/5] fixing signing issues

---
 build.proj                            |  2 +-
 src/SDKs/dirs.proj                    |  4 ++--
 tools/buildTargets/common.Build.props | 13 ++-----------
 tools/buildTargets/signing.targets    |  4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/build.proj b/build.proj
index 306085e782983..37b744925ec41 100644
--- a/build.proj
+++ b/build.proj
@@ -7,7 +7,7 @@
 	<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" /> 
 	<Target Name="Build" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" />
 	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-	<Target Name="FullBuild" DependsOnTargets="Clean;Build;RunTests;Package" />
+	<Target Name="FullBuild" DependsOnTargets="Clean;Build;RunTests" />
 	<Target Name="RunTests" DependsOnTargets="$(RunTestProjectsDependsOn)" />
   <Import Project="Directory.Build.targets" />
 </Project>
diff --git a/src/SDKs/dirs.proj b/src/SDKs/dirs.proj
index 946f2dd8007d4..b94ca8111c801 100644
--- a/src/SDKs/dirs.proj
+++ b/src/SDKs/dirs.proj
@@ -65,8 +65,7 @@
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Compute\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)ContainerRegistry\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)CustomerInsights\**\*Tests.csproj" ProjectType="Test"/>
-		<ProjectToBuild Include="$(MSBuildThisFileDirectory)DataLake.Analytics\**\*Tests.csproj" ProjectType="Test"/>
-		<ProjectToBuild Include="$(MSBuildThisFileDirectory)DataLake.Store\**\*Tests.csproj" ProjectType="Test"/>
+		<ProjectToBuild Include="$(MSBuildThisFileDirectory)DataLake.Analytics\**\*Tests.csproj" ProjectType="Test"/>		
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)DevTestLabs\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Dns\Management.Dns\**\*Tests.csproj" ProjectType="Test"/>
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)EventHub\**\*Tests.csproj" ProjectType="Test"/>
@@ -99,6 +98,7 @@
 	</ItemGroup>
   
   <!--
+	<ProjectToBuild Include="$(MSBuildThisFileDirectory)DataLake.Store\**\*Tests.csproj" ProjectType="Test"/>
   	<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"/>
diff --git a/tools/buildTargets/common.Build.props b/tools/buildTargets/common.Build.props
index 02f1d27e9f68a..44fa551b2fc99 100644
--- a/tools/buildTargets/common.Build.props
+++ b/tools/buildTargets/common.Build.props
@@ -10,20 +10,11 @@
     <AddNugetReferenceForCIandCmdlineBuild>true</AddNugetReferenceForCIandCmdlineBuild>
     <SkipBuildingTestProject>false</SkipBuildingTestProject>
 	<!-- <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> -->
-	</PropertyGroup>
-	
-  <PropertyGroup Label="DebugBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Debug|AnyCPU' ">
 	<SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
-	<NoWarn>1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Label="ReleaseBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Release|AnyCPU' ">
-    <SignAssembly>true</SignAssembly>
-	<DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
-	<NoWarn>1591</NoWarn>
-  </PropertyGroup>
+	<NoWarn>1591;1701</NoWarn>
+	</PropertyGroup>
 	
   <PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
     <DefineConstants>FullNetFx</DefineConstants>
diff --git a/tools/buildTargets/signing.targets b/tools/buildTargets/signing.targets
index 3ac431e870243..3acf54aef6d42 100644
--- a/tools/buildTargets/signing.targets
+++ b/tools/buildTargets/signing.targets
@@ -20,7 +20,7 @@
 			WindowsSdkPath="$(WindowsSdkPath)"
 			Assembly="%(DelaySignedAssembliesToValidate.Identity)"
 			ExpectedTokenSignature="$(StrongNameToken)"
-			ExpectedDelaySigned="false"
+			ExpectedDelaySigned="true"
 			ContinueOnError="false"
 			Condition="'@(DelaySignedAssembliesToValidate)' != ''"/>
     
@@ -37,7 +37,7 @@
 			WindowsSdkPath="$(WindowsSdkPath)"
 			Assembly="%(DelaySignedAssembliesToValidate.Identity)"
 			ExpectedTokenSignature="$(StrongNameToken)"
-			ExpectedDelaySigned="true"
+			ExpectedDelaySigned="false"
 			ContinueOnError="false"
 			Condition="'$(CodeSign)' == 'true' and '@(DelaySignedAssembliesToValidate)' != ''"/>    
   </Target>

From e272c69692dabb0dd3bfa45496cf088989c22f5a Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 19 Apr 2017 11:17:24 -0700
Subject: [PATCH 2/5] signing issues and project search

---
 tools/buildTargets/common.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets
index 74df1cd98e2a9..7b5e33f5a1d7c 100644
--- a/tools/buildTargets/common.targets
+++ b/tools/buildTargets/common.targets
@@ -174,8 +174,8 @@
 		<KVSamples Include="$(LibrarySourceFolder)\SDKs\KeyVault\dataPlane\Microsoft.Azure.KeyVault.Samples\**\*.*csproj"/>
 	</ItemGroup>
     <ItemGroup Condition=" '$(Scope)' != 'All'">
-      <ScopedProjects Include="$(LibrarySourceFolder)\$(Scope)\*.csproj" Exclude="$(LibrarySourceFolder)\$(Scope)\*.Test*.csproj" />	    
-      <ScopedTestProjects Include="$(LibrarySourceFolder)\$(Scope)\*.Test*.csproj" />
+      <ScopedProjects Include="$(LibrarySourceFolder)\$(Scope)\**\*.csproj" Exclude="$(LibrarySourceFolder)\$(Scope)\*Tests*\*.Test*.csproj" />	    
+      <ScopedTestProjects Include="$(LibrarySourceFolder)\$(Scope)\*Test*\*.Test*.csproj" />
     </ItemGroup>
     <ItemGroup>
       <SDKProject Include="%(ScopedProjects.Identity)" Condition=" '%(ScopedProjects.ProjectType)' != 'Test' and '%(ScopedProjects.ExcludeFromBuild)' != 'true' "/>

From 55180f3b67a155fa365feaa172aa6326bd9581a6 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 19 Apr 2017 11:43:40 -0700
Subject: [PATCH 3/5] adding the right properties for signing that were left

---
 tools/buildTargets/common.Build.props | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/tools/buildTargets/common.Build.props b/tools/buildTargets/common.Build.props
index 44fa551b2fc99..59e43e6ea8e1f 100644
--- a/tools/buildTargets/common.Build.props
+++ b/tools/buildTargets/common.Build.props
@@ -10,25 +10,11 @@
     <AddNugetReferenceForCIandCmdlineBuild>true</AddNugetReferenceForCIandCmdlineBuild>
     <SkipBuildingTestProject>false</SkipBuildingTestProject>
 	<!-- <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> -->
-	<SignAssembly>true</SignAssembly>
+	  <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
-	<NoWarn>1591;1701</NoWarn>
+	  <NoWarn>1591;1701;1573</NoWarn>
 	</PropertyGroup>
-	
-  <PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
-    <DefineConstants>FullNetFx</DefineConstants>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-	<GenerateDocumentationFile Condition=" '$(GenerateDocumentationFile)' == '' ">true</GenerateDocumentationFile>
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
-    <DefineConstants>NETSTANDARD14</DefineConstants>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-	<GenerateDocumentationFile Condition=" '$(GenerateDocumentationFile)' == '' ">true</GenerateDocumentationFile>
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
   
   <Choose>
     <When Condition=" '$(BuildingInsideVisualStudio)' == 'true' ">

From 3ad096be914872adf72b0bffefff26668d23c806 Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 19 Apr 2017 13:43:21 -0700
Subject: [PATCH 4/5] more updates for delay sign

---
 src/SDKs/AzSdk.reference.props      | 6 ++++++
 src/SDKs/AzSdk.test.reference.props | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/SDKs/AzSdk.reference.props b/src/SDKs/AzSdk.reference.props
index b7f3c665546b0..7d5a3aee79f7c 100644
--- a/src/SDKs/AzSdk.reference.props
+++ b/src/SDKs/AzSdk.reference.props
@@ -4,6 +4,12 @@
 	<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0.0)" />
   </ItemGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
+    <NoWarn>1591;1701;1573</NoWarn>
+  </PropertyGroup>
   
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
   <!--
diff --git a/src/SDKs/AzSdk.test.reference.props b/src/SDKs/AzSdk.test.reference.props
index 2d6752ca45758..214b84f6f61a3 100644
--- a/src/SDKs/AzSdk.test.reference.props
+++ b/src/SDKs/AzSdk.test.reference.props
@@ -10,4 +10,10 @@
     <!-- This is needed for discovering tests in test explorer -->
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />	
   </ItemGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
+    <NoWarn>1591;1701;1573</NoWarn>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

From bbbb25cf836fb1ceff33d993ac148d42ddbc782d Mon Sep 17 00:00:00 2001
From: Abhijeet Shah <abhishah@microsoft.com>
Date: Wed, 19 Apr 2017 14:02:50 -0700
Subject: [PATCH 5/5] fx signing running test earlier

---
 build.proj                        | 2 +-
 tools/buildTargets/common.targets | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.proj b/build.proj
index 37b744925ec41..c5e768a38a1fa 100644
--- a/build.proj
+++ b/build.proj
@@ -7,7 +7,7 @@
 	<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" /> 
 	<Target Name="Build" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" />
 	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-	<Target Name="FullBuild" DependsOnTargets="Clean;Build;RunTests" />
+	<Target Name="FullBuild" DependsOnTargets="Clean;Build" />
 	<Target Name="RunTests" DependsOnTargets="$(RunTestProjectsDependsOn)" />
   <Import Project="Directory.Build.targets" />
 </Project>
diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets
index 7b5e33f5a1d7c..7b4dd81bcc52f 100644
--- a/tools/buildTargets/common.targets
+++ b/tools/buildTargets/common.targets
@@ -25,6 +25,7 @@
       PreBuildStaticAnalysis;
       RestoreLatestProjects;
       BuildLatestProjects;
+      Test
       PreSign;
     </BuildTraversedProjectsDependsOn>	
 	  <RestoreTraversedProjectsDependsOn>
@@ -119,7 +120,7 @@
     </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)" />
+    <Exec Command="dotnet test %(FinalTestsToRun.Identity) -l trx;LogFileName=$(LibraryRoot)TestResults\%(FinalTestsToRun.Filename).trx " Condition="@(FinalTestsToRun) != ''" ContinueOnError="false" WorkingDirectory="%(FinalTestsToRun.RootDir)%(FinalTestsToRun.Directory)" />
   </Target>
   
   <Target Name="Package">