Skip to content

Commit 618ca66

Browse files
committed
Merge pull request #57 from AzureRT/dev
Update dogfood branch
2 parents 4476d58 + 6c204ed commit 618ca66

File tree

1,642 files changed

+640185
-285919
lines changed

Some content is hidden

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

1,642 files changed

+640185
-285919
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,5 @@ FakesAssemblies/
195195

196196
.vs/
197197
/tools/*.dll
198+
*.GhostDoc.xml
199+
pingme.txt

AzurePowershell.Test.targets

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
3131
<StorageTestDebug>.\src\Common\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
3232
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
33+
<DataLakeAnalyticsTestDebug>.\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll</DataLakeAnalyticsTestDebug>
34+
<DataLakeStoreTestDebug>.\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeStore.Test.dll</DataLakeStoreTestDebug>
3335
<UsageAggregationTestDebug>.\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll</UsageAggregationTestDebug>
3436
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
3537
<ScenarioTestFilter>All</ScenarioTestFilter>
@@ -50,8 +52,8 @@
5052
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
5153
ContinueOnError="false" />
5254
</Target>
53-
54-
<Target Name="InvokeXUnit">
55+
56+
<Target Name="DeclareXunitTests">
5557
<ItemGroup>
5658
<AsmXUnitTests Include=".\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
5759
<AsmXUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
@@ -62,7 +64,7 @@
6264
<AsmXUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
6365
<AsmXUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
6466
</ItemGroup>
65-
<ItemGroup Condition=" '$(scope)' == '' ">
67+
<ItemGroup Condition=" '$(scope)' == 'all' ">
6668
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
6769
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
6870
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
@@ -80,15 +82,18 @@
8082
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
8183
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
8284
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
85+
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
8386
<XUnitTests Include="@(AsmXUnitTests)"/>
8487
</ItemGroup>
8588
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">
8689
<XUnitTests Include="@(AsmXUnitTests)"/>
8790
</ItemGroup>
88-
<ItemGroup Condition=" '$(scope)' !='' and '$(scope)' != 'ServiceManagement' ">
91+
<ItemGroup Condition=" '$(scope)' != 'all' and '$(scope)' != 'ServiceManagement' and '$(scope)' != 'AzureStorage' ">
8992
<XUnitTests Include="$(MSBuildProjectDirectory)\src\ResourceManager\$(scope)\*\bin\Debug\*.Test.dll"/>
9093
</ItemGroup>
91-
94+
</Target>
95+
96+
<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
9297
<Message Importance="high" Text="Running XUnit tests" />
9398
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
9499
<Exec
@@ -97,7 +102,7 @@
97102
<OnError ExecuteTargets="TimeoutErrorHandler"/>
98103
</Target>
99104

100-
<Target Name="InvokeXUnitAll">
105+
<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
101106
<Message Importance="high" Text="Running XUnit tests" />
102107
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
103108
<Exec
@@ -259,6 +264,20 @@
259264
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
260265
</Target>
261266

267+
<!-- Run the DataLakeAnalytics tests -->
268+
<Target Name="DataLakeAnalyticsTests">
269+
<Message Importance="high" Text="Running DataLakeAnalytics tests" />
270+
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataLakeAnalyticsTestDebug)" Html="$(TestOutputDirectory)\DataLakeAnalyticsTests.xunit.dll.html" Verbose="true"
271+
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
272+
</Target>
273+
274+
<!-- Run the DataLakeStore tests -->
275+
<Target Name="DataLakeStoreTests">
276+
<Message Importance="high" Text="Running DataLakeStore tests" />
277+
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataLakeStoreTestDebug)" Html="$(TestOutputDirectory)\DataLakeStoreTests.xunit.dll.html" Verbose="true"
278+
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
279+
</Target>
280+
262281
<!-- run the UsageAggregationTests -->
263282
<Target Name="UsageAggregationTests">
264283
<Message Importance="high" Text="Running UsageAggregates tests" />

ChangeLog.md

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,51 @@
1-
## 2015.09.03 version 0.9.8
1+
## 2015.11.05 version 1.0
2+
* Azure Compute
3+
* AzureRmVM cmdlet bug fixes
4+
* Fixes for DSC Extension cmdlets
5+
* Azure DataLake
6+
* First release of Azure DataLake Store and Azure DataLake Analytics cmdlets
7+
* Azure Network
8+
* Fixes to ExpressRoute cmdlets in Azure Resource Manager
9+
* Changes to BGP cmdlets
10+
* Azure Notification Hubs
11+
* First release of Azure Notification Hubs cmdlets
12+
* Azure Profile
13+
* Enable Certificate login for AD Applications
14+
* Get-AzureRmSubscription, Set-AzureRmContext search all tenants by default when no tenant is specified
15+
* Azure Redis Cache
16+
* Set-AzureRedisCache - Premium and vNet support for redis cache
17+
* New-AzureRedisCache - Premium and vNet support for redis cache
18+
* Azure Resource Manager
19+
* Automatic RP Registration
20+
* Updates for Find-Resource, Authorization cmdlets, and AzureAD cmdlets
21+
* Azure Sql
22+
* Changes to Data Masking cmdlets
23+
* Azure Storage
24+
* Added support for storage file and usage metrics in Azure Resource Manager cmdlets
25+
* Azure Websites
26+
* New and rewritten cmdlets for Azure Web Application management
27+
28+
## 2015.10.09 version 1.0 preview
29+
* Azure Resource Manager Management Cmdlets
30+
* New-AzureRmResourceGroup - Removed the template deployment parameters from this cmdlet. Template deployment will now be
31+
handled only through the New-AzureRmResourceGroupDeployment
32+
* Get-AzureRmResource - Will query directly against the Resource Provider. Removed parameters for tags from here. New cmdlets added for querying against the cache as listed below.
33+
* Get-AzureRmResourceGroup - Removed parameters for finding resources through tags. New cmdlet added for handling this
34+
functionality as mentioned below.
35+
* Find-AzureRmResource - Query against the cache.
36+
* Find-AzureRmResourceGroup - Tag parameter added for querying resource group containing specific tags.
37+
* Test-AzureResource - Cmdlet removed. Will be adding a better and reliable way to achieve this scenario which will be guaranteed to work against all Resource providers.
38+
* Test-AzureResourceGroup - Cmdlet removed. Will be adding a better and reliable way to achieve this scenario.
39+
* Get-AzureRmResourceProvider - This cmdlet has been renamed. Earlier it was called Get-AzureProvider. We have changed the output to include locations. Now you can use this to find out which providers and types are available for certain location.
40+
* Cmdlets added for policy
41+
* New-AzureRmPolicyDefinition, Get-AzureRmPolicyDefinition, Set-AzureRMPolicyDefinition, Remove-AzureRmPolicyDefinition
42+
* New-AzureRmPolicyAssignment, Get-AzureRmPolicyAssignment, Set-AzureRmPolicyAssignment, Remove-AzureRmPolicyAssignment
43+
* Consolidated Log cmdlets
44+
* Removed Get-AzureResourceLog, Get-AzureResourceGroupLog, Get-AzureProviderLog
45+
* Added new cmdlet Get-AzureLog which you can use to obtain logs at different scopes like resource group, resource, provider.
46+
* Removed Get-AzureLocation - the functionality is now provided through the Get-AzureRmResourceProvider
47+
48+
## 2015.09.03 version 0.9.8
249
* Azure Redis Cache cmdlets
350
* New-AzureRMRedisCache - 'RedisVersion' parameter is deprecated.
451
* Azure Compute (ARM) Cmdlets
@@ -51,6 +98,13 @@
5198
* Set-AzureVMSqlServerExtension
5299
* Get-AzureVMSqlServerExtension
53100
* Remove-AzureVMSqlServerExtension
101+
* Azure SQL Database Index Recommendation Cmdlets
102+
* Get-AzureSqlDatabaseIndexRecommendations
103+
* Start-AzureSqlDatabaseExecuteIndexRecommendation
104+
* Stop-AzureSqlDatabaseExecuteIndexRecommendation
105+
* Azure SQL Database and Server Upgrade Hints Cmdlets
106+
* Get-AzureSqlDatabaseUpgradeHint
107+
* Get-AzureSqlServerUpgradeHint
54108

55109
## 2015.08.17 version 0.9.7
56110
* Azure Profile cmdlets

build.proj

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
1919
/p:CodeSign=True;DelaySign=True
2020
Test the code sign workflow locally.
21-
21+
22+
/p:Scope
23+
'ServiceManagement': service management
24+
'AzureStorage': storage data plane cmdlets
25+
'Subfolder under src\ResourceManager': An individual cmdlet module
26+
By default, it builds all
2227
-->
2328

2429
<!-- Define build properties -->
@@ -36,11 +41,15 @@
3641
<SetupOutputDirectory>$(PublishDirectory)\Setup</SetupOutputDirectory>
3742
<TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
3843
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
39-
<NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' != '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
44+
<NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' == '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
45+
<Scope Condition=" $(Scope) == '' " >all</Scope>
4046
</PropertyGroup>
4147
<ItemGroup>
42-
<CmdletSolutionsToBuild Include=".\src\ResourceManager.sln;.\src\ServiceManagement.sln" Condition=" '$(Scope)' == '' "/>
43-
<CmdletSolutionsToBuild Include=".\src\$(Scope).sln" Condition=" '$(Scope)' != '' "/>
48+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln" Condition=" '$(Scope)' == 'all' "/>
49+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"
50+
Condition=" '$(Scope)' != 'all' and '$(Scope)' != 'ServiceManagement' and '$(Scope)' != 'AzureStorage' "/>
51+
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
52+
Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
4453
<SetupSln Include=".\setup\azurepowershell.sln" />
4554
<SetupPowershellGetSln Include=".\setup-powershellget\powershellget.sln" />
4655
</ItemGroup>
@@ -76,7 +85,7 @@
7685
Targets="Clean"
7786
Properties="Configuration=$(Configuration);Platform=Any CPU"
7887
ContinueOnError="false"
79-
Condition=" '$(Scope)' == '' "/>
88+
Condition=" '$(Scope)' == 'all' "/>
8089

8190
<!-- Delete the publish files -->
8291
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
@@ -104,7 +113,7 @@
104113
</Target>
105114

106115
<PropertyGroup>
107-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
116+
<NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
108117
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
109118
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
110119
<PowerShellCommand>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
@@ -131,13 +140,9 @@
131140
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
132141

133142
<!-- Restore packages -->
134-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ResourceManager.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false"
135-
Condition="$(Scope) == ''" />
136-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ServiceManagement.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false"
137-
Condition="$(Scope) == ''" />
138-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\$(Scope).sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false"
139-
Condition="$(Scope) != ''" />
140-
143+
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch)"
144+
ContinueOnError="false" />
145+
141146
<!--Restore the xunit runner needed to run unit tests-->
142147
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
143148

@@ -162,17 +167,17 @@
162167
Targets="Build"
163168
Properties="Configuration=$(Configuration);Platform=Any CPU"
164169
ContinueOnError="false"
165-
Condition=" '$(Scope)' == '' "/>
170+
Condition=" '$(Scope)' == 'all' "/>
166171

167172
<MSBuild
168173
Projects="@(SetupSln)"
169174
Targets="Build"
170175
Properties="Configuration=$(Configuration);Platform=Any CPU"
171176
ContinueOnError="false"
172-
Condition=" '$(Scope)' == '' "/>
177+
Condition=" '$(Scope)' == 'all' "/>
173178

174179
<CallTarget Targets="CodeSignInstaller"
175-
Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == ''" />
180+
Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" />
176181
</Target>
177182

178183
<!-- Do everything possible -->
@@ -200,11 +205,17 @@
200205
<!-- Copying shortcut to be signed -->
201206
<Copy SourceFiles="$(LibraryRoot)setup-powershellget\Setup\ShortcutStartup.ps1"
202207
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
208+
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
209+
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
210+
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
211+
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
203212

204213
<ItemGroup>
205214
<DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
206215
<DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" />
207216
<ScriptsToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\*.ps1" />
217+
<ScriptsToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\*.psm1" />
218+
<ScriptsToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\*.ps1xml" />
208219
</ItemGroup>
209220

210221
<Message Importance="high" Text="$(LibrarySourceFolder)\Package\$(Configuration) does not contains any files to sign. Code sign will skip."
@@ -251,6 +262,10 @@
251262
<!-- Copying signed shortcut back -->
252263
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\ShortcutStartup.ps1"
253264
DestinationFolder="$(LibraryRoot)setup-powershellget\Setup" />
265+
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
266+
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
267+
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1"
268+
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
254269
</Target>
255270

256271
<Target Name="CodeSignInstaller">
@@ -284,11 +299,10 @@
284299
</Target>
285300

286301
<!-- Publish all packages -->
287-
<Target Name="Publish" DependsOnTargets="Build">
302+
<Target Name="Publish">
288303
<Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
289304
<Message Importance="high" Text="Publishing Cmdlets..." />
290-
291-
<Exec Command="$(PowerShellCommand) -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\PublishModules.ps1 $(Configuration) $(NuGetKey) \&quot;$(NuGetPublishingSource)\&quot;&quot;"/>
305+
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\PublishModules.ps1 $(Configuration) $(Scope) $(NuGetKey) \&quot;$(NuGetPublishingSource)\&quot; &quot;"/>
292306
</Target>
293307

294308
<PropertyGroup>

0 commit comments

Comments
 (0)