diff --git a/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/BootstrapTasks/Microsoft.Azure.Build.BootstrapTasks.csproj b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/BootstrapTasks/Microsoft.Azure.Build.BootstrapTasks.csproj
index f88df2b59c61..f650538819ba 100644
--- a/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/BootstrapTasks/Microsoft.Azure.Build.BootstrapTasks.csproj
+++ b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/BootstrapTasks/Microsoft.Azure.Build.BootstrapTasks.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('buildTools.props'))" />
   <PropertyGroup>
     <PackageId>Microsoft.Azure.Build.BootstrapTasks</PackageId>
     <Description>Provides .NET SDK Build bootstrapper tasks</Description>
@@ -18,7 +19,6 @@
     <TaskBinaryOutput>..\..\..\tasks</TaskBinaryOutput>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
     <OutputPath>$(TaskBinaryOutput)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
@@ -27,11 +27,4 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.1.1012" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.1012" />
   </ItemGroup>
-  <!-- <Target Name="CopyOutput" AfterTargets="AfterBuild" Condition="'$(CIBuild)' != 'true'"> -->
-	<!-- <Message Text="CIBuild status ... $(CIBuild)"/> -->
-    <!-- <Copy  -->
-      <!-- SourceFiles="$(OutputPath)\$(AssemblyName).dll"  -->
-      <!-- DestinationFiles="..\..\..\..\bootstraptools\taskBinaries\Microsoft.Azure.Build.BootstrapTasks.dll"  -->
-      <!-- ContinueOnError="false" />     -->
-  <!-- </Target> -->
 </Project>
\ No newline at end of file
diff --git a/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/Build.Common/Microsoft.Azure.Sdk.Build.Common.csproj b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/Build.Common/Microsoft.Azure.Sdk.Build.Common.csproj
index 09f4dc9b3b81..b11abfa8a4e4 100644
--- a/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/Build.Common/Microsoft.Azure.Sdk.Build.Common.csproj
+++ b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/Build.Common/Microsoft.Azure.Sdk.Build.Common.csproj
@@ -1,4 +1,5 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('buildTools.props'))" />
   <PropertyGroup>
     <PackageId>Microsoft.Azure.Sdk.Build.Common</PackageId>
     <Description>Azure SDK build common </Description>
diff --git a/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/SdkBuildTasks/Microsoft.Azure.Sdk.Build.Tasks.csproj b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/SdkBuildTasks/Microsoft.Azure.Sdk.Build.Tasks.csproj
index 3812ec3e2bd3..64c6445debff 100644
--- a/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/SdkBuildTasks/Microsoft.Azure.Sdk.Build.Tasks.csproj
+++ b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/SdkBuildTasks/Microsoft.Azure.Sdk.Build.Tasks.csproj
@@ -1,4 +1,5 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('buildTools.props'))" />
   <PropertyGroup>
     <PackageId>Microsoft.Azure.Sdk.Build.Tasks</PackageId>
     <Description>Provides .NET SDK Build tools tasks</Description>
@@ -17,7 +18,6 @@
     <TaskBinaryOutput>..\..\..\tasks</TaskBinaryOutput>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
     <OutputPath>$(TaskBinaryOutput)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
diff --git a/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/buildTools.props b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/buildTools.props
new file mode 100644
index 000000000000..21d41265c613
--- /dev/null
+++ b/tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/buildTools.props
@@ -0,0 +1,11 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<IsBuildToolsProject>true</IsBuildToolsProject>
+	</PropertyGroup>
+	
+	<PropertyGroup Condition=" '$(IsBuildToolsProject)' == 'true' ">
+		<SignAssembly>true</SignAssembly>
+		<DelaySign>false</DelaySign>
+		<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\BuildTools.snk</AssemblyOriginatorKeyFile>	
+	</PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tools/BuildAssets/targets/common.Build.props b/tools/BuildAssets/targets/common.Build.props
index f500f993bce6..ebe7aa7b5406 100644
--- a/tools/BuildAssets/targets/common.Build.props
+++ b/tools/BuildAssets/targets/common.Build.props
@@ -18,61 +18,41 @@
 		<BuildWideDebugTrace Condition=" '$(DebugTrace)' == '' ">false</BuildWideDebugTrace>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
-
-	<!-- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' AND '$(DelaySignForInternalsVisible)' == 'true' ">
-		There are certain projects that needs internals visible for test purpose
-		<SignAssembly>true</SignAssembly>
-		<DelaySign>true</DelaySign>
-		<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup>
+	
 	<PropertyGroup>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<SignAssembly>true</SignAssembly>
-		<DelaySign>true</DelaySign>
-		<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup> -->
-
-  <PropertyGroup>
 		<SignManifestRootDir>$(BinariesFolder)\signManifest</SignManifestRootDir>
 		<SignServiceDir>$(SignManifestRootDir)\signService</SignServiceDir>
 		<SignClientConfigDir>$(SignManifestRootDir)\signClientConfig</SignClientConfigDir>
 		<AuthenticodeSign>false</AuthenticodeSign>
-  </PropertyGroup>
-  <PropertyGroup>
+	</PropertyGroup>
+	<PropertyGroup>
 		<PackageRootDir>$(BuiltPackageOutputDir)</PackageRootDir>
 		<UnsignedPackageRootDir>$(PackageRootDir)\unsigned</UnsignedPackageRootDir>
 		<SignedPackageRootDir>$(PackageRootDir)\signed</SignedPackageRootDir>
