Skip to content

Commit

Permalink
Revert redirection policies to CLR2, which had unintentionally been c…
Browse files Browse the repository at this point in the history 
…onverted to CLR4 during Platform 7 development, fixes #71.

The policies need to be in the CLR2 GAC in order to be effective so have to be compiled as CLR2.
  • Loading branch information
@Peter-Simpson
Peter-Simpson committed Jul 16, 2024
1 parent 4814731 commit eee254a
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 42 deletions.
56 changes: 28 additions & 28 deletions Installer/PlatformInstaller.mia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4099,8 +4099,8 @@ $
{EF48DD6D-1694-45C4-816F-25FFDFF44FCC}
{917ACA92-ECF0-4B21-B130-36915B903A04}
{8ADF3958-F7C7-4A77-9C80-9162DF259690}
{2950CF53-03D7-40FB-BA17-776760F28FCF}
{62CA9828-7965-4230-8DDD-F414A36FC99C}
{D5197EAB-959A-403F-AC04-89EB24C4120A}
{05729A75-F0F1-4929-8634-C8040419E764}
{5FB40226-D998-44E6-9202-8285FA5264B4}
{08290CEC-A92D-42B0-A693-9E9074D72AEB}
{2B49682A-376C-4A15-8F9A-263C86732B92}
Expand Down Expand Up @@ -9825,32 +9825,6 @@ FALSE
FALSE
FALSE
FALSE
{62CA9828-7965-4230-8DDD-F414A36FC99C}
..\ASCOM.Utilities\ASCOM.Utilities.556\Publisher Policy 5.5.6\UtilitiesPolicy.xml
FALSE|
$COMMONFILES$\ASCOM\Platform\v5.5
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
{2950CF53-03D7-40FB-BA17-776760F28FCF}
..\ASCOM.Utilities\ASCOM.Utilities.556\Publisher Policy 5.5.6\policy.5.5.ASCOM.Utilities.dll
FALSE|
$COMMONFILES$\ASCOM\Platform\v5.5
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
{8ADF3958-F7C7-4A77-9C80-9162DF259690}
..\ASCOM.Utilities\ASCOM.Utilities.556\bin\Release\ASCOM.Utilities.pdb
FALSE|
Expand Down Expand Up @@ -13231,6 +13205,32 @@ FALSE
FALSE
FALSE
FALSE
{05729A75-F0F1-4929-8634-C8040419E764}
..\InstallerSupport\RedirectionPolicies\policy.5.5.Utilities.xml
FALSE|
$COMMONFILES$\ASCOM\Platform\v5.5
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
{D5197EAB-959A-403F-AC04-89EB24C4120A}
..\InstallerSupport\RedirectionPolicies\policy.5.5.ASCOM.Utilities.dll
FALSE|
$COMMONFILES$\ASCOM\Platform\v5.5
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
FALSE
{F167CB59-4A78-4269-B5CF-62EC8025F3D3}
CONFORMPRESENT
$PROGRAMFILES$ASCOM\Conform\Conform.exe
Expand Down
5 changes: 0 additions & 5 deletions Installer/PlatformInstaller.mia.fld
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
Check Application Requirements
Check Application Pre-Requisites
Set Registry Keys
Remove Previous Platform install if present
Remove 64bit components
Remove Previous Platforms 4 and 5 if present
Remove 32bit components
Clean up any remaining simulator COM entries
Install MSI support if required
Remove any items left from previous instals
Remove Platform update checker scheduled task
Remove the earth rotation update scheduled job.
Set Profile ACL
Platform 5 and 5.5 files
Developer files
Validate installation
4 changes: 2 additions & 2 deletions Installer/PlatformInstaller.mia.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1374,8 +1374,8 @@ Install Files ..\InstallerSupport\RedirectionPolicies\Policy.1.1.Exceptions.xml
Comment: Updated Utiities 5.5.6 to replace 5.5.1 that access registry rather than XML files, otherwise unchanged
Install Assembly ..\ASCOM.Utilities\ASCOM.Utilities.556\bin\Release\ASCOM.Utilities.dll to Global Assembly Cache
Install Files ..\ASCOM.Utilities\ASCOM.Utilities.556\bin\Release\ASCOM.Utilities.pdb to $COMMONFILES$\ASCOM\Platform\v5.5
Install Files ..\ASCOM.Utilities\ASCOM.Utilities.556\Publisher Policy 5.5.6\policy.5.5.ASCOM.Utilities.dll to $COMMONFILES$\ASCOM\Platform\v5.5
Install Files ..\ASCOM.Utilities\ASCOM.Utilities.556\Publisher Policy 5.5.6\UtilitiesPolicy.xml to $COMMONFILES$\ASCOM\Platform\v5.5
Install Files ..\InstallerSupport\RedirectionPolicies\policy.5.5.ASCOM.Utilities.dll to $COMMONFILES$\ASCOM\Platform\v5.5
Install Files ..\InstallerSupport\RedirectionPolicies\policy.5.5.Utilities.xml to $COMMONFILES$\ASCOM\Platform\v5.5

