From 36e8ee859c93382b4d87fc79382c790a769c6d44 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Mon, 2 Feb 2026 14:30:09 +0100 Subject: [PATCH] Sign packages and payload --- Cyberduck.sln | 52 +++++++++---------- Directory.Build.props | 8 --- Directory.Build.targets | 40 -------------- cli/src/main/wix/Bundle/duck.bundle.wixproj | 2 +- src/main/msbuild/Cyberduck.Common.props | 7 ++- src/main/msbuild/Cyberduck.Common.targets | 14 ++--- ...Sdk.props => Cyberduck.MSVC.Toolset.props} | 18 ++++--- src/main/msbuild/Cyberduck.Net.props | 8 +-- src/main/msbuild/Cyberduck.Net.targets | 8 +-- src/main/msbuild/Cyberduck.Sign.targets | 41 +++++++++++++++ src/main/msbuild/Cyberduck.java.props | 6 ++- src/main/msbuild/Cyberduck.wxs.targets | 44 +++++++++++++--- windows/src/main/package/package.wapproj | 6 +-- 13 files changed, 141 insertions(+), 113 deletions(-) rename src/main/msbuild/{Microsoft.WindowsSdk.props => Cyberduck.MSVC.Toolset.props} (82%) create mode 100644 src/main/msbuild/Cyberduck.Sign.targets diff --git a/Cyberduck.sln b/Cyberduck.sln index c4ad8a680d..07d25e7a0d 100644 --- a/Cyberduck.sln +++ b/Cyberduck.sln @@ -1,7 +1,28 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31825.309 +# Visual Studio Version 18 +VisualStudioVersion = 18.2.11415.280 d18.0 MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B08EF96-10D6-4F35-94C1-986F9F0F1506}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{72B4BA09-65D8-4C49-930E-B14104B2AB1B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "installer", "installer", "{0DF59FB4-AEA9-4213-A935-6DB851411B67}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "duck", "duck", "{457F1D6D-8AEC-42E2-9211-2A8405C95019}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cyberduck", "Cyberduck", "{7D32EE61-B6F0-4978-B500-45172B181283}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9726AB9-4100-4499-A9CF-78167CC27024}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + Directory.Packages.props = Directory.Packages.props + global.json = global.json + EndProjectSection +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core.Native", "core\src\main\csharp\Cyberduck.Core.Native.csproj", "{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour.Native", "bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj", "{1926AB55-690C-4081-99D5-170847C206D9}" @@ -10,22 +31,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core.Test", "core EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "duck", "cli\src\main\csharp\duck.csproj", "{2287E64E-3515-4324-9833-553348295C15}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B08EF96-10D6-4F35-94C1-986F9F0F1506}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{72B4BA09-65D8-4C49-930E-B14104B2AB1B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck", "windows\src\main\csharp\Cyberduck.csproj", "{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Test", "windows\src\test\csharp\Cyberduck.Test.csproj", "{B5565834-1164-4858-AF50-AE89CFC9BDD2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "installer", "installer", "{0DF59FB4-AEA9-4213-A935-6DB851411B67}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "duck", "duck", "{457F1D6D-8AEC-42E2-9211-2A8405C95019}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cyberduck", "Cyberduck", "{7D32EE61-B6F0-4978-B500-45172B181283}" -EndProject Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Cyberduck.Bootstrapper", "windows\src\main\wix\Bootstrapper\Cyberduck.Bootstrapper.wixproj", "{00858CE5-437F-46BE-8A2E-519B552DBF7D}" EndProject Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Cyberduck.Bundle", "windows\src\main\wix\Bundle\Cyberduck.Bundle.wixproj", "{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}" @@ -36,15 +45,6 @@ Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "duck.bundle", "cli\src\main EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core.Refresh", "core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj", "{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9726AB9-4100-4499-A9CF-78167CC27024}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - Directory.Packages.props = Directory.Packages.props - global.json = global.json - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n-gen", "core\i18n-gen\i18n-gen.csproj", "{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}" EndProject Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "package", "windows\src\main\package\package.wapproj", "{55CDD736-9A8A-4091-AC99-60E2F9C73269}" @@ -146,15 +146,15 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} + {457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} + {7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} {2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} - {72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} {B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} - {457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} - {7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} {00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283} {65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283} {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04} = {457F1D6D-8AEC-42E2-9211-2A8405C95019} diff --git a/Directory.Build.props b/Directory.Build.props index f237c34ee0..7cd498cbc8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -23,12 +23,4 @@ - - $(PATH) - - - - - - diff --git a/Directory.Build.targets b/Directory.Build.targets index da8965315f..bb8c9469a1 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -18,44 +18,4 @@ - - <_SignToolArgs Condition="'$(SignTool)'=='cng'">_SignToolArgsCNG - <_SignToolArgs Condition="'$(_SignToolArgs)'==''">_SignToolArgsCertificateStore - - $(_SignToolArgs);SignToolExecutablePath - - - - - SignTool.exe - $(WindowsSdk_ExecutablePath);$(SignToolExecutablePath) - - - - - - sign /d "Cyberduck" /fd sha256 /tr "http://timestamp.acs.microsoft.com" /td "sha256" /a - - - - - - - "$(SignToolExecutable)" $(SignToolArgsBase) - - - - - - - - $(SignToolArgsBase) /sm /n "iterate GmbH" - - - - - $(SignToolArgsBase) /f "$(CyberduckDir)setup\cert\certificate.crt" /csp "$(SignToolCSP)" /kc "$(SignToolKC)" - - - \ No newline at end of file diff --git a/cli/src/main/wix/Bundle/duck.bundle.wixproj b/cli/src/main/wix/Bundle/duck.bundle.wixproj index 5cd9e85252..16dfd960d5 100644 --- a/cli/src/main/wix/Bundle/duck.bundle.wixproj +++ b/cli/src/main/wix/Bundle/duck.bundle.wixproj @@ -7,6 +7,6 @@ - + diff --git a/src/main/msbuild/Cyberduck.Common.props b/src/main/msbuild/Cyberduck.Common.props index f76a2640bf..114a904e43 100644 --- a/src/main/msbuild/Cyberduck.Common.props +++ b/src/main/msbuild/Cyberduck.Common.props @@ -48,4 +48,9 @@ true - \ No newline at end of file + + x64 + + + + diff --git a/src/main/msbuild/Cyberduck.Common.targets b/src/main/msbuild/Cyberduck.Common.targets index 64fd8f0a99..eb4ced02ee 100644 --- a/src/main/msbuild/Cyberduck.Common.targets +++ b/src/main/msbuild/Cyberduck.Common.targets @@ -2,16 +2,8 @@ - - - - - - SignTool.exe sign /d "$(AppName)" /fd sha256 /tr http://timestamp.entrust.net/TSS/RFC3161sha2TS /td sha256 /a /sm /n "iterate GmbH" - PATH=@(SignToolPath, '%3B') - - - - \ No newline at end of file + + + diff --git a/src/main/msbuild/Microsoft.WindowsSdk.props b/src/main/msbuild/Cyberduck.MSVC.Toolset.props similarity index 82% rename from src/main/msbuild/Microsoft.WindowsSdk.props rename to src/main/msbuild/Cyberduck.MSVC.Toolset.props index b809e9c7b7..f75a95fa3b 100644 --- a/src/main/msbuild/Microsoft.WindowsSdk.props +++ b/src/main/msbuild/Cyberduck.MSVC.Toolset.props @@ -2,20 +2,20 @@ - + + + + + Windows $(VsInstallRoot)\ $(VSInstallDir)Common7\IDE\VC\ - - @@ -47,5 +47,11 @@ $(WindowsSDK_ExecutablePath_x86) + + + + + $(WindowsSDK_ExecutablePath);$(MSBuild_ExecutablePath);$(PATH); + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.Net.props b/src/main/msbuild/Cyberduck.Net.props index 3f28fe2973..4823952dcd 100644 --- a/src/main/msbuild/Cyberduck.Net.props +++ b/src/main/msbuild/Cyberduck.Net.props @@ -1,11 +1,9 @@ - $(BuildSupportDir)Cyberduck.Artifacts.targets + $(BuildSupportDir)Cyberduck.Artifacts.targets;$(BeforeMicrosoftNETSdkTargets) - - $(DefaultItemExcludes);**/*net472* @@ -13,4 +11,8 @@ $(DefaultItemExcludes);**/*net8.0* + + + + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.Net.targets b/src/main/msbuild/Cyberduck.Net.targets index edd85d0199..192098411a 100644 --- a/src/main/msbuild/Cyberduck.Net.targets +++ b/src/main/msbuild/Cyberduck.Net.targets @@ -19,12 +19,12 @@ win-x64 - - + + - - + + diff --git a/src/main/msbuild/Cyberduck.Sign.targets b/src/main/msbuild/Cyberduck.Sign.targets new file mode 100644 index 0000000000..d457d7f0da --- /dev/null +++ b/src/main/msbuild/Cyberduck.Sign.targets @@ -0,0 +1,41 @@ + + + + <_SignToolArgsTarget Condition="'$(_SignToolArgsTarget)'=='' And '$(SignTool)'=='cng'">_SignToolArgsCNG + <_SignToolArgsTarget Condition="'$(_SignToolArgsTarget)'==''">_SignToolArgsCertificateStore + $(_SignToolArgsTarget);SignToolExecutableName + + + + + SignTool.exe + + + + + + + + + sign /d "Cyberduck" /fd sha256 /tr "http://timestamp.acs.microsoft.com" /td "sha256" /a + + + + + + + "$(SignToolExecutableName)" $(SignToolArgsBase) + + + + + $(SignToolArgsBase) /sm /n "iterate GmbH" + + + + + $(SignToolArgsBase) /f "$(CyberduckDir)setup\cert\certificate.crt" /csp "$(SignToolCSP)" /kc "$(SignToolKC)" + + + + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.java.props b/src/main/msbuild/Cyberduck.java.props index f530088aa0..23adae3502 100644 --- a/src/main/msbuild/Cyberduck.java.props +++ b/src/main/msbuild/Cyberduck.java.props @@ -18,11 +18,13 @@ IKVM0111: Emitted NoClassDefFoundError --> IKVM0100;IKVM0101;IKVM0105;IKVM0111;$(NoWarn) - $(MSBuildThisFileDirectory)Cyberduck.java.After.targets + $(MSBuildThisFileDirectory)Cyberduck.java.After.targets;$(AfterMicrosoftNETSdkTargets) - + + build;buildMultitargeting;buildTransitive + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.wxs.targets b/src/main/msbuild/Cyberduck.wxs.targets index 1241f6b132..d28f8ef937 100644 --- a/src/main/msbuild/Cyberduck.wxs.targets +++ b/src/main/msbuild/Cyberduck.wxs.targets @@ -1,15 +1,43 @@ - + - - + + + + - - + + + + - - + + + + + + + + - + + + <_SignPayload Include="@(BindPathPayloadExecutable->WithoutMetadataValue('Sign', '0'))" /> + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/src/main/package/package.wapproj b/windows/src/main/package/package.wapproj index 19bbcdc900..03736cb173 100644 --- a/windows/src/main/package/package.wapproj +++ b/windows/src/main/package/package.wapproj @@ -74,12 +74,12 @@ - + - $(SignAppxPackageExeFullPath) + $(SignAppxPackageExeFullPath) - +