Skip to content

Commit 93c9066

Browse files
committed
bump v6.5.6
bitness installers and setoffice script
1 parent 85ae03a commit 93c9066

File tree

9 files changed

+130
-13
lines changed

9 files changed

+130
-13
lines changed

OneMore.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1616
LICENSE = LICENSE
1717
README.md = README.md
1818
register-onemore.reg = register-onemore.reg
19+
setoffice.ps1 = setoffice.ps1
1920
setregistry.ps1 = setregistry.ps1
2021
setversion.ps1 = setversion.ps1
2122
stop.ps1 = stop.ps1

OneMore/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal static class AssemblyInfo
3737
* NOTE - also update the version in the Setup project
3838
* by clicking on the Setup project node in VS and update its properties
3939
*/
40-
public const string Version = "6.7.5";
40+
public const string Version = "6.7.6";
4141

4242
public const string Product = "OneMore";
4343

OneMoreCalendar/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ namespace OneMoreCalendar
2727
{
2828
internal static class AssemblyInfo
2929
{
30-
public const string Version = "6.7.5";
30+
public const string Version = "6.7.6";
3131
}
3232
}

OneMoreProtocolHandler/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ namespace OneMoreProtocolHandler
2323
{
2424
internal static class AssemblyInfo
2525
{
26-
public const string Version = "6.7.5";
26+
public const string Version = "6.7.6";
2727
}
2828
}

