diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 000000000000..72a7fe354f1d
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,6 @@
+<!-- https://dasmulli.blog/2018/01/20/make-dotnet-test-work-on-solution-files/ -->
+<Project>
+  <Target Name="VSTestIfTestProject">
+    <CallTarget Targets="VSTest" Condition="'$(IsTestProject)' == 'true'" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/after.Azure.PowerShell.sln.targets b/after.Azure.PowerShell.sln.targets
new file mode 100644
index 000000000000..4bbbccf2bb1f
--- /dev/null
+++ b/after.Azure.PowerShell.sln.targets
@@ -0,0 +1,6 @@
+<!-- https://dasmulli.blog/2018/01/20/make-dotnet-test-work-on-solution-files/ -->
+<Project>
+  <Target Name="VSTest">
+    <MSBuild Projects="@(ProjectReference)" Targets="VSTestIfTestProject" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj b/src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj
index 0ed44a8ee3e4..a4e00be5205f 100644
--- a/src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj
+++ b/src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj
@@ -29,9 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Aks">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Aks\Microsoft.Azure.Commands.Aks.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Aks\Commands.Aks.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj
index 73a30c0da604..5b5e10ca80ea 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj
@@ -29,12 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.AnalysisServices">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.AnalysisServices\Microsoft.Azure.Commands.AnalysisServices.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.AnalysisServices.Dataplane">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.AnalysisServices\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.AnalysisServices.Dataplane\Commands.AnalysisServices.Dataplane.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj
index 98560aa56d10..4d7dc90bed93 100644
--- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj
+++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.5-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.ApiManagement">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/UnitTests/PsApiManagementTests.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/UnitTests/PsApiManagementTests.cs
index e4de62fc9189..6dd644c003f5 100644
--- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/UnitTests/PsApiManagementTests.cs
+++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/UnitTests/PsApiManagementTests.cs
@@ -1,5 +1,4 @@
-using Microsoft.Azure.Commands.ApiManagement.Models;
-using Microsoft.Azure.Management.ApiManagement.Models;
+using Microsoft.Azure.Management.ApiManagement.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using System;
 using System.Collections.Generic;
