Skip to content

Commit 17eef8f

Browse files
athippathipp
committed
Merge remote-tracking branch 'Azure/release-3.1.0' into dev
2 parents 9bc0b22 + 5a94020 commit 17eef8f

File tree

244 files changed

+52506
-35019
lines changed

Some content is hidden

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

244 files changed

+52506
-35019
lines changed

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

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

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

‎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.0.0")]
32-
[assembly: AssemblyFileVersion("3.0.0")]
31+
[assembly: AssemblyVersion("3.1.0")]
32+
[assembly: AssemblyFileVersion("3.1.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.0.0")]
50-
[assembly: AssemblyFileVersion("3.0.0")]
49+
[assembly: AssemblyVersion("3.1.0")]
50+
[assembly: AssemblyFileVersion("3.1.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.0.0")]
28-
[assembly: AssemblyFileVersion("3.0.0")]
27+
[assembly: AssemblyVersion("3.1.0")]
28+
[assembly: AssemblyFileVersion("3.1.0")]

‎src/Common/Commands.Common/AzurePSCmdlet.cs

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Common
3535
/// </summary>
3636
public abstract class AzurePSCmdlet : PSCmdlet, IDisposable
3737
{
38+
private const string PSVERSION = "PSVersion";
39+
private const string DEFAULT_PSVERSION = "3.0.0.0";
40+
3841
public ConcurrentQueue<string> DebugMessages { get; private set; }
3942

4043
private RecordingTracingInterceptor _httpTracingInterceptor;
@@ -57,6 +60,35 @@ protected virtual bool IsErrorMetricEnabled
5760
get { return true; }
5861
}
5962

63+
/// <summary>
64+
/// Indicates installed PowerShell version
65+
/// </summary>
66+
private string _psVersion;
67+
68+
/// <summary>
69+
/// Get PsVersion returned from PowerShell.Runspace instance
70+
/// </summary>
71+
protected string PSVersion
72+
{
73+
get
74+
{
75+
if (string.IsNullOrEmpty(_psVersion))
76+
{
77+
if(this.Host != null)
78+
{
79+
_psVersion = this.Host.Version.ToString();
80+
}
81+
else
82+
{
83+
//We are doing this for perf. reasons. This code will execute during tests and so reducing the perf. overhead while running tests.
84+
_psVersion = DEFAULT_PSVERSION;
85+
}
86+
}
87+
88+
return _psVersion;
89+
}
90+
}
91+
6092
/// <summary>
6193
/// Gets the PowerShell module name used for user agent header.
6294
/// By default uses "Azure PowerShell"
@@ -243,9 +275,9 @@ protected virtual void TearDownDebuggingTraces()
243275

244276
protected virtual void SetupHttpClientPipeline()
245277
{
246-
ProductInfoHeaderValue userAgentValue = new ProductInfoHeaderValue(
247-
ModuleName, string.Format("v{0}", ModuleVersion));
248-
AzureSession.ClientFactory.UserAgents.Add(userAgentValue);
278+
AzureSession.ClientFactory.UserAgents.Add(new ProductInfoHeaderValue(ModuleName, string.Format("v{0}", ModuleVersion)));
279+
AzureSession.ClientFactory.UserAgents.Add(new ProductInfoHeaderValue(PSVERSION, string.Format("v{0}", PSVersion)));
280+
249281
AzureSession.ClientFactory.AddHandler(
250282
new CmdletInfoHandler(this.CommandRuntime.ToString(),
251283
this.ParameterSetName, this._clientRequestId));

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

31-
public const string AssemblyFileVersion = "3.0.0";
31+
public const string AssemblyFileVersion = "3.1.0";
3232

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

‎src/Common/Commands.Common/AzureSMProfileProvder.cs renamed to ‎src/Common/Commands.Common/AzureSMProfileProvider.cs

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<Compile Include="AzurePSDataCollectionProfile.cs" />
140140
<Compile Include="AzurePowerShell.cs" />
141141
<Compile Include="AzureRmProfileProvider.cs" />
142-
<Compile Include="AzureSMProfileProvder.cs" />
142+
<Compile Include="AzureSMProfileProvider.cs" />
143143
<Compile Include="ConcurrentQueueExtensions.cs" />
144144
<Compile Include="Constants.cs" />
145145
<Compile Include="ContextExtensions.cs" />

‎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.0.0")]
29-
[assembly: AssemblyFileVersion("3.0.0")]
28+
[assembly: AssemblyVersion("3.1.0")]
29+
[assembly: AssemblyFileVersion("3.1.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.0.0")]
36-
[assembly: AssemblyFileVersion("3.0.0")]
35+
[assembly: AssemblyVersion("3.1.0")]
36+
[assembly: AssemblyFileVersion("3.1.0")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

0 commit comments

Comments
 (0)