Skip to content

Commit 2a1bd99

Browse files
ogailogail
committed
Merge pull request Azure#5 from ogail/dev
Merge latest from public dev branch
2 parents 54c622e + 6497655 commit 2a1bd99

File tree

360 files changed

+67744
-14186
lines changed

Some content is hidden

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

360 files changed

+67744
-14186
lines changed

‎ChangeLog.txt‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
2014.11.14 Version 0.8.11
2+
* Profile
3+
* Clear-AzureProfile: remove all subscription and credential data from the user store
4+
* Select-AzureSubscription: fixed output types in default and PassThru mode
5+
* Compute
6+
* Get-AzureVMSqlServerExtension
7+
* New-AzureVMSqlServerExtension
8+
* Set-AzureVMSqlServerExtension
9+
* Remove-AzureVMSqlServerExtension
10+
* HDInsight
11+
* New cmdlets
12+
* Add-AzureHDInisghtScriptAction
13+
* Set-AzureHDInsightClusterSize
14+
* Changed cmdlets
15+
*Added ConfigActions parameter
16+
* Managed Cache
17+
* Get-AzureManagedCacheNamedCache
18+
* New-AzureManagedCacheNamedCache
19+
* Set-AzureManagedCacheNamedCache
20+
* Remove-AzureManagedCacheNamedCache
21+
* Websites
22+
* Fixes for webjobs and site creation
23+
* Additional settings for Publish-AzureWebsiteProject cmdlet
24+
* Enable use of SAS URLs in ApplicationDiagnostics storage
25+
* Sql Database (AzureResourceManager)
26+
* New cmdlets to manage direct access to Sql databases:
27+
* Enable-AzureSqlDatabaseDirectAccess
28+
* Disable-AzureSqlDatabaseDirectAccess
29+
* Enable-AzureSqlDatabaseServerDirectAccess
30+
* Enable-AzureSqlDatabaseServerDirectAccess
31+
* Rename previous cmdlets to use the term audit policy instead of audit setting
32+
* Get-AzureSqlDatabaseAuditingPolicy
33+
* Set-AzureSqlDatabaseAuditingPolicy
34+
* Get-AzureSqlDatabaseServerAuditingPolicy
35+
* Set-AzureSqlDatabaseServerAuditingPolicy
36+
* Remove-AzureSqlDatabaseAuditing
37+
* Remove-AzureSqlDatabaseServerAuditing
38+
* Use-AzureSqlDatabaseServerAuditingPolicy
39+
* Allow users to define which storage account key (Primary or Secondary) to use when defining audit policy, using the “StorageKeyType” parameter.
40+
141
2014.10.27 Version 0.8.10
242
* Azure Data Factory cmdlets in AzureResourceManager mode
343
* New-AzureDataFactory
@@ -58,6 +98,33 @@
5898
* SlotStickyConnectionStringNames – connection string names not to be moved during swap operation
5999
* SlotStickyAppSettingNames – application settings names not to be moved during swap operation
60100
* AutoSwapSlotName – slot name to swap automatically with after successful deployment
101+
* Recovery Services
102+
* Import & view vault settings
103+
* Import-AzureSiteRecoveryVaultSettingsFile
104+
* Get-AzureSiteRecoveryVaultSettings
105+
* Enumerate Servers, Protection Containers, Protection Entities
106+
* Get-AzureSiteRecoveryServer
107+
* Get-AzureSiteRecoveryProtectionContainer
108+
* Get-AzureSiteRecoveryProtectionEntity
109+
* Get-AzureSiteRecoveryVM
110+
* Manage Azure Site Recovery Operations
111+
* Get-AzureSiteRecoveryJob
112+
* Restart-AzureSiteRecoveryJob
113+
* Resume-AzureSiteRecoveryJob
114+
* Stop-AzureSiteRecoveryJob
115+
* Manage Recovery Plan
116+
* New-AzureSiteRecoveryRecoveryPlan
117+
* Get-AzureSiteRecoveryRecoveryPlanFile
118+
* Get-AzureSiteRecoveryRecoveryPlan
119+
* Remove-AzureSiteRecoveryRecoveryPlan
120+
* Update-AzureSiteRecoveryRecoveryPlan
121+
* Protection and Failover Operations
122+
* Set-AzureSiteRecoveryProtectionEntity
123+
* Start-AzureSiteRecoveryCommitFailoverJob
124+
* Start-AzureSiteRecoveryPlannedFailoverJob
125+
* Start-AzureSiteRecoveryTestFailoverJob
126+
* Start-AzureSiteRecoveryUnplannedFailoverJob
127+
* Update-AzureSiteRecoveryProtectionDirection
61128