diff --git a/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj b/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj
index aee180642432..bf1d25b23538 100644
--- a/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj
+++ b/src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.2.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.ApplicationInsights">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ApplicationInsights\Microsoft.Azure.Commands.ApplicationInsights.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj b/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj
index 727762f9b486..4f4947a24bad 100644
--- a/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj
+++ b/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj
@@ -33,11 +33,9 @@
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Automation">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Automation\Microsoft.Azure.Commands.Automation.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Automation\Commands.Automation.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj
index e0f4db24922d..0c9f5e971ba7 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj
+++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj
@@ -36,9 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Batch">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Batch\Microsoft.Azure.Commands.Batch.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Batch\Commands.Batch.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.Netcore.csproj b/src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.Netcore.csproj
index 4a54684b42c8..d580f9d6a429 100644
--- a/src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.Netcore.csproj
+++ b/src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Billing" Version="2.1.1-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Billing">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Billing\Microsoft.Azure.Commands.Billing.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.Netcore.csproj b/src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.Netcore.csproj
index 8267d6b47c34..b00be6e014c9 100644
--- a/src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.Netcore.csproj
+++ b/src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Cdn" Version="4.0.2-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Cdn">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Cdn\Microsoft.Azure.Commands.Cdn.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.Netcore.csproj b/src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.Netcore.csproj
index 25be974e3c88..81a01417873d 100644
--- a/src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.Netcore.csproj
+++ b/src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="4.1.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Management.CognitiveServices">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.CognitiveServices\Microsoft.Azure.Commands.Management.CognitiveServices.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj
index ebf473d71ce0..d949d92880a8 100644
--- a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj
+++ b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj
@@ -28,14 +28,11 @@
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="23.2.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.6.1-preview" />
- 	<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
-    <PackageReference Include="Moq" Version="4.7.145" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.1-preview" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Compute">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Compute\Microsoft.Azure.Commands.Compute.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Compute\Commands.Compute.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -67,4 +64,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/ResourceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj b/src/ResourceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj
index f42c81b9308b..67242afa9118 100644
--- a/src/ResourceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj
+++ b/src/ResourceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Consumption" Version="3.0.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Consumption">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Consumption\Microsoft.Azure.Commands.Consumption.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/ContainerInstance/Commands.ContainerInstance.Test/Commands.ContainerInstance.Test.Netcore.csproj b/src/ResourceManager/ContainerInstance/Commands.ContainerInstance.Test/Commands.ContainerInstance.Test.Netcore.csproj
index 95a5b5273c14..24ab3df05721 100644
--- a/src/ResourceManager/ContainerInstance/Commands.ContainerInstance.Test/Commands.ContainerInstance.Test.Netcore.csproj
+++ b/src/ResourceManager/ContainerInstance/Commands.ContainerInstance.Test/Commands.ContainerInstance.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="1.0.3-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.ContainerInstance">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ContainerInstance\Microsoft.Azure.Commands.ContainerInstance.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/Commands.ContainerRegistry.Test.Netcore.csproj b/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/Commands.ContainerRegistry.Test.Netcore.csproj
index 4bb4b599a066..92124a845997 100644
--- a/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/Commands.ContainerRegistry.Test.Netcore.csproj
+++ b/src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/Commands.ContainerRegistry.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ContainerRegistry" Version="2.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.ContainerRegistry">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ContainerRegistry\Microsoft.Azure.Commands.ContainerRegistry.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.Netcore.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.Netcore.csproj
index 32d63e694e11..5c41c095d526 100644
--- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.Netcore.csproj
+++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.Netcore.csproj
@@ -29,9 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.DataFactories">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataFactories\Microsoft.Azure.Commands.DataFactories.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.DataFactories\Commands.DataFactories.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.Netcore.csproj b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.Netcore.csproj
index 1f15aa0036d7..db15abb0393f 100644
--- a/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.Netcore.csproj
+++ b/src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.Netcore.csproj
@@ -29,12 +29,6 @@
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.DataLakeAnalytics">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj
index 16e5947386d1..544b930bfacd 100644
--- a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj
+++ b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj
@@ -30,9 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.DataLakeStore">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.DataLakeStore\Commands.DataLakeStore.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/DevSpaces/Commands.DevSpaces.Test/Commands.DevSpaces.Test.Netcore.csproj b/src/ResourceManager/DevSpaces/Commands.DevSpaces.Test/Commands.DevSpaces.Test.Netcore.csproj
index 58bddee676bd..e567434d299e 100644
--- a/src/ResourceManager/DevSpaces/Commands.DevSpaces.Test/Commands.DevSpaces.Test.Netcore.csproj
+++ b/src/ResourceManager/DevSpaces/Commands.DevSpaces.Test/Commands.DevSpaces.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.DevSpaces" Version="0.10.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.DevSpaces">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.DevSpaces\Microsoft.Azure.Commands.DevSpaces.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj
index c70b5ce3a068..cf1810400add 100644
--- a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj
+++ b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj
@@ -27,13 +27,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.6.1-preview" />
-    <!-- <PackageReference Include="Moq" Version="4.2.1510.2205" /> -->
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Dns">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Dns\Microsoft.Azure.Commands.Dns.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.Netcore.csproj b/src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.Netcore.csproj
index 6c10d602f0ca..c579485dd635 100644
--- a/src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.Netcore.csproj
+++ b/src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.Netcore.csproj
@@ -29,15 +29,6 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.3.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.EventGrid">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.EventGrid\Microsoft.Azure.Commands.EventGrid.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.EventHub">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.EventHub\Microsoft.Azure.Commands.EventHub.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.Netcore.csproj b/src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.Netcore.csproj
index c4639522af8a..e90e6a8f0960 100644
--- a/src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.Netcore.csproj
+++ b/src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.3.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.EventHub">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.EventHub\Microsoft.Azure.Commands.EventHub.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/FrontDoor/Commands.FrontDoor.Test/Commands.FrontDoor.Test.Netcore.csproj b/src/ResourceManager/FrontDoor/Commands.FrontDoor.Test/Commands.FrontDoor.Test.Netcore.csproj
index 0a7f748bb78e..6c617d6ffbf7 100644
--- a/src/ResourceManager/FrontDoor/Commands.FrontDoor.Test/Commands.FrontDoor.Test.Netcore.csproj
+++ b/src/ResourceManager/FrontDoor/Commands.FrontDoor.Test/Commands.FrontDoor.Test.Netcore.csproj
@@ -3,12 +3,13 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.FrontDoor.Test.ScenarioTests</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.FrontDoor.Test.ScenarioTests</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.Netcore.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.Netcore.csproj
index 019fc1ed349f..f2201e0f25ee 100644
--- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.Netcore.csproj
+++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.Netcore.csproj
@@ -29,9 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.HDInsight">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.HDInsight\Microsoft.Azure.Commands.HDInsight.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.HDInsight\Commands.HDInsight.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.Netcore.csproj b/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.Netcore.csproj
index 4c48b2bafead..2ecb59bce7e7 100644
--- a/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.Netcore.csproj
+++ b/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.Netcore.csproj
@@ -28,9 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Insights">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Insights\Microsoft.Azure.Commands.Insights.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Insights\Commands.Insights.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/IotCentral/Commands.IotCentral.Test/Commands.IotCentral.Test.Netcore.csproj b/src/ResourceManager/IotCentral/Commands.IotCentral.Test/Commands.IotCentral.Test.Netcore.csproj
index 2df940cfde13..4798c6502136 100644
--- a/src/ResourceManager/IotCentral/Commands.IotCentral.Test/Commands.IotCentral.Test.Netcore.csproj
+++ b/src/ResourceManager/IotCentral/Commands.IotCentral.Test/Commands.IotCentral.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.IotCentral" Version="2.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.IotCentral">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.IotCentral\Microsoft.Azure.Commands.IotCentral.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.Netcore.csproj b/src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.Netcore.csproj
index eba4d2b66272..ebb529beaa21 100644
--- a/src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.Netcore.csproj
+++ b/src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.Netcore.csproj
@@ -29,15 +29,6 @@
     <PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.1.1" />
   </ItemGroup>
 
