Skip to content

Commit ec8f2ed

Browse files
markcowlmarkcowl
committed
Fixing msi update issue with RedisCache, Updating Module manifest for AzureRM and tools
1 parent 359daa8 commit ec8f2ed

File tree

15 files changed

+52
-226
lines changed

15 files changed

+52
-226
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,6 @@
595595
<Component Id="cmpC7297788AE102ED861765ADE84F7A59B" Guid="*">
596596
<File Id="filEA714AAE425D2451466447C9AFFE825E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRmProfileStartup.ps1" />
597597
</Component>
598-
<Component Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" Guid="*">
599-
<File Id="fil6EA712045B160BE36B4A3D2068D50F9F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\CheckVersions.ps1" />
600-
</Component>
601598
<Component Id="cmpCC409403AF670A9E0538AC743C61BD66" Guid="*">
602599
<File Id="fil68CB35902CE5A11BE50C9DE228B61D12" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Hyak.Common.dll" />
603600
</Component>
@@ -1572,9 +1569,6 @@
15721569
<Component Id="cmpFE91A142C4108B5EB50D6C5C5F4A4FA9" Guid="*">
15731570
<File Id="fil6D69005A7EDC2EEA35252F1E602D935C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureRmProfileStartup.ps1" />
15741571
</Component>
1575-
<Component Id="cmp065EDC002BB63B6AA573F18152B7240F" Guid="*">
1576-
<File Id="fil559CC58FC4CFCF2A101739440A55FBC7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\CheckVersions.ps1" />
1577-
</Component>
15781572
<Component Id="cmp02E49F28BB0FA3174A478847B857A4D0" Guid="*">
15791573
<File Id="fil379E46A4E79152D00FBBBF3BF85A0BA2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Hyak.Common.dll" />
15801574
</Component>
@@ -1860,9 +1854,6 @@
18601854
<Component Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" Guid="*">
18611855
<File Id="filAF2791E9DF9A44B6D0F375786A415C61" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRmProfileStartup.ps1" />
18621856
</Component>
1863-
<Component Id="cmp9002DD73D47754F2109499247914700F" Guid="*">
1864-
<File Id="filA918B8D44812C6306881A86655EAA785" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\CheckVersions.ps1" />
1865-
</Component>
18661857
<Component Id="cmpD738842B230F04E64FD98E3E850E6338" Guid="*">
18671858
<File Id="fil73F9971478A8661859398F414D5BDE00" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Hyak.Common.dll" />
18681859
</Component>
@@ -5261,7 +5252,6 @@
52615252
<ComponentRef Id="cmp4F1B147652795AAF834377CCD9CAF2A7" />
52625253
<ComponentRef Id="cmp0BDDC10BCAFF9EC25710B20367203609" />
52635254
<ComponentRef Id="cmpC7297788AE102ED861765ADE84F7A59B" />
5264-
<ComponentRef Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" />
52655255
<ComponentRef Id="cmpCC409403AF670A9E0538AC743C61BD66" />
52665256
<ComponentRef Id="cmp8F649774D57C8E90EC765D8FCE36E32A" />
52675257
<ComponentRef Id="cmp97D0BCD046DCE5E1A3DA3611DDBA27AB" />
@@ -5580,7 +5570,6 @@
55805570
<ComponentRef Id="cmp9F97686A6D38F8B72B2FB1D62529AF0F" />
55815571
<ComponentRef Id="cmpA398972142ABD0AC819F613EE832B65C" />
55825572
<ComponentRef Id="cmpFE91A142C4108B5EB50D6C5C5F4A4FA9" />
5583-
<ComponentRef Id="cmp065EDC002BB63B6AA573F18152B7240F" />
55845573
<ComponentRef Id="cmp02E49F28BB0FA3174A478847B857A4D0" />
55855574
<ComponentRef Id="cmp53B7AE5C484C188098FEE906B381461C" />
55865575
<ComponentRef Id="cmp246D81BDC7381CDCA512555564D15DF8" />
@@ -5674,7 +5663,6 @@
56745663
<ComponentRef Id="cmpBBEEE168902DFD205E35F47468881929" />
56755664
<ComponentRef Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" />
56765665
<ComponentRef Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" />
5677-
<ComponentRef Id="cmp9002DD73D47754F2109499247914700F" />
56785666
<ComponentRef Id="cmpD738842B230F04E64FD98E3E850E6338" />
56795667
<ComponentRef Id="cmp2BE62623A92CD0986F0915CB16373E90" />
56805668
<ComponentRef Id="cmp95E80D6E42ED3C994C89564D15A4E501" />

‎src/ResourceManager/Profile/AzureRM.Profile.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RequiredModules = @()
5151
RequiredAssemblies = @()
5252

5353
# Script files (.ps1) that are run in the caller's environment prior to importing this module
54-
ScriptsToProcess = @('CheckVersions.ps1')
54+
ScriptsToProcess = @()
5555

5656
# Type files (.ps1xml) to be loaded when importing this module
5757
TypesToProcess = @()

