Skip to content

Commit 027dcc5

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#3289 from Azure/master
[Release 3.3.0] Merge master --> dev
2 parents da9324b + 41de679 commit 027dcc5

File tree

491 files changed

+70115
-2059
lines changed

Some content is hidden

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

491 files changed

+70115
-2059
lines changed

‎AzurePowershell.Test.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<XUnitTests Include=".\src\ResourceManager\Dns\Commands.Dns.Test\bin\Debug\Microsoft.Azure.Commands.Dns.Test.dll"/>
8686
<XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
8787
<XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/>
88+
<XUnitTests Include=".\src\ResourceManager\IotHub\Commands.IotHub.Test\bin\Debug\Microsoft.Azure.Commands.IotHub.Test.dll"/>
8889
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
8990
<XUnitTests Include=".\src\ResourceManager\LogicApp\Commands.LogicApp.Test\bin\Debug\Microsoft.Azure.Commands.LogicApp.Test.dll"/>
9091
<XUnitTests Include=".\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll"/>
@@ -106,6 +107,8 @@
106107
<XUnitTests Include=".\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
107108
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
108109
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
110+
<XUnitTests Include=".\src\ResourceManager\ServiceBus\Commands.ServiceBus.Test\bin\Debug\Microsoft.Azure.Commands.ServiceBus.Test.dll"/>
111+
<XUnitTests Include=".\src\ResourceManager\EventHub\Commands.EventHub.Test\bin\Debug\Microsoft.Azure.Commands.EventHubs.Test.dll"/>
109112
<XUnitTests Include="@(AsmXUnitTests)"/>
110113
</ItemGroup>
111114
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">
@@ -526,4 +529,3 @@
526529

527530

528531
</Project>
529-

‎ChangeLog.md‎

Lines changed: 248 additions & 1 deletion
Large diffs are not rendered by default.

‎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" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

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

8-
<?define version="3.1.0" ?>
8+
<?define version="3.3.0" ?>
99

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

‎setup/azurecmdfiles.wxi‎

Lines changed: 262 additions & 0 deletions
Large diffs are not rendered by default.

‎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("3.1.0")]
32-
[assembly: AssemblyFileVersion("3.1.0")]
31+
[assembly: AssemblyVersion("3.3.0")]
32+
[assembly: AssemblyFileVersion("3.3.0")]
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("3.1.0")]
50-
[assembly: AssemblyFileVersion("3.1.0")]
49+
[assembly: AssemblyVersion("3.3.0")]
50+
[assembly: AssemblyFileVersion("3.3.0")]

‎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("3.1.0")]
28-
[assembly: AssemblyFileVersion("3.1.0")]
27+
[assembly: AssemblyVersion("3.3.0")]
28+
[assembly: AssemblyFileVersion("3.3.0")]

‎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 = "3.1.0";
29+
public const string AssemblyVersion = "3.3.0";
3030

31-
public const string AssemblyFileVersion = "3.1.0";
31+
public const string AssemblyFileVersion = "3.3.0";
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("3.1.0")]
29-
[assembly: AssemblyFileVersion("3.1.0")]
28+
[assembly: AssemblyVersion("3.3.0")]
29+
[assembly: AssemblyFileVersion("3.3.0")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.1.0")]
36-
[assembly: AssemblyFileVersion("3.1.0")]
35+
[assembly: AssemblyVersion("3.3.0")]
36+
[assembly: AssemblyFileVersion("3.3.0")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

0 commit comments

Comments
 (0)