Skip to content

Commit a56a1d2

Browse files
committed
Merge pull request Azure#2 from Azure/dev
Dev
2 parents dcaac6a + 54c622e commit a56a1d2

File tree

821 files changed

+219026
-88585
lines changed

Some content is hidden

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

821 files changed

+219026
-88585
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ ClientBin/
168168
*.dbmdl
169169
*.dbproj.schemaview
170170
node_modules/
171+
.pshproj
171172

172173
# RIA/Silverlight projects
173174
Generated_Code/
@@ -190,4 +191,4 @@ UpgradeLog*.htm
190191
*.bim_*.settings
191192

192193
# Microsoft Fakes
193-
FakesAssemblies/
194+
FakesAssemblies/

AzurePowershell.Test.targets

Lines changed: 97 additions & 80 deletions
Large diffs are not rendered by default.

ChangeLog.txt

Lines changed: 111 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,121 @@
1+
2014.10.27 Version 0.8.10
2+
* Azure Data Factory cmdlets in AzureResourceManager mode
3+
* New-AzureDataFactory
4+
* New-AzureDataFactoryGateway
5+
* New-AzureDataFactoryGatewayKey
6+
* New-AzureDataFactoryHub
7+
* New-AzureDataFactoryLinkedService
8+
* New-AzureDataFactoryPipeline
9+
* New-AzureDataFactoryTable
10+
* New-AzureDataFactoryEncryptValue
11+
* Get-AzureDataFactory
12+
* Get-AzureDataFactoryGateway
13+
* Get-AzureDataFactoryHub
14+
* Get-AzureDataFactoryLinkedService
15+
* Get-AzureDataFactoryPipeline
16+
* Get-AzureDataFactoryRun
17+
* Get-AzureDataFactorySlice
18+
* Get-AzureDataFactoryTable
19+
* Remove-AzureDataFactory
20+
* Remove-AzureDataFactoryGateway
21+
* Remove-AzureDataFactoryHub
22+
* Remove-AzureDataFactoryLinkedService
23+
* Remove-AzureDataFactoryPipeline
24+
* Remove-AzureDataFactoryTable
25+
* Resume-AzureDataFactoryPipeline
26+
* Save-AzureDataFactoryLog
27+
* Set-AzureDataFactoryGateway
28+
* Set-AzureDataFactoryPipelineActivePeriod
29+
* Set-AzureDataFactorySliceStatus
30+
* Suspend-AzureDataFactoryPipeline
31+
* Azure Batch cmdlets in AzureResourceManager mode
32+
* Set-AzureBatchAccount
33+
* Remove-AzureBatchAccount
34+
* New-AzureBatchAccountKey
35+
* New-AzureBatchAccount
36+
* Get-AzureBatchAccountKeys
37+
* Get-AzureBatchAccount
38+
* Azure Network
39+
* Multi NIC support
40+
* Add-AzureNetworkInterfaceConfig
41+
* Get-AzureNetworkInterfaceConfig
42+
* Remove-AzureNetworkInterfaceConfig
43+
* Set-AzureNetworkInterfaceConfig
44+
* Security group support
45+
* Set-AzureNetworkSecurityGroupToSubnet
46+
* Set-AzureNetworkSecurityGroupConfig
47+
* Remove-AzureNetworkSecurityGroupFromSubnet
48+
* Remove-AzureNetworkSecurityGroupConfig
49+
* Remove-AzureNetworkSecurityGroup
50+
* New-AzureNetworkSecurityGroup
51+
* Get-AzureNetworkSecurityGroupForSubnet
52+
* Get-AzureNetworkSecurityGroupConfig
53+
* Get-AzureNetworkSecurityGroup
54+
* Azure Virtual Machine
55+
* Added Add PublicConfigKey and PrivateConfigKey parameters to SetAzureVMExtension
56+
* Azure Website
57+
* Set-AzureWebsite exposes new parameters and Get-AzureWebsite returns them
58+
* SlotStickyConnectionStringNames – connection string names not to be moved during swap operation
59+
* SlotStickyAppSettingNames – application settings names not to be moved during swap operation
60+
* AutoSwapSlotName – slot name to swap automatically with after successful deployment
61+
62+
2014.10.03 Version 0.8.9
63+
* Redis Cache cmdlets in AzureResourceManager mode
64+
* New-AzureRedisCache
65+
* Get-AzureRedisCache
66+
* Set-AzureRedisCache
67+
* Remove-AzureRedisCache
68+
* New-AzureRedisCacheKey
69+
* Get-AzureRedisCacheKey
70+
* Fixed Remove-AzureDataDisk regression
71+
* Fixed cloud service cmdlets to work with the latest Azure authoring tools
72+
* Fixed Get-AzureSubscription -ExtendedDetails regression
73+
* Added -CreateACSNamespace parameter to New-AzureSBNamespace cmdlet
74+
75+
2014.09.10 Version 0.8.8
76+
* Role-based access control support
77+
* Query role definition
78+
* Get-AzureRoleDefinition
79+
* Manage role assignment
80+
* New-AzureRoleAssignment
81+
* Get-AzureRoleAssignment
82+
* Remove-AzureRoleAssignment
83+
* Query Active Directory object
84+
* Get-AzureADUser
85+
* Get-AzureADGroup
86+
* Get-AzureADGroupMember
87+
* Get-AzureADServicePrincipal
88+
* Show user's permissions on
89+
* Get-AzureResourceGroup
90+
* Get-AzureResource
91+
* Active Directory service principal login support in Azure Resource Manager mode
92+
* Add-AzureAccount -Credential -ServicePrincipal -Tenant
93+
* SQL Database auditing support in Azure Resource Manager mode
94+
* Use-AzureSqlServerAuditingSetting
95+
* Set-AzureSqlServerAuditingSetting
96+
* Set-AzureSqlDatabaseAuditingSetting
97+
* Get-AzureSqlServerAuditingSetting
98+
* Get-AzureSqlDatabaseAuditingSetting
99+
* Disable-AzureSqlServerAuditing
100+
* Disable-AzureSqlDatabaseAuditing
101+
* Other improvements
102+
* Virtual Machine DSC extension supports PSCredential as configuration argument
103+
* Virtual Machine Antimalware extension supports native JSON configuration
104+
* Storage supports creating storage account with different geo-redundant options
105+
* Traffic Manager supports nesting of profiles
106+
* Website supports configuring x32/x64 worker process
107+
* -Detail parameter on Get-AzureResourceGroup to improve performance
108+
* Major refactoring around account and subscription management
109+
1110
2014.08.22 Version 0.8.7.1
2111
* AzureResourceManager
3112
* Update Gallery and Monitoring management clients to fix Gallery commands
4113
*HDInsight
5114
* Update Microsoft.Net API for Hadoop
6-
115+
7116
2014.08.18 Version 0.8.7
8117
* Update Newtonsoft.Json dependency to 6.0.4
9-
* Compute
118+
* Compute
10119
* Windows Azure Diagnostics (WAD) Version 1.2: extension cmdlets for Iaas And PaaS
11120
* Set-AzureVMDiagnosticsExtension
12121
* Get-AzureVMDiagnosticsExtension

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ You can also find the standalone installers for all the versions at [Downloads](
158158

159159
In general, following are the steps to start using Microsoft Azure PowerShell
160160

161-
* Get yourself authenticated with Microsoft Azure. For details, please check out [this article](http://www.azure.microsoft.com/en-us/manage/install-and-configure-windows-powershell/).
161+
* Get yourself authenticated with Microsoft Azure. For details, please check out [this article](http://azure.microsoft.com/en-us/documentation/articles/install-configure-powershell/).
162162
* Option 1: Login with your Microsoft account or Organizational account directly from PowerShell. Microsoft Azure Active Directory authentication is used in this case. No management certificate is needed.
163163
* Starting from 0.8.6, you can use ``Add-AzureAccount -Credential`` to avoid the browser pop up for Organizational account.
164164
* Option 2: Download and import a publish settings file which contains a management certificate.

build.proj

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<UsingTask
27-
AssemblyFile="$(MSBuildProjectDirectory)\src\packages\xunit.1.9.2\lib\net20\xunit.runner.msbuild.dll"
27+
AssemblyFile="$(MSBuildProjectDirectory)\packages\xunit.runners.2.0.0-beta4-build2738\tools\xunit.runner.msbuild.dll"
2828
TaskName="Xunit.Runner.MSBuild.xunit" />
2929

3030
<!-- Clean the build in all configurations -->
@@ -78,9 +78,9 @@
7878
-->
7979
<Target Name="ForceRestorePackages">
8080
<PropertyGroup>
81-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
82-
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
83-
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
81+
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
82+
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
83+
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
8484
</PropertyGroup>
8585

8686
<ItemGroup>
@@ -94,12 +94,20 @@
9494
<WriteLinesToFile File="$(NuGetRestoreConfigFile)" Lines="&lt;configuration&gt;&lt;/configuration&gt;" Overwrite="true" Encoding="UTF-8" />
9595
<!-- Create config for user name and password for private feed access -->
9696
<Exec Command="$(NuGetCommand) sources add -Name AzureSdkInternal -Source &quot;https://www.myget.org/F/azure-sdk-internal/&quot; $(NuGetRestoreConfigSwitch)" />
97+
<!-- Private versions of packages are picked up from these feeds, defined with environment variables -->
98+
<Exec Command="$(NuGetCommand) sources add -Name PrimaryFeed -Source &quot;$(PRIVATE_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" Condition=" '$(PRIVATE_FEED_URL)'!='' "/>
99+
<Exec Command="$(NuGetCommand) sources Update -Name PrimaryFeed -UserName $(PRIVATE_FEED_USER_NAME) -Password &quot;$(PRIVATE_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)" EchoOff="true" Condition=" '$(PRIVATE_FEED_PASSWORD)'!='' AND '$(PRIVATE_FEED_USER_NAME)'!='' "/>
100+
<Exec Command="$(NuGetCommand) sources add -Name SecondaryFeed -Source &quot;$(SECONDARY_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" Condition=" '$(SECONDARY_FEED_URL)'!='' "/>
101+
<Exec Command="$(NuGetCommand) sources Update -Name SecondaryFeed -UserName $(SECONDARY_FEED_USER_NAME) -Password &quot;$(SECONDARY_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)" EchoOff="true" Condition=" '$(SECONDARY_FEED_PASSWORD)'!='' AND '$(SECONDARY_FEED_USER_NAME)'!='' "/>
102+
97103
<!-- Restore packages -->
98-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="ErrorAndContinue" />
104+
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
99105
<!-- delete config file, don't want to leave passwords hanging around on the build server file system -->
100106
<Delete Files="$(NuGetRestoreConfigFile)" />
107+
<!--Restore the xunit runner needed to run unit tests-->
108+
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
101109
</Target>
102-
110+
103111
<!-- Build all flavors of the Cmdlets -->
104112
<Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
105113
<Message Importance="high" Text="Building Cmdlets..." />
@@ -176,18 +184,31 @@
176184
ContinueOnError="false" />
177185
</Target>
178186

187+
<PropertyGroup>
188+
<RunTestLive Condition="'$(RunTestLive)' == ''">false</RunTestLive>
189+
<XUnitExcludedTrait Condition="!$(RunTestLive)">RunType=LiveOnly</XUnitExcludedTrait>
190+
</PropertyGroup>
179191
<!-- Note: all testing related target should go to 'AzurePowershell.test.targets' file except the one used by CI run -->
180192
<Import Project="$(MSBuildThisFileDirectory)AzurePowershell.test.targets"/>
181193

182194
<!-- Run checkin tests for each pull request -->
183195
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
184196
<Message Importance="high" Text="Running check in tests..." />
185-
<CallTarget Targets="CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests" />
197+
<CallTarget Targets="SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices"/>
186198
</Target>
187199

188200
<!-- Run Full switch with scenario tests -->
189201
<Target
190202
Name="FullWithScenarioTests"
191203
DependsOnTargets="ForceRestorePackages;Clean;BuildDebug;BuildRelease;Test;BuildSetupDebug;BuildSetupRelease;RunOneSDKCIT" />
192204

205+
<!-- Run live tests and record mocks -->
206+
<Target
207+
Name="RunLiveTests"
208+
DependsOnTargets="ForceRestorePackages;Clean;BuildDebug;BuildRelease;LiveTestsFilter;BuildSetupDebug;BuildSetupRelease" />
209+
210+
<Target Name="LiveTestsFilter" DependsOnTargets="BuildDebug;BeforeRunTests">
211+
<Message Importance="high" Text="Running live tests..." />
212+
<CallTarget Targets="LiveTests"/>
213+
</Target>
193214
</Project>

packages.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="xunit.runners" version="2.0.0-beta4-build2738" />
4+
<package id="xunit.runners" version="1.9.2" />
5+
</packages>

setup/azurecmd.wxs

Lines changed: 3 additions & 3 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 - September 2014" ?>
4+
<?define productName="Microsoft Azure PowerShell - October 2014" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

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

@@ -56,7 +56,7 @@
5656
<Directory Id="StaleAzureSdkMenu" Name="$(var.staleStartMenuFolder)"/>
5757
</Directory>
5858
</Directory>
59-
59+
6060
<Property Id="POWERSHELLPATH">
6161
<RegistrySearch Id="POWERSHELLPATH"
6262
Type="raw"

0 commit comments

Comments
 (0)