Skip to content

Commit 94c56cc

Browse files
committed
Merge pull request Azure#1242 from Azure/release-1.0.0
merge Release 1.0.0 -> master
2 parents 503caa0 + a3ea432 commit 94c56cc

File tree

922 files changed

+300180
-104641
lines changed

Some content is hidden

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

922 files changed

+300180
-104641
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: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
1-
## 2015.10.09 version 1.0 preview
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
229
* Azure Resource Manager Management Cmdlets
330
* New-AzureRmResourceGroup - Removed the template deployment parameters from this cmdlet. Template deployment will now be
431
handled only through the New-AzureRmResourceGroupDeployment

setup/azurecmd.wxs

Lines changed: 12 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">
33

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

8-
<?define version="0.9.9" ?>
8+
<?define version="1.0.0" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

@@ -47,10 +47,20 @@
4747
</DirectorySearch>
4848
</Property>
4949

50+
<Property Id="POWERSHELLGETAZUREINSTALLED" >
51+
<DirectorySearch Id="AZURECONTAINER" Path="[BaseModulesFolder]">
52+
<DirectorySearch Id= "AZUREMODULE" Path="Azure"/>
53+
</DirectorySearch>
54+
</Property>
55+
5056
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
5157
<![CDATA[Installed or NOT(POWERSHELLGETMODULESINSTALLED >< "AzureRM.Profile")]]>
5258
</Condition>
5359

60+
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
61+
<![CDATA[Installed or NOT(POWERSHELLGETAZUREINSTALLED >< "Azure")]]>
62+
</Condition>
63+
5464

5565
<Condition Message="This setup requires the Windows PowerShell 3.0 or compatible version to be installed.">
5666
<!-- This condition will break if PowerShell has version x3.0 and it is not compatible with 3.0 -->

0 commit comments

Comments
 (0)