Skip to content

huangpf PR: dev <- Azure:dev #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Jan 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6c5d6d7
ADL QOL fixes
Dec 13, 2016
54c1d5b
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Dec 16, 2016
e89e11f
ADL and common updates
Dec 16, 2016
77714fc
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Jan 4, 2017
f8d720b
remove explicit disable of tracing in ADL
Jan 4, 2017
e3ac458
Help updates for ADLS
Jan 4, 2017
1b099bf
Missed an update for the xml file for ADLS.
Jan 4, 2017
945e7b9
ADLA help cleanup and sanity check
Jan 5, 2017
356005f
Add Commitment Tier Support for ADL
Jan 6, 2017
71c9037
Upgrade test framework to 1.5.1 for ADL
Jan 6, 2017
999b10c
Update the help.
Jan 6, 2017
19b0d46
Fix to TierType
Jan 6, 2017
4a0d929
update help to tiertype
Jan 6, 2017
9a5b0ee
powershell sign complains about 'using static'
Jan 6, 2017
508a3e0
Revert the fixed outputTypes
Jan 9, 2017
8b224aa
Add custom ADLS logging.
Jan 10, 2017
c382b75
Remove breaking enum, cleanup tests
Jan 11, 2017
ed9a64d
Missed two updated tests.
Jan 11, 2017
51b6e75
rearranging build order for common servicemagement module
shahabhijeet Jan 11, 2017
eea07b1
Re-record ADL tests
Jan 11, 2017
bd17e93
removing duplicate release configuration from redis test project
shahabhijeet Jan 11, 2017
e436766
Remove private packages, fix tracing
Jan 11, 2017
6131ba9
Address PR feedback.
Jan 12, 2017
2526f28
Resubmitting AnalysisServices Servicemanagement APIs (#3214)
athipp Jan 12, 2017
abd428c
[AzureRT] Fix Get-AzureRmVM issue (#3375)
hyonholee Jan 12, 2017
5043733
Updates based on PR feedback for ADL
Jan 12, 2017
02a88c9
Update help.xml with the default values.
Jan 12, 2017
b9cc8ee
Merge pull request #3363 from begoldsm/dev
cormacpayne Jan 12, 2017
104c203
Adding ServiceManagement Common project as it is not inheriting solut…
shahabhijeet Jan 12, 2017
a8fe81f
Adding Analysis Service Dataplane module to AzureRm rollup module (#3…
shahabhijeet Jan 12, 2017
e130309
building servicemanagement at end
shahabhijeet Jan 13, 2017
980ccde
Merge pull request #3383 from shahabhijeet/fixSignBuild
cormacpayne Jan 13, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<Scope Condition=" $(Scope) == '' " >all</Scope>
</PropertyGroup>
<ItemGroup>
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln;"
Exclude=".\src\ResourceManager\Intune\*.sln"
Condition=" '$(Scope)' == 'all' "/>
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"
Expand Down
7 changes: 6 additions & 1 deletion src/Common/Commands.Common/GeneralUtilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ public static class GeneralUtilities

private static List<string> AuthorizationHeaderNames = new List<string>() { "Authorization" };

// this is only used to determine cutoff for streams (not xml or json).
private const int StreamCutOffSize = 10 * 1024; //10KB

private static bool TryFindCertificatesInStore(string thumbprint,
System.Security.Cryptography.X509Certificates.StoreLocation location, out X509Certificate2Collection certificates)
{
Expand Down Expand Up @@ -318,7 +321,9 @@ public static string FormatString(string content)
}
else
{
return content;
return content.Length <= GeneralUtilities.StreamCutOffSize ?
content :
content.Substring(0, StreamCutOffSize) + "\r\nDATA TRUNCATED DUE TO SIZE\r\n";
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/ResourceManager/AnalysisServices/AnalysisServices.sln
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices.T
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices", "Commands.AnalysisServices\Commands.AnalysisServices.csproj", "{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices.Dataplane", "Commands.AnalysisServices.Dataplane\Commands.AnalysisServices.Dataplane.csproj", "{4944B213-4F12-4815-B416-3FF1853ADCC1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -52,6 +54,10 @@ Global
{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Release|Any CPU.Build.0 = Release|Any CPU
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
26 changes: 26 additions & 0 deletions src/ResourceManager/AnalysisServices/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!--
Please leave this section at the top of the change log.

Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:

## Current Release
* Overview of change #1
- Additional information about change #1
* Overview of change #2
- Additional information about change #2
- Additional information about change #2
* Overview of change #3
* Overview of change #4
- Additional information about change #4

## YYYY.MM.DD - Version X.Y.Z (Previous Release)
* Overview of change #1
- Additional information about change #1
-->
## Current Release
* Added two new dataplane APIs in a separate module Azure.AnalysisServices.psd1
- This introduces two new APIs that enable customers to login to Azure Analysis Services servers and issue a restart command.

## Version 3.2.0
* Fixed bug in Get-AzureRMAnalysisServicesServer
- When this command was run against some resources, it would fail with a null reference exception.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# ----------------------------------------------------------------------------------
#
# Copyright Microsoft Corporation
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ----------------------------------------------------------------------------------

@{
"Login-AzureAsAccount" = "Restart-AzureAnalysisServicesInstance";
"Restart-AzureAsInstance" = "Set-AzureRmContext";
}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias"
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
#
# Module manifest for module 'Microsoft.Azure.Commands.AnalysisServices.Dataplane'
#
# Generated by: Microsoft Corporation
#
# Generated on: 12/02/2016
#

@{

# Version number of this module.
ModuleVersion = '0.0.1'

# ID used to uniquely identify this module
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'

# Author of this module
Author = 'Microsoft Corporation'

# Company or vendor of this module
CompanyName = 'Microsoft Corporation'

# Copyright statement for this module
Copyright = '© Microsoft Corporation. All rights reserved.'

# Description of the functionality provided by this module
Description = 'Microsoft Azure PowerShell - Analysis Services server management'

# Minimum version of the Windows PowerShell engine required by this module
PowerShellVersion = '3.0'

# Name of the Windows PowerShell host required by this module
PowerShellHostName = ''

# Minimum version of the Windows PowerShell host required by this module
PowerShellHostVersion = ''

# Minimum version of the .NET Framework required by this module
DotNetFrameworkVersion = '4.0'

# Minimum version of the common language runtime (CLR) required by this module
CLRVersion='4.0'

# Processor architecture (None, X86, Amd64, IA64) required by this module
ProcessorArchitecture = 'None'

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()

# Script files (.ps1) that are run in the caller's environment prior to importing this module
ScriptsToProcess = @()

# Type files (.ps1xml) to be loaded when importing this module
TypesToProcess = @()

# Format files (.ps1xml) to be loaded when importing this module
FormatsToProcess = @()

# Modules to import as nested modules of the module specified in ModuleToProcess
NestedModules = @(
'.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll'
)

# Functions to export from this module
FunctionsToExport = '*'

# Cmdlets to export from this module
CmdletsToExport = '*'

# Variables to export from this module
VariablesToExport = '*'

# Aliases to export from this module
AliasesToExport = '*'

# List of all modules packaged with this module
ModuleList = @()

# List of all files packaged with this module
FileList = @()

# Private data to pass to the module specified in ModuleToProcess
PrivateData = @{

PSData = @{

# Tags applied to this module. These help with module discovery in online galleries.
Tags = @("Azure", "AzureAS", "AS")

# A URL to the license for this module.
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

# A URL to the main website for this project.
ProjectUri = 'https://github.com/Azure/azure-powershell'

# A URL to an icon representing this module.
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'

} # End of PSData hashtable

} # End of PrivateData hashtable

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4944B213-4F12-4815-B416-3FF1853ADCC1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Dataplane</RootNamespace>
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Dataplane</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Azure.AnalysisServices\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>true</DelaySign>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\Azure.AnalysisServices</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Azure.Common">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Management.Automation" />
</ItemGroup>
<ItemGroup>
<Compile Include="Commands\AddAzureASAccount.cs" />
<Compile Include="Models\AsAzureAccount.cs" />
<Compile Include="Models\AsAzureClientSession.cs" />
<Compile Include="Models\ASAzureContext.cs" />
<Compile Include="Models\AsAzureEnvironment.cs" />
<Compile Include="Models\AsAzureHttpClient.cs" />
<Compile Include="Models\AsAzureProfile.cs" />
<Compile Include="Commands\Restart-AzureAsInstance.cs" />
<Compile Include="Models\AsAzureAuthenticationProvider.cs" />
<Compile Include="Models\TokenCacheItemProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="AnalysisServicesDataplaneStartup.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Azure.AnalysisServices.psd1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
<Project>{D3804B64-C0D3-48F8-82EC-1F632F833C9E}</Project>
<Name>Commands.Common.Authentication</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
<Name>Commands.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</Project>
Loading