Comment: Updated driver access v1.0.6 to improve compatibility with Platform 5 drivers
Install Assembly ..\ASCOM.DriverAccess.Platform5\bin\Release\ASCOM.DriverAccess.dll to Global Assembly Cache
Expand Down
2 changes: 1 addition & 1 deletion Installer/PlatformInstaller.mpr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2888,7 +2888,7 @@ ASCOM Platform 7.0 - RC1
ASCOM Platform 7.0 - Installation
ASCOM Initiative
All rights reserved. http://www.ascom-standards.org
{43A4C25C-8165-404A-A057-A3B426A645BF}
{840A864B-B020-4220-9273-A29CA3A5ED7B}
ASCOM Initiative
ASCOM Initiative
https://ascomtalk.groups.io/g/Help
Expand Down
2 changes: 1 addition & 1 deletion Installer/PlatformInstaller.mpr.bak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2888,7 +2888,7 @@ ASCOM Platform 7.0 - RC1
ASCOM Platform 7.0 - Installation
ASCOM Initiative
All rights reserved. http://www.ascom-standards.org
{43A4C25C-8165-404A-A057-A3B426A645BF}
{840A864B-B020-4220-9273-A29CA3A5ED7B}
ASCOM Initiative
ASCOM Initiative
https://ascomtalk.groups.io/g/Help
Expand Down
10 changes: 5 additions & 5 deletions InstallerSupport/RedirectionPolicies/BuildPolicies.Cmd
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@Echo off
Call "%VS90COMNTOOLS%vsvars32"
al /link:Policy.1.0.Exceptions.xml /out:policy.1.0.ASCOM.Exceptions.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
al /link:Policy.1.1.Exceptions.xml /out:policy.1.1.ASCOM.Exceptions.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
al /link:Policy.1.0.DriverAccess.xml /out:policy.1.0.ASCOM.DriverAccess.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
al /link:policy.5.5.Astrometry.xml /out:policy.5.5.ASCOM.Astrometry.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
al /link:Policy.5.5.Utilities.xml /out:policy.5.5.ASCOM.Utilities.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\x64\al" /link:Policy.1.0.Exceptions.xml /out:policy.1.0.ASCOM.Exceptions.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\x64\al" /link:Policy.1.1.Exceptions.xml /out:policy.1.1.ASCOM.Exceptions.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\x64\al" /link:Policy.1.0.DriverAccess.xml /out:policy.1.0.ASCOM.DriverAccess.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\x64\al" /link:policy.5.5.Astrometry.xml /out:policy.5.5.ASCOM.Astrometry.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\x64\al" /link:Policy.5.5.Utilities.xml /out:policy.5.5.ASCOM.Utilities.dll /keyfile:..\..\ASCOM.snk /version:6.0.0.0 /fileversion:6.0.0.0 /company:"ASCOM Initiative" /product:"ASCOM Platform"
Binary file modified InstallerSupport/RedirectionPolicies/policy.1.0.ASCOM.DriverAccess.dll
View file
Binary file not shown.
Binary file modified InstallerSupport/RedirectionPolicies/policy.1.0.ASCOM.Exceptions.dll
View file
Binary file not shown.
Binary file modified InstallerSupport/RedirectionPolicies/policy.1.1.ASCOM.Exceptions.dll
View file
Binary file not shown.
Binary file modified InstallerSupport/RedirectionPolicies/policy.5.5.ASCOM.Astrometry.dll
View file
Binary file not shown.
Binary file modified InstallerSupport/RedirectionPolicies/policy.5.5.ASCOM.Utilities.dll
View file
Binary file not shown.

0 comments on commit eee254a

Please sign in to comment.