Skip to content

Commit 604ffe2

Browse files
cormacpaynecormacpayne
committed
Merge remote-tracking branch 'upstream/release-2018-10-05' into release-2018-10-05
2 parents a3fa92e + 52d58bc commit 604ffe2

File tree

12 files changed

+190
-143
lines changed

12 files changed

+190
-143
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="1.0.0" />
27+
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="2.3.0" />
2828
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.4.6604.1" />
2929
</ItemGroup>
3030

‎src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<ItemGroup>
4545
<Reference Include="Microsoft.Azure.Management.DataFactory">
4646
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactory.2.0.0\lib\net452\Microsoft.Azure.Management.DataFactory.dll</HintPath>
47+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactory.2.3.0\lib\net452\Microsoft.Azure.Management.DataFactory.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5050
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.Authorization" version="2.8.0-preview" targetFramework="net452" />
7-
<package id="Microsoft.Azure.Management.DataFactory" version="2.0.0" targetFramework="net452" />
7+
<package id="Microsoft.Azure.Management.DataFactory" version="2.3.0" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020

2121
## Current Release
22+
* Updated the ADF .Net SDK version to 2.3.0.
2223

2324
## Version 0.5.10
2425
* Fixed issue with default resource groups not being set.

‎src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Commands.DataFactoryV2.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="1.0.0" />
31+
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="2.3.0" />
3232
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.4.6604.1" />
3333
</ItemGroup>
3434

‎src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Commands.DataFactoryV2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<ItemGroup>
5252
<Reference Include="Microsoft.Azure.Management.DataFactory">
5353
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactory.2.0.0\lib\net452\Microsoft.Azure.Management.DataFactory.dll</HintPath>
54+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactory.2.3.0\lib\net452\Microsoft.Azure.Management.DataFactory.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.Management.DataFactory" version="2.0.0" targetFramework="net452" />
3+
<package id="Microsoft.Azure.Management.DataFactory" version="2.3.0" targetFramework="net452" />
44
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.4.6604.1" targetFramework="net45" />
55
</packages>

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ProviderTests.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ function Test-AzureProviderOperation
9191
Assert-True { $insightsActions.Length -gt 0 }
9292
Assert-True { $allActions.Length -gt $insightsActions.Length }
9393

94+
# Get all operations of microsoft.eventgrid provider
95+
$eventgridActions = Get-AzureRmProviderOperation Microsoft.EventGrid/*
96+
$eventgridActions
97+
Assert-True { $eventgridActions.Length -gt 0 }
98+
Assert-True { $allActions.Length -gt $eventgridActions.Length }
99+
94100
# Filter non-Microsoft.Insights operations and match the lengths
95101
$nonInsightsActions = $allActions | Where-Object { $_.Operation.ToLower().StartsWith("microsoft.insights/") -eq $false }
96102
$actualLength = $allActions.Length - $nonInsightsActions.Length;

‎src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ProviderTests/TestAzureProviderOperation.json

Lines changed: 164 additions & 122 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ProviderTests/TestAzureProviderOperationDataActions.json

Lines changed: 11 additions & 14 deletions
Large diffs are not rendered by default.

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

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

2222
## Version 6.6.0
2323
* Add missing -Mode parameter to Set-AzureRmPolicyDefinition
24+
* Fix Get-AzureRmProviderOperation commandlet bug for operations with Origin containing User
2425

2526
## Version 6.5.0
2627
* Update New-AzureRmResourceGroupDeployment with new parameter RollbackAction

‎src/ResourceManager/Resources/Commands.Resources/Providers/GetAzureProviderOperationCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private static IEnumerable<PSResourceProviderOperation> GetPSOperationsFromProvi
137137

138138
private static bool IsUserOperation(ProviderOperation operation)
139139
{
140-
return operation.Origin == null || operation.Origin.Contains("user");
140+
return operation.Origin == null || operation.Origin.IndexOf("user", StringComparison.OrdinalIgnoreCase) > -1;
141141
}
142142
private static PSResourceProviderOperation ToPSResourceProviderOperation(ProviderOperation operation, string provider, string resource = null)
143143
{

0 commit comments

Comments
 (0)