Skip to content

Commit cc5244e

Browse files
hyonholeehyonholee
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 86481a9 + 27b466a commit cc5244e

File tree

414 files changed

+37310
-1301
lines changed

Some content is hidden

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

414 files changed

+37310
-1301
lines changed

‎ChangeLog.md‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
1-
## 2016.02.02 version 1.1.1
2-
* Azure RemoteApp: Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
1+
## 2016.02.03 version 1.2.0
2+
* Azure RemoteApp:
3+
* Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
4+
* Azure Stack Admin:
5+
* New module for the management of azure stack administrative resources such as plan, offer, subscription, resource provider and
6+
gallery items.
7+
* Azure Stack Storage Admin:
8+
* New module for the management of azure stack storage administrative resources such as configuration, infrastructure and health.
9+
* Azure Operational Insights new cmdlets:
10+
* Get-AzureRmOperationalInsightsSavedSearch
11+
* Get-AzureRmOperationalInsightsSavedSeearchResults
12+
* Get-AzureRmOperationalInsightsSavedSearches
13+
* Get-AzureRmOperationalInsightsSchema
14+
* Get-AzureRmOperationalInsightsSearchResult
15+
* Get-AzureRmOperationalInsightsSearchResultUpdate
16+
* Remove-AzureRmOperationalInsightsSavedSearch
17+
* Remove-AzureRmOperationalInsightsSavedSearch
18+
* Set-AzureRmOperationalInsightsSavedSearch
19+
* Add-AzureRmAccount fixed issue with wrong credential message
20+
* Get-AzureRmSubscription cmdlet now returns paginated results
21+
* Update-AzureRM now only updates when need unless -Force is used
22+
* Added telemetry to ARM and ASM cmdlets
23+
324
## 2016.01.12 version 1.1.0
425
* Azure SQL Database: Threat Detection policies:
526
* Using new Threat Detection Types

‎build.proj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
5454
Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
5555
<SetupSln Include=".\setup\azurepowershell.sln" />
56+
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
5657
</ItemGroup>
5758

5859
<!--
@@ -161,6 +162,14 @@
161162
Properties="Configuration=$(Configuration);Platform=Any CPU"
162163
ContinueOnError="false"
163164
Condition=" '$(Scope)' == 'all' "/>
165+
166+
<MSBuild
167+
Projects="@(StaticAnalysis)"
168+
Targets="Build"
169+
Properties="Configuration=Debug;Platform=Any CPU"
170+
ContinueOnError="false" />
171+
172+
<CallTarget Targets="DependencyAnalysis" />
164173

165174
<CallTarget Targets="CodeSignInstaller"
166175
Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" />
@@ -280,6 +289,12 @@
280289
<Copy SourceFiles="@(InstallersToSign)" DestinationFolder="signed" Condition="$(DelaySign)" />
281290
</Target>
282291

292+
<!-- Run Dependecy Analyzer -->
293+
<Target Name="DependencyAnalysis">
294+
<Message Importance="high" Text="Running Dependency Analysis..." />
295+
<Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package"/>
296+
</Target>
297+
283298
<!-- Publish all packages -->
284299
<Target Name="Publish">
285300
<Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />

‎setup/azurecmd.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

4-
<?define productName="Microsoft Azure PowerShell - January 2016" ?>
4+
<?define productName="Microsoft Azure PowerShell - February 2016" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="1.1.0" ?>
8+
<?define version="1.2.0" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎setup/azurecmdfiles.wxi‎

Lines changed: 196 additions & 176 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common/AzurePowerShell.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class AzurePowerShell
2929

3030
public const string AssemblyVersion = "1.0.0";
3131

32-
public const string AssemblyFileVersion = "1.0.2";
32+
public const string AssemblyFileVersion = "1.0.4";
3333

3434
public const string ProfileFile = "AzureProfile.json";
3535

‎src/Common/Storage/Azure.Storage.psd1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.3'
12+
ModuleVersion = '1.0.4'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.3'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
4949

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

‎src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
<Reference Include="Microsoft.WindowsAzure.Storage">
126126
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
127127
</Reference>
128-
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=5.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129129
<SpecificVersion>False</SpecificVersion>
130-
<HintPath>..\..\..\packages\Microsoft.Azure.Storage.DataMovement.0.2.0\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
130+
<HintPath>..\..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
131131
</Reference>
132132
<Reference Include="Newtonsoft.Json">
133133
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -281,4 +281,4 @@
281281
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
282282
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
283283
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
284-
</Project>
284+
</Project>

‎src/Common/Storage/Commands.Storage.Test/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<package id="Microsoft.Azure.Common.Authentication" version="1.6.1-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Storage.DataMovement" version="0.2.0" targetFramework="net45" />
98
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
109
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5799.28345-prerelease" targetFramework="net45" />
1110
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/Common/Storage/Commands.Storage/Commands.Storage.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.6.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
5858
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
5959
</Reference>
@@ -105,19 +105,16 @@
105105
<SpecificVersion>False</SpecificVersion>
106106
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
107107
</Reference>
108-
<Reference Include="Microsoft.WindowsAzure.Configuration">
109-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
110-
</Reference>
111108
<Reference Include="Microsoft.WindowsAzure.Management">
112109
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113110
</Reference>
114111
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115112
<SpecificVersion>False</SpecificVersion>
116113
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
117114
</Reference>
118-
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115+
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=5.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119116
<SpecificVersion>False</SpecificVersion>
120-
<HintPath>..\..\..\packages\Microsoft.Azure.Storage.DataMovement.0.2.0\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
117+
<HintPath>..\..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
121118
</Reference>
122119
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
123120
<SpecificVersion>False</SpecificVersion>
@@ -325,4 +322,4 @@
325322
<PropertyGroup>
326323
<PostBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "..\..\..\ResourceManager\AzureResourceManager"</PostBuildEvent>
327324
</PropertyGroup>
328-
</Project>
325+
</Project>

‎src/Common/Storage/Commands.Storage/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
4646
// [assembly: AssemblyVersion("1.0.*")]
47-
[assembly: AssemblyVersion("1.0.3")]
48-
[assembly: AssemblyFileVersion("1.0.3")]
47+
[assembly: AssemblyVersion("1.0.4")]
48+
[assembly: AssemblyFileVersion("1.0.4")]
4949

5050
#if SIGN
5151
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Storage.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

0 commit comments

Comments
 (0)