Skip to content

Commit 671b9a4

Browse files
yaakoviyunyaakoviyun
authored
Merge pull request AzureRT#13 from Azure/dev
Sync from Azure/dev
2 parents 80a4d51 + 980ccde commit 671b9a4

File tree

187 files changed

+32544
-20663
lines changed

Some content is hidden

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

187 files changed

+32544
-20663
lines changed

‎build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Scope Condition=" $(Scope) == '' " >all</Scope>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
48+
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln;"
4949
Exclude=".\src\ResourceManager\Intune\*.sln"
5050
Condition=" '$(Scope)' == 'all' "/>
5151
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"

‎src/Common/Commands.Common/GeneralUtilities.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public static class GeneralUtilities
3838

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

41+
// this is only used to determine cutoff for streams (not xml or json).
42+
private const int StreamCutOffSize = 10 * 1024; //10KB
43+
4144
private static bool TryFindCertificatesInStore(string thumbprint,
4245
System.Security.Cryptography.X509Certificates.StoreLocation location, out X509Certificate2Collection certificates)
4346
{
@@ -318,7 +321,9 @@ public static string FormatString(string content)
318321
}
319322
else
320323
{
321-
return content;
324+
return content.Length <= GeneralUtilities.StreamCutOffSize ?
325+
content :
326+
content.Substring(0, StreamCutOffSize) + "\r\nDATA TRUNCATED DUE TO SIZE\r\n";
322327
}
323328
}
324329

