File tree 3 files changed +8
-1
lines changed
ScenarioTest.ResourceManager
3 files changed +8
-1
lines changed Original file line number Diff line number Diff line change 3
3
<ItemGroup >
4
4
<PackageReference Include =" Microsoft.Rest.ClientRuntime" Version =" 2.4.0" />
5
5
<PackageReference Include =" Microsoft.Rest.ClientRuntime.Azure" Version =" 3.4.0" />
6
- <PackageReference Include =" Newtonsoft.Json" Version =" 11.0.2" />
7
6
</ItemGroup >
8
7
<ItemGroup Condition =" '$(TargetFramework)' == 'netstandard2.0'" >
9
8
<PackageReference Include =" Microsoft.ApplicationInsights" Version =" 2.4.0" />
10
9
<PackageReference Include =" Microsoft.Azure.Common" Version =" 2.2.0" />
11
10
<PackageReference Include =" Hyak.Common" Version =" 1.2.0" />
12
11
<PackageReference Include =" PowerShellStandard.Library" Version =" 5.1.0-preview-06" PrivateAssets =" All" />
13
12
</ItemGroup >
13
+ <ItemGroup Condition =" '$(OmitJsonPackage)' != 'true'" >
14
+ <PackageReference Include =" Newtonsoft.Json" Version =" 10.0.3" />
15
+ </ItemGroup >
14
16
</Project >
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
2
<Project ToolsVersion =" 12.0" DefaultTargets =" Build" xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
3
+ <PropertyGroup >
4
+ <OmitJsonPackage >true</OmitJsonPackage >
5
+ </PropertyGroup >
3
6
<Import Project =" $(MSBuildThisFileDirectory)\Dependencies.Netcore.targets" />
4
7
<ItemGroup >
5
8
<PackageReference Include =" Microsoft.Azure.Management.ResourceManager" Version =" 1.9.0-preview" />
6
9
<PackageReference Include =" Microsoft.Azure.Test.HttpRecorder" Version =" 1.9.0" />
7
10
<PackageReference Include =" Microsoft.Rest.ClientRuntime.Azure.Authentication" Version =" 2.4.0" />
8
11
<PackageReference Include =" Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version =" 1.9.0" />
9
12
<PackageReference Include =" xunit" Version =" 2.4.0" />
13
+ <PackageReference Include =" Newtonsoft.Json" Version =" 11.0.2" />
10
14
</ItemGroup >
11
15
<ItemGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
12
16
<PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 15.8.0" />
Original file line number Diff line number Diff line change @@ -676,6 +676,7 @@ private void SetupPowerShellModules(System.Management.Automation.PowerShell powe
676
676
}
677
677
}
678
678
679
+ powershell . AddScript ( "Disable-AzureRmDataCollection -ErrorAction Ignore" ) ;
679
680
powershell . AddScript (
680
681
string . Format ( "set-location \" {0}\" " , System . AppDomain . CurrentDomain . BaseDirectory ) ) ;
681
682
powershell . AddScript ( string . Format ( @"$TestOutputRoot='{0}'" , System . AppDomain . CurrentDomain . BaseDirectory ) ) ;
You can’t perform that action at this time.
0 commit comments