diff --git a/build.proj b/build.proj
index e2661510a14e5..cc58b206112d1 100644
--- a/build.proj
+++ b/build.proj
@@ -1,25 +1,12 @@
 <Project>
-<Import Project="directory.Build.props" />
-<Import Project="directory.Build.targets" />
-<Import Project="test.props" />
-<Import Project="AzSdk.props" />
-
-<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />  
-  <Target Name="Build" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" />
-  
-    <Target Name="PublishLocal">
-			<Exec Command="$(NuGetCommand) push &quot;$(PackageOutputDir)\%(SdkNuGetPackage.Identity).%(SdkNuGetPackage.PackageVersion).nupkg&quot; $(NuGetKey)$(ActualSource)"
-			  IgnoreExitCode="true"
-			  Condition=" '%(SdkNuGetPackage.Publish)' != 'false' " />
-
-  </Target>
-
-<!--
-  <Import Project="dirs.proj" />
+	<Import Project="directory.Build.props" />
+	<Import Project="directory.Build.targets" />
+	<Import Project="test.props" />
+	<Import Project="AzSdk.props" />
+
+	<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />  
+	<Target Name="Build" DependsOnTargets="$(RestoreTraversedProjectsDependsOn);$(BuildTraversedProjectsDependsOn)" />
+	<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
+	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
   
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  -->
-  
-
-
 </Project>
