Azure · markcowl · Sep 13, 2018 · Aug 30, 2018 · Aug 31, 2018 · Aug 31, 2018
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 src/Publish/
 src/Package/
 src/Stack/
+src/local-artifacts/*
+!.placeholder
 
 obj
 TestResults

diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,8 @@ script:
  - sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
  - sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u || travis_terminate 1
  - sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
- - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG
+ - sudo dotnet pack src/TestPrerequisites/Common.TestPrerequisites.sln --configuration $CONFIG || travis_terminate 1
+ - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0
 
 after_success:
  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

diff --git a/NuGet.Config b/NuGet.Config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <add key="local-artifacts" value="src/local-artifacts" />
     <add key="local-feed" value="tools/LocalFeed" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />

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
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Aks.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Aks.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/packages.config b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/packages.config
@@ -8,8 +8,8 @@
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
-  <package id="Microsoft.Rest.ClientRuntime" version="2.3.12" targetFramework="net452" />
-  <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.13" targetFramework="net452" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.13" targetFramework="net452" />
+  <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.15" targetFramework="net452" />
   <package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
 </packages>
diff --git a/...ysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj b/...ysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...ager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj b/...ager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.ApiManagement.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.ApiManagement.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -24,7 +24,7 @@
     <DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
     <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.4-preview" />
   </ItemGroup>
 

diff --git a/...esourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj b/...esourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <OmitJsonPackage>true</OmitJsonPackage>
+  </PropertyGroup>
+
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
 
   <PropertyGroup>

diff --git a/...nagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.Netcore.csproj b/...nagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...sights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj b/...sights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.ApplicationInsights.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.ApplicationInsights.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...sourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj b/...sourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj
@@ -3,12 +3,14 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.ResourceManager.Automation.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
+    <OutputType>Library</OutputType>
+    <AutoGenerateBindingRedirects>False</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -23,8 +25,10 @@
     <DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
+    <PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.6" />
+  </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.5" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
   </ItemGroup>

diff --git a/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj b/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj
@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.5" />
+    <PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.6" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/...rceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.Netcore.csproj b/...rceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.AzureBackup.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.AzureBackup.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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
@@ -1,14 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OmitJsonPackage>true</OmitJsonPackage>
+    <UseStorageDataPlane>true</UseStorageDataPlane>
+  </PropertyGroup>
 
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Batch.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Batch.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
+    <AutoGenerateBindingRedirects>False</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -23,7 +28,7 @@
     <DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
     <PackageReference Include="Azure.Batch" Version="8.1.1" />
     <PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />

diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs
@@ -109,7 +109,6 @@ public void RunPsTestWorkflow(
                     if (scriptBuilder != null)
                     {
                         var psScripts = scriptBuilder();
-
                         if (psScripts != null)
                         {
                             _helper.RunPowerShellTest(psScripts);

diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs
@@ -35,6 +35,7 @@ public FileTests(Xunit.Abstractions.ITestOutputHelper output)
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.RunType, Category.DesktopOnly)]
         public void TestGetNodeFileContentByTask()
         {
             BatchController controller = BatchController.NewInstance;
@@ -64,6 +65,7 @@ public void TestGetNodeFileContentByTask()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.RunType, Category.DesktopOnly)]
         public void TestGetNodeFileContentByComputeNode()
         {
             BatchController controller = BatchController.NewInstance;

diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <OmitJsonPackage>true</OmitJsonPackage>
+  </PropertyGroup>
+
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
 
   <PropertyGroup>

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
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Billing.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Billing.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Cdn.Test.ScenarioTests</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Cdn.Test.ScenarioTests</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...Services/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.Netcore.csproj b/...Services/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Management.CognitiveServices.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Management.CognitiveServices.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.../Commands.Compute.ManagedService.Test/Commands.Compute.ManagedService.Test.Netcore.csproj b/.../Commands.Compute.ManagedService.Test/Commands.Compute.ManagedService.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Compute.ManagedService.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Compute.ManagedService.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Compute.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Compute.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -23,7 +23,7 @@
     <DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />

diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs b/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs
@@ -33,6 +33,8 @@
 using NetworkManagementClientInternal = Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient;
 using ResourceManagementClientInternal = Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient;
 using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
+using System.Reflection;
+using System.Runtime.Versioning;
 using Microsoft.Azure.Management.Internal.Resources;
 using CommonStorage = Microsoft.Azure.Management.Storage.Version2017_10_01;
 using PublicStorage = Microsoft.Azure.Management.Storage;
@@ -111,7 +113,6 @@ public void RunPsTestWorkflow(
             providersToIgnore.Add("Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2017-05-10");
             providersToIgnore.Add("Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient", "2016-09-01");
             HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
-
             HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");
             using (MockContext context = MockContext.Start(callingClassType, mockName))
             {
@@ -141,7 +142,6 @@ public void RunPsTestWorkflow(
                 try
                 {
                     var psScripts = scriptBuilder?.Invoke();
-
                     if (psScripts != null)
                     {
                         _helper.RunPowerShellTest(psScripts);

diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <OmitJsonPackage>true</OmitJsonPackage>
+  </PropertyGroup>
+
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
 
   <PropertyGroup>

diff --git a/...rceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj b/...rceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.Consumption.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.Consumption.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...erInstance/Commands.ContainerInstance.Test/Commands.ContainerInstance.Test.Netcore.csproj b/...erInstance/Commands.ContainerInstance.Test/Commands.ContainerInstance.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.ContainerInstance.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.ContainerInstance.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...erRegistry/Commands.ContainerRegistry.Test/Commands.ContainerRegistry.Test.Netcore.csproj b/...erRegistry/Commands.ContainerRegistry.Test/Commands.ContainerRegistry.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.ContainerRegistry.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.ContainerRegistry.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...ager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.Netcore.csproj b/...ager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.DataFactories.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.DataFactories.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.1" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.2" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.4.6604.1" />
   </ItemGroup>
 

diff --git a/...esourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.Netcore.csproj b/...esourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.Netcore.csproj
@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.1" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.2" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.4.6604.1" />
   </ItemGroup>
 

diff --git a/...ager/DataFactoryV2/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.Netcore.csproj b/...ager/DataFactoryV2/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.DataFactoryV2.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.DataFactoryV2.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...eAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.Netcore.csproj b/...eAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.DataLakeAnalytics.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.DataLakeAnalytics.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...ager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj b/...ager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.Netcore.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.Azure.Commands.DataLake.Test</AssemblyName>
     <RootNamespace>Microsoft.Azure.Commands.DataLake.Test</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...esourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj b/...esourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <OmitJsonPackage>true</OmitJsonPackage>
+  </PropertyGroup>
+
   <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
 
   <PropertyGroup>