Skip to content

Commit c270f1f

Browse files
huangpfhuangpf
authored
Merge pull request Azure#567 from Azure/dev
huangpf PR: dev <- Azure:dev
2 parents 76a6f9c + 2cdf4f2 commit c270f1f

File tree

227 files changed

+6602
-6646
lines changed

Some content is hidden

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

227 files changed

+6602
-6646
lines changed

‎ChangeLog.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##2016.07.04 version 1.6.0
1+
##2016.07.11 version 1.6.0
22
* Azure SQL DB Backup/Restore
33
* Cmdlets for LTR (Long Term Retention) backup feature
44
* Get-AzureRmSqlServerBackupLongTermRetentionVault
@@ -7,7 +7,11 @@
77
* Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
88
* Restore-AzureRmSqlDatabase now supports point-in-time restore of a deleted database
99
* Restore-AzureRmSqlDatabase now supports restoring from a Long Term Retention backup
10-
10+
##2016.06.23 version 1.5.1
11+
* Azure Resource Manager
12+
- Fix a bug in New-AzureRmResourceGroupDeployment. In some deployments the cmdlet throws an exception with "Deployment 'deploymentName' could not be found." and causes the cmdlet to fail. The fix makes sure the deployment is created before getting operations.
13+
* AzureRM.Profile
14+
- Fix issues #2387, #2388 with SubscriptionId and TenantId ValidationSet in Set-AzureRMContext cmdlet
1115
##2016.06.01 version 1.5.0
1216
* Azure Resource Manager
1317
- (Get/Set/New/Remove)-AzureRmResourceGroup cmdlets will now use the new autorest generated ARM assembly

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="1.5.0" ?>
8+
<?define version="1.5.1" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -645,9 +645,6 @@
645645
<Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
646646
<File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
647647
</Component>
648-
<Component Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" Guid="*">
649-
<File Id="filE254185AB3866CEF5D2C5C3A835C029A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureResourceManager.psd1" />
650-
</Component>
651648
<Component Id="cmp594709EB2E69BD7173BC8833BE2061B4" Guid="*">
652649
<File Id="filEF7117E1317C1E3E14DF115DF4490BA3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRM.Compute.psd1" />
653650
</Component>
@@ -1446,9 +1443,6 @@
14461443
</Component>
14471444
</Directory>
14481445
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
1449-
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
1450-
<File Id="fil6DABB515D371B3CE610505D7BF92C2F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureResourceManager.psd1" />
1451-
</Component>
14521446
<Component Id="cmpAB04FC1EEE889CA90013762F64086BFF" Guid="*">
14531447
<File Id="fil83ACE69C51FD4368547AE421E6E1E09A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureRM.KeyVault.psd1" />
14541448
</Component>
@@ -1595,9 +1589,6 @@
15951589
</Component>
15961590
</Directory>
15971591
<Directory Id="dir95F6A3AD30BFB6FD9198425454B16108" Name="AzureRM.LogicApp">
1598-
<Component Id="cmp24514A3872F0DEB4309BFD9E92C4145F" Guid="*">
1599-
<File Id="filBB544DFF118D197314549481B935B950" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\AzureResourceManager.psd1" />
1600-
</Component>
16011592
<Component Id="cmp2BC048C87A71EBC0CB5EF453100E00AF" Guid="*">
16021593
<File Id="fil6E0EA9169FF3D88A5912B9657A28FFC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\AzureRM.LogicApp.psd1" />
16031594
</Component>
@@ -1782,9 +1773,6 @@
17821773
<Component Id="cmp70B60DBD32D61BCA5715AB2D64131358" Guid="*">
17831774
<File Id="filF785DC83C86073F482446C70517349AF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AutoMapper.Net4.dll" />
17841775
</Component>
1785-
<Component Id="cmp92653399A1E9659661E74CA982C1D16A" Guid="*">
1786-
<File Id="fil992649F341AABCD20ED06A605644123C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureResourceManager.psd1" />
1787-
</Component>
17881776
<Component Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" Guid="*">
17891777
<File Id="fil073D08239CE53D9BDD13AB4040BF2180" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureRM.Network.psd1" />
17901778
</Component>
@@ -2758,9 +2746,6 @@
27582746
</Component>
27592747
</Directory>
27602748
<Directory Id="dirBA80E9DB8E2152CE322690719CF18460" Name="AzureRM.Sql">
2761-
<Component Id="cmpABAF8D1829695B54EE167D137802FE49" Guid="*">
2762-
<File Id="filDAC4590B1C55DF4558E19F4A6EEB8A22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\AzureResourceManager.psd1" />
2763-
</Component>
27642749
<Component Id="cmpDD0209B9F15287C06AF2A301A6DA9C67" Guid="*">
27652750
<File Id="filCA0336774210FEEAEDD1EA24F1465699" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\AzureRM.Resources.psd1" />
27662751
</Component>
@@ -2913,9 +2898,6 @@
29132898
</Component>
29142899
</Directory>
29152900
<Directory Id="dir0F79C72718C45BA510EC2F8CB9AE064F" Name="AzureRM.Storage">
2916-
<Component Id="cmp3D2A9D83FC8C994C373CE6ED8587BDFB" Guid="*">
2917-
<File Id="fil248B3C493A709553BC8A9F07EBC95E8A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\AzureResourceManager.psd1" />
2918-
</Component>
29192901
<Component Id="cmp60521804CF648610DFEE8873C98DF6FE" Guid="*">
29202902
<File Id="filFC489F6B6166573995DC7230724FFC47" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Resources.psd1" />
29212903
</Component>
@@ -3361,9 +3343,6 @@
33613343
</Component>
33623344
</Directory>
33633345
<Directory Id="dir71903E152B1EC7360B3834768786084D" Name="AzureRM.Websites">
3364-
<Component Id="cmp976F4BB0FDF13DD49710C6F49EC6155E" Guid="*">
3365-
<File Id="fil4CEC7BA75E9E4B270DB19F35611E2C89" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureResourceManager.psd1" />
3366-
</Component>
33673346
<Component Id="cmp31CCE98DB6C5E1DB88E1B384C167D241" Guid="*">
33683347
<File Id="filE79F6A1D30ACBAD2611E711D647AA710" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureRM.Resources.psd1" />
33693348
</Component>
@@ -5695,7 +5674,6 @@
56955674
<ComponentRef Id="cmp3D82D19F427B152BB3BB2BAD217958C2" />
56965675
<ComponentRef Id="cmpFDA0979F65585F21A39465A3177C778A" />
56975676
<ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
5698-
<ComponentRef Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" />
56995677
<ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />
57005678
<ComponentRef Id="cmp62338AF9F953CEE8318F8EF07FDDF6AD" />
57015679
<ComponentRef Id="cmp30EDC6EA2C80A9FC62537EE1A73B699A" />
@@ -5956,7 +5934,6 @@
59565934
<ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
59575935
<ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
59585936
<ComponentRef Id="cmp09C89A8B21C5D2C4595F1D35C982F73B" />
5959-
<ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
59605937
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
59615938
<ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />
59625939
<ComponentRef Id="cmp007494D6DDD084F46271414EDBAE4A28" />
@@ -6005,7 +5982,6 @@
60055982
<ComponentRef Id="cmp55A0977CC2E4CD91F6738FFD78449307" />
60065983
<ComponentRef Id="cmpD29EA01597258746011AE6EF9FC3D15A" />
60075984
<ComponentRef Id="cmp8EE8340753317C13D69F692E7E42B175" />
6008-
<ComponentRef Id="cmp24514A3872F0DEB4309BFD9E92C4145F" />
60095985
<ComponentRef Id="cmp2BC048C87A71EBC0CB5EF453100E00AF" />
60105986
<ComponentRef Id="cmp13747CF5FA04719E8EB6868EAB0E18B7" />
60115987
<ComponentRef Id="cmp0362FE47213976940F462CA25B10B16B" />
@@ -6066,7 +6042,6 @@
60666042
<ComponentRef Id="cmp5786485F44089C42878CE439EB85D475" />
60676043
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
60686044
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
6069-
<ComponentRef Id="cmp92653399A1E9659661E74CA982C1D16A" />
60706045
<ComponentRef Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" />
60716046
<ComponentRef Id="cmp38E15B299E627D81758AE975A1C5588F" />
60726047
<ComponentRef Id="cmp9F97686A6D38F8B72B2FB1D62529AF0F" />
@@ -6384,7 +6359,6 @@
63846359
<ComponentRef Id="cmp273975FE717E0BB68232E0CD3E70AA82" />
63856360
<ComponentRef Id="cmpC49EFF5B153B832A1B30B31544E0C17E" />
63866361
<ComponentRef Id="cmpD67A45515144EEB5AF6F9DD0C4B2BFDA" />
6387-
<ComponentRef Id="cmpABAF8D1829695B54EE167D137802FE49" />
63886362
<ComponentRef Id="cmpDD0209B9F15287C06AF2A301A6DA9C67" />
63896363
<ComponentRef Id="cmpB904935B70928974D5ABC88308A90047" />
63906364
<ComponentRef Id="cmp5C61554BD83089367CC25D6B8087BA72" />
@@ -6435,7 +6409,6 @@
64356409
<ComponentRef Id="cmp56F9151EB19BE7D5CE2655D19ADF5C9A" />
64366410
<ComponentRef Id="cmp39A46C3BD11947E08479BBD49CB20104" />
64376411
<ComponentRef Id="cmpC1352E11D4D3526DFA43840F587B64D9" />
6438-
<ComponentRef Id="cmp3D2A9D83FC8C994C373CE6ED8587BDFB" />
64396412
<ComponentRef Id="cmp60521804CF648610DFEE8873C98DF6FE" />
64406413
<ComponentRef Id="cmp4AFA8C6EDE02E2B9FC026EFD116FAFA7" />
64416414
<ComponentRef Id="cmp926FBB377170F25C198A076240F70BB6" />
@@ -6581,7 +6554,6 @@
65816554
<ComponentRef Id="cmp3AD5835A28E94C8EB2904782C63B95B4" />
65826555
<ComponentRef Id="cmp3CA816B036B1A48C5114288067BD2C34" />
65836556
<ComponentRef Id="cmp8162A7134D4C9EB5D49EC45591995C2B" />
6584-
<ComponentRef Id="cmp976F4BB0FDF13DD49710C6F49EC6155E" />
65856557
<ComponentRef Id="cmp31CCE98DB6C5E1DB88E1B384C167D241" />
65866558
<ComponentRef Id="cmp83791849FA3C29D4D8CCF5D3FFA24FC1" />
65876559
<ComponentRef Id="cmpF679AA745A78D9232AFA533AC5A06B55" />

