Skip to content

Commit 58edfe5

Browse files
MiYanniMiYanni
authored
Merge branch 'develop' into myget-symbols
2 parents 562f357 + 3dab736 commit 58edfe5

14 files changed

+16
-16
lines changed

‎local-packages/Microsoft.Azure.Test.Framework.3.0.0.nupkg

111 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.0.nupkg

-65.4 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.0.symbols.nupkg

-81.9 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.1.nupkg

66.4 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.1.symbols.nupkg

83.2 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.0.nupkg

-79.3 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.0.symbols.nupkg

-95.8 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.1.nupkg

79.5 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.1.symbols.nupkg

96 KB
Binary file not shown.

‎src/Authentication.Abstractions/packages.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
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.13" targetFramework="net452" />
12-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.15" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.14" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.16" targetFramework="net452" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
1414
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net40" />
@@ -18,9 +18,9 @@
1818
<!-- Test Packages -->
1919
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
2020
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
21-
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
22-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
23-
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.2" targetFramework="net452" />
21+
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
22+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.13.0" targetFramework="net452" />
23+
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.4" targetFramework="net452" />
2424
<package id="Microsoft.WindowsAzure.Management.Compute" version="14.0.0" targetFramework="net45" />
2525
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
2626
<package id="Moq" version="4.2.1510.2205" targetFramework="net40" />

‎src/Dependencies.Netcore.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.13" />
12-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.15" />
11+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.14" />
12+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.16" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1515
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />

‎src/Dependencies.Runtime.targets

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<HintPath>$(PackagesDirectory)Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
1616
</Reference>
1717
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
18-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.13\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
18+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.14\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
1919
</Reference>
2020
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
21-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.15\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
21+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.16\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
2222
</Reference>
2323
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
2424
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
@@ -47,14 +47,14 @@
4747
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4848
<HintPath>$(PackagesDirectory)Microsoft.Azure.Management.ResourceManager.1.9.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.6179.26854, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
50+
<Reference Include="Microsoft.Azure.Test.Framework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.Framework.3.0.0\lib\net452\Microsoft.Azure.Test.Framework.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.HttpRecorder.1.8.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
54+
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.HttpRecorder.1.13.0\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
57+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.4\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
6060
<HintPath>$(PackagesDirectory)Microsoft.WindowsAzure.Management.Storage.6.0.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎src/Dependencies.Test.Netcore.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<Import Project="$(MSBuildThisFileDirectory)\Dependencies.Netcore.targets" />
77
<ItemGroup>
88
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.0-preview" />
9-
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.14.0" />
9+
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.14.1" />
1010
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
11-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.8.0" />
11+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.8.1" />
1212
<PackageReference Include="xunit" Version="2.4.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

‎src/ResourceManager/ArgumentCompleters/ResourceNameCompleter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ResourceNameCompleterAttribute : ArgumentCompleterAttribute
4343
/// Example: ResourceNameCompleter(new string[] { "Microsoft.Batch/operations", "ResourceGroupName" })]
4444
/// </summary>
4545
/// <param name="resourceTypes"></param>
46-
public ResourceNameCompleterAttribute(string resourceType, string[] parentResourceParameterNames) : base(CreateScriptBlock(resourceType, parentResourceParameterNames))
46+
public ResourceNameCompleterAttribute(string resourceType, params string[] parentResourceParameterNames) : base(CreateScriptBlock(resourceType, parentResourceParameterNames))
4747
{
4848
}
4949

0 commit comments

Comments
 (0)