-<ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.EventHub">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.EventHub\Microsoft.Azure.Commands.EventHub.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.IotHub">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.IotHub\Microsoft.Azure.Commands.IotHub.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.Netcore.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.Netcore.csproj
index f8586121433c..a9538d16205a 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.Netcore.csproj
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.Netcore.csproj
@@ -31,9 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.KeyVault">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.KeyVault\Microsoft.Azure.Commands.KeyVault.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.KeyVault\Commands.KeyVault.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/LogicApp/Commands.LogicApp.Test/Commands.LogicApp.Test.Netcore.csproj b/src/ResourceManager/LogicApp/Commands.LogicApp.Test/Commands.LogicApp.Test.Netcore.csproj
index d584bff0c9cc..373d50d6874f 100644
--- a/src/ResourceManager/LogicApp/Commands.LogicApp.Test/Commands.LogicApp.Test.Netcore.csproj
+++ b/src/ResourceManager/LogicApp/Commands.LogicApp.Test/Commands.LogicApp.Test.Netcore.csproj
@@ -29,9 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.LogicApp">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.LogicApp\Microsoft.Azure.Commands.LogicApp.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.LogicApp\Commands.LogicApp.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/Commands.MachineLearning.Test.Netcore.csproj b/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/Commands.MachineLearning.Test.Netcore.csproj
index 83a202873ba0..d45c559a0094 100644
--- a/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/Commands.MachineLearning.Test.Netcore.csproj
+++ b/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/Commands.MachineLearning.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.MachineLearning" Version="1.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.MachineLearning">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.MachineLearning\Microsoft.Azure.Commands.MachineLearning.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/Commands.MachineLearningCompute.Test.Netcore.csproj b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/Commands.MachineLearningCompute.Test.Netcore.csproj
index f26eab6c2f8b..a92bd9612b51 100644
--- a/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/Commands.MachineLearningCompute.Test.Netcore.csproj
+++ b/src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/Commands.MachineLearningCompute.Test.Netcore.csproj
@@ -26,18 +26,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.MachineLearningCompute" Version="0.4.0" />
-    <!-- <PackageReference Include="Microsoft.Azure.Management.Storage" Version="3.0.0" />
-    <PackageReference Include="Moq" Version="4.2.1510.2205" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
-    <PackageReference Include="System.Security.Cryptography.Encoding" Version="4.3.0" />
-    <PackageReference Include="System.Security.Cryptography.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" /> -->
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.MachineLearningCompute">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.MachineLearningCompute\Microsoft.Azure.Commands.MachineLearningCompute.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/Commands.MarketplaceOrdering.Test.Netcore.csproj b/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/Commands.MarketplaceOrdering.Test.Netcore.csproj
index 436d3bacd630..24be8ccf269a 100644
--- a/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/Commands.MarketplaceOrdering.Test.Netcore.csproj
+++ b/src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/Commands.MarketplaceOrdering.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.MarketplaceOrdering" Version="1.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.MarketplaceOrdering">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.MarketplaceOrdering\Microsoft.Azure.Commands.MarketplaceOrdering.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Media/Commands.Media.Test/Commands.Media.Test.Netcore.csproj b/src/ResourceManager/Media/Commands.Media.Test/Commands.Media.Test.Netcore.csproj
index 346ea476b125..58cf76689d7b 100644
--- a/src/ResourceManager/Media/Commands.Media.Test/Commands.Media.Test.Netcore.csproj
+++ b/src/ResourceManager/Media/Commands.Media.Test/Commands.Media.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="0.1.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Media">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Media\Microsoft.Azure.Commands.Media.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.Netcore.csproj b/src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.Netcore.csproj
index 3b7ea1eceea0..fd3ead0b16cf 100644
--- a/src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.Netcore.csproj
+++ b/src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.NotificationHubs" Version="2.3.2-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.NotificationHubs">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.NotificationHubs\Microsoft.Azure.Commands.NotificationHubs.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.Netcore.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.Netcore.csproj
index ef696ffadb75..1d27d41f5df0 100644
--- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.Netcore.csproj
+++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.Netcore.csproj
@@ -29,12 +29,6 @@
     <PackageReference Include="Microsoft.Azure.OperationalInsights" Version="0.10.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.OperationalInsights">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.Netcore.csproj b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.Netcore.csproj
