diff --git a/eng/mgmt/Directory.Build.Mgmt.props b/eng/mgmt/Directory.Build.Mgmt.props
index 759e6d5aeaa6e..d25dd7e7b9810 100644
--- a/eng/mgmt/Directory.Build.Mgmt.props
+++ b/eng/mgmt/Directory.Build.Mgmt.props
@@ -1,11 +1,13 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<PkgVersion>0.10.0</PkgVersion>
+		<PkgVersion>0.12.0-dev.20190718.1</PkgVersion>
 		<PkgLocalDir>$(RepoRoot)\restoredPackages\microsoft.internal.netsdkbuild.mgmt.tools\$(PkgVersion)\Sdk</PkgLocalDir>
 	</PropertyGroup>
 
+	<!-- during execution of tasks tests, this conditional import will satisfy the import resolution. And you will have to manually execute a target to restore the package
+	Again this is strickly for build tools tests that will be run against this repo -->
 	<Import Condition="Exists($(PkgLocalDir))" Project="$(PkgLocalDir)\CI.Bootstrap.targets" />
-	<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.10.0" />
+	<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.12.0-dev.20190718.1" />
 	<Import Project="$(RepoRoot)\tools\bootstrapTools\bootstrap.targets" />
 	<PropertyGroup>
 		<SignAssembly>true</SignAssembly>
diff --git a/eng/pipelines/mgmt.yml b/eng/pipelines/mgmt.yml
index ad3823bef6868..de5bd9e65cd3e 100644
--- a/eng/pipelines/mgmt.yml
+++ b/eng/pipelines/mgmt.yml
@@ -10,6 +10,7 @@ variables:
   msBuildLogDir: msbuildlogs
   loggingArgs: '/clp:ShowtimeStamp /flp:LogFile=$(msBuildLogDir)/msbuild.normal.log;Verbosity=normal /flp1:Summary;Verbosity=minimal;LogFile=$(msBuildLogDir)/msbuild.sum.log /flp2:warningsonly;logfile=$(msBuildLogDir)/msbuild.wrn.log /flp3:errorsonly;logfile=$(msBuildLogDir)/msbuild.err.log'
   RPScopeArgs: '/p:PullRequestNumber=$(system.pullrequest.pullrequestnumber) /p:RepoHtmlUrl=https://github.com/$(build.repository.id) /p:CIBuildId=$(OfficialBuildId)'
+  timeoutInMinutes: 120
 
 jobs:
 - template: templates/jobs/archetype-sdk-mgmt.yml
diff --git a/sdk/mgmtcommon/AzSdk.RP.props b/sdk/mgmtcommon/AzSdk.RP.props
new file mode 100644
index 0000000000000..39645fa6dc051
--- /dev/null
+++ b/sdk/mgmtcommon/AzSdk.RP.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag />
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.FullDesktop.Tests/ClientRuntime.FullDesktop.Tests.csproj b/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.FullDesktop.Tests/ClientRuntime.FullDesktop.Tests.csproj
index abdd1cbd204e8..72e210227a18c 100644
--- a/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.FullDesktop.Tests/ClientRuntime.FullDesktop.Tests.csproj
+++ b/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.FullDesktop.Tests/ClientRuntime.FullDesktop.Tests.csproj
@@ -2,6 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
+  <PropertyGroup>
+    <ExcludeFromTest>false</ExcludeFromTest>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\TestCommon\ClientRuntime.Test.Common.csproj" />
diff --git a/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.NetCore.Tests/ClientRuntime.NetCore.Tests.csproj b/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.NetCore.Tests/ClientRuntime.NetCore.Tests.csproj
index a2c3d74040440..7bb7bebf17651 100644
--- a/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.NetCore.Tests/ClientRuntime.NetCore.Tests.csproj
+++ b/sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.NetCore.Tests/ClientRuntime.NetCore.Tests.csproj
@@ -7,36 +7,34 @@
     <PackageTags>Microsoft AutoRest ClientRuntime REST</PackageTags>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
   </ItemGroup>
+
   <ItemGroup>
-	<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
-</ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />
+    <!-- <ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" /> -->
     <ProjectReference Include="..\TestCommon\ClientRuntime.Test.Common.csproj" />
   </ItemGroup>
+  
   <ItemGroup> 
      <Compile Include="$(RepoEngPath)\mgmt\DisableTestRunParallel.cs" Link="DisableTestRunParallel.cs" /> 
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
   
   <!--Do not remove until VS Test Tools fixes #472-->
-  <ItemGroup>
+  
+  <!-- <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup> -->
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="System.Net.Http" Version="4.3.0" />
   </ItemGroup>
+
 </Project>
diff --git a/sdk/mgmtcommon/ClientRuntime/Tests/TestCommon/ClientRuntime.Test.Common.csproj b/sdk/mgmtcommon/ClientRuntime/Tests/TestCommon/ClientRuntime.Test.Common.csproj
index 7057a922fb91a..8fc9a8b4b08ce 100644
--- a/sdk/mgmtcommon/ClientRuntime/Tests/TestCommon/ClientRuntime.Test.Common.csproj
+++ b/sdk/mgmtcommon/ClientRuntime/Tests/TestCommon/ClientRuntime.Test.Common.csproj
@@ -9,13 +9,12 @@
   <ItemGroup>
     <ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />
   </ItemGroup>
-  <ItemGroup>
-	  <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
diff --git a/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg b/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg
deleted file mode 100644
index bca9db748d989..0000000000000
Binary files a/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg and /dev/null differ
diff --git a/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.12.0-dev.20190718.1.nupkg b/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.12.0-dev.20190718.1.nupkg
new file mode 100644
index 0000000000000..820a8130ef0e9
Binary files /dev/null and b/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.12.0-dev.20190718.1.nupkg differ