Skip to content

Commit a419cce

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#7258 from maddieclayton/updatenetwork
Update network preview branch
2 parents b49e9f8 + b797ada commit a419cce

File tree

929 files changed

+251524
-157921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

929 files changed

+251524
-157921
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
src/Publish/
33
src/Package/
44
src/Stack/
5+
src/local-artifacts/*
6+
!.placeholder
57

68
obj
79
TestResults

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ script:
2727
- sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
2828
- sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u || travis_terminate 1
2929
- sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
30-
- sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG
30+
- sudo dotnet pack src/TestPrerequisites/Common.TestPrerequisites.sln --configuration $CONFIG || travis_terminate 1
31+
- sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0
3132

3233
after_success:
3334
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

‎NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4+
<add key="local-artifacts" value="src/local-artifacts" />
45
<add key="local-feed" value="tools/LocalFeed" />
56
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
67
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />

‎src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.Aks.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Aks.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.12" targetFramework="net452" />
12-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.13" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.13" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.15" targetFramework="net452" />
1313
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1414
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1515
</packages>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -24,7 +24,7 @@
2424
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
2525
</PropertyGroup>
2626

27-
<ItemGroup>
27+
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
2828
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.4-preview" />
2929
</ItemGroup>
3030

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<OmitJsonPackage>true</OmitJsonPackage>
5+
</PropertyGroup>
6+
37
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
48

59
<PropertyGroup>

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights.Test/Commands.ApplicationInsights.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.ApplicationInsights.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ApplicationInsights.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.Netcore.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.ResourceManager.Automation.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1111
<WarningsAsErrors />
12+
<OutputType>Library</OutputType>
13+
<AutoGenerateBindingRedirects>False</AutoGenerateBindingRedirects>
1214
</PropertyGroup>
1315

1416
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -23,8 +25,10 @@
2325
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
2426
</PropertyGroup>
2527

28+
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
29+
<PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.6" />
30+
</ItemGroup>
2631
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.5" />
2832
<PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
2933
<PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
3034
</ItemGroup>

‎src/ResourceManager/Automation/Commands.Automation/Commands.Automation.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.5" />
31+
<PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.6" />
3232
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3333
</ItemGroup>
3434

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.AzureBackup.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.AzureBackup.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<OmitJsonPackage>true</OmitJsonPackage>
4+
<UseStorageDataPlane>true</UseStorageDataPlane>
5+
</PropertyGroup>
26

37
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
48

59
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
10+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
711
<AssemblyName>Microsoft.Azure.Commands.Batch.Test</AssemblyName>
812
<RootNamespace>Microsoft.Azure.Commands.Batch.Test</RootNamespace>
913
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1014
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1115
<WarningsAsErrors />
16+
<AutoGenerateBindingRedirects>False</AutoGenerateBindingRedirects>
1217
</PropertyGroup>
1318

1419
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -23,7 +28,7 @@
2328
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
2429
</PropertyGroup>
2530

26-
<ItemGroup>
31+
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
2732
<PackageReference Include="Azure.Batch" Version="8.1.1" />
2833
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
2934
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public void RunPsTestWorkflow(
109109
if (scriptBuilder != null)
110110
{
111111
var psScripts = scriptBuilder();
112-
113112
if (psScripts != null)
114113
{
115114
_helper.RunPowerShellTest(psScripts);

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public FileTests(Xunit.Abstractions.ITestOutputHelper output)
3535

3636
[Fact]
3737
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
[Trait(Category.RunType, Category.DesktopOnly)]
3839
public void TestGetNodeFileContentByTask()
3940
{
4041
BatchController controller = BatchController.NewInstance;
@@ -64,6 +65,7 @@ public void TestGetNodeFileContentByTask()
6465

6566
[Fact]
6667
[Trait(Category.AcceptanceType, Category.CheckIn)]
68+
[Trait(Category.RunType, Category.DesktopOnly)]
6769
public void TestGetNodeFileContentByComputeNode()
6870
{
6971
BatchController controller = BatchController.NewInstance;

‎src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<OmitJsonPackage>true</OmitJsonPackage>
5+
</PropertyGroup>
6+
37
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
48

59
<PropertyGroup>

‎src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.Billing.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Billing.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.Cdn.Test.ScenarioTests</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Cdn.Test.ScenarioTests</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.Management.CognitiveServices.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Management.CognitiveServices.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/Compute.ManagedService/Commands.Compute.ManagedService.Test/Commands.Compute.ManagedService.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.Compute.ManagedService.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Compute.ManagedService.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.Compute.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Compute.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -23,12 +23,12 @@
2323
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
2424
</PropertyGroup>
2525

26-
<ItemGroup>
26+
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
2727
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
2828
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
2929
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
31-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.5.0-preview" />
31+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
3232
<PackageReference Include="Moq" Version="4.7.145" />
3333
</ItemGroup>
3434

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<Reference Include="Microsoft.Azure.Management.Compute">
4747
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.21.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
49+
<Reference Include="Microsoft.Azure.Management.Network, Version=19.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.5.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Management.Storage, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
using NetworkManagementClientInternal = Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient;
3434
using ResourceManagementClientInternal = Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient;
3535
using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
36+
using System.Reflection;
37+
using System.Runtime.Versioning;
3638
using Microsoft.Azure.Management.Internal.Resources;
3739
using CommonStorage = Microsoft.Azure.Management.Storage.Version2017_10_01;
3840
using PublicStorage = Microsoft.Azure.Management.Storage;
@@ -111,7 +113,6 @@ public void RunPsTestWorkflow(
111113
providersToIgnore.Add("Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2017-05-10");
112114
providersToIgnore.Add("Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient", "2016-09-01");
113115
HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
114-
115116
HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");
116117
using (MockContext context = MockContext.Start(callingClassType, mockName))
117118
{
@@ -141,7 +142,6 @@ public void RunPsTestWorkflow(
141142
try
142143
{
143144
var psScripts = scriptBuilder?.Invoke();
144-
145145
if (psScripts != null)
146146
{
147147
_helper.RunPowerShellTest(psScripts);

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="21.0.0" targetFramework="net452" />
10-
<package id="Microsoft.Azure.Management.Network" version="19.3.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="19.5.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.KeyVault" version="2.4.1-alpha" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="7.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<OmitJsonPackage>true</OmitJsonPackage>
5+
</PropertyGroup>
6+
37
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
48

59
<PropertyGroup>

‎src/ResourceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.Consumption.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Consumption.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/ContainerInstance/Commands.ContainerInstance.Test/Commands.ContainerInstance.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.ContainerInstance.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ContainerInstance.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/Commands.ContainerRegistry.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.ContainerRegistry.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.ContainerRegistry.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.DataFactories.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.DataFactories.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.1" />
27+
<PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.2" />
2828
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.4.6604.1" />
2929
</ItemGroup>
3030

‎src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.1" />
31+
<PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.2" />
3232
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.4.6604.1" />
3333
</ItemGroup>
3434

‎src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
77
<AssemblyName>Microsoft.Azure.Commands.DataFactoryV2.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.DataFactoryV2.Test</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

0 commit comments

Comments
 (0)