index c72ca331e65d..f8811faab943 100644
--- a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.Netcore.csproj
+++ b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBI.Test/Commands.PowerBI.Test.Netcore.csproj
@@ -28,15 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.PowerBIDedicated" Version="0.11.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.PowerBI">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.PowerBIEmbedded\Microsoft.Azure.Commands.PowerBI.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.Management.PowerBIEmbedded">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.PowerBIEmbedded\Microsoft.Azure.Commands.Management.PowerBIEmbedded.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBIEmbedded.Test/Commands.PowerBIEmbedded.Test.Netcore.csproj b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBIEmbedded.Test/Commands.PowerBIEmbedded.Test.Netcore.csproj
index 35665e7b3b37..f44161c6ad6d 100644
--- a/src/ResourceManager/PowerBIEmbedded/Commands.PowerBIEmbedded.Test/Commands.PowerBIEmbedded.Test.Netcore.csproj
+++ b/src/ResourceManager/PowerBIEmbedded/Commands.PowerBIEmbedded.Test/Commands.PowerBIEmbedded.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.PowerBIEmbedded" Version="1.1.1-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Management.PowerBIEmbedded">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.PowerBIEmbedded\Microsoft.Azure.Commands.Management.PowerBIEmbedded.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.Netcore.csproj b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.Netcore.csproj
index bbe122d32bad..0ac302825604 100644
--- a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.Netcore.csproj
+++ b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.Netcore.csproj
@@ -25,21 +25,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Profile">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Profile\Microsoft.Azure.Commands.Profile.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Profile\Commands.Profile.Netcore.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <None Remove="App.config" />
+    <!-- <None Remove="App.config" /> -->
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="*.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Profile\Microsoft.Azure.PowerShell.ResourceManager.dll">
+    <!-- <None Include="..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Profile\Microsoft.Azure.PowerShell.ResourceManager.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </None> -->
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.Netcore.csproj
index 036f2ad9d7da..8b55ae81cd47 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.Netcore.csproj
@@ -32,27 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.ARM">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.Backup">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.Backup.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.Backup.Logger">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.Backup.Logger.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.Backup.Models">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.Backup.Models.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.Backup.Providers">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.Backup.Providers.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.Backup.ServiceClientAdapter">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.Backup.ServiceClientAdapter.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.RecoveryServices.Backup.Models\Commands.RecoveryServices.Backup.Models.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery.Test/Commands.RecoveryServices.SiteRecovery.Test.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery.Test/Commands.RecoveryServices.SiteRecovery.Test.Netcore.csproj
index 73e203748a70..c4c68e6c0547 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery.Test/Commands.RecoveryServices.SiteRecovery.Test.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery.Test/Commands.RecoveryServices.SiteRecovery.Test.Netcore.csproj
@@ -30,12 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.ARM">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.SiteRecovery">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.RecoveryServices.SiteRecovery\Commands.RecoveryServices.SiteRecovery.Netcore.csproj" />
+    <ProjectReference Include="..\Commands.RecoveryServices\Commands.RecoveryServices.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.Netcore.csproj b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.Netcore.csproj
index 0f18f5960d52..4cedb788e1a4 100644
--- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.Netcore.csproj
+++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.RecoveryServices.ARM">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.Netcore.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.Netcore.csproj
index 2afd836645c6..e700b5c15d61 100644
--- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.Netcore.csproj
+++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.Netcore.csproj
@@ -30,9 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.RedisCache">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.RedisCache\Microsoft.Azure.Commands.RedisCache.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.RedisCache\Commands.RedisCache.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/Relay/Commands.Relay.Test/Commands.Relay.Test.Netcore.csproj b/src/ResourceManager/Relay/Commands.Relay.Test/Commands.Relay.Test.Netcore.csproj
index 5db9bae0f9f3..eebd04356580 100644
--- a/src/ResourceManager/Relay/Commands.Relay.Test/Commands.Relay.Test.Netcore.csproj
+++ b/src/ResourceManager/Relay/Commands.Relay.Test/Commands.Relay.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Relay">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Relay\Microsoft.Azure.Commands.Relay.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.Netcore.csproj b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.Netcore.csproj
index 187a9263a357..806133be9210 100644
--- a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.Netcore.csproj
+++ b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.Netcore.csproj
@@ -32,14 +32,8 @@
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.0" />
   </ItemGroup>
 