OneMoreSetup/OneMoreSetup.vdproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11389,15 +11389,15 @@
1138911389
{
1139011390
"Name" = "8:OneMoreAddIn"
1139111391
"ProductName" = "8:OneMoreAddIn"
11392-
"ProductCode" = "8:{B01A8B01-E945-43BF-ABDF-9540A833CA58}"
11393-
"PackageCode" = "8:{83AA7652-A92E-4286-B099-842410CFF528}"
11392+
"ProductCode" = "8:{F16E084C-B744-41FD-9281-8A251B7FFCD9}"
11393+
"PackageCode" = "8:{05A4FBAA-0DE3-4DC9-9856-59874FA62056}"
1139411394
"UpgradeCode" = "8:{058F6D04-E0D0-4984-B6B7-7FE0C581680E}"
1139511395
"AspNetVersion" = "8:4.0.30319.0"
1139611396
"RestartWWWService" = "11:FALSE"
1139711397
"RemovePreviousVersions" = "11:TRUE"
1139811398
"DetectNewerInstalledVersion" = "11:TRUE"
1139911399
"InstallAllUsers" = "11:TRUE"
11400-
"ProductVersion" = "8:6.7.5"
11400+
"ProductVersion" = "8:6.7.6"
1140111401
"Manufacturer" = "8:River"
1140211402
"ARPHELPTELEPHONE" = "8:"
1140311403
"ARPHELPLINK" = "8:https://github.com/stevencohn/OneMore"

OneMoreSetupActions/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ namespace OneMoreSetupActions
2323
{
2424
internal static class AssemblyInfo
2525
{
26-
public const string Version = "6.7.5";
26+
public const string Version = "6.7.6";
2727
}
2828
}

OneMoreTray/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ namespace OneMoreService
2727
{
2828
internal static class AssemblyInfo
2929
{
30-
public const string Version = "6.7.5";
30+
public const string Version = "6.7.6";
3131
}
3232
}

build.ps1

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -442,11 +442,12 @@ Begin
442442
function ConfigureSetupProject
443443
{
444444
param($vdproj)
445-
$lines = (Get-Content $vdproj)
446445

447446
$json = ConvertVdprojToJson $vdproj
448447
$folders = GetArcFolders $json
449448

449+
$lines = (Get-Content $vdproj)
450+
450451
$script:productVersion = $lines | `
451452
where { $_ -match '"ProductVersion" = "8:(.+?)"' } | `
452453
foreach { $matches[1] }
@@ -518,13 +519,13 @@ Begin
518519
elseif ($_.Trim() -eq """Folder"" = ""8:$($folders.x86)""" -and $Architecture -ne 'x86')
519520
{
520521
# SQLite.Interop.dll Folder location
521-
Write-Host "... updating folder from $($folders.x86) to $($folders.x64)" -Fore DarkGray
522+
Write-Host "... updating SQLite.Interop x86 folder from $($folders.x86) to $($folders.x64)" -Fore DarkGray
522523
"""Folder"" = ""8:$($folders.x64)""" | Out-File $vdproj -Append
523524
}
524525
elseif ($_.Trim() -eq """Folder"" = ""8:$($folders.win86)""" -and $Architecture -ne 'x86')
525526
{
526527
# WebView2Loader.dll Folder location
527-
Write-Host "... updating folder from $($folders.win86) to $($folders.win64)" -Fore DarkGray
528+
Write-Host "... updating WebView2Loader win-x86 folder from $($folders.win86) to $($folders.win64)" -Fore DarkGray
528529
"""Folder"" = ""8:$($folders.win64)""" | Out-File $vdproj -Append
529530
}
530531
elseif ($_ -notmatch '^"Scc')
@@ -665,9 +666,10 @@ Begin
665666
{
666667
# explode hashtable NoteProperty into object of properties
667668
$json | Get-Member -MemberType NoteProperty | foreach {
668-
$obj = $json.$($_.Name)
669+
$omKey = $_.Name
670+
$obj = $json.$omKey
669671
# inject omKey property into object to hold the object's name (json key)
670-
$obj | Add-Member -MemberType NoteProperty -Name 'omKey' -Value $_.Name -Force
672+
$obj | Add-Member -MemberType NoteProperty -Name 'omKey' -Value $omKey -Force
671673
Write-Output $obj
672674
}
673675
}

setoffice.ps1

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<#
2+
.SYNOPSIS
3+
Check or set the Office Bitness/Platform registry values.
4+
5+
.PARAMETER Architecture
6+
The architecture to set. Valid values are 'x86' or 'x64'. Default is 'x86'.
7+
8+
.PARAMETER Check
9+
Check the current Office Bitness/Platform registry values. This is the default action.
10+
11+
.PARAMETER Set
12+
Set the Office Bitness/Platform registry values to the specified Architecture.
13+
#>
14+
15+
[CmdletBinding()]
16+
param (
17+
[ValidateSet('x86','x64')]
18+
[string] $Architecture = 'x86',
19+
[switch] $Check,
20+
[switch] $Set
21+
)
22+
23+
Begin
24+
{
25+
$UninstallPath = "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*"
26+
27+
$RegistryPaths = @(
28+
@{ Path = 'HKLM:\Software\Microsoft\Office\16.0\Outlook'; Key = 'Bitness' },
29+
@{ Path = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Office\16.0\Outlook'; Key = 'Bitness' },
30+
@{ Path = 'HKLM:\Software\Microsoft\Office\ClickToRun\Configuration'; Key = 'Platform' }
31+
)
32+
33+
function CheckBitness
34+
{
35+
$status = (CheckOffice) ? 'is' : 'is not'
36+
Write-Host
37+
Write-Host "... Office $status installed" -Fore Yellow
38+
39+
Write-Host
40+
foreach ($item in $registryPaths)
41+
{
42+
$path = $item.Path
43+
$key = $item.Key
44+
45+
try
46+
{
47+
$props = Get-ItemProperty -Path $path -ErrorAction Stop
48+
Write-Host "... $path`\$key: $($props.$key)"
49+
}
50+
catch
51+
{
52+
Write-Host "... $path not found or inaccessible" -Fore DarkGray
53+
}
54+
}
55+
}
56+
57+
function CheckOffice
58+
{
59+
$count = (Get-ItemProperty $UninstallPath | where {
60+
$_.DisplayName -like "*Office*" } | Measure).Count
61+
62+
return $count -gt 0
63+
}
64+
65+
function SetBitness
66+
{
67+
param($Bitness)
68+
69+
Write-Host
70+
foreach ($item in $registryPaths)
71+
{
72+
$path = $item.Path
73+
$key = $item.Key
74+
75+
try
76+
{
77+
Write-Host "... setting $path\$key to '$Bitness'"
78+
79+
# create key if it doesn't exist
80+
if (-not (Test-Path $path))
81+
{
82+
New-Item -Path $path -Force | Out-Null
83+
}
84+
85+
Set-ItemProperty -Path $path -Name $key -Value $Bitness -Force
86+
}
87+
catch
88+
{
89+
Write-Host "*** failed to write to $path`: $_" -Fore Red
90+
}
91+
}
92+
}
93+
#>
94+
}
95+
Process
96+
{
97+
if ($Check -or !$Set)
98+
{
99+
CheckBitness
100+
return
101+
}
102+
103+
if ($Set)
104+
{
105+
if (CheckOffice)
106+
{
107+
Write-Host "`nOffice is installed! This may overwrite your Office configuration." -Fore Yellow
108+
$choice = Read-Host "`n... Are you sure you want to write Bitness/Platform values? (y/n)"
109+
if ($choice -ne 'y') { return }
110+
}
111+
112+
SetBitness $Architecture
113+
}
114+
}

0 commit comments

Comments
 (0)