From eee254af6ca5749d908c818e7c8f9ebcadf9ee29 Mon Sep 17 00:00:00 2001 From: Peter Simpson <38855929+Peter-Simpson@users.noreply.github.com> Date: Tue, 16 Jul 2024 13:13:29 +0100 Subject: [PATCH] Revert redirection policies to CLR2, which had unintentionally been converted 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. --- Installer/PlatformInstaller.mia | 56 +++++++++--------- Installer/PlatformInstaller.mia.fld | 5 -- Installer/PlatformInstaller.mia.txt | 4 +- Installer/PlatformInstaller.mpr | 2 +- Installer/PlatformInstaller.mpr.bak | 2 +- .../RedirectionPolicies/BuildPolicies.Cmd | 10 ++-- .../policy.1.0.ASCOM.DriverAccess.dll | Bin 3584 -> 3584 bytes .../policy.1.0.ASCOM.Exceptions.dll | Bin 3584 -> 3584 bytes .../policy.1.1.ASCOM.Exceptions.dll | Bin 3584 -> 3584 bytes .../policy.5.5.ASCOM.Astrometry.dll | Bin 3584 -> 3584 bytes .../policy.5.5.ASCOM.Utilities.dll | Bin 3584 -> 3584 bytes 11 files changed, 37 insertions(+), 42 deletions(-) diff --git a/Installer/PlatformInstaller.mia b/Installer/PlatformInstaller.mia index 9a13a1ffc..c0b19a23b 100644 --- a/Installer/PlatformInstaller.mia +++ b/Installer/PlatformInstaller.mia @@ -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} @@ -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| @@ -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 diff --git a/Installer/PlatformInstaller.mia.fld b/Installer/PlatformInstaller.mia.fld index 3b108cf32..902f97c78 100644 --- a/Installer/PlatformInstaller.mia.fld +++ b/Installer/PlatformInstaller.mia.fld @@ -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 diff --git a/Installer/PlatformInstaller.mia.txt b/Installer/PlatformInstaller.mia.txt index c3539b2d8..680bcdce9 100644 --- a/Installer/PlatformInstaller.mia.txt +++ b/Installer/PlatformInstaller.mia.txt @@ -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 diff --git a/Installer/PlatformInstaller.mpr b/Installer/PlatformInstaller.mpr index b1c617007..5636acc83 100644 --- a/Installer/PlatformInstaller.mpr +++ b/Installer/PlatformInstaller.mpr @@ -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 diff --git a/Installer/PlatformInstaller.mpr.bak b/Installer/PlatformInstaller.mpr.bak index 636f1924c..f880f92d7 100644 --- a/Installer/PlatformInstaller.mpr.bak +++ b/Installer/PlatformInstaller.mpr.bak @@ -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 diff --git a/InstallerSupport/RedirectionPolicies/BuildPolicies.Cmd b/InstallerSupport/RedirectionPolicies/BuildPolicies.Cmd index 9522d9335..720aeb1c6 100644 --- a/InstallerSupport/RedirectionPolicies/BuildPolicies.Cmd +++ b/InstallerSupport/RedirectionPolicies/BuildPolicies.Cmd @@ -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" diff --git a/InstallerSupport/RedirectionPolicies/policy.1.0.ASCOM.DriverAccess.dll b/InstallerSupport/RedirectionPolicies/policy.1.0.ASCOM.DriverAccess.dll index b0e357a61882cb888c39a6ea460c05702506955c..abf7aa0417d76544dbfe221887e3dd6242de115d 100644 GIT binary patch delta 280 zcmV+z0q6dJ9Dp2+K z`G#b35OamnvU{lIaOnW%2&urqo}Nov4PD<^E6q|3BOkmTvqOI{_9LiOfQsz=e>of~vQQ%XVs009610000C0001XGA=MKH83|aHN^pQ6QTMrVe>!jSA`>sq!*#~J=AKGQ1JI5jwJy} znpJ+jMdqmX5n=_xqI!m%(=T%+?;&Tn{Z+U!*jwNp^xVqHWHmv4>dK9y0mni0%IZpc zW=r@(`uEoOsW}XlA8S=0Tim+vQ5(uaQ%XVs009610000C0001XGA=MKH83|aH`n@7S^HF=yWs=mo_qp>e+c#T(r~I#%sE+!~SV|^7d(VN+@2r*vAnz@pR7b zZQpGFm!vZL@7UZa=)=^Ukk-1c+`fOc*)-WVd&9o$b2B}b(R#LeM_J44M8~T4Gk3qQ z(fpC87h2}e$5Y+%vC;fqe46w;r(iE9Mg~T(GkJhynTei(p0RpWoBm7pHt~lb>~sO^Zvl|>%#ZV^e;B_T)NjgqT#U=im9TQ}L1wJ@{TY z!j)ZAo!E@!gp(5NpQ5)C0nQnR3getfE;p>XCiK-Gl2q@jAVFOH)+sZ2K#`5t?w){@ zRY+}VsBGI9#klmFnkdW)49hfp9~)3YQ%XVs009610000C0001XGA=MKH83|aHila=qM|8oE;^MFX2)BA%Rv9$li4;30uNuWUa8^~r eE$PY<1Y1Wn9XqoR1ycb5K(i4Hs{ykP2=WC*{c8RI delta 281 zcmV+!0p|XI9Dp29^kqIcG^7D^bf8dpuG`nqgPSgL$MsBfc-MVKHd5HHNuwE;%^F=h_Rz1m z0w-)S^Y4*AKkZ0ZZT!5MOvsa{3N%39PMX&uYfax6pRs8{QdwgX&VJk(S_}T`q3hPU zn3Weq&#;gXOV&>X!=5VR_WOl7h#Me6Q%XVs009610000C0001XG%heMGcYqTIg{!F zWC10UPXmns1hd@(0|77Ix5#A!TOUJ}p^k>grDl=<2)BA%Rv9$li4>;~w8S?)ILx|z ffVnIST_E9k`HZs<1ycb601&eg45|UM4hZrE+#_(Q diff --git a/InstallerSupport/RedirectionPolicies/policy.5.5.ASCOM.Astrometry.dll b/InstallerSupport/RedirectionPolicies/policy.5.5.ASCOM.Astrometry.dll index 23542e1d803513428705f0a03cb330fea8f3dc80..2c3af38cd6742d6a1bc33ab91023fc57dfe5e527 100644 GIT binary patch delta 281 zcmV+!0p|XI9Dp2J0YI}6466aN4hZrEO#N*# delta 282 zcmZpWX^@%FAzWPhCxrnD9xyN|ax-#IoGs17ATV)<0<+5*hK;vN8S6XtE=kM#D*jcz zS-@uBtZNo~Eq+h=Qgn#BV6N&U3zq7Z--q=ly|0~LxmUu`dCB96!qv&@?Q@O_p4jwH zdtrA+^~OPLnG(TLHL(eq2rPi607g$?5CD%7R@f8RW5pW3tPe5c9% znT3nq&yVq+T>aXuICFAI+fV)X(h5$&UQUb*j9_>20Ld~FJp(;s17kzW$*-7F7*!|x zGxsvGY`)9P%&4DhbHIL$exy%BQ2s;pk6TVLaBQ!N36nH=&?&Nt%!A3r9(B*Vvvj zb>hhf;zA8)wI45PJK48AS3V+GAwjXSPgKxW_*u>zF>xcw^^4mT-)^c;Siu<~`TX74 z#SPB#B?mTi*O>o(eRadC&GybmT4ffmf4{l-0kfRXVGkyK<}EjS?|s?EJLAye1(&NE zqKYMsYD`r$)n6HWjdxGby&J~T>zsnUoERAx!Or9Xl4VAE270Cj=0@g|UooXHGEVkq z?qy`!e3zM-QJ=+@-~FUth3o1M$1cRM8NFuU*j^PACTa4ZQ^Z<*z0^_5g0RrTx-U-& cu|&I@%35#cXANd#bl5D&vzl=;AIB$F0P|~Tc>n+a delta 281 zcmV+!0p|XI9Dp2x5 zxLazpWDAuvVcpZPDwv-%`c3*)UeGxKaf8+C=$Qed!qHvHJV!w3#EeC;5o!K2am zOLeZRWJ?tBB00ce)$#hB40Ilsm>aS}Q%XVs009610000C0001XG%heMGcYqTIg{!F zWC10UPXmns1hd@(0|75>@h`#|whKq8u-ttF?NO`%2)BA%Rv9$li4>;~w8S?)ILx|z ffVnIST_E9k`HZs<1ycb601&eg45|UM4hZrERA+No