‎src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828

2929
[assembly: ComVisible(false)]
3030
[assembly: CLSCompliant(false)]
31-
[assembly: AssemblyVersion("1.5.0")]
32-
[assembly: AssemblyFileVersion("1.5.0")]
31+
[assembly: AssemblyVersion("1.5.1")]
32+
[assembly: AssemblyFileVersion("1.5.1")]
3333
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848
// [assembly: AssemblyVersion("1.0.*")]
49-
[assembly: AssemblyVersion("1.5.0")]
50-
[assembly: AssemblyFileVersion("1.5.0")]
49+
[assembly: AssemblyVersion("1.5.1")]
50+
[assembly: AssemblyFileVersion("1.5.1")]

‎src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
27-
[assembly: AssemblyVersion("1.5.0")]
28-
[assembly: AssemblyFileVersion("1.5.0")]
27+
[assembly: AssemblyVersion("1.5.1")]
28+
[assembly: AssemblyFileVersion("1.5.1")]

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class AzurePowerShell
2626

2727
public const string AssemblyCopyright = "Copyright © Microsoft";
2828

29-
public const string AssemblyVersion = "1.5.0";
29+
public const string AssemblyVersion = "1.5.1";
3030

31-
public const string AssemblyFileVersion = "1.5.0";
31+
public const string AssemblyFileVersion = "1.5.1";
3232

3333
public const string ProfileFile = "AzureProfile.json";
3434

‎src/Common/Commands.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
28-
[assembly: AssemblyVersion("1.5.0")]
29-
[assembly: AssemblyFileVersion("1.5.0")]
28+
[assembly: AssemblyVersion("1.5.1")]
29+
[assembly: AssemblyFileVersion("1.5.1")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

0 commit comments

Comments
 (0)