-
-    <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Resources">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Resources\Microsoft.Azure.Commands.Resources.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Commands.ResourceManager.Cmdlets">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Resources\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll</HintPath>
-    </Reference>
+  <ItemGroup>
+    <ProjectReference Include="..\Commands.Resources\Commands.Resources.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/Search/Commands.Management.Search.Test/Commands.Management.Search.Test.Netcore.csproj b/src/ResourceManager/Search/Commands.Management.Search.Test/Commands.Management.Search.Test.Netcore.csproj
index 140b6e06b3af..6f81d43d9a54 100644
--- a/src/ResourceManager/Search/Commands.Management.Search.Test/Commands.Management.Search.Test.Netcore.csproj
+++ b/src/ResourceManager/Search/Commands.Management.Search.Test/Commands.Management.Search.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Search" Version="2.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Management.Search">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Search\Microsoft.Azure.Commands.Management.Search.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Security/Commands.Security.Test/Commands.Security.Test.Netcore.csproj b/src/ResourceManager/Security/Commands.Security.Test/Commands.Security.Test.Netcore.csproj
index 90cdc63b63d6..d9ad59ae2f37 100644
--- a/src/ResourceManager/Security/Commands.Security.Test/Commands.Security.Test.Netcore.csproj
+++ b/src/ResourceManager/Security/Commands.Security.Test/Commands.Security.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.SecurityCenter" Version="0.10.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.SecurityCenter">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Security\Microsoft.Azure.Commands.SecurityCenter.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/ServiceBus/Commands.ServiceBus.Test/Commands.ServiceBus.Test.Netcore.csproj b/src/ResourceManager/ServiceBus/Commands.ServiceBus.Test/Commands.ServiceBus.Test.Netcore.csproj
index 4590d61bfdb6..541cb425bd9e 100644
--- a/src/ResourceManager/ServiceBus/Commands.ServiceBus.Test/Commands.ServiceBus.Test.Netcore.csproj
+++ b/src/ResourceManager/ServiceBus/Commands.ServiceBus.Test/Commands.ServiceBus.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.ServiceBus">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ServiceBus\Microsoft.Azure.Commands.ServiceBus.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/Commands.ServiceFabric.Test.Netcore.csproj b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/Commands.ServiceFabric.Test.Netcore.csproj
index 297ec9aba690..75333efd5ee6 100644
--- a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/Commands.ServiceFabric.Test.Netcore.csproj
+++ b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/Commands.ServiceFabric.Test.Netcore.csproj
@@ -30,9 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.ServiceFabric">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.ServiceFabric\Microsoft.Azure.Commands.ServiceFabric.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.ServiceFabric\Commands.ServiceFabric.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/SignalR/Commands.SignalR.Test/Commands.SignalR.Test.Netcore.csproj b/src/ResourceManager/SignalR/Commands.SignalR.Test/Commands.SignalR.Test.Netcore.csproj
index 64cd7fc67146..bc9e049daac1 100644
--- a/src/ResourceManager/SignalR/Commands.SignalR.Test/Commands.SignalR.Test.Netcore.csproj
+++ b/src/ResourceManager/SignalR/Commands.SignalR.Test/Commands.SignalR.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.SignalR" Version="0.11.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.SignalR">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.SignalR\Microsoft.Azure.Commands.SignalR.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.Netcore.csproj b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.Netcore.csproj
index b6948d679ef6..7827dcf163e8 100644
--- a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.Netcore.csproj
+++ b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.Netcore.csproj
@@ -30,12 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.Sql">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Sql\Microsoft.Azure.Commands.Sql.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Azure.Management.Sql.Legacy">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Sql\Microsoft.Azure.Management.Sql.Legacy.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Sql\Commands.Sql.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/Storage/Commands.Storage.Test/Commands.Storage.Test.Netcore.csproj b/src/ResourceManager/Storage/Commands.Storage.Test/Commands.Storage.Test.Netcore.csproj
index 00e2eb30c160..ff080f168bb9 100644
--- a/src/ResourceManager/Storage/Commands.Storage.Test/Commands.Storage.Test.Netcore.csproj
+++ b/src/ResourceManager/Storage/Commands.Storage.Test/Commands.Storage.Test.Netcore.csproj
@@ -30,17 +30,12 @@
   <ItemGroup>
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
     <PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.8.1" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.WindowsAzure.Commands.Storage">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Storage\Microsoft.WindowsAzure.Commands.Storage.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.Storage\Commands.Storage.Netcore.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/ResourceManager/StorageSync/Commands.StorageSync.Test/Commands.StorageSync.Test.Netcore.csproj b/src/ResourceManager/StorageSync/Commands.StorageSync.Test/Commands.StorageSync.Test.Netcore.csproj
