Skip to content

Commit dbb3dc4

Browse files
author
Maddie Clayton
authored
Merge pull request #8503 from markcowl/net472tests
Enable PowerShell 5.1 / Net472 Test Automation
2 parents 300ec4c + 5b4512f commit dbb3dc4

File tree

12 files changed

+112
-87
lines changed

12 files changed

+112
-87
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Azure PowerShell specific
2+
Net472Tests/
23
artifacts/
34
src/Stack/
45
src/local-artifacts/*

‎build.proj

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
4949
<LibrarySourceFolder>$(LibraryRoot)src</LibrarySourceFolder>
5050
<LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
51+
<LibraryArtifactsFolder>$(LibraryRoot)artifacts</LibraryArtifactsFolder>
5152
<LocalFeedFolder>$(LibraryToolsFolder)\LocalFeed</LocalFeedFolder>
5253
<Configuration Condition=" '$(Configuration)' != 'Release'">Debug</Configuration>
5354
<CodeSign>false</CodeSign>
@@ -378,6 +379,9 @@
378379
<PropertyGroup Condition="'$(ExcludeAuthenticators)' == 'true'">
379380
<AuthenticatorExclusions>$(LibraryRoot)src/**/Authenticators.csproj;</AuthenticatorExclusions>
380381
</PropertyGroup>
382+
<PropertyGroup Condition="'$(Framework)' == ''">
383+
<Framework>netcoreapp2.0</Framework>
384+
</PropertyGroup>
381385

382386
<CallTarget Targets="BinScopeCheck" Condition="'$(OnPremiseBuild)'" />
383387
<CallTarget Targets="RunPoliCheck" Condition="'$(OnPremiseBuild)'" />
@@ -397,7 +401,7 @@
397401
<Exec Command="dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj $(LibraryRoot)tools/TestFx/TestFx.csproj" />
398402
<!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
399403
<!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
400-
<Exec Command="dotnet test Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework netcoreapp2.0 --logger trx" />
404+
<Exec Command="dotnet test Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(Framework) --logger trx" />
401405

402406
<ItemGroup>
403407
<TestResults Include="$(LibraryRoot)src/**/TestResults/*.trx" />
@@ -407,6 +411,37 @@
407411
<OnError ExecuteTargets="TestFailureErrorMessage" />
408412
</Target>
409413

414+
<Target Name="TestNet472">
415+
<Message Importance="high" Text="Running check in tests..." />
416+
<PropertyGroup>
417+
<AuthExclusions>$(LibraryRoot)src/**/Authenticators.csproj;</AuthExclusions>
418+
<AutomationExclusions>$(LibraryRoot)src/**/Automation.Test.csproj;</AutomationExclusions>
419+
<StorageExclusions>$(LibraryRoot)src/**/Storage.Test.csproj;</StorageExclusions>
420+
</PropertyGroup>
421+
422+
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
423+
<Exec Command="dotnet new sln -n Azure.PowerShell --force" />
424+
<ItemGroup>
425+
<ModuleCsprojFiles Include="$(LibraryRoot)src/**/*.csproj" Exclude="$(AuthExclusions);$(AutomationExclusions);$(StorageExclusions)"/>
426+
</ItemGroup>
427+
<!-- https://stackoverflow.com/a/35477012/294804 -->
428+
<ItemGroup>
429+
<ModuleCsprojFilesRelative Include="@(ModuleCsprojFiles)">
430+
<RelativePath>$([MSBuild]::MakeRelative($(LibraryRoot), %(ModuleCsprojFiles.FullPath)))</RelativePath>
431+
</ModuleCsprojFilesRelative>
432+
</ItemGroup>
433+
<Exec Command="dotnet sln Azure.PowerShell.sln add @(ModuleCsprojFilesRelative->'%(RelativePath)', ' ')" />
434+
<Exec Command="dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj $(LibraryRoot)tools/TestFx/TestFx.csproj" />
435+
<!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
436+
<!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
437+
<Exec Command="dotnet build Azure.PowerShell.sln --configuration $(Configuration)" />
438+
<Exec Command="dotnet new console -n Net472Tests" />
439+
<Exec Command="dotnet add Net472Tests package xunit.runner.console --version 2.4.0" />
440+
<Exec Command="dotnet restore --packages ./artifacts/tools -f --no-cache Net472Tests" />
441+
<Exec Command="$(PowerShellCommandPrefix) &quot;$(LibraryToolsFolder)/TestNet472Modules.ps1 -TestExecPath '$(LibraryArtifactsFolder)/tools/xunit.runner.console/2.4.0/tools/net472/xunit.console.exe' &quot;" />
442+
<OnError ExecuteTargets="TestFailureErrorMessage" />
443+
</Target>
444+
410445
<Target Name="TestFailureErrorMessage">
411446
<Error Text="Test failures occured, check the files in artifacts/Test" />
412447
</Target>