diff --git a/src/SdkCommon/ClientRuntime/ClientRuntime.sln b/src/SdkCommon/ClientRuntime/ClientRuntime.sln
index e8b2c24ae38a3..8447af103d033 100644
--- a/src/SdkCommon/ClientRuntime/ClientRuntime.sln
+++ b/src/SdkCommon/ClientRuntime/ClientRuntime.sln
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Rest.ClientRuntim
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Rest.ClientRuntime.Tracing.Tests", "Test\ClientRuntime.Tracing.Tests\Microsoft.Rest.ClientRuntime.Tracing.Tests.csproj", "{05A3BD74-8C1B-457B-A85A-35C7B393449E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientRuntime.E2E.Tests", "Test\ClientRuntime.E2E.Tests\ClientRuntime.E2E.Tests.csproj", "{935BFCFC-6CE6-45D4-A39A-2416F900FDE3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Rest.ClientRuntime", "ClientRuntime\Microsoft.Rest.ClientRuntime.csproj", "{20392A6A-3240-4429-B62D-AAE1BC8773F7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Rest.ClientRuntime.Azure", "ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure.csproj", "{0D20004D-46DC-4EB2-9193-8B399BA918A0}"
@@ -45,10 +43,6 @@ Global
 		{05A3BD74-8C1B-457B-A85A-35C7B393449E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05A3BD74-8C1B-457B-A85A-35C7B393449E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05A3BD74-8C1B-457B-A85A-35C7B393449E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{935BFCFC-6CE6-45D4-A39A-2416F900FDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{935BFCFC-6CE6-45D4-A39A-2416F900FDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{935BFCFC-6CE6-45D4-A39A-2416F900FDE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{935BFCFC-6CE6-45D4-A39A-2416F900FDE3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20392A6A-3240-4429-B62D-AAE1BC8773F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20392A6A-3240-4429-B62D-AAE1BC8773F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{20392A6A-3240-4429-B62D-AAE1BC8773F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -85,6 +79,5 @@ Global
 		{FEB95626-8C88-4E1D-8543-EE428AAE096D} = {FC756A84-660A-4917-85D0-0BBFB19FF71C}
 		{046D03E7-A0EC-4FC6-95FA-98B525819FC5} = {FC756A84-660A-4917-85D0-0BBFB19FF71C}
 		{05A3BD74-8C1B-457B-A85A-35C7B393449E} = {FC756A84-660A-4917-85D0-0BBFB19FF71C}
-		{935BFCFC-6CE6-45D4-A39A-2416F900FDE3} = {FC756A84-660A-4917-85D0-0BBFB19FF71C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj
index c330fa92b4e27..cfb0366d07be7 100644
--- a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj
+++ b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj
@@ -9,25 +9,40 @@
     <PackageTags>Rest ClientRuntime Azure Test $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <TestProjectType>true</TestProjectType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
-
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0)" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="[2.2.12,3.0.0)" />
+    <!--
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="[2.2.12,3.0.0)" />
+    -->
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-<!--
+
+  <!--
+  <ItemGroup>
+    <ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />    
+  </ItemGroup>
+  -->
+  <!--
+  
+  
   <ItemGroup>
     <ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />
     <ProjectReference Include="..\..\ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure.csproj" />
     <ProjectReference Include="..\..\ClientRuntime.Azure.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.csproj" />
   </ItemGroup>
-  -->
-  <!--
+  
     Add list of project references that you need inside VS IDE for debugging purpose.
     Also add list of nuget packages references that will be replaced during build outside of VS
     These are mutually exclusive references.
diff --git a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj
index 3cc1487f69497..bf59104fefa3f 100644
--- a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj
+++ b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj
@@ -22,10 +22,8 @@
 
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.6" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.5" />
-    <!--<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.7.0,2.0.0)" />-->
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.6.0,2.0.0)" />
-
-    <ProjectReference Include="..\..\..\TestFramework\Microsoft.Azure.Test.HttpRecorder\Microsoft.Azure.Test.HttpRecorder.csproj" />
+    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.7.0,2.0.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.6.0,2.0.0)" />    
   </ItemGroup>
   
   <ItemGroup>
@@ -39,6 +37,7 @@
   </ItemGroup>
 
   <!--
+  <ProjectReference Include="..\..\..\TestFramework\Microsoft.Azure.Test.HttpRecorder\Microsoft.Azure.Test.HttpRecorder.csproj" />
     Add list of project references that you need inside VS IDE for debugging purpose.
     Also add list of nuget packages references that will be replaced during build outside of VS
     These are mutually exclusive references.
diff --git a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/Properties/AssemblyInfo.cs b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/Properties/AssemblyInfo.cs
index 97bdb11d3c80c..d85b9825001fa 100644
--- a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/Properties/AssemblyInfo.cs
+++ b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.E2E.Tests/Properties/AssemblyInfo.cs
@@ -5,10 +5,12 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+/*
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Microsoft.Rest.ClientRuntime.E2E.Tests")]
 [assembly: AssemblyTrademark("")]
+*/
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
diff --git a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.csproj b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.csproj
index d744da733d94b..e5facce2cd6cd 100644
--- a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.csproj
+++ b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.csproj
@@ -9,7 +9,7 @@
     <PackageTags>Microsoft AutoRest ClientRuntime REST</PackageTags>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
     <TestProjectType>true</TestProjectType>
   </PropertyGroup>
 
@@ -28,6 +28,7 @@
   <!--
   
     <ItemGroup Condition=" '$(TargetFramework)' != 'net452' ">
+    <ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />    
     <PackageReference Update="Mirosoft.NETCore.App" Version="1.0.2" />
     <PackageReference Update="NETStandard.Library" Version="1.6.1" />
   </ItemGroup>
diff --git a/src/SdkCommon/TestFramework/HttpRecorder.Tests/HttpRecorder.Tests.csproj b/src/SdkCommon/TestFramework/HttpRecorder.Tests/HttpRecorder.Tests.csproj
index 0aea1f2463f86..7e00d648ae720 100644
--- a/src/SdkCommon/TestFramework/HttpRecorder.Tests/HttpRecorder.Tests.csproj
+++ b/src/SdkCommon/TestFramework/HttpRecorder.Tests/HttpRecorder.Tests.csproj
@@ -42,8 +42,9 @@
   </ItemGroup>
 -->
   
-  <ItemGroup>
-    <!--<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />-->
+  <ItemGroup><!--<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />-->
+  
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
   <!--
diff --git a/src/SdkCommon/TestFramework/TestFramework.Net45Tests/Properties/AssemblyInfo.cs b/src/SdkCommon/TestFramework/TestFramework.Net45Tests/Properties/AssemblyInfo.cs
index a3abd42e97b11..f80da4436695d 100644
--- a/src/SdkCommon/TestFramework/TestFramework.Net45Tests/Properties/AssemblyInfo.cs
+++ b/src/SdkCommon/TestFramework/TestFramework.Net45Tests/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+/*
 [assembly: AssemblyTitle("Net45Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -13,6 +14,9 @@
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+*/
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +36,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
diff --git a/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj b/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj
index 711e5e9d9e292..f7de400b0741d 100644
--- a/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj
+++ b/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj
@@ -1,5 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />
+  <PropertyGroup>
+    <TargetFrameworks>net452</TargetFrameworks>
+    <Description>Net 452 test project for TestFramework</Description>
+    <AssemblyName>TestFramework.Net45Tests</AssemblyName>
+    <AssemblyTitle>Testframework 452 test for Test Framework</AssemblyTitle>
+    <VersionPrefix>1.0.0</VersionPrefix>
+  </PropertyGroup>
+
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="2.28.3" />
+    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.7.0,2.0.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.6.0,2.0.0)" />
+
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="[2.2.12,3.0.0)" />
+  </ItemGroup>
+  
+</Project>
+  <!--
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
   <Import Project="..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -108,11 +131,12 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-</Project>
\ No newline at end of file
+  
+</Project>
+-->
\ No newline at end of file
diff --git a/src/SdkCommon/TestFramework/TestRecordAndFramework.sln b/src/SdkCommon/TestFramework/TestRecordAndFramework.sln
index 5e52cd5c60859..02dbd109ae38e 100644
--- a/src/SdkCommon/TestFramework/TestRecordAndFramework.sln
+++ b/src/SdkCommon/TestFramework/TestRecordAndFramework.sln
@@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpRecorder.Tests", "HttpR
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFramework.Tests", "TestFramework.Tests\TestFramework.Tests.csproj", "{6A242C2E-019F-4300-B874-5E365EB43041}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFramework.Net45Tests", "TestFramework.Net45Tests\TestFramework.Net45Tests.csproj", "{2541F589-7A92-4890-9678-E7D313E27C47}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -145,6 +147,22 @@ Global
 		{6A242C2E-019F-4300-B874-5E365EB43041}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
 		{6A242C2E-019F-4300-B874-5E365EB43041}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A242C2E-019F-4300-B874-5E365EB43041}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net40-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net40-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net40-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net40-Release|Any CPU.Build.0 = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2541F589-7A92-4890-9678-E7D313E27C47}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/SdkCommon/TestFramework/dirs.proj b/src/SdkCommon/TestFramework/dirs.proj
index a800bd57b603a..29d29455d82e9 100644
--- a/src/SdkCommon/TestFramework/dirs.proj
+++ b/src/SdkCommon/TestFramework/dirs.proj
@@ -3,12 +3,9 @@
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)ClientRuntime.Azure.TestFramework\Microsoft.Rest.ClientRuntime.Azure.TestFramework.csproj" />
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)Microsoft.Azure.Test.HttpRecorder\Microsoft.Azure.Test.HttpRecorder.csproj" />		
 	</ItemGroup>
-
-	<!--
 	<ItemGroup>
-		<ProjectToBuild Include="$(MSBuildThisFileDirectory)HttpRecorder.Tests\HttpRecorder.Tests.csproj" ProjectType="Test"  />
-		<ProjectToBuild Include="$(MSBuildThisFileDirectory)TestFramework.Net45Tests\TestFramework.Net45Tests.csroj" ProjectType="Test" />
+	<ProjectToBuild Include="$(MSBuildThisFileDirectory)TestFramework.Net45Tests\TestFramework.Net45Tests.csproj" ProjectType="Test" />
+		<ProjectToBuild Include="$(MSBuildThisFileDirectory)HttpRecorder.Tests\HttpRecorder.Tests.csproj" ProjectType="Test"  />		
 		<ProjectToBuild Include="$(MSBuildThisFileDirectory)TestFramework.Tests\TestFramework.Tests.csproj" ProjectType="Test" />
 	</ItemGroup>
-	-->
 </Project>
diff --git a/src/SdkCommon/TestFramework/testframework.common.props b/src/SdkCommon/TestFramework/testframework.common.props
index 2b4ecd70a19b0..1060cd651d799 100644
--- a/src/SdkCommon/TestFramework/testframework.common.props
+++ b/src/SdkCommon/TestFramework/testframework.common.props
@@ -12,9 +12,4 @@
     <Reference Include="System.Net.Http" />
 	<Reference Include="System.Net.Http.WebRequest" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">    
-    <!-- <PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" /> -->
-    <!-- <PackageReference Include="NETStandard.Library" Version="1.6.1" /> -->
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test.props b/test.props
index ab7f3a22738ed..aa0b06f4f5b4f 100644
--- a/test.props
+++ b/test.props
@@ -17,7 +17,19 @@
     <AddProjectReferenceForDebuggingPurpose>false</AddProjectReferenceForDebuggingPurpose>
     <AddNugetReferenceForCIandCmdlineBuild>true</AddNugetReferenceForCIandCmdlineBuild>
     <SkipBuildingTestProject>false</SkipBuildingTestProject>	
-	<!-- <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> -->
+	
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">1.1.0</RuntimeFrameworkVersion>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'net452' ">$(PackageTargetFallback);net452;dnxcore50</PackageTargetFallback>
+	
+	<!-- 
+	<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+	
+	<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.1' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.1' ">1.6.1</NetStandardImplicitPackageVersion>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>
+	-->
 	</PropertyGroup>
 	
 <PropertyGroup Label="DebugBuildOptions" Condition=" '$(Configuration)'=='Debug' ">
diff --git a/tools/buildTargets/common.NugetPackage.props b/tools/buildTargets/common.NugetPackage.props
index 35ffe8ce970e6..a07141e72b2f4 100644
--- a/tools/buildTargets/common.NugetPackage.props
+++ b/tools/buildTargets/common.NugetPackage.props
@@ -20,6 +20,9 @@
     <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
     <PackageTags>$(PackageTags) $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+	<PackageTargetFallback Condition=" '$(TargetFramework)' == 'net452' ">$(PackageTargetFallback);net452;dnxcore50</PackageTargetFallback>    
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.4' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.4' ">1.6.1</NetStandardImplicitPackageVersion>
     
 
     <!--
diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets
index 57671f033b0ac..28249b842bbcd 100644
--- a/tools/buildTargets/common.targets
+++ b/tools/buildTargets/common.targets
@@ -17,10 +17,14 @@
   <PropertyGroup>
     <BuildTraversedProjectsDependsOn>
       PreBuildStaticAnalysis;
-      RestoreLatestProjects;
+      <!-- RestoreLatestProjects; -->
       BuildLatestProjects;
       Package
     </BuildTraversedProjectsDependsOn>
+	
+	<RestoreTraversedProjectsDependsOn>
+		RestoreLatestProjects;
+	</RestoreTraversedProjectsDependsOn>
 
     <CleanTraversedProjectsDependsOn>
       CleanLatestProjects;