Update wix projects to openssl3.x and remove duplicate nuget ref

AmpScm · Jan 31, 2024 · 652a929 · 652a929
1 parent f0d0bce
commit 652a929
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/imports/svn-dist/Wix/P_ARM64.wxs b/imports/svn-dist/Wix/P_ARM64.wxs
@@ -105,7 +105,7 @@
                 <File Id="libaprutil_1.dll" Name="SlikSvn-libaprutil-1.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libcrypto.dll" Guid="B9E59868-28DD-4FA4-A8DB-9110F53DE69F">
-                <File Id="libcrypto.dll" Name="SlikSvn-libcrypto-1_1-ARM64.dll" KeyPath="yes" Checksum="yes" />
+                <File Id="libcrypto.dll" Name="SlikSvn-libcrypto-3-ARM64.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Directory Id="INSTALLLOCATION_BIN_engines" Name="engines" FileSource="$(var.distDir)\bin\engines\">
                 <Component Id="Capi.dll" Guid="CE19BB13-0872-4A8A-B510-018248E5D8C7">
@@ -116,7 +116,7 @@
                 <File Id="libsasl21.dll" Name="SlikSvn-libsasl21.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libssl.dll" Guid="14534E6A-7BB7-407A-9E3B-2C73463EC2CE">
-                <File Id="libssl.dll" Name="SlikSvn-libssl-1_1-ARM64.dll" KeyPath="yes" Checksum="yes" />
+                <File Id="libssl.dll" Name="SlikSvn-libssl-3-ARM64.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libintl.dll" Guid="E63D5D3A-09B2-4A0F-A4A4-10919DC6A4D2">
                 <File Id="libintl.dll" Name="SlikSvn-libintl.dll" KeyPath="yes" Checksum="yes" />

diff --git a/imports/svn-dist/Wix/P_Win32.wxs b/imports/svn-dist/Wix/P_Win32.wxs
@@ -105,7 +105,7 @@
                 <File Id="libaprutil_1.dll" Name="SlikSvn-libaprutil-1.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libcrypto.dll" Guid="E4FCB2C7-37EB-4D26-81D1-EBBDFC3BC254">
-                <File Id="libcrypto.dll" Name="SlikSvn-libcrypto-1_1.dll" KeyPath="yes" Checksum="yes" />
+                <File Id="libcrypto.dll" Name="SlikSvn-libcrypto-3.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Directory Id="INSTALLLOCATION_BIN_engines" Name="engines" FileSource="$(var.distDir)\bin\engines">
                 <Component Id="Capi.dll" Guid="7D63AE46-7922-4CCF-8D19-5000EEDDE446">
@@ -116,7 +116,7 @@
                 <File Id="libsasl21.dll" Name="SlikSvn-libsasl21.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libssl.dll" Guid="4FEF731C-79EA-4D51-BEB6-6CCBDC29616C">
-                <File Id="libssl.dll" Name="SlikSvn-libssl-1_1.dll" KeyPath="yes" Checksum="yes" />
+                <File Id="libssl.dll" Name="SlikSvn-libssl-3.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libintl.dll" Guid="F4CDB29C-7A57-4DBD-9679-A998EFD33D78">
                 <File Id="libintl.dll" Name="SlikSvn-libintl.dll" KeyPath="yes" Checksum="yes" />

diff --git a/imports/svn-dist/Wix/P_X64.wxs b/imports/svn-dist/Wix/P_X64.wxs
@@ -105,7 +105,7 @@
                 <File Id="libaprutil_1.dll" Name="SlikSvn-libaprutil-1.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libcrypto.dll" Guid="E5ACB7F7-9CAC-4FA3-9DE2-297F42182D78">
-                <File Id="libcrypto.dll" Name="SlikSvn-libcrypto-1_1-x64.dll" KeyPath="yes" Checksum="yes" />
+                <File Id="libcrypto.dll" Name="SlikSvn-libcrypto-3-x64.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Directory Id="INSTALLLOCATION_BIN_engines" Name="engines" FileSource="$(var.distDir)\bin\engines\">
                 <Component Id="Capi.dll" Guid="937F455B-CA31-4350-A7D6-2B24A2A41F42">
@@ -116,7 +116,7 @@
                 <File Id="libsasl21.dll" Name="SlikSvn-libsasl21.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libssl.dll" Guid="B90ADB2A-FBDF-4CD0-879C-EF40AAA6D280">
-                <File Id="libssl.dll" Name="SlikSvn-libssl-1_1-x64.dll" KeyPath="yes" Checksum="yes" />
+                <File Id="libssl.dll" Name="SlikSvn-libssl-3-x64.dll" KeyPath="yes" Checksum="yes" />
             </Component>
             <Component Id="libintl.dll" Guid="81D9F23F-760A-4E65-A327-A8EF2B6EBE55">
                 <File Id="libintl.dll" Name="SlikSvn-libintl.dll" KeyPath="yes" Checksum="yes" />

diff --git a/imports/svn-dist/Wix/SlikSvn.wixproj b/imports/svn-dist/Wix/SlikSvn.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
+<Project Sdk="WixToolset.Sdk/4.0.3">
     <PropertyGroup>
         <UpgradeCode>38BD67A1-0135-414F-82ED-3BF0F30C87AA</UpgradeCode>
     </PropertyGroup>
@@ -60,15 +60,12 @@
         <OutputName>Slik-Subversion-$(SvnFullVersion)-ARM64</OutputName>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" />
+        <PackageReference Include="WixToolset.UI.wixext" Version="4.0.3" />
     </ItemGroup>
     <ItemGroup>
         <Content Include="SlikSvnLicense.rtf" />
         <Compile Include="../Release/Licenses/SharpSvn-Licenses-v4.wxs">
             <Link>SharpSvn-Licenses-v4.wxs</Link>
         </Compile>
     </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="WixToolset.UI.wixext" />
-    </ItemGroup>
 </Project>