diff --git a/.gitignore b/.gitignore
index 9e1c379c5502..ae9ce57e9090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ binaries/
 [Rr]elease/
 build/
 restoredPackages/
+PolicheckOutput/
 tools/net46/
 tools/Microsoft.WindowsAzure.Build.Tasks/packages/
 PublishedNugets/
diff --git a/Directory.Build.props b/Directory.Build.props
index 6f37985a3f06..5e0e7b5860b9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,7 @@
 		<AuthenticationSolution>src\Authentication\Authentication.sln</AuthenticationSolution>
 		<ManagementLibrariesSolution>AzureManagementLibraries.sln</ManagementLibrariesSolution>
 		<BinariesFolder>$(LibraryRoot)binaries</BinariesFolder>
+    <PoliCheckOutputDir>$(LibraryRoot)PolicheckOutput</PoliCheckOutputDir>
 		<BuiltPackageOutputDir>$(BinariesFolder)\packages</BuiltPackageOutputDir>
 		<DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
 		<CodeSign Condition=" '$(CodeSign)' == '' ">false</CodeSign>
diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs
index c8b868ee72e9..2ecdaaaeb80f 100644
--- a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs
+++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs
@@ -77,6 +77,19 @@ public void ScopedProject()
             }
         }
 
+        [Fact]
+        public void UnSupportedProjects()
+        {
+            SDKCategorizeProjects cproj = new SDKCategorizeProjects();
+            cproj.SourceRootDirPath = sourceRootDir;
+            cproj.BuildScope = @"SDKs\Batch\DataPlane";
+
+            if (cproj.Execute())
+            {
+                Assert.Equal(3, cproj.unSupportedProjectsToBuild.Count<ITaskItem>());
+            }
+        }
+
         [Fact]
         public void IgnoredProjects()
         {
diff --git a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs
index 28eb4f19545c..23318beefcb1 100644
--- a/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs
+++ b/tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs
@@ -172,12 +172,12 @@ public override bool Execute()
 
             Debug.WriteLine("Parsing Projects took {0}", (projTimeAfter - projTimeBefore).TotalSeconds.ToString());
 
-            var net452SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
-            var netStd14SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netstandard14 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
-            var netCore11SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
-            var testNetCore11Projects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
-            var testNet452Projects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
-            var unSupportedProjects = from s in projWithMetaData where (s.IsTargetFxSupported = false) select s.ProjectTaskItem;
+            var net452SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
+            var netStd14SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.netstandard14 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
+            var netCore11SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
+            var testNetCore11Projects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
+            var testNet452Projects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
+            var unSupportedProjects = from s in projWithMetaData where (s.IsTargetFxSupported == false) select s.ProjectTaskItem;
 
             net452SdkProjectsToBuild = net452SdkProjects?.ToArray<ITaskItem>();
             netStd14SdkProjectsToBuild = netStd14SdkProjects?.ToArray<ITaskItem>();
diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets
index c053d5a0a4c5..d2de170bae99 100644
--- a/tools/buildTargets/common.targets
+++ b/tools/buildTargets/common.targets
@@ -247,6 +247,8 @@
     <Message Text=" "/>
     <Message Text="TestSDKProjects ....... @(FilteredTestProjects->Count())"/>
     <Message Text="%(FilteredTestProjects.Identity)"/>
+    <Message Text="UnSupported Projects ....... @(unSupportedProjectsToBuild->Count())"/>
+    <Message Text="%(unSupportedProjectsToBuild.Identity)"/>
 
     <ItemGroup>
       <net452SDKProjects Include="@(net452SDKProj)"/>
diff --git a/tools/buildTargets/signing.targets b/tools/buildTargets/signing.targets
index 315822ca6627..841635c26711 100644
--- a/tools/buildTargets/signing.targets
+++ b/tools/buildTargets/signing.targets
@@ -1,9 +1,10 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <StrongNameToken Condition=" '$(StrongNameToken)' == '' ">31bf3856ad364e35</StrongNameToken>
-    <CorporateScanPaths>@(ProjectToScanDirs)</CorporateScanPaths>
+    <ScopeScanPath Condition=" '$(Scope)' != ''">$(LibrarySourceFolder)\$(Scope.TrimEnd('\'))</ScopeScanPath>
+    <CorporateScanPaths Condition=" Exists($(ScopeScanPath))">$(ScopeScanPath)</CorporateScanPaths>
+    <CorporateScanPaths Condition=" '$(CorporateScanPaths)' == '' ">$(LibrarySourceFolder)</CorporateScanPaths>
   </PropertyGroup>
-  <!--Condition=" '$(CodeSign)' == 'true' "-->
   <Target Name="PreSign" >
     <GetFrameworkSdkPath>
       <Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
@@ -17,8 +18,10 @@
     <Message Importance="high" Text="Contains no files. Code sign will skip."
 				 Condition="'@(DelaySignedAssembliesToValidate)' == ''" />
 
-    <!--<CallTarget Targets="CorporateValidation" Condition=" '$(OnPremiseBuild)'=='true' " />-->
-
+    <Message Text="Running PoliCheck on ..... $(CorporateScanPaths)" Condition=" '$(CorporateScanPaths)' != '' and '$(RunGlobalReadinessTools)' == 'true'"/>
+    <CallTarget Targets="CorporateValidation" Condition=" '$(OnPremiseBuild)' == 'true' and '$(RunGlobalReadinessTools)' == 'true' "/>
+    <!--Condition=" '$(OnPremiseBuild)'=='true' and '$(RunGlobalReadinessTools)' == 'true' "-->
+    
     <ValidateStrongNameSignatureTask
 			WindowsSdkPath="$(WindowsSdkPath)"
 			Assembly="%(DelaySignedAssembliesToValidate.Identity)"
@@ -98,5 +101,4 @@
     <Exec Command='$(WindowsSDK_ExecutablePath_x86)\sn.exe -Vx *' Condition="$(isadmin) != 0"/>
     <Exec Command='$(WindowsSDK_ExecutablePath_x64)\sn.exe -Vx *' Condition="$(isadmin) != 0"/>
   </Target>
-</Project>
-
+</Project>
\ No newline at end of file