index 1871fdf0adc1..b4775ce5ab80 100644
--- a/src/ResourceManager/StorageSync/Commands.StorageSync.Test/Commands.StorageSync.Test.Netcore.csproj
+++ b/src/ResourceManager/StorageSync/Commands.StorageSync.Test/Commands.StorageSync.Test.Netcore.csproj
@@ -25,9 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.StorageSync">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.StorageSync\Microsoft.Azure.Commands.StorageSync.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.StorageSync\Commands.StorageSync.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.Netcore.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.Netcore.csproj
index 0d209db4cc9e..f6ffba6e8a69 100644
--- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.Netcore.csproj
+++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.Netcore.csproj
@@ -28,12 +28,6 @@
     <PackageReference Include="Microsoft.Azure.Management.StreamAnalytics" Version="2.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.StreamAnalytics">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.Netcore.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.Netcore.csproj
index 7d28b7d32ecd..8135c8143d48 100644
--- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.Netcore.csproj
+++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.Netcore.csproj
@@ -29,9 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Commands.TrafficManager">
-      <HintPath>..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.TrafficManager\Microsoft.Azure.Commands.TrafficManager.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\Commands.TrafficManager2\Commands.TrafficManager.Netcore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/Common.Netcore.Dependencies.Test.targets b/tools/Common.Netcore.Dependencies.Test.targets
index f76b7bc2bee1..c86e9fac3e81 100644
--- a/tools/Common.Netcore.Dependencies.Test.targets
+++ b/tools/Common.Netcore.Dependencies.Test.targets
@@ -49,7 +49,7 @@
  </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.1-preview" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
   </ItemGroup>