62129
2014.10.03 Version 0.8.9
63130
* Redis Cache cmdlets in AzureResourceManager mode

‎build.proj‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@
7272
ContinueOnError="false" />
7373
</Target>
7474

75+
<PropertyGroup>
76+
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
77+
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
78+
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
79+
</PropertyGroup>
80+
7581
<!--
7682
Force nuget package restore so that packages that include .targets files
7783
don't need to be checked into source control.
7884
-->
7985
<Target Name="ForceRestorePackages">
80-
<PropertyGroup>
81-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
82-
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
83-
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
84-
</PropertyGroup>
85-
8686
<ItemGroup>
8787
<NuGetCache Include="$(LOCALAPPDATA)\NuGet\Cache\*.nupkg"/>
8888
</ItemGroup>
@@ -94,12 +94,7 @@
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-
97+
<CallTarget Targets="ForceRestorePackagesFromPrivateFeed"/>
10398
<!-- Restore packages -->
10499
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
105100
<!-- delete config file, don't want to leave passwords hanging around on the build server file system -->
@@ -108,6 +103,12 @@
108103
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
109104
</Target>
110105

106+
<Target Name="ForceRestorePackagesFromPrivateFeed" Condition="'$(PRIVATE_FEED_PASSWORD)' != ''">
107+
<Exec Command="$(NuGetCommand) sources add -Name Hydra -Source &quot;$(PRIVATE_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" />
108+
<Exec Command="$(NuGetCommand) sources Update -Name Hydra -UserName $(PRIVATE_FEED_USER_NAME) -Password &quot;$(PRIVATE_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)"
109+
EchoOff="true" />
110+
</Target>
111+
111112
<!-- Build all flavors of the Cmdlets -->
112113
<Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
113114
<Message Importance="high" Text="Building Cmdlets..." />

‎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">
33

4-
<?define productName="Microsoft Azure PowerShell - October 2014" ?>
4+
<?define productName="Microsoft Azure PowerShell - November 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.10.1" ?>
8+
<?define version="0.8.11" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎src/Common/Commands.Common.Storage/StorageUtilities.cs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using Microsoft.WindowsAzure.Management.Storage;
44
using Microsoft.WindowsAzure.Storage;
55
using Microsoft.WindowsAzure.Storage.Auth;
6+
using Microsoft.WindowsAzure.Storage.Blob;
7+
using Microsoft.WindowsAzure.Storage.Table;
68

79
namespace Microsoft.WindowsAzure.Commands.Common.Storage
810
{
@@ -41,5 +43,37 @@ public static CloudStorageAccount GenerateCloudStorageAccount(StorageManagementC
4143
tableEndpoint,
4244
fileEndpoint);
4345
}
46+
47+
public static string GenerateTableStorageSasUrl(string connectionString, string tableName, DateTime expiryTime, SharedAccessTablePermissions permissions)
48+
{
49+
CloudStorageAccount storageAccount = CloudStorageAccount.Parse(connectionString);
50+
CloudTableClient tableClient = storageAccount.CreateCloudTableClient();
51+
CloudTable tableReference = tableClient.GetTableReference(tableName);
52+
tableReference.CreateIfNotExists();
53+
var sasToken = tableReference.GetSharedAccessSignature(
54+
new SharedAccessTablePolicy()
55+
{
56+
SharedAccessExpiryTime = expiryTime,
57+
Permissions = permissions
58+
});
59+
60+
return tableReference.Uri + sasToken;
61+
}
62+
63+
public static string GenerateBlobStorageSasUrl(string connectionString, string blobContainerName, DateTime expiryTime, SharedAccessBlobPermissions permissions)
64+
{
65+
CloudStorageAccount storageAccount = CloudStorageAccount.Parse(connectionString);
66+
CloudBlobClient blobClient = storageAccount.CreateCloudBlobClient();
67+
CloudBlobContainer blobContainer = blobClient.GetContainerReference(blobContainerName);
68+
blobContainer.CreateIfNotExists();
69+
var sasToken = blobContainer.GetSharedAccessSignature(
70+
new SharedAccessBlobPolicy()
71+
{
72+
SharedAccessExpiryTime = expiryTime,
73+
Permissions = permissions
74+
});
75+
76+
return blobContainer.Uri + sasToken;
77+
}
4478
}
4579
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</Reference>
5656
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\..\packages\Hydra.HttpRecorder.1.0.5406.28672-prerelease\lib\net45\Microsoft.Azure.Utilities.HttpRecorder.dll</HintPath>
58+
<HintPath>..\..\packages\Hydra.HttpRecorder.1.0.5417.13285-prerelease\lib\net45\Microsoft.Azure.Utilities.HttpRecorder.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>

0 commit comments

Comments
 (0)