‎src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ function Api-ImportExportWadlTest {
164164

165165
$context = New-AzApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
166166

167-
$wadlPath = Join-Path "$TestOutputRoot" "Resources" "WADLYahoo.xml"
167+
$wadlPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "WADLYahoo.xml"
168168
$path = "wadlapi"
169169
$wadlApiId = getAssetName
170170

@@ -198,7 +198,7 @@ function Api-ImportExportSwaggerTest {
198198

199199
$context = New-AzApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
200200

201-
$swaggerPath = Join-Path "$TestOutputRoot" "Resources" "SwaggerPetStoreV2.json"
201+
$swaggerPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "SwaggerPetStoreV2.json"
202202
$swaggerUrl = "http://petstore.swagger.io/v2/swagger.json"
203203
$path1 = "swaggerapifromFile"
204204
$path2 = "swaggerapifromUrl"
@@ -254,7 +254,7 @@ function Api-ImportExportWsdlTest {
254254

255255
$context = New-AzApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
256256
$wsdlUrl = "http://fazioapisoap.azurewebsites.net/fazioService.svc?singleWSDL"
257-
$wsdlPath1 = Join-Path "$TestOutputRoot" "Resources" "Weather.wsdl"
257+
$wsdlPath1 = Join-Path (Join-Path "$TestOutputRoot" "Resources") "Weather.wsdl"
258258
$path1 = "soapapifromFile"
259259
$path2 = "soapapifromUrl"
260260
$wsdlApiId1 = getAssetName
@@ -1091,10 +1091,10 @@ function Policy-CrudTest {
10911091

10921092
# load from file get to pipeline scenarios
10931093

1094-
$tenantValidPath = Join-Path "$TestOutputRoot" "Resources" "TenantValidPolicy.xml"
1095-
$productValidPath = Join-Path "$TestOutputRoot" "Resources" "ProductValidPolicy.xml"
1096-
$apiValidPath = Join-Path "$TestOutputRoot" "Resources" "ApiValidPolicy.xml"
1097-
$operationValidPath = Join-Path "$TestOutputRoot" "Resources" "OperationValidPolicy.xml"
1094+
$tenantValidPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "TenantValidPolicy.xml"
1095+
$productValidPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "ProductValidPolicy.xml"
1096+
$apiValidPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "ApiValidPolicy.xml"
1097+
$operationValidPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "OperationValidPolicy.xml"
10981098

10991099
$context = New-AzApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
11001100

@@ -1285,7 +1285,7 @@ function Certificate-CrudTest {
12851285

12861286
Assert-AreEqual 0 $certificates.Count
12871287

1288-
$certPath = Join-Path "$TestOutputRoot" "Resources" "powershelltest.pfx"
1288+
$certPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "powershelltest.pfx"
12891289
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
12901290
$certPassword = 'Password'
12911291
$certSubject = "CN=*.msitesting.net"
@@ -2122,7 +2122,7 @@ function BackendServiceFabric-CrudTest {
21222122

21232123
# create certificate
21242124
$certId = getAssetName
2125-
$certPath = Join-Path "$TestOutputRoot" "Resources" "powershelltest.pfx"
2125+
$certPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "powershelltest.pfx"
21262126
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
21272127
$certPassword = 'Password'
21282128
$certSubject = "CN=*.msitesting.net"
@@ -2299,7 +2299,7 @@ function ApiRevision-CrudTest {
22992299

23002300
$context = New-AzApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
23012301

2302-
$swaggerPath = Join-Path "$TestOutputRoot" "Resources" "SwaggerPetStoreV2.json"
2302+
$swaggerPath = Join-Path (Join-Path "$TestOutputRoot" "Resources") "SwaggerPetStoreV2.json"
23032303
$path1 = "swaggerapifromFile"
23042304
$swaggerApiId1 = getAssetName
23052305
$apiRevisionId = "2"

‎src/Automation/Automation.Test/Automation.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<PropertyGroup>
1010
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
1111
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
12+
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
1213
</PropertyGroup>
1314

1415
<ItemGroup>

‎src/Az.Test.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<!-- Build -->
1313
<PropertyGroup>
14-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
14+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;netstandard2.0</TargetFrameworks>
1515
<AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName>
1616
<RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
1717
<IsPackable>false</IsPackable>
@@ -25,6 +25,10 @@
2525
<DefineConstants>TRACE;RELEASE;NETSTANDARD</DefineConstants>
2626
</PropertyGroup>
2727

28+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
29+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
30+
</PropertyGroup>
31+
2832
<ItemGroup Condition="'$(IncludeCommonTestProject)' != 'false'">
2933
<ProjectReference Include="$(RepoTools)ScenarioTest.ResourceManager\ScenarioTest.ResourceManager.csproj" />
3034
<ProjectReference Include="$(RepoTools)TestFx\TestFx.csproj" />

‎src/ServiceFabric/ServiceFabric.Test/ScenarioTests/TestServiceFabric.ps1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,13 @@ function Test-AddAzureRmServiceFabricApplicationCertificateRollback
317317
}
318318
Catch [System.Exception]
319319
{
320-
Assert-AreEqual $true ($PSItem.Exception.Message -match 'is different from the location of the VM') "unexpected error message: $($PSItem.Exception.Message)"
320+
$Exception = $PSitem.Exception
321+
while ($Exception.InnerException -ne $null)
322+
{
323+
$Exception = $Exception.InnerException
324+
}
325+
326+
Assert-AreEqual $true ($Exception.Message -match 'is different from the location of the VM') ("unexpected error message: " + $Exception.Message )
321327
$exceptionThrown = $true
322328
}
323329

‎src/Storage/Storage.Test/Storage.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<PropertyGroup>
1111
<RootNamespace>Microsoft.WindowsAzure.Management.$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
12+
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
1213
</PropertyGroup>
1314

1415
<ItemGroup>

‎src/Websites/Websites.Test/ScenarioTests/Common.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# ----------------------------------------------------------------------------------
1414

1515
$TestOutputRoot = [System.AppDomain]::CurrentDomain.BaseDirectory;
16-
$ResourcesPath = Join-Path $TestOutputRoot "ScenarioTests" "Resources"
16+
$ResourcesPath = Join-Path (Join-Path $TestOutputRoot "ScenarioTests") "Resources"
1717

1818
<#
1919
.SYNOPSIS

‎src/lib/test.net472.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
publicKeyToken="30ad4fe6b2a6aeed"
88
culture="neutral" />
99
<codeBase version="9.0.0.0"
10-
href="../../../../../../lib/Newtonsoft.Json.9.dll"/>
10+
href="../../../../../lib/Newtonsoft.Json.9.dll"/>
1111
<codeBase version="10.0.0.0"
12-
href="../../../../../../lib/Newtonsoft.Json.10.dll"/>
12+
href="../../../../../lib/Newtonsoft.Json.10.dll"/>
1313
</dependentAssembly>
1414
</assemblyBinding>
1515
</runtime>

‎tools/Common.Netcore.Dependencies.Test.targets

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,28 @@
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<OmitJsonPackage>true</OmitJsonPackage>
5+
<IsTestProject>true</IsTestProject>
56
</PropertyGroup>
67
<Import Project="$(MSBuildThisFileDirectory)\Common.Netcore.Dependencies.targets" />
78

8-
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
9-
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.1-preview" >
10-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
11-
</PackageReference>
12-
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.13.3" >
13-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
14-
</PackageReference>
15-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.7" >
16-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
17-
</PackageReference>
18-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.7.6" >
19-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
20-
</PackageReference>
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.1-preview" />
11+
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.13.3" />
12+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.7" />
13+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.7.6" />
2114
<PackageReference Include="xunit" Version="2.4.0" />
2215
</ItemGroup>
2316

24-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
17+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2618
<PackageReference Include="xunit.runner.console" Version="2.4.0" />
27-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.0.0" />
19+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
2820
<Reference Include="System.Net.Http" />
2921
<Reference Include="System.Management.Automation">
3022
<SpecificVersion>False</SpecificVersion>
3123
<HintPath>$(windir)\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
3224
</Reference>
3325
<PackageReference Include="Newtonsoft.Json" version="10.0.3" />
26+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.0" />
3427
</ItemGroup>
3528

3629
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">

‎tools/Common.Netcore.Dependencies.targets

Lines changed: 18 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
4-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.19">
5-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
6-
</PackageReference>
7-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19">
8-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
9-
</PackageReference>
10-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.1.16-preview">
11-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
12-
</PackageReference>
13-
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.1.16-preview">
14-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
15-
</PackageReference>
16-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.1.16-preview">
17-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
18-
</PackageReference>
19-
<PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.1.16-preview">
20-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
21-
</PackageReference>
22-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.1.16-preview">
23-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
24-
</PackageReference>
25-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.1.16-preview">
26-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
27-
</PackageReference>
28-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.1.16-preview">
29-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
30-
</PackageReference>
31-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.1.16-preview">
32-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
33-
</PackageReference>
34-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.1.16-preview">
35-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
36-
</PackageReference>
37-
<PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.1.16-preview">
38-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
39-
</PackageReference>
40-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.1.16-preview">
41-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
42-
</PackageReference>
43-
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.1.16-preview">
44-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
45-
</PackageReference>
46-
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.1.16-preview">
47-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
48-
</PackageReference>
3+
<ItemGroup >
4+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.19"/>
5+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19"/>
6+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.1.16-preview"/>
7+
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.1.16-preview"/>
8+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.1.16-preview"/>
9+
<PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.1.16-preview"/>
10+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.1.16-preview"/>
11+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.1.16-preview"/>
12+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.1.16-preview"/>
13+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.1.16-preview"/>
14+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.1.16-preview"/>
15+
<PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.1.16-preview"/>
16+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.1.16-preview"/>
17+
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.1.16-preview"/>
18+
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.1.16-preview"/>
4919
</ItemGroup>
50-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
20+
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
5121
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0">
5222
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
5323
</PackageReference>
@@ -63,8 +33,6 @@
6333
<StorageToolsPath>$(NugetPackageRoot)microsoft.azure.powershell.storage\1.1.16-preview\tools\</StorageToolsPath>
6434
</PropertyGroup>
6535
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
66-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3">
67-
<PrivateAssets Condition="'$(HideReferenceDependencies)' == 'true'">All</PrivateAssets>
68-
</PackageReference>
36+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>
6937
</ItemGroup>
7038
</Project>

0 commit comments

Comments
 (0)