File tree Expand file tree Collapse file tree 3 files changed +8
-1
lines changed
ScenarioTest.ResourceManager Expand file tree Collapse file tree 3 files changed +8
-1
lines changed Original file line number Diff line number Diff line change 33 <ItemGroup >
44 <PackageReference Include =" Microsoft.Rest.ClientRuntime" Version =" 2.4.0" />
55 <PackageReference Include =" Microsoft.Rest.ClientRuntime.Azure" Version =" 3.4.0" />
6- <PackageReference Include =" Newtonsoft.Json" Version =" 11.0.2" />
76 </ItemGroup >
87 <ItemGroup Condition =" '$(TargetFramework)' == 'netstandard2.0'" >
98 <PackageReference Include =" Microsoft.ApplicationInsights" Version =" 2.4.0" />
109 <PackageReference Include =" Microsoft.Azure.Common" Version =" 2.2.0" />
1110 <PackageReference Include =" Hyak.Common" Version =" 1.2.0" />
1211 <PackageReference Include =" PowerShellStandard.Library" Version =" 5.1.0-preview-06" PrivateAssets =" All" />
1312 </ItemGroup >
13+ <ItemGroup Condition =" '$(OmitJsonPackage)' != 'true'" >
14+ <PackageReference Include =" Newtonsoft.Json" Version =" 10.0.3" />
15+ </ItemGroup >
1416</Project >
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<Project ToolsVersion =" 12.0" DefaultTargets =" Build" xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
3+ <PropertyGroup >
4+ <OmitJsonPackage >true</OmitJsonPackage >
5+ </PropertyGroup >
36 <Import Project =" $(MSBuildThisFileDirectory)\Dependencies.Netcore.targets" />
47 <ItemGroup >
58 <PackageReference Include =" Microsoft.Azure.Management.ResourceManager" Version =" 1.9.0-preview" />
69 <PackageReference Include =" Microsoft.Azure.Test.HttpRecorder" Version =" 1.9.0" />
710 <PackageReference Include =" Microsoft.Rest.ClientRuntime.Azure.Authentication" Version =" 2.4.0" />
811 <PackageReference Include =" Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version =" 1.9.0" />
912 <PackageReference Include =" xunit" Version =" 2.4.0" />
13+ <PackageReference Include =" Newtonsoft.Json" Version =" 11.0.2" />
1014 </ItemGroup >
1115 <ItemGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
1216 <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
676676 }
677677 }
678678
679+ powershell . AddScript ( "Disable-AzureRmDataCollection -ErrorAction Ignore" ) ;
679680 powershell . AddScript (
680681 string . Format ( "set-location \" {0}\" " , System . AppDomain . CurrentDomain . BaseDirectory ) ) ;
681682 powershell . AddScript ( string . Format ( @"$TestOutputRoot='{0}'" , System . AppDomain . CurrentDomain . BaseDirectory ) ) ;
You can’t perform that action at this time.
0 commit comments