-  </PropertyGroup>
-
-  <PropertyGroup>
+	</PropertyGroup>
+  
+	<PropertyGroup>	
 		<BuildNameLabel>DesktopBuild</BuildNameLabel>
-  </PropertyGroup>
+	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
 		<DefineConstants>net452;FullNetFx;LEGACY</DefineConstants>
 		<OutputPath>bin\$(Configuration)\</OutputPath>
-		<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> -->
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
 		<DefineConstants>netstandard14</DefineConstants>
 		<OutputPath>bin\$(Configuration)\</OutputPath>
-		<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> -->
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
 		<DefineConstants>netcoreapp11</DefineConstants>
 		<OutputPath>bin\$(Configuration)\</OutputPath>
-		<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> -->
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<DefineConstants>netcoreapp20</DefineConstants>
 		<OutputPath>bin\$(Configuration)\</OutputPath>
-		<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFrameworks)\$(AssemblyName).xml</DocumentationFile> -->
 	</PropertyGroup>
 
 	<Choose>
diff --git a/tools/BuildAssets/targets/common.targets b/tools/BuildAssets/targets/common.targets
index eb4c9411c468..ff1ba0ec7eb8 100644
--- a/tools/BuildAssets/targets/common.targets
+++ b/tools/BuildAssets/targets/common.targets
@@ -256,11 +256,15 @@
     <Exec Command="dotnet test -f $(NetFx461) %(net452TestProj.Identity) -l trx;LogFileName=$(LibraryRoot)TestResults\$(NetFx461)\%(net452TestProj.Filename).trx /nodeReuse:false" Condition="@(net461TestProj) != ''" ContinueOnError="false" WorkingDirectory="%(net461TestProj.RootDir)%(net461TestProj.Directory)" />
   </Target>
 
-  <Target Name="PackgNugetBootStrap" DependsOnTargets="Package;SignNugetPackage">
-	
-  </Target>
+  <!--
+    This target is primarily being used by DevOps pipeline scenario for data plan which is using VSO tasks to sign.
+    So this target assumes build outputs are already generated and would simply like to package the
+    signed artificats (without rebuilding)
+    NOTE: This package cannot be used independently, will get an error as build outputs are not generated.
+  -->
+  <Target Name="PackageNoBuild" DependsOnTargets="CategorizeProjects;Package" />
   
-  <Target Name="Package" DependsOnTargets="CategorizeProjects">
+  <Target Name="Package">
     <Message Text="Packaging..... @(net452SDKProj);@(netStd14SDKProj);@(nonSdkProject)" />
     <Message Text="PackageOutputDir....... $(BuiltPackageOutputDir)" />
     <PropertyGroup>
diff --git a/tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.dll b/tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.dll
index 699bc7e34581..e5414ec4dc15 100644
Binary files a/tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.dll and b/tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.dll differ
diff --git a/tools/BuildAssets/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.dll b/tools/BuildAssets/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.dll
index 4e432834f84d..0206ddff0a80 100644
Binary files a/tools/BuildAssets/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.dll and b/tools/BuildAssets/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.dll differ
diff --git a/tools/BuildAssets/tasks/net46/Microsoft.Build.Framework.dll b/tools/BuildAssets/tasks/net46/Microsoft.Build.Framework.dll
index 6319d53e39ca..709e75a9faa7 100644
Binary files a/tools/BuildAssets/tasks/net46/Microsoft.Build.Framework.dll and b/tools/BuildAssets/tasks/net46/Microsoft.Build.Framework.dll differ
diff --git a/tools/BuildAssets/tasks/net46/Microsoft.Build.Tasks.Core.dll b/tools/BuildAssets/tasks/net46/Microsoft.Build.Tasks.Core.dll
index 4c3ba52a39b9..a0e09d5d54e5 100644
Binary files a/tools/BuildAssets/tasks/net46/Microsoft.Build.Tasks.Core.dll and b/tools/BuildAssets/tasks/net46/Microsoft.Build.Tasks.Core.dll differ
diff --git a/tools/BuildAssets/tasks/net46/Microsoft.Build.Utilities.Core.dll b/tools/BuildAssets/tasks/net46/Microsoft.Build.Utilities.Core.dll
index dcf872f4a671..e9fd61b50b43 100644
Binary files a/tools/BuildAssets/tasks/net46/Microsoft.Build.Utilities.Core.dll and b/tools/BuildAssets/tasks/net46/Microsoft.Build.Utilities.Core.dll differ
diff --git a/tools/BuildAssets/tasks/net46/Microsoft.Build.dll b/tools/BuildAssets/tasks/net46/Microsoft.Build.dll
index 4c599742998e..f0418158741b 100644
Binary files a/tools/BuildAssets/tasks/net46/Microsoft.Build.dll and b/tools/BuildAssets/tasks/net46/Microsoft.Build.dll differ
diff --git a/tools/BuildTools.snk b/tools/BuildTools.snk
new file mode 100644
index 000000000000..6122b7f87ed9
Binary files /dev/null and b/tools/BuildTools.snk differ