Skip to content

Commit 5c80e4e

Browse files
author
Maddie Clayton
authored
Merge branch 'release-2018-06-29' into get-status-2
2 parents 5b5bb97 + 69374cc commit 5c80e4e

File tree

66 files changed

+18411
-73675
lines changed

Some content is hidden

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

66 files changed

+18411
-73675
lines changed

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/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+
* Fixed formatting of OutputTypes in help files
2122

2223
## Version 0.5.1
2324
* Set minimum dependency of module to PowerShell 5.0

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Synchronize-AzureASInstance.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
3737
/// </summary>
3838
[Cmdlet(VerbsData.Sync, "AzureAnalysisServicesInstance", SupportsShouldProcess = true)]
3939
[Alias("Sync-AzureAsInstance")]
40-
[OutputType(typeof(ScaleOutServerDatabaseSyncDetails[]))]
40+
[OutputType(typeof(ScaleOutServerDatabaseSyncDetails))]
4141
public class SynchronizeAzureAzureAnalysisServer : AzurePSCmdlet
4242
{
4343
private static TimeSpan DefaultPollingInterval = TimeSpan.FromSeconds(30);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
3030
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
3131
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
32-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
32+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3333
<PackageReference Include="Moq" Version="4.7.145" />
3434
</ItemGroup>
3535

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
44
<Import Project="..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
@@ -67,7 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.20.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="20.0.0" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class AdlsTestsBase : RMTestBase
4141
private LegacyTest.CSMTestEnvironmentFactory csmTestFactory;
4242
private EnvironmentSetupHelper helper;
4343
private const string AuthorizationApiVersion = "2014-07-01-preview";
44-
internal const string resourceGroupLocation = "East US 2";
44+
internal const string resourceGroupLocation = "eastus2";
4545

4646
public ResourceManagementClient ResourceManagementClient { get; private set; }
4747

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsAccount.json

Lines changed: 785 additions & 9356 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsAccountTiers.json

Lines changed: 471 additions & 5954 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsFileSystem.json

Lines changed: 313 additions & 6580 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsFileSystemPermissions.json

Lines changed: 308 additions & 4589 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)