Skip to content

Commit 8f76e1f

Browse files
stankovskistankovski
committed
Merge pull request #1132 from markcowl/datamsi
Add back UserAgents OM and update installer for PowerShell Get compatibility
2 parents 057728d + d1e8a0a commit 8f76e1f

File tree

179 files changed

+327
-215
lines changed

Some content is hidden

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

179 files changed

+327
-215
lines changed

‎setup/azurecmd.wxs‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - October 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

88
<?define version="0.9.9" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
11-
11+
1212
<Product Id="*"
1313
Name="$(var.productName)"
1414
Language="1033"
@@ -27,11 +27,29 @@
2727
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
2828
<Property Id="ALLUSERS" Value="1" />
2929
<!-- per machine install-->
30-
3130
<Property Id="PSCOMPATIBLEVERSION">
3231
<RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
3332
</Property>
3433

34+
<SetProperty Action="SetBase64" Id="BaseModulesFolder" Value="[ProgramFiles64Folder]WindowsPowerShell\Modules" Before="AppSearch">
35+
VersionNT64
36+
</SetProperty>
37+
38+
<SetProperty Action="SetBase32" Id="BaseModulesFolder" Value="[ProgramFilesFolder]WindowsPowerShell\Modules" Before="AppSearch">
39+
NOT VersionNT64
40+
</SetProperty>
41+
42+
<Property Id="POWERSHELLGETMODULESINSTALLED" >
43+
<DirectorySearch Id="PROGRAMFILESCONTAINER" Path="[BaseModulesFolder]">
44+
<DirectorySearch Id= "PROFILEMODULE" Path="AzureRM.Profile"/>
45+
</DirectorySearch>
46+
</Property>
47+
48+
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
49+
<![CDATA[Installed or NOT(POWERSHELLGETMODULESINSTALLED >< "AzureRM.Profile")]]>
50+
</Condition>
51+
52+
3553
<Condition Message="This setup requires the Windows PowerShell 3.0 or compatible version to be installed.">
3654
<!-- This condition will break if PowerShell has version x3.0 and it is not compatible with 3.0 -->
3755
<![CDATA[Installed or (PSCOMPATIBLEVERSION >< "3.0")]]>
@@ -69,7 +87,7 @@
6987
<Component Id="PSModulePath.System" Guid="273525B9-7AAB-421A-90C8-8E50A1840B8D">
7088
<CreateFolder />
7189
<!-- Work around bug that PowerShell does not always consider default module paths. -->
72-
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[PowerShellFolder]ResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
90+
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
7391
</Component>
7492
</DirectoryRef>
7593

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
59+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
6262
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Common/Commands.Common.Storage/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.3.3-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.3.4-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ protected override void EndProcessing()
235235
DebugStreamTraceListener.RemoveAdalTracing(_adalListener);
236236
FlushDebugMessages();
237237

238-
AzureSession.ClientFactory.UserAgents.RemoveAll(u => u.Product.Name == ModuleName);
238+
AzureSession.ClientFactory.UserAgents.RemoveWhere(u => u.Product.Name == ModuleName);
239239
AzureSession.ClientFactory.RemoveHandler(typeof(CmdletInfoHandler));
240240
base.EndProcessing();
241241
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
67+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Common.NetFramework">
7070
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.Common/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.ApplicationInsights" version="1.1.1-beta" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Common.Authentication" version="1.3.3-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Common.Authentication" version="1.3.4-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</Reference>
4848
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
50+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Common.NetFramework">
5353
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>

‎src/Common/Commands.ScenarioTests.Common/Mocks/MockClientFactory.cs‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class MockClientFactory : IClientFactory
4242

4343
public MockClientFactory(IEnumerable<object> clients, bool throwIfClientNotSpecified = true)
4444
{
45-
UniqueUserAgents = new HashSet<ProductInfoHeaderValue>();
45+
UserAgents = new HashSet<ProductInfoHeaderValue>();
4646
ManagementClients = clients.ToList();
4747
throwWhenNotAvailable = throwIfClientNotSpecified;
4848
}
@@ -177,15 +177,15 @@ public void RemoveHandler(Type handlerType)
177177

178178
public void AddUserAgent(string productName, string productVersion)
179179
{
180-
throw new NotImplementedException();
180+
this.UserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));
181181
}
182182

183183
public void AddUserAgent(string productName)
184184
{
185-
throw new NotImplementedException();
185+
this.AddUserAgent(productName, string.Empty);
186186
}
187187

188-
public HashSet<ProductInfoHeaderValue> UniqueUserAgents { get; set; }
188+
public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }
189189

190190
/// <summary>
191191
/// This class exists to allow adding an additional reference to the httpClient to prevent the client
@@ -233,17 +233,5 @@ public TClient CreateCustomArmClient<TClient>(params object[] parameters) where
233233

234234
return client;
235235
}
236-
237-
List<ProductInfoHeaderValue> IClientFactory.UserAgents
238-
{
239-
get
240-
{
241-
return this.UniqueUserAgents.ToList();
242-
}
243-
set
244-
{
245-
value.ForEach((v) => this.UniqueUserAgents.Add(v));
246-
}
247-
}
248236
}
249237
}

‎src/Common/Commands.ScenarioTests.Common/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.3.3-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.3.4-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.Framework" version="1.0.5715.36130-prerelease" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</Reference>
6060
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
62+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.4-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Common.NetFramework">
6565
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>

0 commit comments

Comments
 (0)