‎src/ResourceManager/AnalysisServices/AnalysisServices.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices.T
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices", "Commands.AnalysisServices\Commands.AnalysisServices.csproj", "{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}"
2020
EndProject
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices.Dataplane", "Commands.AnalysisServices.Dataplane\Commands.AnalysisServices.Dataplane.csproj", "{4944B213-4F12-4815-B416-3FF1853ADCC1}"
22+
EndProject
2123
Global
2224
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2325
Debug|Any CPU = Debug|Any CPU
@@ -52,6 +54,10 @@ Global
5254
{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
5355
{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
5456
{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{4944B213-4F12-4815-B416-3FF1853ADCC1}.Release|Any CPU.Build.0 = Release|Any CPU
5561
EndGlobalSection
5662
GlobalSection(SolutionProperties) = preSolution
5763
HideSolutionNode = FALSE

‎src/ResourceManager/AnalysisServices/ChangeLog.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!--
2+
Please leave this section at the top of the change log.
3+
4+
Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
5+
6+
## Current Release
7+
* Overview of change #1
8+
- Additional information about change #1
9+
* Overview of change #2
10+
- Additional information about change #2
11+
- Additional information about change #2
12+
* Overview of change #3
13+
* Overview of change #4
14+
- Additional information about change #4
15+
16+
## YYYY.MM.DD - Version X.Y.Z (Previous Release)
17+
* Overview of change #1
18+
- Additional information about change #1
19+
-->
20+
## Current Release
21+
* Added two new dataplane APIs in a separate module Azure.AnalysisServices.psd1
22+
- This introduces two new APIs that enable customers to login to Azure Analysis Services servers and issue a restart command.
23+
24+
## Version 3.2.0
25+
* Fixed bug in Get-AzureRMAnalysisServicesServer
26+
- When this command was run against some resources, it would fail with a null reference exception.

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/AnalysisServicesDataplaneStartup.ps1

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
@{
16+
"Login-AzureAsAccount" = "Restart-AzureAnalysisServicesInstance";
17+
"Restart-AzureAsInstance" = "Set-AzureRmContext";
18+
}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias"

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
#
2+
# Module manifest for module 'Microsoft.Azure.Commands.AnalysisServices.Dataplane'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 12/02/2016
7+
#
8+
9+
@{
10+
11+
# Version number of this module.
12+
ModuleVersion = '0.0.1'
13+
14+
# ID used to uniquely identify this module
15+
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'
16+
17+
# Author of this module
18+
Author = 'Microsoft Corporation'
19+
20+
# Company or vendor of this module
21+
CompanyName = 'Microsoft Corporation'
22+
23+
# Copyright statement for this module
24+
Copyright = '© Microsoft Corporation. All rights reserved.'
25+
26+
# Description of the functionality provided by this module
27+
Description = 'Microsoft Azure PowerShell - Analysis Services server management'
28+
29+
# Minimum version of the Windows PowerShell engine required by this module
30+
PowerShellVersion = '3.0'
31+
32+
# Name of the Windows PowerShell host required by this module
33+
PowerShellHostName = ''
34+
35+
# Minimum version of the Windows PowerShell host required by this module
36+
PowerShellHostVersion = ''
37+
38+
# Minimum version of the .NET Framework required by this module
39+
DotNetFrameworkVersion = '4.0'
40+
41+
# Minimum version of the common language runtime (CLR) required by this module
42+
CLRVersion='4.0'
43+
44+
# Processor architecture (None, X86, Amd64, IA64) required by this module
45+
ProcessorArchitecture = 'None'
46+
47+
# Assemblies that must be loaded prior to importing this module
48+
RequiredAssemblies = @()
49+
50+
# Script files (.ps1) that are run in the caller's environment prior to importing this module
51+
ScriptsToProcess = @()
52+
53+
# Type files (.ps1xml) to be loaded when importing this module
54+
TypesToProcess = @()
55+
56+
# Format files (.ps1xml) to be loaded when importing this module
57+
FormatsToProcess = @()
58+
59+
# Modules to import as nested modules of the module specified in ModuleToProcess
60+
NestedModules = @(
61+
'.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll'
62+
)
63+
64+
# Functions to export from this module
65+
FunctionsToExport = '*'
66+
67+
# Cmdlets to export from this module
68+
CmdletsToExport = '*'
69+
70+
# Variables to export from this module
71+
VariablesToExport = '*'
72+
73+
# Aliases to export from this module
74+
AliasesToExport = '*'
75+
76+
# List of all modules packaged with this module
77+
ModuleList = @()
78+
79+
# List of all files packaged with this module
80+
FileList = @()
81+
82+
# Private data to pass to the module specified in ModuleToProcess
83+
PrivateData = @{
84+
85+
PSData = @{
86+
87+
# Tags applied to this module. These help with module discovery in online galleries.
88+
Tags = @("Azure", "AzureAS", "AS")
89+
90+
# A URL to the license for this module.
91+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
92+
93+
# A URL to the main website for this project.
94+
ProjectUri = 'https://github.com/Azure/azure-powershell'
95+
96+
# A URL to an icon representing this module.
97+
# IconUri = ''
98+
99+
# ReleaseNotes of this module
100+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
101+
102+
} # End of PSData hashtable
103+
104+
} # End of PrivateData hashtable
105+
106+
}

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands.AnalysisServices.Dataplane.csproj

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{4944B213-4F12-4815-B416-3FF1853ADCC1}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Microsoft.Azure.Commands.AnalysisServices.Dataplane</RootNamespace>
11+
<AssemblyName>Microsoft.Azure.Commands.AnalysisServices.Dataplane</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
15+
<RestorePackages>true</RestorePackages>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Azure.AnalysisServices\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<SignAssembly>true</SignAssembly>
28+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
29+
<DelaySign>true</DelaySign>
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\Azure.AnalysisServices</OutputPath>
33+
<DefineConstants>TRACE</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
</PropertyGroup>
37+
<ItemGroup>
38+
<Reference Include="Microsoft.Azure.Common">
39+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
40+
</Reference>
41+
<Reference Include="Microsoft.Azure.Common.NetFramework">
42+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
43+
</Reference>
44+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
46+
<Private>True</Private>
47+
</Reference>
48+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
50+
<Private>True</Private>
51+
</Reference>
52+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
54+
<Private>True</Private>
55+
</Reference>
56+
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
58+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
59+
</Reference>
60+
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
62+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65+
<SpecificVersion>False</SpecificVersion>
66+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
67+
</Reference>
68+
<Reference Include="Microsoft.WindowsAzure.Management">
69+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
72+
<SpecificVersion>False</SpecificVersion>
73+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
74+
</Reference>
75+
<Reference Include="System" />
76+
<Reference Include="System.Net" />
77+
<Reference Include="System.Net.Http" />
78+
<Reference Include="System.Net.Http.WebRequest" />
79+
<Reference Include="System.Runtime.Serialization" />
80+
<Reference Include="System.Xml.Linq" />
81+
<Reference Include="System.Data" />
82+
<Reference Include="System.Xml" />
83+
<Reference Include="System.Management.Automation" />
84+
</ItemGroup>
85+
<ItemGroup>
86+
<Compile Include="Commands\AddAzureASAccount.cs" />
87+
<Compile Include="Models\AsAzureAccount.cs" />
88+
<Compile Include="Models\AsAzureClientSession.cs" />
89+
<Compile Include="Models\ASAzureContext.cs" />
90+
<Compile Include="Models\AsAzureEnvironment.cs" />
91+
<Compile Include="Models\AsAzureHttpClient.cs" />
92+
<Compile Include="Models\AsAzureProfile.cs" />
93+
<Compile Include="Commands\Restart-AzureAsInstance.cs" />
94+
<Compile Include="Models\AsAzureAuthenticationProvider.cs" />
95+
<Compile Include="Models\TokenCacheItemProvider.cs" />
96+
<Compile Include="Properties\AssemblyInfo.cs" />
97+
<Compile Include="Properties\Resources.Designer.cs">
98+
<DependentUpon>Resources.resx</DependentUpon>
99+
<AutoGen>True</AutoGen>
100+
<DesignTime>True</DesignTime>
101+
</Compile>
102+
</ItemGroup>
103+
<ItemGroup>
104+
<None Include="AnalysisServicesDataplaneStartup.ps1">
105+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
106+
</None>
107+
<None Include="Azure.AnalysisServices.psd1">
108+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
109+
</None>
110+
<None Include="MSSharedLibKey.snk" />
111+
<None Include="packages.config">
112+
<SubType>Designer</SubType>
113+
</None>
114+
</ItemGroup>
115+
<ItemGroup>
116+
<EmbeddedResource Include="Properties\Resources.resx">
117+
<Generator>ResXFileCodeGenerator</Generator>
118+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
119+
<SubType>Designer</SubType>
120+
</EmbeddedResource>
121+
</ItemGroup>
122+
<ItemGroup>
123+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
124+
<Project>{D3804B64-C0D3-48F8-82EC-1F632F833C9E}</Project>
125+
<Name>Commands.Common.Authentication</Name>
126+
</ProjectReference>
127+
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
128+
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
129+
<Name>Commands.Common</Name>
130+
</ProjectReference>
131+
</ItemGroup>
132+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
133+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
134+
</Project>

0 commit comments

Comments
 (0)