Skip to content

Commit bba1025

Browse files
committed
Merge branch 'dev' into cross_server_gt
Conflicts: src/ResourceManager/Sql/Commands.Sql.Test/packages.config src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj src/ResourceManager/Sql/Commands.Sql/Properties/Resources.resx src/ResourceManager/Sql/Commands.Sql/packages.config
2 parents b2355c2 + 1ba78bb commit bba1025

File tree

1,201 files changed

+426673
-200972
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,201 files changed

+426673
-200972
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: 17 additions & 0 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>
@@ -80,6 +82,7 @@
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' ">
@@ -261,6 +264,20 @@
261264
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
262265
</Target>
263266

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+
264281
<!-- run the UsageAggregationTests -->
265282
<Target Name="UsageAggregationTests">
266283
<Message Importance="high" Text="Running UsageAggregates tests" />

ChangeLog.md

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,46 @@
1-
* Azure Redis Cache
1+
* Azure SQL Database: new cmdlets for managing database threat detection policies:
2+
* Get-AzureRmSqlDatabaseThreatDetectionPolicy
3+
* Set-AzureRmSqlDatabaseThreatDetectionPolicy
4+
* Remove-AzureRmSqlDatabaseThreatDetectionPolicy
5+
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
6+
* Get-AzureRemoteAppVmStaleAdObject
7+
* Clear-AzureRemoteAppVmStaleAdObject
8+
9+
## 2015.11.09 version 1.0.1
10+
* Azure Compute
11+
* Added cmdlets for managing VM DiskEncryption extension
12+
* Azure KeyVault
13+
* Added EnabledForDiskEncryption and EnabledForTemplateDeployment flags to Azure Key Vault access policy
14+
* Azure Websites
15+
* Fixed issues with website management client creation
16+
17+
## 2015.11.05 version 1.0
18+
* Azure Compute
19+
* AzureRmVM cmdlet bug fixes
20+
* Fixes for DSC Extension cmdlets
21+
* Azure DataLake
22+
* First release of Azure DataLake Store and Azure DataLake Analytics cmdlets
23+
* Azure Network
24+
* Fixes to ExpressRoute cmdlets in Azure Resource Manager
25+
* Changes to BGP cmdlets
26+
* Azure Notification Hubs
27+
* First release of Azure Notification Hubs cmdlets
28+
* Azure Profile
29+
* Enable Certificate login for AD Applications
30+
* Get-AzureRmSubscription, Set-AzureRmContext search all tenants by default when no tenant is specified
31+
* Azure Redis Cache
232
* Set-AzureRedisCache - Premium and vNet support for redis cache
333
* New-AzureRedisCache - Premium and vNet support for redis cache
4-
34+
* Azure Resource Manager
35+
* Automatic RP Registration
36+
* Updates for Find-Resource, Authorization cmdlets, and AzureAD cmdlets
37+
* Azure Sql
38+
* Changes to Data Masking cmdlets
39+
* Azure Storage
40+
* Added support for storage file and usage metrics in Azure Resource Manager cmdlets
41+
* Azure Websites
42+
* New and rewritten cmdlets for Azure Web Application management
43+
544
## 2015.10.09 version 1.0 preview
645
* Azure Resource Manager Management Cmdlets
746
* New-AzureRmResourceGroup - Removed the template deployment parameters from this cmdlet. Template deployment will now be

build.proj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
5252
Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
5353
<SetupSln Include=".\setup\azurepowershell.sln" />
54-
<SetupPowershellGetSln Include=".\setup-powershellget\powershellget.sln" />
5554
</ItemGroup>
5655

5756
<!--
@@ -80,13 +79,6 @@
8079
Properties="Configuration=$(Configuration);Platform=Any CPU"
8180
ContinueOnError="false" />
8281

83-
<MSBuild
84-
Projects="@(SetupPowershellGetSln)"
85-
Targets="Clean"
86-
Properties="Configuration=$(Configuration);Platform=Any CPU"
87-
ContinueOnError="false"
88-
Condition=" '$(Scope)' == 'all' "/>
89-
9082
<!-- Delete the publish files -->
9183
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
9284
<ItemGroup>
@@ -161,14 +153,6 @@
161153

162154
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
163155

164-
<Message Importance="high" Text="Building Setup..." />
165-
<MSBuild
166-
Projects="@(SetupPowershellGetSln)"
167-
Targets="Build"
168-
Properties="Configuration=$(Configuration);Platform=Any CPU"
169-
ContinueOnError="false"
170-
Condition=" '$(Scope)' == 'all' "/>
171-
172156
<MSBuild
173157
Projects="@(SetupSln)"
174158
Targets="Build"
@@ -203,8 +187,6 @@
203187
</GetFrameworkSdkPath>
204188

205189
<!-- Copying shortcut to be signed -->
206-
<Copy SourceFiles="$(LibraryRoot)setup-powershellget\Setup\ShortcutStartup.ps1"
207-
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
208190
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
209191
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
210192
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
@@ -260,8 +242,6 @@
260242
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
261243

262244
<!-- Copying signed shortcut back -->
263-
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\ShortcutStartup.ps1"
264-
DestinationFolder="$(LibraryRoot)setup-powershellget\Setup" />
265245
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
266246
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
267247
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1"

setup-powershellget/Setup/CustomAction.config

Lines changed: 0 additions & 32 deletions
This file was deleted.

setup-powershellget/Setup/CustomAction.cs

Lines changed: 0 additions & 110 deletions
This file was deleted.

setup-powershellget/Setup/Setup.csproj

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)