‎src/ResourceManager/Profile/CheckVersions.ps1

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@
188188
<Compile Include="MockSubscriptionClientFactory.cs" />
189189
<Compile Include="NullClient.cs" />
190190
<Compile Include="ProfileController.cs" />
191-
<Compile Include="ProfileModuleTests.cs" />
192191
<Compile Include="RPRegistrationDelegatingHandlerTests.cs" />
193192
<Compile Include="SubscriptionCmdletTests.cs" />
194193
<Compile Include="TenantCmdletTests.cs" />
@@ -204,12 +203,6 @@
204203
</Content>
205204
<None Include="MSSharedLibKey.snk" />
206205
<None Include="packages.config" />
207-
<None Include="FakeModuleRepo\AzureRM.ApiManagement.998.9.8.nupkg">
208-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
209-
</None>
210-
<None Include="FakeModuleRepo\AzureRM.Profile.999.9.8.nupkg">
211-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
212-
</None>
213206
<None Include="SessionRecords\Microsoft.Azure.Commands.Profile.Test.ProfileModuleTests\WarningOnIncompatibleVersions.json">
214207
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
215208
</None>
@@ -225,9 +218,6 @@
225218
<None Include="SessionRecords\Microsoft.Azure.Commands.Profile.Test.SubscriptionCmdletTests\SetAzureRmContextWorks.json">
226219
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
227220
</None>
228-
<Content Include="ProfileModuleTests.ps1">
229-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
230-
</Content>
231221
</ItemGroup>
232222
<ItemGroup>
233223
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">

‎src/ResourceManager/Profile/Commands.Profile.Test/FakeModuleRepo/AzureRM.ApiManagement.998.9.8.nupkg

-3.63 KB
Binary file not shown.

‎src/ResourceManager/Profile/Commands.Profile.Test/FakeModuleRepo/AzureRM.Profile.999.9.8.nupkg

-4.44 KB
Binary file not shown.

‎src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.ps1

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,6 @@
167167
<Link>AzureRM.Profile.psd1</Link>
168168
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
169169
</None>
170-
<None Include="..\CheckVersions.ps1">
171-
<Link>CheckVersions.ps1</Link>
172-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
173-
</None>
174170
<None Include="AzureRmProfileStartup.ps1">
175171
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
176172
</None>

‎src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.11.0-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="Microsoft.Azure.Management.Redis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.2.0.0-preview\lib\net45\Microsoft.Azure.Management.Redis.dll</HintPath>
60+
<Reference Include="Microsoft.Azure.Management.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.2.0.1-preview\lib\net45\Microsoft.Azure.Management.Redis.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Insights" version="0.11.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Redis" version="2.0.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Redis" version="2.0.1-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.0-preview" targetFramework="net45" />

‎src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.11.0-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="Microsoft.Azure.Management.Redis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.2.0.0-preview\lib\net45\Microsoft.Azure.Management.Redis.dll</HintPath>
62+
<Reference Include="Microsoft.Azure.Management.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.2.0.1-preview\lib\net45\Microsoft.Azure.Management.Redis.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/RedisCache/Commands.RedisCache/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Insights" version="0.11.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Redis" version="2.0.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Redis" version="2.0.1-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎tools/ARMIncrementVersion.ps1

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,10 @@ Param(
1010
[bool]$Patch
1111
)
1212

13-
# Function to update nuspec file
14-
function IncrementVersion([string]$FilePath)
13+
function ReplaceVersion([string]$key, [string]$line)
1514
{
16-
Write-Output "Updating File: $FilePath"
17-
(Get-Content $FilePath) |
18-
ForEach-Object {
19-
$matches = ([regex]::matches($_, "ModuleVersion = '([\d\.]+)'"))
20-
21-
if($matches.Count -eq 1)
15+
$matches = ([regex]::matches($line, "$key = '([\d\.]+)'"))
16+
if($matches.Count -eq 1)
2217
{
2318
$packageVersion = $matches.Groups[1].Value
2419
$version = $packageVersion.Split(".")
@@ -46,11 +41,19 @@ function IncrementVersion([string]$FilePath)
4641
}
4742

4843
$version = [String]::Join(".", $version)
49-
$_.Replace("ModuleVersion = '$packageVersion'", "ModuleVersion = '$version'")
44+
$line.Replace("$key = '$packageVersion'", "$key = '$version'")
5045
} else {
51-
$_
46+
$line
5247
}
53-
48+
}
49+
# Function to update nuspec file
50+
function IncrementVersion([string]$FilePath)
51+
{
52+
Write-Output "Updating File: $FilePath"
53+
(Get-Content $FilePath) |
54+
ForEach-Object {
55+
$temp = ReplaceVersion("ModuleVersion", $_)
56+
ReplaceVersion("RequiredVersion", $temp)
5457
} | Set-Content -Path $FilePath -Encoding UTF8
5558
}
5659

0 commit comments

Comments
 (0)