Skip to content

Commit 38daeb2

Browse files
author
Maddie Clayton
authored
Merge branch 'preview' into Oct2018FRP
2 parents eeaac2d + 00329a9 commit 38daeb2

File tree

831 files changed

+294172
-224530
lines changed

Some content is hidden

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

831 files changed

+294172
-224530
lines changed

‎Azure.PowerShell.Netcore.sln

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27130.2027
3+
VisualStudioVersion = 15.0.27130.2020
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Profile.Netcore", "src\ResourceManager\Profile\Commands.Profile\Commands.Profile.Netcore.csproj", "{31044C50-5F29-4CB4-9E7C-8E0123FA6B77}"
66
EndProject
@@ -148,8 +148,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.SignalR.Netcore",
148148
EndProject
149149
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DevSpaces.Netcore", "src\ResourceManager\DevSpaces\Commands.DevSpaces\Commands.DevSpaces.Netcore.csproj", "{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}"
150150
EndProject
151+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.FrontDoor.Netcore", "src\ResourceManager\FrontDoor\Commands.FrontDoor\Commands.FrontDoor.Netcore.csproj", "{9207944C-6E48-4845-BC58-85C7EFAA0E28}"
152+
EndProject
151153
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.IotCentral.Netcore", "src\ResourceManager\IotCentral\Commands.IotCentral\Commands.IotCentral.Netcore.csproj", "{18B8B354-6920-4329-AB6B-DC98790B7A5A}"
152154
EndProject
155+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Security.Netcore", "src\ResourceManager\Security\Commands.Security\Commands.Security.Netcore.csproj", "{FA322448-E646-4221-9FEA-3C1C8CC81B99}"
156+
EndProject
157+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.StorageSync.Netcore", "src\ResourceManager\StorageSync\Commands.StorageSync\Commands.StorageSync.Netcore.csproj", "{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}"
158+
EndProject
153159
Global
154160
GlobalSection(SolutionConfigurationPlatforms) = preSolution
155161
Debug|Any CPU = Debug|Any CPU
@@ -1035,6 +1041,18 @@ Global
10351041
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|x64.Build.0 = Release|Any CPU
10361042
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|x86.ActiveCfg = Release|Any CPU
10371043
{6EBD1E1B-12D1-451D-B284-ED35A91D6C8C}.Release|x86.Build.0 = Release|Any CPU
1044+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1045+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
1046+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Debug|x64.ActiveCfg = Debug|Any CPU
1047+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Debug|x64.Build.0 = Debug|Any CPU
1048+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Debug|x86.ActiveCfg = Debug|Any CPU
1049+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Debug|x86.Build.0 = Debug|Any CPU
1050+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
1051+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Release|Any CPU.Build.0 = Release|Any CPU
1052+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Release|x64.ActiveCfg = Release|Any CPU
1053+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Release|x64.Build.0 = Release|Any CPU
1054+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Release|x86.ActiveCfg = Release|Any CPU
1055+
{9207944C-6E48-4845-BC58-85C7EFAA0E28}.Release|x86.Build.0 = Release|Any CPU
10381056
{18B8B354-6920-4329-AB6B-DC98790B7A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10391057
{18B8B354-6920-4329-AB6B-DC98790B7A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
10401058
{18B8B354-6920-4329-AB6B-DC98790B7A5A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1047,6 +1065,30 @@ Global
10471065
{18B8B354-6920-4329-AB6B-DC98790B7A5A}.Release|x64.Build.0 = Release|Any CPU
10481066
{18B8B354-6920-4329-AB6B-DC98790B7A5A}.Release|x86.ActiveCfg = Release|Any CPU
10491067
{18B8B354-6920-4329-AB6B-DC98790B7A5A}.Release|x86.Build.0 = Release|Any CPU
1068+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1069+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Debug|Any CPU.Build.0 = Debug|Any CPU
1070+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Debug|x64.ActiveCfg = Debug|Any CPU
1071+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Debug|x64.Build.0 = Debug|Any CPU
1072+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Debug|x86.ActiveCfg = Debug|Any CPU
1073+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Debug|x86.Build.0 = Debug|Any CPU
1074+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Release|Any CPU.ActiveCfg = Release|Any CPU
1075+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Release|Any CPU.Build.0 = Release|Any CPU
1076+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Release|x64.ActiveCfg = Release|Any CPU
1077+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Release|x64.Build.0 = Release|Any CPU
1078+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Release|x86.ActiveCfg = Release|Any CPU
1079+
{FA322448-E646-4221-9FEA-3C1C8CC81B99}.Release|x86.Build.0 = Release|Any CPU
1080+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1081+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Debug|Any CPU.Build.0 = Debug|Any CPU
1082+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Debug|x64.ActiveCfg = Debug|Any CPU
1083+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Debug|x64.Build.0 = Debug|Any CPU
1084+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Debug|x86.ActiveCfg = Debug|Any CPU
1085+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Debug|x86.Build.0 = Debug|Any CPU
1086+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Release|Any CPU.ActiveCfg = Release|Any CPU
1087+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Release|Any CPU.Build.0 = Release|Any CPU
1088+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Release|x64.ActiveCfg = Release|Any CPU
1089+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Release|x64.Build.0 = Release|Any CPU
1090+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Release|x86.ActiveCfg = Release|Any CPU
1091+
{4C2F89E4-A0E0-4ECB-A5DA-A583EDF1ED62}.Release|x86.Build.0 = Release|Any CPU
10501092
EndGlobalSection
10511093
GlobalSection(SolutionProperties) = preSolution
10521094
HideSolutionNode = FALSE

‎documentation/development-docs/azure-powershell-design-guidelines.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
- [ResourceId](#resourceid)
4141
- [InputObject](#inputobject)
4242
- [AsJob Parameter](#asjob-parameter)
43+
- [Argument Completers](#argument-completers)
4344

4445
## Expected Patterns for Standard Cmdlets
4546

@@ -291,6 +292,22 @@ using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
291292
public string ResourceGroupName { get; set; }
292293
```
293294

295+
### Resource Name Completer
296+
297+
For any parameter that takes a resource name, the `ResourceNameCompleter` should be applied as an attribute. This will allow the user to tab through all resource names for the ResourceType in the current subscription. This completer will filter based upon the current parent resources provided (for instance, if ResourceGroupName is provided, only the resources in that particular resource group will be returned). For this completer, please provide the ResourceType as the first argument, followed by the parameter name for all parent resources starting at the top level.
298+
299+
```cs
300+
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
301+
...
302+
[Parameter(Mandatory = false, HelpMessage = "The parent server name")]
303+
[ResourceNameCompleter("Microsoft.Sql/servers", nameof(ResourceGroupName))]
304+
public string ServerName { get; set; }
305+
306+
[Parameter(Mandatory = false, HelpMessage = "The database name")]
307+
[ResourceNameCompleter("Microsoft.Sql/servers/databases", nameof(ResourceGroupName), nameof(ServerName))]
308+
public string Name { get; set; }
309+
```
310+
294311
### Location Completer
295312

296313
For any parameter that takes a location, the `LocationCompleter` should be applied as an attribute. In order to use the `LocationCompleter`, you must input as an argument all of the Providers/ResourceTypes used by the cmdlet. The user will then be able to tab through locations that are valid for all of the Providers/ResourceTypes specified.

‎documentation/development-docs/azure-powershell-developer-guide.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,22 @@ using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
415415
public string ResourceGroupName { get; set; }
416416
```
417417

418+
### Resource Name Completer
419+
420+
For any parameter that takes a resource name, the `ResourceNameCompleter` should be applied as an attribute. This will allow the user to tab through all resource names for the ResourceType in the current subscription. This completer will filter based upon the current parent resources provided (for instance, if ResourceGroupName is provided, only the resources in that particular resource group will be returned). For this completer, please provide the ResourceType as the first argument, followed by the parameter name for all parent resources starting at the top level.
421+
422+
```cs
423+
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
424+
...
425+
[Parameter(Mandatory = false, HelpMessage = "The parent server name")]
426+
[ResourceNameCompleter("Microsoft.Sql/servers", nameof(ResourceGroupName))]
427+
public string ServerName { get; set; }
428+
429+
[Parameter(Mandatory = false, HelpMessage = "The database name")]
430+
[ResourceNameCompleter("Microsoft.Sql/servers/databases", nameof(ResourceGroupName), nameof(ServerName))]
431+
public string Name { get; set; }
432+
```
433+
418434
### Location Completer
419435

420436
For any parameter that takes a location, the `LocationCompleter` should be applied as an attribute. In order to use the `LocationCompleter`, you must input as an argument all of the Providers/ResourceTypes used by the cmdlet. The user will then be able to tab through locations that are valid for all of the Providers/ResourceTypes specified.

‎src/Azure.PowerShell.Netcore.Test.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RecoveryServices.B
9999
EndProject
100100
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RecoveryServices.SiteRecovery.Test.Netcore", "ResourceManager\RecoveryServices\Commands.RecoveryServices.SiteRecovery.Test\Commands.RecoveryServices.SiteRecovery.Test.Netcore.csproj", "{A2660AEE-6B12-43FB-A6A5-0FFF08C80DFB}"
101101
EndProject
102+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Security.Test.Netcore", "ResourceManager\Security\Commands.Security.Test\Commands.Security.Test.Netcore.csproj", "{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}"
103+
EndProject
104+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.StorageSync.Test.Netcore", "ResourceManager\StorageSync\Commands.StorageSync.Test\Commands.StorageSync.Test.Netcore.csproj", "{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}"
105+
EndProject
102106
Global
103107
GlobalSection(SolutionConfigurationPlatforms) = preSolution
104108
Debug|Any CPU = Debug|Any CPU
@@ -685,6 +689,30 @@ Global
685689
{A2660AEE-6B12-43FB-A6A5-0FFF08C80DFB}.Release|x64.Build.0 = Release|Any CPU
686690
{A2660AEE-6B12-43FB-A6A5-0FFF08C80DFB}.Release|x86.ActiveCfg = Release|Any CPU
687691
{A2660AEE-6B12-43FB-A6A5-0FFF08C80DFB}.Release|x86.Build.0 = Release|Any CPU
692+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
693+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Debug|Any CPU.Build.0 = Debug|Any CPU
694+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Debug|x64.ActiveCfg = Debug|Any CPU
695+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Debug|x64.Build.0 = Debug|Any CPU
696+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Debug|x86.ActiveCfg = Debug|Any CPU
697+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Debug|x86.Build.0 = Debug|Any CPU
698+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Release|Any CPU.ActiveCfg = Release|Any CPU
699+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Release|Any CPU.Build.0 = Release|Any CPU
700+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Release|x64.ActiveCfg = Release|Any CPU
701+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Release|x64.Build.0 = Release|Any CPU
702+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Release|x86.ActiveCfg = Release|Any CPU
703+
{8F2BE5E5-EBD6-4D09-8B22-F4B5DBCA569F}.Release|x86.Build.0 = Release|Any CPU
704+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
705+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
706+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Debug|x64.ActiveCfg = Debug|Any CPU
707+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Debug|x64.Build.0 = Debug|Any CPU
708+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Debug|x86.ActiveCfg = Debug|Any CPU
709+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Debug|x86.Build.0 = Debug|Any CPU
710+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
711+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Release|Any CPU.Build.0 = Release|Any CPU
712+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Release|x64.ActiveCfg = Release|Any CPU
713+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Release|x64.Build.0 = Release|Any CPU
714+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Release|x86.ActiveCfg = Release|Any CPU
715+
{E24BA5EA-9B34-4BE7-997E-5F66F400D6BA}.Release|x86.Build.0 = Release|Any CPU
688716
EndGlobalSection
689717
GlobalSection(SolutionProperties) = preSolution
690718
HideSolutionNode = FALSE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Hyak.Common" version="1.1.3" targetFramework="net452" />
44
<package id="Microsoft.Azure.Common" version="2.1.4" targetFramework="net452" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net452" />
6-
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
6+
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.1-preview" targetFramework="net452" />
77
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.7.0" targetFramework="net452" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />

‎src/ResourceManager/Aks/Commands.Aks/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Update dependencies for type mapping issue
2122

2223
## Version 0.0.6
2324
* Update version of YamlDotNet.Signed used

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
</ProjectReference>
9696
</ItemGroup>
9797
<ItemGroup>
98-
<Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
98+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
9999
<SpecificVersion>False</SpecificVersion>
100-
<HintPath>..\..\..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>
100+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103103
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎src/ResourceManager/Aks/Commands.Aks/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.2.1" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
55
<package id="System.Management.Automation_PowerShell_3.0" version="6.3.9600.17400" targetFramework="net452" />
66
<package id="YamlDotNet.Signed" version="5.2.1" targetFramework="net452" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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.17" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.18" targetFramework="net452" />
1212
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" 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" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Analysis" version="2.0.4" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.1-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.7.0" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
52-
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
51+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
52+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.ApiManagement" version="4.0.5-preview" targetFramework="net452" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
66
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Update dependencies for type mapping issue
2122

2223
## Version 6.1.5
2324
* Fixed issue with default resource groups not being set.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
50+
<Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51+
<HintPath>..\..\..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.2.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.ApiManagement" version="4.0.5-preview" targetFramework="net452" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
66
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />

‎src/ResourceManager/Automation/Automation.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ Global
3636
{59D1B5DC-9175-43EC-90C6-CBA601B3565F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
3737
EndGlobalSection
3838
GlobalSection(ExtensibilityGlobals) = postSolution
39-
SolutionGuid = {7EB964F8-1A60-4113-A715-3087E4B215DE}
39+
SolutionGuid = {321D48F0-23DC-42CE-8FA9-EBD686B690EC}
4040
EndGlobalSection
4141
EndGlobal

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
29-
<PackageReference Include="Microsoft.Azure.Management.Automation" Version="2.0.7" />
29+
<PackageReference Include="Microsoft.Azure.Management.Automation" Version="3.4.0-preview" />
3030
</ItemGroup>
31+
3132
<ItemGroup>
3233
<PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
3334
<PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
@@ -40,9 +41,15 @@
4041
</ItemGroup>
4142

4243
<ItemGroup>
44+
<None Update="SessionRecords\**\*.json">
45+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
46+
</None>
4347
<None Update="ScenarioTests\*.ps1">
4448
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4549
</None>
50+
<None Update="ScenarioTests\Resources\*.*">
51+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
52+
</None>
4653
</ItemGroup>
4754

4855
</Project>

0 commit comments

Comments
 (0)