From 6e0f5184d160664fea9b20afb6ca82dd0feebf4f Mon Sep 17 00:00:00 2001 From: Damon Tivel Date: Sat, 15 Aug 2026 10:54:10 -0700 Subject: [PATCH 1/4] Add ClickOnce publish-layout resolution Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: be91288d-5106-4c59-a1fa-c5353dccb828 --- src/Sign.Core/Resources.Designer.cs | 153 ++ src/Sign.Core/Resources.resx | 68 + .../ClickOnce/ApplicationManifestAdapter.cs | 2 - ...nceApplicationManifestFileGraphResolver.cs | 81 + ...lickOnceDeployManifestFileGraphResolver.cs | 403 ++++ .../Tools/ClickOnce/ClickOnceFileGraph.cs | 41 + .../ClickOnce/ClickOnceFileGraphEntry.cs | 34 + .../ClickOnce/ClickOnceFileGraphEntryKind.cs | 15 + .../ClickOnceFileGraphResolutionException.cs | 22 + .../Tools/ClickOnce/ClickOnceFileSystem.cs | 27 + .../ClickOnce/ClickOnceManifestAdapter.cs | 6 +- .../ClickOnce/ClickOnceManifestDiagnostic.cs | 37 + .../ClickOnce/ClickOncePayloadFileResolver.cs | 443 ++++ .../Tools/ClickOnce/IApplicationManifest.cs | 3 - .../Tools/ClickOnce/IClickOnceManifest.cs | 3 +- src/Sign.Core/xlf/Resources.cs.xlf | 85 + src/Sign.Core/xlf/Resources.de.xlf | 85 + src/Sign.Core/xlf/Resources.es.xlf | 85 + src/Sign.Core/xlf/Resources.fr.xlf | 85 + src/Sign.Core/xlf/Resources.it.xlf | 85 + src/Sign.Core/xlf/Resources.ja.xlf | 85 + src/Sign.Core/xlf/Resources.ko.xlf | 85 + src/Sign.Core/xlf/Resources.pl.xlf | 85 + src/Sign.Core/xlf/Resources.pt-BR.xlf | 85 + src/Sign.Core/xlf/Resources.ru.xlf | 85 + src/Sign.Core/xlf/Resources.tr.xlf | 85 + src/Sign.Core/xlf/Resources.zh-Hans.xlf | 85 + src/Sign.Core/xlf/Resources.zh-Hant.xlf | 85 + ...kOnceDeploymentReferenceValidationTests.cs | 411 ++++ .../ClickOnceDiagnosticOrderingTests.cs | 254 ++ .../ClickOnce/ClickOnceFileGraphModelTests.cs | 225 ++ .../ClickOnceFileGraphResolverTests.cs | 2097 +++++++++++++++++ .../ClickOnceFileGraphTestUtilities.cs | 114 + .../ClickOnce/ClickOnceManifestReaderTests.cs | 18 +- .../ClickOnceResolutionFailureTests.cs | 269 +++ .../ClickOnceTargetPathCompatibilityTests.cs | 370 +++ .../ClickOnce/ClickOnceVstoFileGraphTests.cs | 133 ++ 37 files changed, 6317 insertions(+), 17 deletions(-) create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationManifestFileGraphResolver.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceDeployManifestFileGraphResolver.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntryKind.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphResolutionException.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceFileSystem.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceManifestDiagnostic.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOncePayloadFileResolver.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphResolverTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphTestUtilities.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoFileGraphTests.cs diff --git a/src/Sign.Core/Resources.Designer.cs b/src/Sign.Core/Resources.Designer.cs index e8f6b2be..1ba103c8 100644 --- a/src/Sign.Core/Resources.Designer.cs +++ b/src/Sign.Core/Resources.Designer.cs @@ -96,6 +96,159 @@ internal static string CertificateIsNotYetTimeValid { } } + /// + /// Looks up a localized string similar to Application manifest '{0}' contains invalid target path '{1}'.. + /// + internal static string ClickOnceApplicationManifestInvalidTargetPath { + get { + return ResourceManager.GetString("ClickOnceApplicationManifestInvalidTargetPath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Application manifest '{0}' contains a required file reference without a target path.. + /// + internal static string ClickOnceApplicationManifestMissingTargetPath { + get { + return ResourceManager.GetString("ClickOnceApplicationManifestMissingTargetPath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'.. + /// + internal static string ClickOnceApplicationManifestPayloadProbeFailed { + get { + return ResourceManager.GetString("ClickOnceApplicationManifestPayloadProbeFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to read application manifest '{0}'.. + /// + internal static string ClickOnceApplicationManifestReadFailed { + get { + return ResourceManager.GetString("ClickOnceApplicationManifestReadFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Application manifest '{0}' references required file '{1}', but it could not be found.. + /// + internal static string ClickOnceApplicationManifestRequiredFileNotFound { + get { + return ResourceManager.GetString("ClickOnceApplicationManifestRequiredFileNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to resolve files referenced by application manifest '{0}'.. + /// + internal static string ClickOnceApplicationManifestResolveFailed { + get { + return ResourceManager.GetString("ClickOnceApplicationManifestResolveFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deployment manifest '{0}' references application manifest '{1}', but the file does not exist.. + /// + internal static string ClickOnceDeploymentManifestApplicationManifestNotFound { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestApplicationManifestNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'.. + /// + internal static string ClickOnceDeploymentManifestLauncherProbeFailed { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestLauncherProbeFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deployment manifest '{0}' does not identify an application manifest.. + /// + internal static string ClickOnceDeploymentManifestMissingEntryPoint { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestMissingEntryPoint", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to read deployment manifest '{0}'.. + /// + internal static string ClickOnceDeploymentManifestReadFailed { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestReadFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to read application manifest '{0}' referenced by deployment manifest '{1}'.. + /// + internal static string ClickOnceDeploymentManifestReferencedApplicationReadFailed { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestReferencedApplicationReadFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to File '{0}' referenced by deployment manifest '{1}' is not an application manifest.. + /// + internal static string ClickOnceDeploymentManifestReferencedApplicationWrongType { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestReferencedApplicationWrongType", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to resolve files referenced by deployment manifest '{0}'.. + /// + internal static string ClickOnceDeploymentManifestResolveFailed { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestResolveFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'.. + /// + internal static string ClickOnceDeploymentManifestSetupProbeFailed { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestSetupProbeFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'.. + /// + internal static string ClickOnceDeploymentManifestUnresolvedApplicationManifest { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestUnresolvedApplicationManifest", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deployment manifest '{0}' must contain exactly one non-prerequisite application manifest reference and no file references.. + /// + internal static string ClickOnceDeploymentManifestUnsupportedReferences { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestUnsupportedReferences", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to File '{0}' is not a deployment manifest.. + /// + internal static string ClickOnceDeploymentManifestWrongType { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestWrongType", resourceCulture); + } + } + /// /// Looks up a localized string similar to Signing Mage job with {count} files.. /// diff --git a/src/Sign.Core/Resources.resx b/src/Sign.Core/Resources.resx index ab4345d2..9d069623 100644 --- a/src/Sign.Core/Resources.resx +++ b/src/Sign.Core/Resources.resx @@ -135,6 +135,74 @@ Signing Mage job with {count} files. {Locked="Mage"} is another signing tool. {Placeholder="{count}"} is the number of files to be signed. + + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + {fileName} returned the error {error} {Placeholder="{fileName}"} is a file name, and {Placeholder="{error}"} is verbose output from a tool. diff --git a/src/Sign.Core/Tools/ClickOnce/ApplicationManifestAdapter.cs b/src/Sign.Core/Tools/ClickOnce/ApplicationManifestAdapter.cs index 40e2434b..6faef5a8 100644 --- a/src/Sign.Core/Tools/ClickOnce/ApplicationManifestAdapter.cs +++ b/src/Sign.Core/Tools/ClickOnce/ApplicationManifestAdapter.cs @@ -14,7 +14,5 @@ internal ApplicationManifestAdapter(ApplicationManifest manifest) : base(manifest) { } - - public FileReferenceCollection FileReferences => Manifest.FileReferences; } } diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationManifestFileGraphResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationManifestFileGraphResolver.cs new file mode 100644 index 00000000..3cb4e682 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationManifestFileGraphResolver.cs @@ -0,0 +1,81 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using System.Globalization; + +namespace Sign.Core +{ + internal sealed class ClickOnceApplicationManifestFileGraphResolver + { + private readonly IClickOnceManifestReader _manifestReader; + private readonly ClickOncePayloadFileResolver _payloadResolver; + + internal ClickOnceApplicationManifestFileGraphResolver( + IClickOnceManifestReader manifestReader, + ClickOncePayloadFileResolver payloadResolver) + { + ArgumentNullException.ThrowIfNull(manifestReader, nameof(manifestReader)); + ArgumentNullException.ThrowIfNull(payloadResolver, nameof(payloadResolver)); + + _manifestReader = manifestReader; + _payloadResolver = payloadResolver; + } + + internal bool TryResolve(FileInfo applicationManifestFile, out ClickOnceFileGraph? graph) + { + ArgumentNullException.ThrowIfNull(applicationManifestFile, nameof(applicationManifestFile)); + + IApplicationManifest? applicationManifest; + + try + { + using FileStream stream = applicationManifestFile.OpenRead(); + + if (!_manifestReader.TryReadApplicationManifest( + stream, + out applicationManifest)) + { + graph = null; + + return false; + } + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException or + InvalidOperationException or + System.Xml.XmlException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestReadFailed, + applicationManifestFile.FullName), + innerException: exception); + } + + applicationManifest.ReadOnly = false; + + List diagnostics = new(); + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + applicationManifest, + diagnostics); + + graph = new ClickOnceFileGraph( + deploymentManifest: null, + deployManifest: null, + new ClickOnceFileGraphEntry( + applicationManifestFile, + applicationManifestFile.Name, + ClickOnceFileGraphEntryKind.ApplicationManifest), + applicationManifest, + payloads, + adjacentExecutables: Array.Empty(), + diagnostics); + + return true; + } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceDeployManifestFileGraphResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceDeployManifestFileGraphResolver.cs new file mode 100644 index 00000000..1454545f --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceDeployManifestFileGraphResolver.cs @@ -0,0 +1,403 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using System.Globalization; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core +{ + internal sealed class ClickOnceDeployManifestFileGraphResolver + { + private const string LauncherFileName = "Launcher.exe"; + private const string SetupFileName = "setup.exe"; + + private readonly IClickOnceManifestReader _manifestReader; + private readonly ClickOncePayloadFileResolver _payloadResolver; + private readonly Func _fileExists; + + internal ClickOnceDeployManifestFileGraphResolver( + IClickOnceManifestReader manifestReader, + ClickOncePayloadFileResolver payloadResolver) + : this(manifestReader, payloadResolver, ClickOnceFileSystem.IsFile) + { + } + + internal ClickOnceDeployManifestFileGraphResolver( + IClickOnceManifestReader manifestReader, + ClickOncePayloadFileResolver payloadResolver, + Func fileExists) + { + ArgumentNullException.ThrowIfNull(manifestReader, nameof(manifestReader)); + ArgumentNullException.ThrowIfNull(payloadResolver, nameof(payloadResolver)); + ArgumentNullException.ThrowIfNull(fileExists, nameof(fileExists)); + + _manifestReader = manifestReader; + _payloadResolver = payloadResolver; + _fileExists = fileExists; + } + + internal ClickOnceFileGraph Resolve(FileInfo deploymentManifestFile) + { + ArgumentNullException.ThrowIfNull(deploymentManifestFile, nameof(deploymentManifestFile)); + + IDeployManifest deploymentManifest = ReadDeployManifest(deploymentManifestFile); + AssemblyReference? entryPoint = deploymentManifest.EntryPoint; + List diagnostics = GetDiagnostics(deploymentManifest); + + if ((entryPoint is null && + deploymentManifest.AssemblyReferences.Count == 0 && + deploymentManifest.FileReferences.Count == 0) || + (entryPoint is not null && + string.IsNullOrWhiteSpace(entryPoint.TargetPath))) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestMissingEntryPoint, + deploymentManifestFile.FullName), + diagnostics); + } + + entryPoint = ValidateReferences( + deploymentManifestFile, + deploymentManifest, + entryPoint); + deploymentManifest.ReadOnly = false; + + try + { + ResolveFilesWithTargetOnlyEntryPoint( + deploymentManifest, + entryPoint, + new[] { deploymentManifestFile.Directory! }); + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException or + ArgumentException) + { + List resolutionDiagnostics = GetDiagnostics(deploymentManifest); + + throw CreateResolutionException( + deploymentManifestFile, + resolutionDiagnostics, + exception); + } + + diagnostics = GetDiagnostics(deploymentManifest); + + FileInfo applicationManifestFile = GetApplicationManifestFile( + deploymentManifestFile, + entryPoint, + diagnostics); + IApplicationManifest applicationManifest = ReadApplicationManifest( + deploymentManifestFile, + applicationManifestFile, + diagnostics); + applicationManifest.ReadOnly = false; + + IReadOnlyList payloads = _payloadResolver.ResolveForDeployment( + applicationManifestFile, + applicationManifest, + deploymentManifestFile.Directory!, + deploymentManifest.MapFileExtensions, + diagnostics); + + IReadOnlyList adjacentExecutables = + ResolveAdjacentExecutables( + deploymentManifestFile, + deploymentManifestFile.Directory!, + payloads, + diagnostics); + + return new ClickOnceFileGraph( + new ClickOnceFileGraphEntry( + deploymentManifestFile, + deploymentManifestFile.Name, + ClickOnceFileGraphEntryKind.DeploymentManifest), + deploymentManifest, + new ClickOnceFileGraphEntry( + applicationManifestFile, + entryPoint.TargetPath, + ClickOnceFileGraphEntryKind.ApplicationManifest, + entryPoint), + applicationManifest, + payloads, + adjacentExecutables, + diagnostics); + } + + private IDeployManifest ReadDeployManifest(FileInfo deploymentManifestFile) + { + try + { + using FileStream stream = deploymentManifestFile.OpenRead(); + + if (_manifestReader.TryReadDeployManifest( + stream, + out IDeployManifest? deploymentManifest)) + { + return deploymentManifest; + } + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException or + InvalidOperationException or + System.Xml.XmlException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReadFailed, + deploymentManifestFile.FullName), + innerException: exception); + } + + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestWrongType, + deploymentManifestFile.FullName)); + } + + private static AssemblyReference ValidateReferences( + FileInfo deploymentManifestFile, + IDeployManifest deploymentManifest, + AssemblyReference? entryPoint) + { + if (deploymentManifest.AssemblyReferences.Count != 1 || + deploymentManifest.FileReferences.Count != 0 || + entryPoint is null || + entryPoint.IsPrerequisite || + !ReferenceEquals( + entryPoint, + deploymentManifest.AssemblyReferences[0])) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestUnsupportedReferences, + deploymentManifestFile.FullName), + deploymentManifest.Diagnostics); + } + + return entryPoint; + } + + private IApplicationManifest ReadApplicationManifest( + FileInfo deploymentManifestFile, + FileInfo applicationManifestFile, + IReadOnlyCollection diagnostics) + { + try + { + using FileStream stream = applicationManifestFile.OpenRead(); + + if (_manifestReader.TryReadApplicationManifest( + stream, + out IApplicationManifest? applicationManifest)) + { + return applicationManifest; + } + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException or + InvalidOperationException or + System.Xml.XmlException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReferencedApplicationReadFailed, + applicationManifestFile.FullName, + deploymentManifestFile.FullName), + diagnostics, + exception); + } + + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReferencedApplicationWrongType, + applicationManifestFile.FullName, + deploymentManifestFile.FullName), + diagnostics); + } + + private FileInfo GetApplicationManifestFile( + FileInfo deploymentManifestFile, + AssemblyReference entryPoint, + IReadOnlyCollection diagnostics) + { + string? resolvedPath = entryPoint.ResolvedPath; + + if (string.IsNullOrWhiteSpace(resolvedPath)) + { + string expectedPath = Path.Combine( + deploymentManifestFile.DirectoryName!, + entryPoint.TargetPath); + + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestUnresolvedApplicationManifest, + deploymentManifestFile.FullName, + expectedPath), + diagnostics); + } + + FileInfo applicationManifestFile = new(resolvedPath); + + try + { + if (!_fileExists(applicationManifestFile)) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestApplicationManifestNotFound, + deploymentManifestFile.FullName, + applicationManifestFile.FullName), + diagnostics); + } + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException or + ArgumentException or + NotSupportedException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReferencedApplicationReadFailed, + applicationManifestFile.FullName, + deploymentManifestFile.FullName), + diagnostics, + exception); + } + + return applicationManifestFile; + } + + private static void ResolveFilesWithTargetOnlyEntryPoint( + IDeployManifest deploymentManifest, + AssemblyReference? entryPoint, + IReadOnlyList searchDirectories) + { + if (entryPoint is null) + { + deploymentManifest.ResolveFiles(searchDirectories); + + return; + } + + string? sourcePath = entryPoint.SourcePath; + AssemblyIdentity? assemblyIdentity = entryPoint.AssemblyIdentity; + + try + { + // ManifestUtilities otherwise prioritizes SourcePath and assembly identity over TargetPath. + entryPoint.SourcePath = null; + entryPoint.AssemblyIdentity = null; + deploymentManifest.ResolveFiles(searchDirectories); + } + finally + { + entryPoint.SourcePath = sourcePath; + entryPoint.AssemblyIdentity = assemblyIdentity; + } + } + + private IReadOnlyList ResolveAdjacentExecutables( + FileInfo deploymentManifestFile, + DirectoryInfo deploymentDirectory, + IReadOnlyList payloads, + IReadOnlyCollection diagnostics) + { + HashSet payloadPaths = payloads + .Select(payload => Path.GetFullPath(payload.Source.FullName)) + .ToHashSet(StringComparer.OrdinalIgnoreCase); + List adjacentExecutables = new(); + FileInfo setup = new(Path.Combine(deploymentDirectory.FullName, SetupFileName)); + + if (IsAdjacentFile( + setup, + deploymentManifestFile, + Resources.ClickOnceDeploymentManifestSetupProbeFailed, + diagnostics)) + { + adjacentExecutables.Add( + new ClickOnceFileGraphEntry( + setup, + setup.Name, + ClickOnceFileGraphEntryKind.Setup)); + } + + FileInfo launcher = new(Path.Combine(deploymentDirectory.FullName, LauncherFileName)); + + if (!payloadPaths.Contains(Path.GetFullPath(launcher.FullName)) && + IsAdjacentFile( + launcher, + deploymentManifestFile, + Resources.ClickOnceDeploymentManifestLauncherProbeFailed, + diagnostics)) + { + adjacentExecutables.Add( + new ClickOnceFileGraphEntry( + launcher, + launcher.Name, + ClickOnceFileGraphEntryKind.Launcher)); + } + + return adjacentExecutables; + } + + private bool IsAdjacentFile( + FileInfo candidate, + FileInfo deploymentManifestFile, + string failureMessageFormat, + IReadOnlyCollection diagnostics) + { + try + { + return _fileExists(candidate); + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + failureMessageFormat, + candidate.FullName, + deploymentManifestFile.FullName), + diagnostics, + exception); + } + } + + private static ClickOnceFileGraphResolutionException CreateResolutionException( + FileInfo deploymentManifestFile, + IEnumerable diagnostics, + Exception innerException) + { + return new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestResolveFailed, + deploymentManifestFile.FullName), + diagnostics, + innerException); + } + + private static List GetDiagnostics(IClickOnceManifest manifest) + { + return manifest.Diagnostics.ToList(); + } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs new file mode 100644 index 00000000..74818bd2 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs @@ -0,0 +1,41 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core +{ + internal sealed class ClickOnceFileGraph + { + internal ClickOnceFileGraph( + ClickOnceFileGraphEntry? deploymentManifest, + IDeployManifest? deployManifest, + ClickOnceFileGraphEntry applicationManifest, + IApplicationManifest applicationManifestModel, + IEnumerable payloads, + IEnumerable adjacentExecutables, + IEnumerable diagnostics) + { + ArgumentNullException.ThrowIfNull(applicationManifest, nameof(applicationManifest)); + ArgumentNullException.ThrowIfNull(applicationManifestModel, nameof(applicationManifestModel)); + ArgumentNullException.ThrowIfNull(payloads, nameof(payloads)); + ArgumentNullException.ThrowIfNull(adjacentExecutables, nameof(adjacentExecutables)); + ArgumentNullException.ThrowIfNull(diagnostics, nameof(diagnostics)); + + DeploymentManifest = deploymentManifest; + DeployManifest = deployManifest; + ApplicationManifest = applicationManifest; + ApplicationManifestModel = applicationManifestModel; + Payloads = payloads.ToArray(); + AdjacentExecutables = adjacentExecutables.ToArray(); + Diagnostics = diagnostics.ToArray(); + } + + internal ClickOnceFileGraphEntry? DeploymentManifest { get; } + internal IDeployManifest? DeployManifest { get; } + internal ClickOnceFileGraphEntry ApplicationManifest { get; } + internal IApplicationManifest ApplicationManifestModel { get; } + internal IReadOnlyList Payloads { get; } + internal IReadOnlyList AdjacentExecutables { get; } + internal IReadOnlyList Diagnostics { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs new file mode 100644 index 00000000..2aebbe95 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs @@ -0,0 +1,34 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core +{ + internal sealed class ClickOnceFileGraphEntry + { + internal ClickOnceFileGraphEntry( + FileInfo source, + string targetPath, + ClickOnceFileGraphEntryKind kind, + BaseReference? manifestReference = null, + string? mappingAddedSuffix = null) + { + ArgumentNullException.ThrowIfNull(source, nameof(source)); + ArgumentException.ThrowIfNullOrWhiteSpace(targetPath, nameof(targetPath)); + + Source = source; + TargetPath = targetPath; + Kind = kind; + ManifestReference = manifestReference; + MappingAddedSuffix = mappingAddedSuffix; + } + + internal FileInfo Source { get; } + internal string TargetPath { get; } + internal ClickOnceFileGraphEntryKind Kind { get; } + internal BaseReference? ManifestReference { get; } + internal string? MappingAddedSuffix { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntryKind.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntryKind.cs new file mode 100644 index 00000000..3c4b76f9 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntryKind.cs @@ -0,0 +1,15 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core +{ + internal enum ClickOnceFileGraphEntryKind + { + DeploymentManifest, + ApplicationManifest, + Payload, + Setup, + Launcher + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphResolutionException.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphResolutionException.cs new file mode 100644 index 00000000..25178368 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphResolutionException.cs @@ -0,0 +1,22 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core +{ + internal sealed class ClickOnceFileGraphResolutionException : Exception + { + internal ClickOnceFileGraphResolutionException( + string message, + IEnumerable? diagnostics = null, + Exception? innerException = null) + : base(message, innerException) + { + ArgumentException.ThrowIfNullOrWhiteSpace(message, nameof(message)); + + Diagnostics = diagnostics?.ToArray() ?? Array.Empty(); + } + + internal IReadOnlyList Diagnostics { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileSystem.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileSystem.cs new file mode 100644 index 00000000..cafc242b --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileSystem.cs @@ -0,0 +1,27 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core +{ + internal static class ClickOnceFileSystem + { + internal static bool IsFile(FileInfo file) + { + ArgumentNullException.ThrowIfNull(file, nameof(file)); + + try + { + return !File.GetAttributes(file.FullName).HasFlag(FileAttributes.Directory); + } + catch (FileNotFoundException) + { + return false; + } + catch (DirectoryNotFoundException) + { + return false; + } + } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestAdapter.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestAdapter.cs index 1b1f0c28..297adf35 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestAdapter.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestAdapter.cs @@ -22,8 +22,12 @@ protected ClickOnceManifestAdapter(TManifest manifest) public AssemblyIdentity AssemblyIdentity => Manifest.AssemblyIdentity; public AssemblyReferenceCollection AssemblyReferences => Manifest.AssemblyReferences; + public IReadOnlyList Diagnostics => Manifest.OutputMessages + .Cast() + .Select(message => new ClickOnceManifestDiagnostic(message)) + .ToArray(); public AssemblyReference? EntryPoint => Manifest.EntryPoint; - public OutputMessageCollection OutputMessages => Manifest.OutputMessages; + public FileReferenceCollection FileReferences => Manifest.FileReferences; public bool ReadOnly { diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestDiagnostic.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestDiagnostic.cs new file mode 100644 index 00000000..6c7ff54d --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestDiagnostic.cs @@ -0,0 +1,37 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core +{ + internal sealed class ClickOnceManifestDiagnostic + { + internal ClickOnceManifestDiagnostic(OutputMessage message) + { + ArgumentNullException.ThrowIfNull(message, nameof(message)); + + Name = message.Name; + Text = message.Text; + Type = message.Type; + } + + internal ClickOnceManifestDiagnostic( + string name, + string text, + OutputMessageType type) + { + ArgumentNullException.ThrowIfNull(name, nameof(name)); + ArgumentNullException.ThrowIfNull(text, nameof(text)); + + Name = name; + Text = text; + Type = type; + } + + internal string Name { get; } + internal string Text { get; } + internal OutputMessageType Type { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadFileResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadFileResolver.cs new file mode 100644 index 00000000..4363dca2 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadFileResolver.cs @@ -0,0 +1,443 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using System.Globalization; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core +{ + internal sealed class ClickOncePayloadFileResolver + { + private const string ClrPlatformAssemblyName = "Microsoft.Windows.CommonLanguageRuntime"; + private const string DeploySuffix = ".deploy"; + + private readonly Func _fileExists; + + internal ClickOncePayloadFileResolver() + : this(ClickOnceFileSystem.IsFile) + { + } + + internal ClickOncePayloadFileResolver(Func fileExists) + { + ArgumentNullException.ThrowIfNull(fileExists, nameof(fileExists)); + + _fileExists = fileExists; + } + + internal IReadOnlyList ResolveForDeployment( + FileInfo applicationManifestFile, + IApplicationManifest applicationManifest, + DirectoryInfo deploymentDirectory, + bool mapFileExtensions, + ICollection diagnostics) + { + ArgumentNullException.ThrowIfNull(applicationManifestFile, nameof(applicationManifestFile)); + ArgumentNullException.ThrowIfNull(applicationManifest, nameof(applicationManifest)); + ArgumentNullException.ThrowIfNull(deploymentDirectory, nameof(deploymentDirectory)); + ArgumentNullException.ThrowIfNull(diagnostics, nameof(diagnostics)); + + DirectoryInfo applicationDirectory = applicationManifestFile.Directory!; + DirectoryInfo[] searchDirectories = PathsEqual(applicationDirectory.FullName, deploymentDirectory.FullName) + ? new[] { applicationDirectory } + : new[] { applicationDirectory, deploymentDirectory }; + DirectoryInfo[][] resolutionSearchDirectories = searchDirectories.Length == 1 + ? new[] { searchDirectories } + // Preserve diagnostics from the application-directory attempt before retrying with fallback. + : new[] { new[] { applicationDirectory }, searchDirectories }; + + return Resolve( + applicationManifestFile, + applicationManifest, + searchDirectories, + resolutionSearchDirectories, + mapFileExtensions ? PayloadLookupKind.Mapped : PayloadLookupKind.Unmapped, + diagnostics); + } + + internal IReadOnlyList ResolveForExplicitApplication( + FileInfo applicationManifestFile, + IApplicationManifest applicationManifest, + ICollection diagnostics) + { + ArgumentNullException.ThrowIfNull(applicationManifestFile, nameof(applicationManifestFile)); + ArgumentNullException.ThrowIfNull(applicationManifest, nameof(applicationManifest)); + ArgumentNullException.ThrowIfNull(diagnostics, nameof(diagnostics)); + + return Resolve( + applicationManifestFile, + applicationManifest, + new[] { applicationManifestFile.Directory! }, + new[] { new[] { applicationManifestFile.Directory! } }, + PayloadLookupKind.UnmappedThenMapped, + diagnostics); + } + + private IReadOnlyList Resolve( + FileInfo applicationManifestFile, + IApplicationManifest applicationManifest, + DirectoryInfo[] searchDirectories, + DirectoryInfo[][] resolutionSearchDirectories, + PayloadLookupKind lookupKind, + ICollection diagnostics) + { + List references = GetPhysicalReferences(applicationManifest); + + foreach (BaseReference reference in references) + { + ValidateTargetPath( + applicationManifestFile, + reference.TargetPath, + searchDirectories, + diagnostics); + } + + int diagnosticCount = 0; + + try + { + using TargetOnlyResolutionScope resolutionScope = new(references); + + foreach (DirectoryInfo[] resolutionDirectories in resolutionSearchDirectories) + { + try + { + applicationManifest.ResolveFiles(resolutionDirectories); + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException or + ArgumentException) + { + AddDiagnostics(applicationManifest, diagnostics, ref diagnosticCount); + + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestResolveFailed, + applicationManifestFile.FullName), + diagnostics, + exception); + } + + AddDiagnostics(applicationManifest, diagnostics, ref diagnosticCount); + } + } + finally + { + ClearResolvedPaths(applicationManifest); + } + + List payloads = new(references.Count); + + foreach (BaseReference reference in references) + { + string? targetPath = reference.TargetPath; + + if (string.IsNullOrWhiteSpace(targetPath)) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestMissingTargetPath, + applicationManifestFile.FullName), + diagnostics); + } + + FileInfo source; + string? mappingAddedSuffix; + + try + { + if (TryResolve( + applicationManifestFile, + targetPath, + searchDirectories, + lookupKind, + diagnostics, + out source, + out mappingAddedSuffix)) + { + reference.ResolvedPath = source.FullName; + + payloads.Add( + new ClickOnceFileGraphEntry( + source, + targetPath, + ClickOnceFileGraphEntryKind.Payload, + reference, + mappingAddedSuffix)); + + continue; + } + } + catch (Exception exception) when ( + exception is ArgumentException or + NotSupportedException or + PathTooLongException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestInvalidTargetPath, + applicationManifestFile.FullName, + targetPath), + diagnostics, + exception); + } + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestRequiredFileNotFound, + applicationManifestFile.FullName, + targetPath), + diagnostics); + } + + return payloads; + } + + private static void ClearResolvedPaths(IApplicationManifest applicationManifest) + { + foreach (AssemblyReference reference in applicationManifest.AssemblyReferences) + { + reference.ResolvedPath = null; + } + + foreach (FileReference reference in applicationManifest.FileReferences) + { + reference.ResolvedPath = null; + } + + if (applicationManifest.EntryPoint is not null) + { + applicationManifest.EntryPoint.ResolvedPath = null; + } + } + + private static List GetPhysicalReferences(IApplicationManifest applicationManifest) + { + List references = applicationManifest.AssemblyReferences + .Cast() + .Where(IsPhysical) + .Cast() + .ToList(); + + if (applicationManifest.EntryPoint is not null && + IsPhysical(applicationManifest.EntryPoint) && + !references.Any(reference => ReferenceEquals(reference, applicationManifest.EntryPoint))) + { + references.Add(applicationManifest.EntryPoint); + } + + references.AddRange(applicationManifest.FileReferences.Cast()); + + return references; + } + + private static bool IsPhysical(AssemblyReference reference) + { + return !reference.IsPrerequisite && + !string.Equals( + reference.AssemblyIdentity?.Name, + ClrPlatformAssemblyName, + StringComparison.OrdinalIgnoreCase); + } + + private static void ValidateTargetPath( + FileInfo applicationManifestFile, + string? targetPath, + IEnumerable searchDirectories, + ICollection diagnostics) + { + if (string.IsNullOrWhiteSpace(targetPath)) + { + return; + } + + try + { + foreach (DirectoryInfo directory in searchDirectories) + { + _ = Path.GetFullPath(Path.Combine(directory.FullName, targetPath)); + } + } + catch (Exception exception) when ( + exception is ArgumentException or + PathTooLongException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestInvalidTargetPath, + applicationManifestFile.FullName, + targetPath), + diagnostics, + exception); + } + } + + private bool TryResolve( + FileInfo applicationManifestFile, + string targetPath, + IEnumerable searchDirectories, + PayloadLookupKind lookupKind, + ICollection diagnostics, + out FileInfo source, + out string? mappingAddedSuffix) + { + foreach (DirectoryInfo directory in searchDirectories) + { + if (lookupKind is PayloadLookupKind.Unmapped or PayloadLookupKind.UnmappedThenMapped) + { + FileInfo unmappedSource = new(Path.Combine(directory.FullName, targetPath)); + + if (IsFile( + applicationManifestFile, + targetPath, + unmappedSource, + diagnostics)) + { + source = unmappedSource; + mappingAddedSuffix = null; + + return true; + } + } + + if (lookupKind is PayloadLookupKind.Mapped or PayloadLookupKind.UnmappedThenMapped) + { + FileInfo mappedSource = new(Path.Combine(directory.FullName, $"{targetPath}{DeploySuffix}")); + + if (IsFile( + applicationManifestFile, + targetPath, + mappedSource, + diagnostics)) + { + source = mappedSource; + mappingAddedSuffix = DeploySuffix; + + return true; + } + } + } + + source = null!; + mappingAddedSuffix = null; + + return false; + } + + private bool IsFile( + FileInfo applicationManifestFile, + string targetPath, + FileInfo sourceCandidate, + ICollection diagnostics) + { + try + { + return _fileExists(sourceCandidate); + } + catch (PathTooLongException) + { + throw; + } + catch (Exception exception) when ( + exception is IOException or + UnauthorizedAccessException) + { + throw new ClickOnceFileGraphResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestPayloadProbeFailed, + applicationManifestFile.FullName, + targetPath, + sourceCandidate.FullName), + diagnostics, + exception); + } + } + + private static void AddDiagnostics( + IClickOnceManifest manifest, + ICollection diagnostics, + ref int diagnosticCount) + { + IReadOnlyList manifestDiagnostics = manifest.Diagnostics; + + for (int i = diagnosticCount; i < manifestDiagnostics.Count; ++i) + { + diagnostics.Add(manifestDiagnostics[i]); + } + + diagnosticCount = manifestDiagnostics.Count; + } + + private static bool PathsEqual(string left, string right) + { + return string.Equals( + Path.GetFullPath(left), + Path.GetFullPath(right), + StringComparison.OrdinalIgnoreCase); + } + + private enum PayloadLookupKind + { + Unmapped, + Mapped, + UnmappedThenMapped + } + + private sealed class TargetOnlyResolutionScope : IDisposable + { + private readonly IReadOnlyList _states; + + internal TargetOnlyResolutionScope(IEnumerable references) + { + _states = references + .Distinct(ReferenceEqualityComparer.Instance) + .Select(reference => new ReferenceState(reference)) + .ToArray(); + + foreach (ReferenceState state in _states) + { + state.Reference.SourcePath = null; + + if (state.Reference is AssemblyReference assemblyReference) + { + assemblyReference.AssemblyIdentity = null; + } + } + } + + public void Dispose() + { + foreach (ReferenceState state in _states) + { + state.Reference.SourcePath = state.SourcePath; + + if (state.Reference is AssemblyReference assemblyReference) + { + assemblyReference.AssemblyIdentity = state.AssemblyIdentity; + } + } + } + + private sealed class ReferenceState + { + internal ReferenceState(BaseReference reference) + { + Reference = reference; + SourcePath = reference.SourcePath; + AssemblyIdentity = (reference as AssemblyReference)?.AssemblyIdentity; + } + + internal BaseReference Reference { get; } + internal string? SourcePath { get; } + internal AssemblyIdentity? AssemblyIdentity { get; } + } + } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/IApplicationManifest.cs b/src/Sign.Core/Tools/ClickOnce/IApplicationManifest.cs index c32cb4d9..98aec190 100644 --- a/src/Sign.Core/Tools/ClickOnce/IApplicationManifest.cs +++ b/src/Sign.Core/Tools/ClickOnce/IApplicationManifest.cs @@ -2,12 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE.txt file in the project root for more information. -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; - namespace Sign.Core { internal interface IApplicationManifest : IClickOnceManifest { - FileReferenceCollection FileReferences { get; } } } diff --git a/src/Sign.Core/Tools/ClickOnce/IClickOnceManifest.cs b/src/Sign.Core/Tools/ClickOnce/IClickOnceManifest.cs index ab0d9a14..bca152ff 100644 --- a/src/Sign.Core/Tools/ClickOnce/IClickOnceManifest.cs +++ b/src/Sign.Core/Tools/ClickOnce/IClickOnceManifest.cs @@ -10,8 +10,9 @@ internal interface IClickOnceManifest { AssemblyIdentity AssemblyIdentity { get; } AssemblyReferenceCollection AssemblyReferences { get; } + IReadOnlyList Diagnostics { get; } AssemblyReference? EntryPoint { get; } - OutputMessageCollection OutputMessages { get; } + FileReferenceCollection FileReferences { get; } bool ReadOnly { get; set; } void ResolveFiles(IReadOnlyList searchDirectories); diff --git a/src/Sign.Core/xlf/Resources.cs.xlf b/src/Sign.Core/xlf/Resources.cs.xlf index b936578b..06ce179a 100644 --- a/src/Sign.Core/xlf/Resources.cs.xlf +++ b/src/Sign.Core/xlf/Resources.cs.xlf @@ -32,6 +32,91 @@ Soubor {fileName} vrátil výstup {output}. {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Podepisování úlohy Mage pomocí {count} souborů. diff --git a/src/Sign.Core/xlf/Resources.de.xlf b/src/Sign.Core/xlf/Resources.de.xlf index b8b04972..c7a7e662 100644 --- a/src/Sign.Core/xlf/Resources.de.xlf +++ b/src/Sign.Core/xlf/Resources.de.xlf @@ -32,6 +32,91 @@ {fileName} hat die Ausgabe {output} zurückgegeben {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Der Mage-Auftrag wird mit {count} Dateien signiert. diff --git a/src/Sign.Core/xlf/Resources.es.xlf b/src/Sign.Core/xlf/Resources.es.xlf index 0fca3f30..cabd09e4 100644 --- a/src/Sign.Core/xlf/Resources.es.xlf +++ b/src/Sign.Core/xlf/Resources.es.xlf @@ -32,6 +32,91 @@ {fileName} devolvió la salida {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Firmando el trabajo de Mage con {count} archivos. diff --git a/src/Sign.Core/xlf/Resources.fr.xlf b/src/Sign.Core/xlf/Resources.fr.xlf index beb2d9a5..1bdccb62 100644 --- a/src/Sign.Core/xlf/Resources.fr.xlf +++ b/src/Sign.Core/xlf/Resources.fr.xlf @@ -32,6 +32,91 @@ {fileName} a renvoyé la sortie {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Signature du travail Mage avec {count} fichiers. diff --git a/src/Sign.Core/xlf/Resources.it.xlf b/src/Sign.Core/xlf/Resources.it.xlf index 5357a2f1..7da0ecb2 100644 --- a/src/Sign.Core/xlf/Resources.it.xlf +++ b/src/Sign.Core/xlf/Resources.it.xlf @@ -32,6 +32,91 @@ {fileName} ha restituito l'output {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Firma del processo Mage con {count} file. diff --git a/src/Sign.Core/xlf/Resources.ja.xlf b/src/Sign.Core/xlf/Resources.ja.xlf index f7e2c5f1..11213871 100644 --- a/src/Sign.Core/xlf/Resources.ja.xlf +++ b/src/Sign.Core/xlf/Resources.ja.xlf @@ -32,6 +32,91 @@ {fileName} が出力 {output} を返しました {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. {count} 個のファイルを使用して Mage ジョブに署名しています。 diff --git a/src/Sign.Core/xlf/Resources.ko.xlf b/src/Sign.Core/xlf/Resources.ko.xlf index 8b38539b..5dd1fcf0 100644 --- a/src/Sign.Core/xlf/Resources.ko.xlf +++ b/src/Sign.Core/xlf/Resources.ko.xlf @@ -32,6 +32,91 @@ {fileName}에서 출력 {output}을(를) 반환했습니다. {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. {count} 파일로 Mage 작업에 서명하는 중입니다. diff --git a/src/Sign.Core/xlf/Resources.pl.xlf b/src/Sign.Core/xlf/Resources.pl.xlf index 33d8d4fb..5703feeb 100644 --- a/src/Sign.Core/xlf/Resources.pl.xlf +++ b/src/Sign.Core/xlf/Resources.pl.xlf @@ -32,6 +32,91 @@ Plik {fileName} zwrócił dane wyjśćiowe {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Podpisywanie zadania Mage przy użyciu {count} plików. diff --git a/src/Sign.Core/xlf/Resources.pt-BR.xlf b/src/Sign.Core/xlf/Resources.pt-BR.xlf index 3400e27e..1b8b417f 100644 --- a/src/Sign.Core/xlf/Resources.pt-BR.xlf +++ b/src/Sign.Core/xlf/Resources.pt-BR.xlf @@ -32,6 +32,91 @@ {fileName} retornou a saída {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Autenticando o trabalho Mage com {count} arquivos. diff --git a/src/Sign.Core/xlf/Resources.ru.xlf b/src/Sign.Core/xlf/Resources.ru.xlf index 04a5d356..a32b5855 100644 --- a/src/Sign.Core/xlf/Resources.ru.xlf +++ b/src/Sign.Core/xlf/Resources.ru.xlf @@ -32,6 +32,91 @@ {fileName} возвращает выходные данные {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Подписывание задания Mage с несколькими файлами ({count}). diff --git a/src/Sign.Core/xlf/Resources.tr.xlf b/src/Sign.Core/xlf/Resources.tr.xlf index f6d54a13..044f71e9 100644 --- a/src/Sign.Core/xlf/Resources.tr.xlf +++ b/src/Sign.Core/xlf/Resources.tr.xlf @@ -32,6 +32,91 @@ {fileName}, {output} çıkışını döndürdü {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. Mage işi {count} dosya ile imzalanıyor. diff --git a/src/Sign.Core/xlf/Resources.zh-Hans.xlf b/src/Sign.Core/xlf/Resources.zh-Hans.xlf index 7d31e7fa..8e375c3f 100644 --- a/src/Sign.Core/xlf/Resources.zh-Hans.xlf +++ b/src/Sign.Core/xlf/Resources.zh-Hans.xlf @@ -32,6 +32,91 @@ {fileName} 返回输出 {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. 正在对包含 {count} 个文件的 Mage 作业进行签名。 diff --git a/src/Sign.Core/xlf/Resources.zh-Hant.xlf b/src/Sign.Core/xlf/Resources.zh-Hant.xlf index 7149ef7f..3e629f60 100644 --- a/src/Sign.Core/xlf/Resources.zh-Hant.xlf +++ b/src/Sign.Core/xlf/Resources.zh-Hant.xlf @@ -32,6 +32,91 @@ {fileName} 已傳回輸出 {output} {Placeholder="{fileName}"} is a file name, and {Placeholder="{output}"} is verbose output from a tool. + + Application manifest '{0}' contains invalid target path '{1}'. + Application manifest '{0}' contains invalid target path '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is an invalid target path. + + + Application manifest '{0}' contains a required file reference without a target path. + Application manifest '{0}' contains a required file reference without a target path. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + Failed to access source candidate '{2}' for target path '{1}' in application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is the exact target path from the manifest. {NumberedPlaceholder="{2}"} is the absolute source candidate path. + + + Failed to read application manifest '{0}'. + Failed to read application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Application manifest '{0}' references required file '{1}', but it could not be found. + Application manifest '{0}' references required file '{1}', but it could not be found. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. + + + Failed to resolve files referenced by application manifest '{0}'. + Failed to resolve files referenced by application manifest '{0}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. + + + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read deployment manifest '{0}'. + Failed to read deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + Failed to read application manifest '{0}' referenced by deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + File '{0}' referenced by deployment manifest '{1}' is not an application manifest. + {NumberedPlaceholder="{0}"} is a referenced file path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Failed to resolve files referenced by deployment manifest '{0}'. + Failed to resolve files referenced by deployment manifest '{0}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + Failed to access setup bootstrapper candidate '{0}' associated with deployment manifest '{1}'. + {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. + + + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. + + + File '{0}' is not a deployment manifest. + File '{0}' is not a deployment manifest. + {NumberedPlaceholder="{0}"} is a file path. + Signing Mage job with {count} files. 正在簽署具有 {count} 個檔案的 Mage 工作。 diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs new file mode 100644 index 00000000..b2da6937 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs @@ -0,0 +1,411 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using System.Globalization; +using System.Xml.Linq; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Sign.TestInfrastructure; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceDeploymentReferenceValidationTests : IDisposable + { + private const string ApplicationManifestFileName = + "App.exe.manifest"; + private const string DeploymentManifestFileName = + "App.application"; + private const string PrerequisiteFileName = + "prerequisite.dll"; + private const string VstoManifestFileName = "App.vsto"; + + private readonly DirectoryService _directoryService; + + public ClickOnceDeploymentReferenceValidationTests() + { + _directoryService = new( + Substitute.For>()); + } + + public void Dispose() + { + _directoryService.Dispose(); + } + + [Theory] + [InlineData(DeploymentManifestFileName)] + [InlineData(VstoManifestFileName)] + public void DeploymentResolver_WhenSerializedManifestHasOneApplicationDependencyAndNoFiles_Succeeds( + string deploymentManifestFileName) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifest = + ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + root, + ApplicationManifestFileName); + FileInfo deploymentManifest = + ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + root, + deploymentManifestFileName, + applicationManifest.Name); + ClickOnceDeployManifestFileGraphResolver resolver = new( + new ClickOnceManifestReader(), + new ClickOncePayloadFileResolver()); + + ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + + IDeployManifest deployManifest = + Assert.IsAssignableFrom( + graph.DeployManifest); + ClickOnceFileGraphEntry deploymentManifestEntry = + Assert.IsType( + graph.DeploymentManifest); + Assert.Equal( + deploymentManifest.FullName, + deploymentManifestEntry.Source.FullName); + Assert.Equal( + applicationManifest.FullName, + graph.ApplicationManifest.Source.FullName); + Assert.Single(deployManifest.AssemblyReferences); + Assert.Empty(deployManifest.FileReferences); + Assert.Empty(graph.Payloads); + } + + [Fact] + public void DeploymentResolver_WhenSerializedManifestHasExtraInstallDependency_RejectsBeforeResolution() + { + AssertSerializedManifestRejected( + manifest => + manifest.AssemblyReferences.Add( + new AssemblyReference("extra.dll")), + assertParsedManifest: manifest => + Assert.Equal( + expected: 2, + actual: manifest.AssemblyReferences.Count)); + } + + [Fact] + public void DeploymentResolver_WhenSerializedManifestHasFileReference_RejectsBeforeResolution() + { + AssertSerializedManifestRejected( + manifest => + manifest.FileReferences.Add( + new FileReference("extra.dat")), + assertParsedManifest: manifest => + Assert.Single(manifest.FileReferences)); + } + + [Fact] + public void DeploymentResolver_WhenSerializedManifestHasExtraPrerequisite_RejectsBeforeResolution() + { + AssertSerializedManifestRejected( + manifest => + manifest.AssemblyReferences.Add( + CreatePrerequisiteReference()), + MakeExtraDependencyPrerequisite, + assertParsedManifest: manifest => + Assert.Contains( + manifest.AssemblyReferences.Cast(), + reference => reference.IsPrerequisite)); + } + + [Fact] + public void DeploymentResolver_WhenSerializedManifestHasDuplicateDependency_RejectsBeforeResolution() + { + AssertSerializedManifestRejected( + _ => + { + }, + DuplicateDependency, + manifest => + Assert.Equal( + expected: 2, + actual: manifest.AssemblyReferences.Count)); + } + + [Fact] + public void DeploymentResolver_WhenSerializedManifestHasSolePrerequisite_RejectsBeforeResolution() + { + AssertSerializedManifestRejected( + _ => + { + }, + MakeSoleDependencyPrerequisite, + manifest => + Assert.True( + Assert.Single( + manifest.AssemblyReferences + .Cast()) + .IsPrerequisite)); + } + + [Fact] + public void DeploymentResolver_WhenEntryPointIsNotTheSoleCollectionReference_RejectsBeforeResolution() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo deploymentManifestFile = + ClickOnceFileGraphTestUtilities.CreateFile( + temporaryDirectory.Directory, + DeploymentManifestFileName); + AssemblyReference collectionReference = new() + { + TargetPath = ApplicationManifestFileName + }; + AssemblyReference entryPoint = new() + { + TargetPath = ApplicationManifestFileName + }; + DeployManifest model = CreateDeploymentManifest(); + + model.AssemblyReferences.Clear(); + model.AssemblyReferences.Add(collectionReference); + model.EntryPoint = collectionReference; + + IDeployManifest deploymentManifest = + Substitute.For(); + bool resolveFilesCalled = false; + + deploymentManifest.AssemblyReferences.Returns( + model.AssemblyReferences); + deploymentManifest.EntryPoint.Returns(entryPoint); + deploymentManifest.FileReferences.Returns(model.FileReferences); + deploymentManifest.Diagnostics.Returns( + Array.Empty()); + deploymentManifest + .When(manifest => manifest.ResolveFiles( + Arg.Any>())) + .Do(_ => resolveFilesCalled = true); + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + int fileProbeCount = 0; + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + new ClickOncePayloadFileResolver(), + _ => + { + ++fileProbeCount; + return false; + }); + + AssertUnsupportedReferences( + deploymentManifestFile, + () => resolver.Resolve(deploymentManifestFile)); + Assert.False(resolveFilesCalled); + Assert.Equal(expected: 0, actual: fileProbeCount); + } + + private void AssertSerializedManifestRejected( + Action mutateManifest, + Action? mutateSerializedManifest = null, + Action? assertParsedManifest = null) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifest = + ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + root, + ApplicationManifestFileName); + DeployManifest model = CreateDeploymentManifest(); + + model.EntryPoint!.TargetPath = applicationManifest.Name; + mutateManifest(model); + + FileInfo deploymentManifestFile = + ClickOnceFileGraphTestUtilities.WriteManifest( + root, + DeploymentManifestFileName, + model); + + mutateSerializedManifest?.Invoke(deploymentManifestFile); + + ClickOnceManifestReader realManifestReader = new(); + IDeployManifest parsedManifest; + + using (FileStream stream = deploymentManifestFile.OpenRead()) + { + Assert.True( + realManifestReader.TryReadDeployManifest( + stream, + out IDeployManifest? manifest)); + parsedManifest = Assert.IsAssignableFrom( + manifest); + } + + assertParsedManifest?.Invoke(parsedManifest); + + IDeployManifest recordingManifest = + Substitute.For(); + bool resolveFilesCalled = false; + + recordingManifest.AssemblyReferences.Returns( + parsedManifest.AssemblyReferences); + recordingManifest.EntryPoint.Returns( + parsedManifest.EntryPoint); + recordingManifest.FileReferences.Returns( + parsedManifest.FileReferences); + recordingManifest.Diagnostics.Returns( + parsedManifest.Diagnostics); + recordingManifest + .When(manifest => manifest.ResolveFiles( + Arg.Any>())) + .Do(_ => resolveFilesCalled = true); + + int applicationReadCount = 0; + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = recordingManifest; + return true; + }); + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + ++applicationReadCount; + callInfo[1] = null; + return false; + }); + + int fileProbeCount = 0; + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + new ClickOncePayloadFileResolver(), + _ => + { + ++fileProbeCount; + return false; + }); + + AssertUnsupportedReferences( + deploymentManifestFile, + () => resolver.Resolve(deploymentManifestFile)); + Assert.False(resolveFilesCalled); + Assert.Equal(expected: 0, actual: applicationReadCount); + Assert.Equal(expected: 0, actual: fileProbeCount); + } + + private static DeployManifest CreateDeploymentManifest() + { + DeployManifest manifest = new(); + + manifest.AssemblyIdentity.Name = "TestDeployment"; + manifest.AssemblyIdentity.Version = + ClickOnceFileGraphTestUtilities.ManifestVersion; + manifest.AssemblyIdentity.ProcessorArchitecture = + ClickOnceFileGraphTestUtilities.ProcessorArchitecture; + + AssemblyReference entryPoint = new( + ApplicationManifestFileName); + + manifest.AssemblyReferences.Add(entryPoint); + manifest.EntryPoint = entryPoint; + + return manifest; + } + + private static AssemblyReference CreatePrerequisiteReference() + { + return new AssemblyReference() + { + AssemblyIdentity = new AssemblyIdentity( + "Prerequisite", + ClickOnceFileGraphTestUtilities.ManifestVersion), + IsPrerequisite = true, + TargetPath = PrerequisiteFileName + }; + } + + private static void DuplicateDependency(FileInfo deploymentManifest) + { + XDocument document = XDocument.Load( + deploymentManifest.FullName); + XElement dependency = Assert.Single( + document.Descendants(), + element => element.Name.LocalName == "dependency"); + + dependency.AddAfterSelf(new XElement(dependency)); + document.Save( + deploymentManifest.FullName, + SaveOptions.DisableFormatting); + deploymentManifest.Refresh(); + } + + private static void MakeSoleDependencyPrerequisite( + FileInfo deploymentManifest) + { + XDocument document = XDocument.Load( + deploymentManifest.FullName); + XElement dependentAssembly = Assert.Single( + document.Descendants(), + element => + element.Name.LocalName == "dependentAssembly"); + + dependentAssembly.SetAttributeValue( + "dependencyType", + "preRequisite"); + document.Save( + deploymentManifest.FullName, + SaveOptions.DisableFormatting); + deploymentManifest.Refresh(); + } + + private static void MakeExtraDependencyPrerequisite( + FileInfo deploymentManifest) + { + XDocument document = XDocument.Load( + deploymentManifest.FullName); + XElement dependentAssembly = Assert.Single( + document.Descendants(), + element => + element.Name.LocalName == "dependentAssembly" && + string.Equals( + (string?)element.Attribute("codebase"), + PrerequisiteFileName, + StringComparison.Ordinal)); + + dependentAssembly.SetAttributeValue( + "dependencyType", + "preRequisite"); + document.Save( + deploymentManifest.FullName, + SaveOptions.DisableFormatting); + deploymentManifest.Refresh(); + } + + private static void AssertUnsupportedReferences( + FileInfo deploymentManifestFile, + Action resolve) + { + ClickOnceFileGraphResolutionException exception = + Assert.Throws( + resolve); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestUnsupportedReferences, + deploymentManifestFile.FullName), + exception.Message); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs new file mode 100644 index 00000000..a4bcdf20 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs @@ -0,0 +1,254 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Sign.TestInfrastructure; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceDiagnosticOrderingTests : IDisposable + { + private const string ApplicationDirectory = + @"Application Files\App_1_0_0_0"; + private const string ApplicationManifestFileName = + "App.exe.manifest"; + private const string DeploymentManifestFileName = + "App.application"; + private const string DeploymentWarningTargetPath = + "deployment-warning.dll"; + private const string FallbackPayloadTargetPath = + "fallback.dll"; + private const string MissingPayloadTargetPath = + "missing.dll"; + + private readonly DirectoryService _directoryService; + + public ClickOnceDiagnosticOrderingTests() + { + _directoryService = new( + Substitute.For>()); + } + + public void Dispose() + { + _directoryService.Dispose(); + } + + [Fact] + public void ApplicationManifestAdapter_AdaptsMultipleRealOutputMessagesInOrder() + { + ApplicationManifest manifest = + ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + + manifest.FileReferences.Add( + new FileReference() + { + TargetPath = FallbackPayloadTargetPath + }); + manifest.FileReferences.Add( + new FileReference() + { + TargetPath = MissingPayloadTargetPath + }); + + ApplicationManifestAdapter adapter = new(manifest); + + adapter.ResolveFiles(Array.Empty()); + + Assert.Collection( + adapter.Diagnostics, + diagnostic => + AssertDiagnostic( + diagnostic, + FallbackPayloadTargetPath), + diagnostic => + AssertDiagnostic( + diagnostic, + MissingPayloadTargetPath)); + } + + [Fact] + public void DeploymentResolver_WhenFallbackSucceeds_PreservesRealDeploymentThenApplicationDiagnosticOrder() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo payload = + ClickOnceFileGraphTestUtilities.CreateFile( + root, + FallbackPayloadTargetPath); + FileInfo applicationManifest = + ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + FallbackPayloadTargetPath); + FileInfo deploymentManifest = + ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath( + root.FullName, + applicationManifest.FullName)); + ClickOnceDeployManifestFileGraphResolver resolver = + CreateResolverWithDeploymentDiagnostic( + applicationManifest, + DeploymentWarningTargetPath); + + ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + + Assert.Equal( + payload.FullName, + Assert.Single(graph.Payloads).Source.FullName); + Assert.Collection( + graph.Diagnostics, + diagnostic => + AssertDiagnostic( + diagnostic, + DeploymentWarningTargetPath), + diagnostic => + AssertDiagnostic( + diagnostic, + FallbackPayloadTargetPath)); + } + + [Fact] + public void DeploymentResolver_WhenFallbackCannotResolveEveryPayload_PreservesRealCrossManifestDiagnosticOrder() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + ClickOnceFileGraphTestUtilities.CreateFile( + root, + FallbackPayloadTargetPath); + FileInfo applicationManifest = + ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + FallbackPayloadTargetPath, + MissingPayloadTargetPath); + FileInfo deploymentManifest = + ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath( + root.FullName, + applicationManifest.FullName)); + ClickOnceDeployManifestFileGraphResolver resolver = + CreateResolverWithDeploymentDiagnostic( + applicationManifest, + DeploymentWarningTargetPath); + + ClickOnceFileGraphResolutionException exception = + Assert.Throws( + () => resolver.Resolve(deploymentManifest)); + + Assert.Contains( + MissingPayloadTargetPath, + exception.Message, + StringComparison.Ordinal); + Assert.Collection( + exception.Diagnostics, + diagnostic => + AssertDiagnostic( + diagnostic, + DeploymentWarningTargetPath), + diagnostic => + AssertDiagnostic( + diagnostic, + FallbackPayloadTargetPath), + diagnostic => + AssertDiagnostic( + diagnostic, + MissingPayloadTargetPath), + diagnostic => + AssertDiagnostic( + diagnostic, + MissingPayloadTargetPath)); + } + + private static void AssertDiagnostic( + ClickOnceManifestDiagnostic diagnostic, + string targetPath) + { + Assert.Equal( + "GenerateManifest.ResolveFailedInReadWriteMode", + diagnostic.Name); + Assert.Equal(OutputMessageType.Error, diagnostic.Type); + Assert.Contains( + targetPath, + diagnostic.Text, + StringComparison.Ordinal); + } + + private static ClickOnceDeployManifestFileGraphResolver CreateResolverWithDeploymentDiagnostic( + FileInfo applicationManifestFile, + string deploymentDiagnosticTargetPath) + { + AssemblyReference entryPoint = new() + { + ResolvedPath = applicationManifestFile.FullName, + TargetPath = applicationManifestFile.Name + }; + DeployManifest deploymentModel = new(); + + deploymentModel.AssemblyReferences.Add(entryPoint); + deploymentModel.EntryPoint = entryPoint; + + IDeployManifest deploymentManifest = + Substitute.For(); + + deploymentManifest.AssemblyReferences.Returns( + deploymentModel.AssemblyReferences); + deploymentManifest.EntryPoint.Returns(entryPoint); + deploymentManifest.FileReferences.Returns( + deploymentModel.FileReferences); + deploymentManifest.Diagnostics.Returns( + new[] + { + new ClickOnceManifestDiagnostic( + "GenerateManifest.ResolveFailedInReadWriteMode", + deploymentDiagnosticTargetPath, + OutputMessageType.Error) + }); + + ClickOnceManifestReader realManifestReader = new(); + IApplicationManifest applicationManifest; + + using (FileStream stream = applicationManifestFile.OpenRead()) + { + Assert.True( + realManifestReader.TryReadApplicationManifest( + stream, + out IApplicationManifest? parsedManifest)); + applicationManifest = Assert.IsAssignableFrom( + parsedManifest); + } + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = applicationManifest; + return true; + }); + + return new ClickOnceDeployManifestFileGraphResolver( + manifestReader, + new ClickOncePayloadFileResolver()); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs new file mode 100644 index 00000000..43980cbd --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs @@ -0,0 +1,225 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using NSubstitute; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceFileGraphModelTests + { + private const string ApplicationManifestFileName = "App.exe.manifest"; + private const string DeploySuffix = ".deploy"; + private const string DeploymentManifestFileName = "App.application"; + private const string PayloadFileName = "payload.dll"; + private const string ResolutionFailedMessage = "Resolution failed."; + private const string SetupFileName = "setup.exe"; + private const string WarningMessageName = "GenerateManifest.ResolveFailedInReadWriteMode"; + private const string WarningTargetPath = "warning.txt"; + private const string Whitespace = " "; + + [Fact] + public void FileGraphEntry_Constructor_PreservesValues() + { + FileInfo source = new(fileName: $"{PayloadFileName}{DeploySuffix}"); + FileReference manifestReference = new(); + + ClickOnceFileGraphEntry entry = new( + source, + PayloadFileName, + ClickOnceFileGraphEntryKind.Payload, + manifestReference, + DeploySuffix); + + Assert.Same(source, entry.Source); + Assert.Equal(PayloadFileName, entry.TargetPath); + Assert.Equal(ClickOnceFileGraphEntryKind.Payload, entry.Kind); + Assert.Same(manifestReference, entry.ManifestReference); + Assert.Equal(DeploySuffix, entry.MappingAddedSuffix); + } + + [Fact] + public void FileGraphEntry_Constructor_ValidatesRequiredArguments() + { + FileInfo source = new(fileName: PayloadFileName); + + Assert.Throws( + () => new ClickOnceFileGraphEntry( + source: null!, + targetPath: PayloadFileName, + kind: ClickOnceFileGraphEntryKind.Payload)); + Assert.Throws( + () => new ClickOnceFileGraphEntry( + source, + targetPath: Whitespace, + kind: ClickOnceFileGraphEntryKind.Payload)); + } + + [Fact] + public void FileGraph_Constructor_PreservesModelsAndSnapshotsCollections() + { + ClickOnceFileGraphEntry deploymentManifest = CreateEntry( + DeploymentManifestFileName, + ClickOnceFileGraphEntryKind.DeploymentManifest); + ClickOnceFileGraphEntry applicationManifest = CreateEntry( + ApplicationManifestFileName, + ClickOnceFileGraphEntryKind.ApplicationManifest); + ClickOnceFileGraphEntry payload = CreateEntry( + PayloadFileName, + ClickOnceFileGraphEntryKind.Payload); + ClickOnceFileGraphEntry adjacentExecutable = CreateEntry( + SetupFileName, + ClickOnceFileGraphEntryKind.Setup); + IDeployManifest deployManifest = Substitute.For(); + IApplicationManifest applicationManifestModel = + Substitute.For(); + List payloads = new() { payload }; + List adjacentExecutables = new() { adjacentExecutable }; + List diagnostics = new() { CreateDiagnostic() }; + + ClickOnceFileGraph graph = new( + deploymentManifest, + deployManifest, + applicationManifest, + applicationManifestModel, + payloads, + adjacentExecutables, + diagnostics); + + payloads.Clear(); + adjacentExecutables.Clear(); + diagnostics.Clear(); + + Assert.Same(deploymentManifest, graph.DeploymentManifest); + Assert.Same(deployManifest, graph.DeployManifest); + Assert.Same(applicationManifest, graph.ApplicationManifest); + Assert.Same(applicationManifestModel, graph.ApplicationManifestModel); + Assert.Same(payload, Assert.Single(graph.Payloads)); + Assert.Same(adjacentExecutable, Assert.Single(graph.AdjacentExecutables)); + Assert.Single(graph.Diagnostics); + } + + [Fact] + public void FileGraph_Constructor_ValidatesRequiredArguments() + { + ClickOnceFileGraphEntry applicationManifest = CreateEntry( + ApplicationManifestFileName, + ClickOnceFileGraphEntryKind.ApplicationManifest); + IApplicationManifest applicationManifestModel = + Substitute.For(); + ClickOnceFileGraphEntry[] entries = Array.Empty(); + ClickOnceManifestDiagnostic[] diagnostics = Array.Empty(); + + Assert.Throws( + () => new ClickOnceFileGraph( + deploymentManifest: null, + deployManifest: null, + applicationManifest: null!, + applicationManifestModel, + payloads: entries, + adjacentExecutables: entries, + diagnostics)); + Assert.Throws( + () => new ClickOnceFileGraph( + deploymentManifest: null, + deployManifest: null, + applicationManifest, + applicationManifestModel: null!, + payloads: entries, + adjacentExecutables: entries, + diagnostics)); + Assert.Throws( + () => new ClickOnceFileGraph( + deploymentManifest: null, + deployManifest: null, + applicationManifest, + applicationManifestModel, + payloads: null!, + adjacentExecutables: entries, + diagnostics)); + Assert.Throws( + () => new ClickOnceFileGraph( + deploymentManifest: null, + deployManifest: null, + applicationManifest, + applicationManifestModel, + payloads: entries, + adjacentExecutables: null!, + diagnostics)); + Assert.Throws( + () => new ClickOnceFileGraph( + deploymentManifest: null, + deployManifest: null, + applicationManifest, + applicationManifestModel, + payloads: entries, + adjacentExecutables: entries, + diagnostics: null!)); + } + + [Fact] + public void FileGraphResolutionException_Constructor_PreservesValuesAndSnapshotsDiagnostics() + { + ClickOnceManifestDiagnostic diagnostic = CreateDiagnostic(); + List diagnostics = new() { diagnostic }; + InvalidOperationException innerException = new(); + + ClickOnceFileGraphResolutionException exception = new( + ResolutionFailedMessage, + diagnostics, + innerException); + + diagnostics.Clear(); + + Assert.Equal(ResolutionFailedMessage, exception.Message); + Assert.Same(diagnostic, Assert.Single(exception.Diagnostics)); + Assert.Same(innerException, exception.InnerException); + } + + [Fact] + public void FileGraphResolutionException_Constructor_DefaultsDiagnosticsAndValidatesMessage() + { + ClickOnceFileGraphResolutionException exception = new(message: ResolutionFailedMessage); + + Assert.Empty(exception.Diagnostics); + Assert.Throws( + () => new ClickOnceFileGraphResolutionException(message: Whitespace)); + } + + [Fact] + public void ManifestDiagnostic_Constructor_PreservesValues() + { + ClickOnceManifestDiagnostic diagnostic = new( + WarningMessageName, + WarningTargetPath, + OutputMessageType.Warning); + + Assert.Equal(WarningMessageName, diagnostic.Name); + Assert.Equal(WarningTargetPath, diagnostic.Text); + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + } + + [Fact] + public void ManifestDiagnostic_Constructor_ValidatesMessage() + { + Assert.Throws( + () => new ClickOnceManifestDiagnostic(message: null!)); + } + + private static ClickOnceFileGraphEntry CreateEntry( + string path, + ClickOnceFileGraphEntryKind kind) + { + return new ClickOnceFileGraphEntry(new FileInfo(path), path, kind); + } + + private static ClickOnceManifestDiagnostic CreateDiagnostic() + { + return new ClickOnceManifestDiagnostic( + WarningMessageName, + WarningTargetPath, + OutputMessageType.Warning); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphResolverTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphResolverTests.cs new file mode 100644 index 00000000..b8cc02d0 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphResolverTests.cs @@ -0,0 +1,2097 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using System.Globalization; +using System.Text; +using System.Xml; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Sign.TestInfrastructure; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceFileGraphResolverTests : IDisposable + { + private const string ApplicationDirectory = @"Application Files\App_1_0_0_0"; + private const string ApplicationManifestFileName = "App.exe.manifest"; + private const string ClrPlatformAssemblyName = "Microsoft.Windows.CommonLanguageRuntime"; + private const string DependencyManifestFileName = "dependency.manifest"; + private const string DeploySuffix = ".deploy"; + private const string DeploymentManifestFileName = "App.application"; + private const string FileContents = "payload"; + private const string LauncherFileName = "Launcher.exe"; + private const string ManifestVersion = "1.0.0.0"; + private const string MissingTargetPathMessage = "without a target path"; + private const string OptionalPayloadFileName = "optional.txt"; + private const string PayloadFileName = "payload.dll"; + private const string ProcessorArchitecture = "msil"; + private const string SharedPayloadFileName = "shared.dll"; + private const string SetupFileName = "setup.exe"; + private const string VstoManifestFileName = "App.vsto"; + private const string WarningMessageName = "GenerateManifest.ResolveFailedInReadWriteMode"; + private const string WarningOneTargetPath = "warning-one.txt"; + private const string WarningTwoTargetPath = "warning-two.txt"; + + private readonly DirectoryService _directoryService; + private readonly ClickOnceApplicationManifestFileGraphResolver _applicationResolver; + private readonly ClickOnceDeployManifestFileGraphResolver _deploymentResolver; + private readonly ClickOncePayloadFileResolver _payloadResolver; + + public ClickOnceFileGraphResolverTests() + { + _directoryService = new( + Substitute.For>()); + + ClickOnceManifestReader manifestReader = new(); + _payloadResolver = new ClickOncePayloadFileResolver(); + + _applicationResolver = new ClickOnceApplicationManifestFileGraphResolver( + manifestReader, + _payloadResolver); + _deploymentResolver = new ClickOnceDeployManifestFileGraphResolver( + manifestReader, + _payloadResolver); + } + + public void Dispose() + { + _directoryService.Dispose(); + } + + [Fact] + public void DeploymentResolver_WhenMultipleVersionsAndManifestsExist_UsesReferencedApplicationManifest() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string CurrentApplicationDirectory = @"Application Files\App_2_0_0_0"; + const string CurrentPayloadFileName = "current.dll"; + const string OldPayloadFileName = "old.dll"; + + FileInfo currentPayload = CreateFile( + root, + $@"{CurrentApplicationDirectory}\{CurrentPayloadFileName}"); + ApplicationManifest currentApplication = CreateApplicationManifest(); + AddFileReference(currentApplication, CurrentPayloadFileName); + FileInfo currentManifest = WriteManifest( + root, + $@"{CurrentApplicationDirectory}\{ApplicationManifestFileName}", + currentApplication); + + ApplicationManifest oldApplication = CreateApplicationManifest(); + AddFileReference(oldApplication, OldPayloadFileName); + CreateFile(root, $@"{ApplicationDirectory}\{OldPayloadFileName}"); + WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + oldApplication); + CreateFusionManifest( + root, + $@"{CurrentApplicationDirectory}\{DependencyManifestFileName}"); + + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, currentManifest.FullName)); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.Equal(currentManifest.FullName, graph.ApplicationManifest.Source.FullName); + Assert.False(graph.DeployManifest!.ReadOnly); + Assert.False(graph.ApplicationManifestModel.ReadOnly); + Assert.Equal( + currentManifest.FullName, + graph.DeployManifest.EntryPoint!.ResolvedPath); + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(currentPayload.FullName, payload.Source.FullName); + Assert.Equal(CurrentPayloadFileName, payload.TargetPath); + } + + [Fact] + public void DeploymentResolver_WhenSameIdentityApplicationManifestExistsAtRoot_UsesTargetPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string applicationManifestPath = $@"{ApplicationDirectory}\{ApplicationManifestFileName}"; + + FileInfo expectedPayload = CreateFile(root, $@"{ApplicationDirectory}\target.dll"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, expectedPayload.Name); + FileInfo expectedApplicationManifest = WriteManifest( + root, + applicationManifestPath, + application); + + FileInfo decoyPayload = CreateFile(root, "decoy.dll"); + ApplicationManifest decoyApplication = CreateApplicationManifest(); + AddFileReference(decoyApplication, decoyPayload.Name); + WriteManifest( + root, + $"{application.AssemblyIdentity.Name}.manifest", + decoyApplication); + + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifestPath, + applicationManifestIdentity: application.AssemblyIdentity); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.Equal(expectedApplicationManifest.FullName, graph.ApplicationManifest.Source.FullName); + Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Equal(application.AssemblyIdentity.Name, graph.DeployManifest!.EntryPoint!.AssemblyIdentity.Name); + Assert.Equal(application.AssemblyIdentity.Version, graph.DeployManifest.EntryPoint.AssemblyIdentity.Version); + Assert.Equal( + application.AssemblyIdentity.ProcessorArchitecture, + graph.DeployManifest.EntryPoint.AssemblyIdentity.ProcessorArchitecture); + } + + [Fact] + public void DeploymentResolver_WhenSameIdentityFusionManifestExistsAtRoot_UsesTargetPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string applicationManifestPath = $@"{ApplicationDirectory}\{ApplicationManifestFileName}"; + + FileInfo expectedPayload = CreateFile(root, $@"{ApplicationDirectory}\target.dll"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, expectedPayload.Name); + FileInfo expectedApplicationManifest = WriteManifest( + root, + applicationManifestPath, + application); + CreateFusionManifest( + root, + $"{application.AssemblyIdentity.Name}.manifest", + application.AssemblyIdentity.Name, + application.AssemblyIdentity.Version); + + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifestPath, + applicationManifestIdentity: application.AssemblyIdentity); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.Equal(expectedApplicationManifest.FullName, graph.ApplicationManifest.Source.FullName); + Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Equal(application.AssemblyIdentity.Name, graph.DeployManifest!.EntryPoint!.AssemblyIdentity.Name); + Assert.Equal(application.AssemblyIdentity.Version, graph.DeployManifest.EntryPoint.AssemblyIdentity.Version); + Assert.Equal( + application.AssemblyIdentity.ProcessorArchitecture, + graph.DeployManifest.EntryPoint.AssemblyIdentity.ProcessorArchitecture); + } + + [Fact] + public void DeploymentResolver_WhenVstoDeploymentManifestIsValid_ResolvesFileGraph() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + FileInfo payload = CreateFile(root, $@"{ApplicationDirectory}\{PayloadFileName}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + VstoManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName)); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.NotNull(graph.DeploymentManifest); + Assert.Equal(deploymentManifest.FullName, graph.DeploymentManifest.Source.FullName); + Assert.Equal(applicationManifest.FullName, graph.ApplicationManifest.Source.FullName); + Assert.Equal(payload.FullName, Assert.Single(graph.Payloads).Source.FullName); + } + + [Fact] + public void DeploymentResolver_WhenFileExtensionsAreMapped_ResolvesApplicationManifestSeparately() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string applicationManifestPath = $@"{ApplicationDirectory}\{ApplicationManifestFileName}"; + + FileInfo mappedPayload = CreateFile( + root, + $@"{ApplicationDirectory}\{PayloadFileName}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + applicationManifestPath, + application); + FileInfo mappedApplicationManifest = WriteManifest( + root, + $"{applicationManifestPath}{DeploySuffix}", + CreateApplicationManifest()); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifestPath, + mapFileExtensions: true); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.Equal(applicationManifest.FullName, graph.ApplicationManifest.Source.FullName); + Assert.NotEqual(mappedApplicationManifest.FullName, graph.ApplicationManifest.Source.FullName); + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(mappedPayload.FullName, payload.Source.FullName); + Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + } + + [Fact] + public void DeploymentResolver_WhenOnlyMappedApplicationManifestExists_DoesNotUseIt() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string applicationManifestPath = $@"{ApplicationDirectory}\{ApplicationManifestFileName}"; + + FileInfo mappedApplicationManifest = WriteManifest( + root, + $"{applicationManifestPath}{DeploySuffix}", + CreateApplicationManifest()); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifestPath, + mapFileExtensions: true); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains( + Path.Combine(root.FullName, applicationManifestPath), + exception.Message, + StringComparison.Ordinal); + Assert.DoesNotContain(mappedApplicationManifest.FullName, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void DeploymentResolver_WhenPayloadExistsInBothDirectories_PrefersApplicationDirectory() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = SharedPayloadFileName; + + FileInfo expectedPayload = CreateFile(root, $@"{ApplicationDirectory}\{PayloadTargetPath}"); + CreateFile(root, PayloadTargetPath); + + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName)); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); + } + + [Fact] + public void DeploymentResolver_WhenPayloadIsMissingFromApplicationDirectory_UsesDeploymentDirectory() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = SharedPayloadFileName; + + FileInfo expectedPayload = CreateFile(root, PayloadTargetPath); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName)); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); + ClickOnceManifestDiagnostic diagnostic = Assert.Single(graph.Diagnostics); + Assert.Equal(OutputMessageType.Error, diagnostic.Type); + Assert.Contains(PayloadTargetPath, diagnostic.Text, StringComparison.Ordinal); + } + + [Fact] + public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeFails_DoesNotUseDeploymentDirectory() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string inaccessiblePayloadPath = Path.Combine( + root.FullName, + ApplicationDirectory, + SharedPayloadFileName); + + CreateFile(root, SharedPayloadFileName); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, SharedPayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName)); + UnauthorizedAccessException expectedException = new(); + ClickOncePayloadFileResolver payloadResolver = new( + file => file.FullName.Equals(inaccessiblePayloadPath, StringComparison.OrdinalIgnoreCase) + ? throw expectedException + : file.Exists); + ClickOnceDeployManifestFileGraphResolver deploymentResolver = new( + new ClickOnceManifestReader(), + payloadResolver); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => deploymentResolver.Resolve(deploymentManifest)); + + Assert.Same(expectedException, exception.InnerException); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestPayloadProbeFailed, + applicationManifest.FullName, + SharedPayloadFileName, + inaccessiblePayloadPath), + exception.Message); + Assert.Contains( + exception.Diagnostics, + diagnostic => diagnostic.Text.Contains(SharedPayloadFileName, StringComparison.Ordinal)); + } + + [Fact] + public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeHasIoFailure_DoesNotUseDeploymentDirectory() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string failedPayloadPath = Path.Combine( + root.FullName, + ApplicationDirectory, + SharedPayloadFileName); + + CreateFile(root, SharedPayloadFileName); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, SharedPayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName)); + IOException expectedException = new(); + ClickOncePayloadFileResolver payloadResolver = new( + file => file.FullName.Equals(failedPayloadPath, StringComparison.OrdinalIgnoreCase) + ? throw expectedException + : file.Exists); + ClickOnceDeployManifestFileGraphResolver deploymentResolver = new( + new ClickOnceManifestReader(), + payloadResolver); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => deploymentResolver.Resolve(deploymentManifest)); + + Assert.Same(expectedException, exception.InnerException); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestPayloadProbeFailed, + applicationManifest.FullName, + SharedPayloadFileName, + failedPayloadPath), + exception.Message); + Assert.Contains( + exception.Diagnostics, + diagnostic => diagnostic.Text.Contains(SharedPayloadFileName, StringComparison.Ordinal)); + } + + [Fact] + public void DeploymentResolver_WhenMappedApplicationDirectoryPayloadProbeFails_DoesNotUseDeploymentDirectory() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string failedPayloadPath = Path.Combine( + root.FullName, + ApplicationDirectory, + $"{SharedPayloadFileName}{DeploySuffix}"); + + CreateFile(root, $"{SharedPayloadFileName}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, SharedPayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName), + mapFileExtensions: true); + UnauthorizedAccessException expectedException = new(); + ClickOncePayloadFileResolver payloadResolver = new( + file => file.FullName.Equals(failedPayloadPath, StringComparison.OrdinalIgnoreCase) + ? throw expectedException + : file.Exists); + ClickOnceDeployManifestFileGraphResolver deploymentResolver = new( + new ClickOnceManifestReader(), + payloadResolver); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => deploymentResolver.Resolve(deploymentManifest)); + + Assert.Same(expectedException, exception.InnerException); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestPayloadProbeFailed, + applicationManifest.FullName, + SharedPayloadFileName, + failedPayloadPath), + exception.Message); + Assert.Contains( + exception.Diagnostics, + diagnostic => diagnostic.Text.Contains(SharedPayloadFileName, StringComparison.Ordinal)); + } + + [Fact] + public void DeploymentResolver_WhenFileExtensionsAreMapped_RecordsMappingAddedSuffix() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = PayloadFileName; + + FileInfo expectedPayload = CreateFile(root, $@"{ApplicationDirectory}\{PayloadTargetPath}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName), + mapFileExtensions: true); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(PayloadTargetPath, payload.TargetPath); + Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + Assert.Equal($"{PayloadTargetPath}{DeploySuffix}", payload.Source.Name); + Assert.Equal(FileContents, File.ReadAllText(expectedPayload.FullName)); + } + + [Fact] + public void DeploymentResolver_WhenMappedPayloadExistsInBothDirectories_PrefersApplicationDirectory() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = SharedPayloadFileName; + + FileInfo expectedPayload = CreateFile( + root, + $@"{ApplicationDirectory}\{PayloadTargetPath}{DeploySuffix}"); + CreateFile(root, $"{PayloadTargetPath}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName), + mapFileExtensions: true); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); + } + + [Fact] + public void DeploymentResolver_WhenFileExtensionsAreMapped_DoesNotUseExactTarget() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = PayloadFileName; + + CreateFile(root, $@"{ApplicationDirectory}\{PayloadTargetPath}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName), + mapFileExtensions: true); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void DeploymentResolver_WhenFileExtensionsAreNotMapped_DoesNotUseMappedTarget() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = PayloadFileName; + + CreateFile(root, $@"{ApplicationDirectory}\{PayloadTargetPath}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName)); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void DeploymentResolver_WhenMappedTargetAlreadyEndsInDeploy_AddsExactlyOneSuffix() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = "payload.deploy"; + + FileInfo expectedPayload = CreateFile( + root, + $@"{ApplicationDirectory}\{PayloadTargetPath}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName), + mapFileExtensions: true); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + } + + [Fact] + public void DeploymentResolver_ClassifiesReferencedAndAdjacentExecutables() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string NestedLauncherPath = $@"nested\{LauncherFileName}"; + const string NestedSetupPath = @"nested\setup.exe"; + + FileInfo referencedLauncher = CreateFile(root, $@"{ApplicationDirectory}\{LauncherFileName}"); + FileInfo adjacentLauncher = CreateFile(root, LauncherFileName); + FileInfo setup = CreateFile(root, SetupFileName); + CreateFile(root, NestedLauncherPath); + CreateFile(root, NestedSetupPath); + + ApplicationManifest application = CreateApplicationManifest(); + AddAssemblyReference(application, LauncherFileName, isEntryPoint: true); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath(root.FullName, applicationManifest.FullName)); + + ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(referencedLauncher.FullName, payload.Source.FullName); + Assert.Equal(ClickOnceFileGraphEntryKind.Payload, payload.Kind); + + Assert.Contains( + graph.AdjacentExecutables, + entry => + entry.Source.FullName == setup.FullName && + entry.Kind == ClickOnceFileGraphEntryKind.Setup); + Assert.Contains( + graph.AdjacentExecutables, + entry => + entry.Source.FullName == adjacentLauncher.FullName && + entry.Kind == ClickOnceFileGraphEntryKind.Launcher); + Assert.Equal(expected: 2, actual: graph.AdjacentExecutables.Count); + } + + [Fact] + public void DeploymentResolver_WhenRootLauncherIsReferenced_DoesNotClassifyItAsAdjacent() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo launcher = CreateFile(root, LauncherFileName); + ApplicationManifest application = CreateApplicationManifest(); + AddAssemblyReference(application, LauncherFileName, isEntryPoint: true); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifest.Name); + List adjacentProbeCandidates = new(); + ClickOnceDeployManifestFileGraphResolver resolver = new( + new ClickOnceManifestReader(), + _payloadResolver, + file => + { + adjacentProbeCandidates.Add(file.FullName); + + return ClickOnceFileSystem.IsFile(file); + }); + + ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + + Assert.Equal(launcher.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Empty(graph.AdjacentExecutables); + Assert.DoesNotContain( + launcher.FullName, + adjacentProbeCandidates, + StringComparer.OrdinalIgnoreCase); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public void DeploymentResolver_WhenSetupProbeFails_PreservesDiagnosticsAndThrows( + bool isUnauthorizedAccess) + { + AssertAdjacentExecutableProbeFailure( + SetupFileName, + Resources.ClickOnceDeploymentManifestSetupProbeFailed, + isUnauthorizedAccess); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public void DeploymentResolver_WhenLauncherProbeFails_PreservesDiagnosticsAndThrows( + bool isUnauthorizedAccess) + { + AssertAdjacentExecutableProbeFailure( + LauncherFileName, + Resources.ClickOnceDeploymentManifestLauncherProbeFailed, + isUnauthorizedAccess); + } + + private void AssertAdjacentExecutableProbeFailure( + string candidateFileName, + string failureMessageFormat, + bool isUnauthorizedAccess) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo deploymentManifestFile = CreateFile(root, DeploymentManifestFileName); + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + FileInfo candidate = new(Path.Combine(root.FullName, candidateFileName)); + ClickOnceManifestDiagnostic expectedDiagnostic = + CreateWarningDiagnostic(WarningOneTargetPath); + AssemblyReference entryPoint = new() + { + ResolvedPath = applicationManifestFile.FullName, + TargetPath = applicationManifestFile.Name + }; + IDeployManifest deploymentManifest = Substitute.For(); + + ConfigureDeploymentManifestReferences( + deploymentManifest, + entryPoint); + deploymentManifest.Diagnostics.Returns(new[] { expectedDiagnostic }); + + ApplicationManifest applicationModel = CreateApplicationManifest(); + IApplicationManifest applicationManifest = Substitute.For(); + + applicationManifest.AssemblyReferences.Returns(applicationModel.AssemblyReferences); + applicationManifest.EntryPoint.Returns(applicationModel.EntryPoint); + applicationManifest.FileReferences.Returns(applicationModel.FileReferences); + applicationManifest.Diagnostics.Returns( + Array.Empty()); + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = applicationManifest; + return true; + }); + + Exception expectedException = isUnauthorizedAccess + ? new UnauthorizedAccessException() + : new IOException(); + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + _payloadResolver, + file => + { + if (file.FullName == candidate.FullName) + { + throw expectedException; + } + + return ClickOnceFileSystem.IsFile(file); + }); + + ClickOnceFileGraphResolutionException exception = + Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Same(expectedException, exception.InnerException); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + failureMessageFormat, + candidate.FullName, + deploymentManifestFile.FullName), + exception.Message); + Assert.Same(expectedDiagnostic, Assert.Single(exception.Diagnostics)); + } + + [Theory] + [InlineData(DeploymentManifestFileName)] + [InlineData(VstoManifestFileName)] + public void DeploymentResolver_WhenDeploymentManifestIsWrongType_Throws(string fileName) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo deploymentManifest = WriteManifest( + root, + fileName, + CreateApplicationManifest()); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(deploymentManifest.FullName, exception.Message, StringComparison.Ordinal); + const string ExpectedMessage = "not a deployment manifest"; + + Assert.Contains(ExpectedMessage, exception.Message, StringComparison.Ordinal); + } + + [Theory] + [InlineData(DeploymentManifestFileName)] + [InlineData(VstoManifestFileName)] + public void DeploymentResolver_WhenDeploymentManifestIsMalformed_Throws(string fileName) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo deploymentManifest = CreateFile(root, fileName); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReadFailed, + deploymentManifest.FullName), + exception.Message); + Assert.IsType(exception.InnerException); + } + + [Fact] + public void DeploymentResolver_WhenReferencedApplicationManifestIsWrongType_Throws() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + FileInfo wrongTypeManifest = CreateFusionManifest(root, ApplicationManifestFileName); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + wrongTypeManifest.Name); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(wrongTypeManifest.FullName, exception.Message, StringComparison.Ordinal); + const string ExpectedMessage = "not an application manifest"; + + Assert.Contains(ExpectedMessage, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void DeploymentResolver_WhenReferencedApplicationManifestIsMalformed_Throws() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + FileInfo malformedManifest = CreateFile(root, ApplicationManifestFileName); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + malformedManifest.Name); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReferencedApplicationReadFailed, + malformedManifest.FullName, + deploymentManifest.FullName), + exception.Message); + Assert.IsType(exception.InnerException); + } + + [Fact] + public void DeploymentResolver_WhenReferencedApplicationManifestIsMissing_ThrowsWithExpectedPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string MissingManifest = ApplicationDirectory + @"\" + ApplicationManifestFileName; + + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + MissingManifest); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains( + Path.Combine(root.FullName, MissingManifest), + exception.Message, + StringComparison.Ordinal); + Assert.Contains( + exception.Diagnostics, + diagnostic => diagnostic.Type == OutputMessageType.Error); + } + + [Theory] + [InlineData(ApplicationManifestFileName)] + [InlineData(@"missing\App.exe.manifest")] + public void DeploymentResolver_WhenResolvedApplicationManifestIsMissing_ThrowsNotFound( + string applicationManifestPath) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string resolvedPath = Path.Combine(root.FullName, applicationManifestPath); + ClickOnceFileGraphResolutionException exception = ResolveWithApplicationManifestProbe( + root, + resolvedPath, + ClickOnceFileSystem.IsFile); + + Assert.Contains(resolvedPath, exception.Message, StringComparison.Ordinal); + Assert.Contains("file does not exist", exception.Message, StringComparison.Ordinal); + Assert.Null(exception.InnerException); + } + + [Fact] + public void DeploymentResolver_WhenResolvedApplicationManifestIsDirectory_ThrowsNotFound() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string resolvedPath = Path.Combine(root.FullName, ApplicationManifestFileName); + Directory.CreateDirectory(resolvedPath); + + ClickOnceFileGraphResolutionException exception = ResolveWithApplicationManifestProbe( + root, + resolvedPath, + ClickOnceFileSystem.IsFile); + + Assert.Contains(resolvedPath, exception.Message, StringComparison.Ordinal); + Assert.Contains("file does not exist", exception.Message, StringComparison.Ordinal); + Assert.Null(exception.InnerException); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public void DeploymentResolver_WhenApplicationManifestProbeFails_ThrowsReadFailure( + bool unauthorized) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string resolvedPath = Path.Combine(root.FullName, ApplicationManifestFileName); + Exception expectedException = unauthorized + ? new UnauthorizedAccessException() + : new IOException(); + + ClickOnceFileGraphResolutionException exception = ResolveWithApplicationManifestProbe( + root, + resolvedPath, + _ => throw expectedException); + + Assert.Contains(resolvedPath, exception.Message, StringComparison.Ordinal); + Assert.Contains("Failed to read application manifest", exception.Message, StringComparison.Ordinal); + Assert.Same(expectedException, exception.InnerException); + ClickOnceManifestDiagnostic diagnostic = Assert.Single(exception.Diagnostics); + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + Assert.Contains(WarningOneTargetPath, diagnostic.Text, StringComparison.Ordinal); + } + + [Theory] + [InlineData(false, null)] + [InlineData(true, null)] + [InlineData(true, "")] + [InlineData(true, " ")] + public void DeploymentResolver_WhenEntryPointIsMissingOrHasNoTargetPath_Throws( + bool hasEntryPoint, + string? targetPath) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo deploymentManifestFile = CreateFile( + temporaryDirectory.Directory, + DeploymentManifestFileName); + ClickOnceManifestDiagnostic expectedDiagnostic = CreateWarningDiagnostic(WarningOneTargetPath); + IDeployManifest deploymentManifest = Substitute.For(); + AssemblyReference? entryPoint = hasEntryPoint + ? new AssemblyReference() { TargetPath = targetPath } + : null; + + ConfigureDeploymentManifestReferences( + deploymentManifest, + entryPoint); + deploymentManifest.Diagnostics.Returns(new[] { expectedDiagnostic }); + + IClickOnceManifestReader manifestReader = Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + _payloadResolver); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Contains(deploymentManifestFile.FullName, exception.Message, StringComparison.Ordinal); + Assert.Contains("does not identify an application manifest", exception.Message, StringComparison.Ordinal); + ClickOnceManifestDiagnostic diagnostic = Assert.Single(exception.Diagnostics); + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + Assert.Contains(WarningOneTargetPath, diagnostic.Text, StringComparison.Ordinal); + } + + [Fact] + public void DeploymentResolver_WhenEntryPointIsUnresolved_DoesNotUseTargetPathAsFallback() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + FileInfo deploymentManifestFile = CreateFile(root, DeploymentManifestFileName); + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + AssemblyReference entryPoint = new() + { + TargetPath = applicationManifestFile.Name + }; + IDeployManifest deploymentManifest = + Substitute.For(); + + ConfigureDeploymentManifestReferences( + deploymentManifest, + entryPoint); + deploymentManifest.Diagnostics.Returns( + Array.Empty()); + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + _payloadResolver); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Contains(applicationManifestFile.FullName, exception.Message, StringComparison.Ordinal); + deploymentManifest.Received(1).ResolveFiles( + Arg.Is>(directories => + directories != null && + directories + .Select(directory => directory.FullName) + .SequenceEqual( + new[] { root.FullName }, + StringComparer.OrdinalIgnoreCase))); + } + + [Fact] + public void DeploymentResolver_WhenRequiredPayloadIsMissing_ThrowsWithTargetPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = @"missing\payload.dll"; + + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifest.Name); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); + Assert.Contains( + exception.Diagnostics, + diagnostic => + diagnostic.Type == OutputMessageType.Error && + diagnostic.Text.Contains(PayloadTargetPath, StringComparison.Ordinal)); + } + + [Fact] + public void DeploymentResolver_WhenApplicationResolutionProducesWarning_PreservesDiagnosticAndSucceeds() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + FileInfo deploymentManifestFile = CreateFile(root, DeploymentManifestFileName); + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + FileInfo payload = CreateFile(root, PayloadFileName); + + AssemblyReference deploymentEntryPoint = new() + { + ResolvedPath = applicationManifestFile.FullName, + TargetPath = applicationManifestFile.Name + }; + IDeployManifest deploymentManifest = + Substitute.For(); + + ConfigureDeploymentManifestReferences( + deploymentManifest, + deploymentEntryPoint); + deploymentManifest.MapFileExtensions.Returns(false); + deploymentManifest.Diagnostics.Returns( + Array.Empty()); + + ApplicationManifest applicationModel = CreateApplicationManifest(); + AddFileReference(applicationModel, payload.Name); + List applicationDiagnostics = new(); + IApplicationManifest applicationManifest = + Substitute.For(); + + applicationManifest.AssemblyReferences.Returns( + applicationModel.AssemblyReferences); + applicationManifest.EntryPoint.Returns( + applicationModel.EntryPoint); + applicationManifest.FileReferences.Returns( + applicationModel.FileReferences); + applicationManifest.Diagnostics.Returns(applicationDiagnostics); + applicationManifest + .When(manifest => manifest.ResolveFiles( + Arg.Any>())) + .Do(_ => + { + applicationDiagnostics.Add(CreateWarningDiagnostic(WarningOneTargetPath)); + applicationDiagnostics.Add(CreateWarningDiagnostic(WarningTwoTargetPath)); + }); + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = applicationManifest; + return true; + }); + + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + _payloadResolver); + + ClickOnceFileGraph graph = resolver.Resolve(deploymentManifestFile); + + Assert.Equal(payload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Collection( + graph.Diagnostics, + diagnostic => + { + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + Assert.Contains(WarningOneTargetPath, diagnostic.Text, StringComparison.Ordinal); + }, + diagnostic => + { + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + Assert.Contains(WarningTwoTargetPath, diagnostic.Text, StringComparison.Ordinal); + }); + } + + [Fact] + public void DeploymentResolver_WhenApplicationResolutionRetries_PreservesEachDiagnosticOnceInOrder() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + FileInfo deploymentManifestFile = CreateFile(root, DeploymentManifestFileName); + FileInfo applicationManifestFile = CreateFile( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}"); + FileInfo payload = CreateFile(root, PayloadFileName); + + AssemblyReference deploymentEntryPoint = new() + { + ResolvedPath = applicationManifestFile.FullName, + TargetPath = Path.GetRelativePath(root.FullName, applicationManifestFile.FullName) + }; + IDeployManifest deploymentManifest = Substitute.For(); + + ConfigureDeploymentManifestReferences( + deploymentManifest, + deploymentEntryPoint); + deploymentManifest.MapFileExtensions.Returns(false); + deploymentManifest.Diagnostics.Returns( + Array.Empty()); + + ApplicationManifest applicationModel = CreateApplicationManifest(); + AddFileReference(applicationModel, payload.Name); + List applicationDiagnostics = new(); + IApplicationManifest applicationManifest = Substitute.For(); + int resolutionAttempt = 0; + + applicationManifest.AssemblyReferences.Returns(applicationModel.AssemblyReferences); + applicationManifest.EntryPoint.Returns(applicationModel.EntryPoint); + applicationManifest.FileReferences.Returns(applicationModel.FileReferences); + applicationManifest.Diagnostics.Returns(applicationDiagnostics); + applicationManifest + .When(manifest => manifest.ResolveFiles( + Arg.Any>())) + .Do(_ => + { + ++resolutionAttempt; + applicationDiagnostics.Add( + CreateWarningDiagnostic( + resolutionAttempt == 1 + ? WarningOneTargetPath + : WarningTwoTargetPath)); + }); + + IClickOnceManifestReader manifestReader = Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = applicationManifest; + return true; + }); + + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + _payloadResolver); + + ClickOnceFileGraph graph = resolver.Resolve(deploymentManifestFile); + + Assert.Equal(expected: 2, actual: resolutionAttempt); + Assert.Equal(payload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Collection( + graph.Diagnostics, + diagnostic => + { + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + Assert.Contains(WarningOneTargetPath, diagnostic.Text, StringComparison.Ordinal); + }, + diagnostic => + { + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + Assert.Contains(WarningTwoTargetPath, diagnostic.Text, StringComparison.Ordinal); + }); + } + + [Fact] + public void ApplicationResolver_WhenTargetExists_UsesTargetWithoutMappingSuffix() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = @"content\payload.dll"; + + FileInfo expectedPayload = CreateFile(root, PayloadTargetPath); + CreateFile(root, $"{PayloadTargetPath}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + + Assert.True(_applicationResolver.TryResolve(applicationManifest, out ClickOnceFileGraph? graph)); + + Assert.NotNull(graph); + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Null(payload.MappingAddedSuffix); + } + + [Fact] + public void ApplicationResolver_WhenOnlyMappedTargetExists_RecordsOneMappingAddedSuffix() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = "payload.deploy"; + + FileInfo expectedPayload = CreateFile(root, $"{PayloadTargetPath}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + + Assert.True(_applicationResolver.TryResolve(applicationManifest, out ClickOnceFileGraph? graph)); + + Assert.NotNull(graph); + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(PayloadTargetPath, payload.TargetPath); + Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + } + + [Fact] + public void ApplicationResolver_WhenExactPayloadProbeFails_DoesNotUseMappedTarget() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + string inaccessiblePayloadPath = Path.Combine(root.FullName, PayloadFileName); + + CreateFile(root, $"{PayloadFileName}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + UnauthorizedAccessException expectedException = new(); + ClickOncePayloadFileResolver payloadResolver = new( + file => file.FullName.Equals(inaccessiblePayloadPath, StringComparison.OrdinalIgnoreCase) + ? throw expectedException + : file.Exists); + ClickOnceApplicationManifestFileGraphResolver applicationResolver = new( + new ClickOnceManifestReader(), + payloadResolver); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => applicationResolver.TryResolve(applicationManifest, out _)); + + Assert.Same(expectedException, exception.InnerException); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestPayloadProbeFailed, + applicationManifest.FullName, + PayloadFileName, + inaccessiblePayloadPath), + exception.Message); + Assert.Contains( + exception.Diagnostics, + diagnostic => diagnostic.Text.Contains(PayloadFileName, StringComparison.Ordinal)); + } + + [Fact] + public void ApplicationResolver_WhenDirectoryOccupiesExactPayloadPath_UsesMappedTarget() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + Directory.CreateDirectory(Path.Combine(root.FullName, PayloadFileName)); + FileInfo expectedPayload = CreateFile(root, $"{PayloadFileName}{DeploySuffix}"); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + + Assert.True(_applicationResolver.TryResolve(applicationManifest, out ClickOnceFileGraph? graph)); + + Assert.NotNull(graph); + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + } + + [Fact] + public void ApplicationResolver_WhenOnlyDoubleMappedTargetExists_DoesNotInventAdditionalSuffix() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string DoubleMappedPayloadPath = $"{PayloadFileName}{DeploySuffix}{DeploySuffix}"; + + CreateFile(root, DoubleMappedPayloadPath); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadFileName); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _applicationResolver.TryResolve(applicationManifest, out _)); + + Assert.Contains(PayloadFileName, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void ApplicationResolver_DoesNotUseDeploymentDirectoryFallback() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = "shared.dll"; + + CreateFile(root, PayloadTargetPath); + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath); + FileInfo applicationManifest = WriteManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + application); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _applicationResolver.TryResolve(applicationManifest, out _)); + + Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void ApplicationResolver_WhenManifestIsNotClickOnce_ReturnsFalse() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo fusionManifest = CreateFusionManifest( + temporaryDirectory.Directory, + DependencyManifestFileName); + + bool result = _applicationResolver.TryResolve( + fusionManifest, + out ClickOnceFileGraph? graph); + + Assert.False(result); + Assert.Null(graph); + } + + [Fact] + public void ApplicationResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = OptionalPayloadFileName; + + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath, isOptional: true); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _applicationResolver.TryResolve(applicationManifest, out _)); + + Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); + Assert.Contains( + exception.Diagnostics, + diagnostic => + diagnostic.Type == OutputMessageType.Error && + diagnostic.Text.Contains(PayloadTargetPath, StringComparison.Ordinal)); + } + + [Fact] + public void DeploymentResolver_WhenOptionalPayloadHasNoTargetPath_Throws() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + ApplicationManifest application = CreateApplicationManifest(); + application.FileReferences.Add(new FileReference() { IsOptional = true }); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifest.Name); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(MissingTargetPathMessage, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void DeploymentResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + const string PayloadTargetPath = OptionalPayloadFileName; + + ApplicationManifest application = CreateApplicationManifest(); + AddFileReference(application, PayloadTargetPath, isOptional: true); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifest.Name); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); + Assert.Contains( + exception.Diagnostics, + diagnostic => + diagnostic.Type == OutputMessageType.Error && + diagnostic.Text.Contains(PayloadTargetPath, StringComparison.Ordinal)); + } + + [Fact] + public void DeploymentResolver_WhenRequiredPayloadHasNoTargetPath_Throws() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + ApplicationManifest application = CreateApplicationManifest(); + application.FileReferences.Add(new FileReference()); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifest.Name); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _deploymentResolver.Resolve(deploymentManifest)); + + Assert.Contains(MissingTargetPathMessage, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void PayloadResolver_WhenOptionalReferenceHasNoTargetPath_Throws() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = CreateFile( + temporaryDirectory.Directory, + ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + applicationManifest.FileReferences.Add(new FileReference() { IsOptional = true }); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List())); + + Assert.Contains(MissingTargetPathMessage, exception.Message, StringComparison.Ordinal); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public void PayloadResolver_WhenOptionalPhysicalReferenceProbeFails_Throws(bool isAssembly) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = CreateFile( + temporaryDirectory.Directory, + ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + + if (isAssembly) + { + AddAssemblyReference(applicationManifest, OptionalPayloadFileName, isOptional: true); + } + else + { + AddFileReference(applicationManifest, OptionalPayloadFileName, isOptional: true); + } + + UnauthorizedAccessException expectedException = new(); + ClickOncePayloadFileResolver payloadResolver = new(_ => throw expectedException); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List())); + + Assert.Same(expectedException, exception.InnerException); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestPayloadProbeFailed, + applicationManifestFile.FullName, + OptionalPayloadFileName, + Path.Combine(applicationManifestFile.DirectoryName!, OptionalPayloadFileName)), + exception.Message); + } + + [Fact] + public void PayloadResolver_WhenRequiredFileProbeFails_PreservesExistingDiagnostics() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = CreateFile( + temporaryDirectory.Directory, + ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + AddFileReference(applicationManifest, WarningOneTargetPath); + applicationManifest.ResolveFiles( + new[] { temporaryDirectory.Directory.FullName }); + ClickOnceManifestDiagnostic existingDiagnostic = Assert.Single( + new ApplicationManifestAdapter(applicationManifest).Diagnostics); + applicationManifest.FileReferences.Clear(); + AddFileReference(applicationManifest, PayloadFileName); + IOException expectedException = new(); + ClickOncePayloadFileResolver payloadResolver = new(_ => throw expectedException); + List diagnostics = new(); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + diagnostics)); + + Assert.Same(expectedException, exception.InnerException); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestPayloadProbeFailed, + applicationManifestFile.FullName, + PayloadFileName, + Path.Combine(applicationManifestFile.DirectoryName!, PayloadFileName)), + exception.Message); + Assert.Contains( + exception.Diagnostics, + diagnostic => + diagnostic.Name == existingDiagnostic.Name && + diagnostic.Text == existingDiagnostic.Text && + diagnostic.Type == existingDiagnostic.Type); + } + + [Fact] + public void PayloadResolver_WhenRequiredFileProbeHasPathTooLongFailure_ReportsInvalidTargetPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = CreateFile( + temporaryDirectory.Directory, + ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + AddFileReference(applicationManifest, PayloadFileName); + PathTooLongException expectedException = new(); + ClickOncePayloadFileResolver payloadResolver = new(_ => throw expectedException); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List())); + + Assert.Same(expectedException, exception.InnerException); + Assert.Contains(applicationManifestFile.FullName, exception.Message, StringComparison.Ordinal); + Assert.Contains(PayloadFileName, exception.Message, StringComparison.Ordinal); + Assert.Contains("invalid target path", exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void PayloadResolver_IncludesOnlyPhysicalReferencesAndPreservesReferenceIdentity() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + + const string AssemblyTargetPath = "library.dll"; + const string ContentTargetPath = "content.txt"; + const string EntryPointTargetPath = "entry.exe"; + const string PrerequisiteTargetPath = "prerequisite.dll"; + const string VirtualTargetPath = "virtual.dll"; + + AssemblyReference assemblyReference = new() { TargetPath = AssemblyTargetPath }; + AssemblyReference prerequisiteReference = new() + { + IsPrerequisite = true, + TargetPath = PrerequisiteTargetPath + }; + AssemblyReference virtualReference = new() + { + AssemblyIdentity = new AssemblyIdentity(ClrPlatformAssemblyName, ManifestVersion), + TargetPath = VirtualTargetPath + }; + AssemblyReference entryPoint = new() { TargetPath = EntryPointTargetPath }; + FileReference fileReference = new() { TargetPath = ContentTargetPath }; + + applicationManifest.AssemblyReferences.Add(assemblyReference); + applicationManifest.AssemblyReferences.Add(prerequisiteReference); + applicationManifest.AssemblyReferences.Add(virtualReference); + applicationManifest.EntryPoint = entryPoint; + applicationManifest.FileReferences.Add(fileReference); + + CreateFile(root, assemblyReference.TargetPath); + CreateFile(root, prerequisiteReference.TargetPath); + CreateFile(root, virtualReference.TargetPath); + CreateFile(root, entryPoint.TargetPath); + CreateFile(root, fileReference.TargetPath); + + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List()); + + Assert.Equal(expected: 3, actual: payloads.Count); + Assert.Contains(payloads, payload => ReferenceEquals(payload.ManifestReference, assemblyReference)); + Assert.Contains(payloads, payload => ReferenceEquals(payload.ManifestReference, entryPoint)); + Assert.Contains(payloads, payload => ReferenceEquals(payload.ManifestReference, fileReference)); + Assert.DoesNotContain(payloads, payload => ReferenceEquals(payload.ManifestReference, prerequisiteReference)); + Assert.DoesNotContain(payloads, payload => ReferenceEquals(payload.ManifestReference, virtualReference)); + Assert.Null(prerequisiteReference.ResolvedPath); + Assert.Null(virtualReference.ResolvedPath); + } + + [Fact] + public void PayloadResolver_WhenSourcePathCompetesWithTargetPath_UsesTargetPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + FileInfo expectedPayload = CreateFile(root, PayloadFileName); + FileInfo sourcePathPayload = CreateFile(root, "source-path.dll"); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + AssemblyReference reference = new() + { + SourcePath = sourcePathPayload.Name, + TargetPath = expectedPayload.Name + }; + applicationManifest.AssemblyReferences.Add(reference); + + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List()); + + ClickOnceFileGraphEntry payload = Assert.Single(payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); + Assert.Equal(sourcePathPayload.Name, reference.SourcePath); + Assert.Same(reference, payload.ManifestReference); + } + + [Fact] + public void PayloadResolver_WhenAssemblyIdentityCompetesWithTargetPath_UsesTargetPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + FileInfo expectedPayload = CreateFile(root, PayloadFileName); + FileInfo identityPayload = CreateFusionManifest(root, "SideBySide.manifest"); + + ApplicationManifest applicationManifest = CreateApplicationManifest(); + AssemblyIdentity identity = AssemblyIdentity.FromManifest(identityPayload.FullName); + AssemblyReference reference = new() + { + AssemblyIdentity = identity, + TargetPath = expectedPayload.Name + }; + applicationManifest.AssemblyReferences.Add(reference); + applicationManifest.ResolveFiles(new[] { root.FullName }); + Assert.Equal(identityPayload.FullName, reference.ResolvedPath); + + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List()); + + ClickOnceFileGraphEntry payload = Assert.Single(payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); + Assert.Same(identity, reference.AssemblyIdentity); + Assert.Same(reference, payload.ManifestReference); + } + + [Fact] + public void PayloadResolver_DuringDiagnosticResolution_SuppressesAndRestoresCompetingHints() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + FileInfo expectedPayload = CreateFile(root, PayloadFileName); + const string SourcePath = "source-path.dll"; + AssemblyIdentity identity = new("SideBySide", ManifestVersion); + AssemblyReference reference = new() + { + AssemblyIdentity = identity, + SourcePath = SourcePath, + TargetPath = expectedPayload.Name + }; + ApplicationManifest applicationModel = CreateApplicationManifest(); + applicationModel.AssemblyReferences.Add(reference); + IApplicationManifest applicationManifest = Substitute.For(); + + applicationManifest.AssemblyReferences.Returns(applicationModel.AssemblyReferences); + applicationManifest.EntryPoint.Returns(applicationModel.EntryPoint); + applicationManifest.FileReferences.Returns(applicationModel.FileReferences); + applicationManifest.Diagnostics.Returns( + Array.Empty()); + applicationManifest + .When(manifest => manifest.ResolveFiles( + Arg.Any>())) + .Do(_ => + { + Assert.Null(reference.SourcePath); + Assert.Null(reference.AssemblyIdentity); + reference.ResolvedPath = "diagnostic-path.dll"; + }); + + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + applicationManifest, + new List()); + + Assert.Equal(expectedPayload.FullName, Assert.Single(payloads).Source.FullName); + Assert.Equal(SourcePath, reference.SourcePath); + Assert.Same(identity, reference.AssemblyIdentity); + Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); + } + + [Fact] + public void PayloadResolver_WhenResolvedPathCompetesWithTargetPath_UsesTargetPath() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + FileInfo expectedPayload = CreateFile(root, PayloadFileName); + FileInfo resolvedPathPayload = CreateFile(root, "resolved-path.dll"); + ApplicationManifest applicationModel = CreateApplicationManifest(); + AssemblyReference reference = new() + { + ResolvedPath = resolvedPathPayload.FullName, + TargetPath = expectedPayload.Name + }; + applicationModel.AssemblyReferences.Add(reference); + IApplicationManifest applicationManifest = Substitute.For(); + applicationManifest.AssemblyReferences.Returns(applicationModel.AssemblyReferences); + applicationManifest.EntryPoint.Returns(applicationModel.EntryPoint); + applicationManifest.FileReferences.Returns(applicationModel.FileReferences); + applicationManifest.Diagnostics.Returns( + Array.Empty()); + + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + applicationManifest, + new List()); + + ClickOnceFileGraphEntry payload = Assert.Single(payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); + Assert.Same(reference, payload.ManifestReference); + } + + [Fact] + public void PayloadResolver_WhenTargetPathIsInvalid_ThrowsLocalizedResolutionException() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = CreateFile( + temporaryDirectory.Directory, + ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + const string InvalidTargetPath = "invalid\0path"; + + applicationManifest.FileReferences.Add(new FileReference() { TargetPath = InvalidTargetPath }); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List())); + + const string ExpectedMessage = "invalid target path"; + + Assert.Contains(ExpectedMessage, exception.Message, StringComparison.Ordinal); + } + + [Fact] + public void PayloadResolver_WhenRequiredReferenceHasNoTargetPath_Throws() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + + FileInfo applicationManifestFile = CreateFile(root, ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + applicationManifest.FileReferences.Add(new FileReference()); + + ClickOnceFileGraphResolutionException exception = Assert.Throws( + () => _payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + new List())); + + Assert.Contains(MissingTargetPathMessage, exception.Message, StringComparison.Ordinal); + } + + private static ApplicationManifest CreateApplicationManifest() + { + ApplicationManifest manifest = new(); + manifest.AssemblyIdentity.Name = "TestApplication"; + manifest.AssemblyIdentity.Version = ManifestVersion; + manifest.AssemblyIdentity.ProcessorArchitecture = ProcessorArchitecture; + + return manifest; + } + + private static void AddAssemblyReference( + ApplicationManifest manifest, + string targetPath, + bool isEntryPoint = false, + bool isOptional = false) + { + AssemblyReference reference = new() + { + IsOptional = isOptional, + TargetPath = targetPath + }; + + manifest.AssemblyReferences.Add(reference); + + if (isEntryPoint) + { + manifest.EntryPoint = reference; + } + } + + private static void AddFileReference( + ApplicationManifest manifest, + string targetPath, + bool isOptional = false) + { + manifest.FileReferences.Add( + new FileReference() + { + IsOptional = isOptional, + TargetPath = targetPath + }); + } + + private static FileInfo WriteDeploymentManifest( + DirectoryInfo root, + string relativePath, + string applicationManifestTargetPath, + bool mapFileExtensions = false, + AssemblyIdentity? applicationManifestIdentity = null) + { + DeployManifest manifest = new() + { + MapFileExtensions = mapFileExtensions + }; + manifest.AssemblyIdentity.Name = "TestDeployment"; + manifest.AssemblyIdentity.Version = ManifestVersion; + manifest.AssemblyIdentity.ProcessorArchitecture = ProcessorArchitecture; + + AssemblyReference entryPoint = new(applicationManifestTargetPath); + + if (applicationManifestIdentity is not null) + { + entryPoint.AssemblyIdentity = new AssemblyIdentity(applicationManifestIdentity); + } + + manifest.AssemblyReferences.Add(entryPoint); + manifest.EntryPoint = entryPoint; + + return WriteManifest(root, relativePath, manifest); + } + + private static FileInfo WriteManifest( + DirectoryInfo root, + string relativePath, + Manifest manifest) + { + FileInfo file = new(Path.Combine(root.FullName, relativePath)); + file.Directory!.Create(); + + using (FileStream stream = file.Create()) + { + ManifestWriter.WriteManifest(manifest, stream); + } + + file.Refresh(); + + return file; + } + + private static FileInfo CreateFile( + DirectoryInfo root, + string relativePath) + { + FileInfo file = new(Path.Combine(root.FullName, relativePath)); + file.Directory!.Create(); + File.WriteAllText(path: file.FullName, contents: FileContents); + file.Refresh(); + + return file; + } + + private static FileInfo CreateFusionManifest( + DirectoryInfo root, + string relativePath, + string identityName = "SideBySide", + string identityVersion = ManifestVersion) + { + string xml = $""" + + + + + """; + FileInfo file = new(Path.Combine(root.FullName, relativePath)); + file.Directory!.Create(); + File.WriteAllText(file.FullName, xml, Encoding.UTF8); + file.Refresh(); + + return file; + } + + private static ClickOnceManifestDiagnostic CreateWarningDiagnostic( + string targetPath) + { + return new ClickOnceManifestDiagnostic( + WarningMessageName, + targetPath, + OutputMessageType.Warning); + } + + private static void ConfigureDeploymentManifestReferences( + IDeployManifest deploymentManifest, + AssemblyReference? entryPoint) + { + DeployManifest model = new(); + + if (entryPoint is not null) + { + model.AssemblyReferences.Add(entryPoint); + model.EntryPoint = entryPoint; + } + + deploymentManifest.AssemblyReferences.Returns( + model.AssemblyReferences); + deploymentManifest.EntryPoint.Returns(entryPoint); + deploymentManifest.FileReferences.Returns( + model.FileReferences); + } + + private static ClickOnceFileGraphResolutionException ResolveWithApplicationManifestProbe( + DirectoryInfo root, + string resolvedPath, + Func fileExists) + { + FileInfo deploymentManifestFile = CreateFile(root, DeploymentManifestFileName); + AssemblyReference entryPoint = new() + { + ResolvedPath = resolvedPath, + TargetPath = ApplicationManifestFileName + }; + IDeployManifest deploymentManifest = Substitute.For(); + + ConfigureDeploymentManifestReferences( + deploymentManifest, + entryPoint); + deploymentManifest.Diagnostics.Returns( + new[] { CreateWarningDiagnostic(WarningOneTargetPath) }); + + IClickOnceManifestReader manifestReader = Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + new ClickOncePayloadFileResolver(), + fileExists); + + return Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphTestUtilities.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphTestUtilities.cs new file mode 100644 index 00000000..9057abfd --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphTestUtilities.cs @@ -0,0 +1,114 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core.Test +{ + internal static class ClickOnceFileGraphTestUtilities + { + internal const string ManifestVersion = "1.0.0.0"; + internal const string ProcessorArchitecture = "msil"; + + internal static ApplicationManifest CreateApplicationManifest() + { + ApplicationManifest manifest = new(); + manifest.AssemblyIdentity.Name = "TestApplication"; + manifest.AssemblyIdentity.Version = ManifestVersion; + manifest.AssemblyIdentity.ProcessorArchitecture = ProcessorArchitecture; + + return manifest; + } + + internal static FileInfo CreateFile( + DirectoryInfo root, + string relativePath, + string contents = "payload") + { + FileInfo file = new(Path.Combine(root.FullName, relativePath)); + file.Directory!.Create(); + File.WriteAllText(file.FullName, contents); + file.Refresh(); + + return file; + } + + internal static FileInfo WriteApplicationManifest( + DirectoryInfo root, + string relativePath, + params string[] payloadTargetPaths) + { + ApplicationManifest manifest = CreateApplicationManifest(); + + foreach (string targetPath in payloadTargetPaths) + { + manifest.FileReferences.Add( + new FileReference() + { + TargetPath = targetPath + }); + } + + return WriteManifest(root, relativePath, manifest); + } + + internal static FileInfo WriteDeploymentManifest( + DirectoryInfo root, + string relativePath, + string applicationManifestTargetPath, + bool mapFileExtensions = false) + { + DeployManifest manifest = new() + { + MapFileExtensions = mapFileExtensions + }; + manifest.AssemblyIdentity.Name = "TestDeployment"; + manifest.AssemblyIdentity.Version = ManifestVersion; + manifest.AssemblyIdentity.ProcessorArchitecture = ProcessorArchitecture; + + AssemblyReference entryPoint = new(applicationManifestTargetPath); + + manifest.AssemblyReferences.Add(entryPoint); + manifest.EntryPoint = entryPoint; + + return WriteManifest(root, relativePath, manifest); + } + + internal static FileInfo WriteManifest( + DirectoryInfo root, + string relativePath, + Manifest manifest) + { + FileInfo file = new(Path.Combine(root.FullName, relativePath)); + file.Directory!.Create(); + + using (FileStream stream = file.Create()) + { + ManifestWriter.WriteManifest(manifest, stream); + } + + file.Refresh(); + + return file; + } + + internal static FileInfo WriteMalformedManifest( + DirectoryInfo root, + string relativePath) + { + const string Xml = ""; + + return CreateFile(root, relativePath, Xml); + } + + internal static string GetVstoManifestPath() + { + return Path.Combine( + AppContext.BaseDirectory, + "TestAssets", + "ClickOnce", + "VstoApplication.manifest"); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs index 6cef8f18..d6a1dba3 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs @@ -39,7 +39,7 @@ public void TryReadApplicationManifest_WhenManifestIsApplication_ReturnsTypedWri Assert.True(result); Assert.NotNull(manifest); Assert.Equal("TestApplication", manifest.AssemblyIdentity.Name); - Assert.NotNull(manifest.OutputMessages); + Assert.NotNull(manifest.Diagnostics); manifest.ReadOnly = true; @@ -548,7 +548,7 @@ public void ApplicationManifestAdapter_Properties_ForwardToManifest() Assert.Same(manifest.AssemblyReferences, adapter.AssemblyReferences); Assert.Same(manifest.EntryPoint, adapter.EntryPoint); Assert.Same(manifest.FileReferences, adapter.FileReferences); - Assert.Same(manifest.OutputMessages, adapter.OutputMessages); + Assert.Empty(adapter.Diagnostics); } [Fact] @@ -563,7 +563,8 @@ public void DeployManifestAdapter_Properties_ForwardToManifest() Assert.Same(manifest.AssemblyIdentity, adapter.AssemblyIdentity); Assert.Same(manifest.AssemblyReferences, adapter.AssemblyReferences); Assert.Same(manifest.EntryPoint, adapter.EntryPoint); - Assert.Same(manifest.OutputMessages, adapter.OutputMessages); + Assert.Same(manifest.FileReferences, adapter.FileReferences); + Assert.Empty(adapter.Diagnostics); Assert.Equal(manifest.MapFileExtensions, adapter.MapFileExtensions); } @@ -607,13 +608,10 @@ public void ApplicationManifestAdapter_ResolveFiles_AllowsNoSearchDirectories() adapter.ResolveFiles(Array.Empty()); - Assert.Equal( - expected: 1, - actual: adapter.OutputMessages.ErrorCount); - OutputMessage message = adapter.OutputMessages[0]; - Assert.Equal(ExpectedMessageName, message.Name); - Assert.Equal(OutputMessageType.Error, message.Type); - Assert.False(string.IsNullOrWhiteSpace(message.Text)); + ClickOnceManifestDiagnostic diagnostic = Assert.Single(adapter.Diagnostics); + Assert.Equal(ExpectedMessageName, diagnostic.Name); + Assert.Equal(OutputMessageType.Error, diagnostic.Type); + Assert.False(string.IsNullOrWhiteSpace(diagnostic.Text)); } [Fact] diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs new file mode 100644 index 00000000..da7f682e --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs @@ -0,0 +1,269 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using System.Globalization; +using System.Xml; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Sign.TestInfrastructure; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceResolutionFailureTests : IDisposable + { + private const string ApplicationManifestFileName = + "App.exe.manifest"; + private const string DeploymentManifestFileName = + "App.application"; + private const string PayloadFileName = "payload.dll"; + private const string SourcePath = "source-path.dll"; + private const string WarningMessageName = + "GenerateManifest.ResolveFailedInReadWriteMode"; + private const string WarningTargetPath = "warning.txt"; + + private readonly DirectoryService _directoryService; + + public ClickOnceResolutionFailureTests() + { + _directoryService = new( + Substitute.For>()); + } + + public void Dispose() + { + _directoryService.Dispose(); + } + + [Fact] + public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPathAndPreservesDiagnostics() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = + ClickOnceFileGraphTestUtilities.CreateFile( + root, + ApplicationManifestFileName); + ApplicationManifest applicationModel = + ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + AssemblyIdentity identity = new( + "Payload", + ClickOnceFileGraphTestUtilities.ManifestVersion); + AssemblyReference reference = new() + { + AssemblyIdentity = identity, + ResolvedPath = "original-resolved-path.dll", + SourcePath = SourcePath, + TargetPath = PayloadFileName + }; + + applicationModel.AssemblyReferences.Add(reference); + + List manifestDiagnostics = new(); + ClickOnceManifestDiagnostic expectedDiagnostic = + CreateWarningDiagnostic(); + IOException expectedException = new(); + IApplicationManifest applicationManifest = + Substitute.For(); + + applicationManifest.AssemblyReferences.Returns( + applicationModel.AssemblyReferences); + applicationManifest.EntryPoint.Returns( + applicationModel.EntryPoint); + applicationManifest.FileReferences.Returns( + applicationModel.FileReferences); + applicationManifest.Diagnostics.Returns(manifestDiagnostics); + applicationManifest + .When(manifest => manifest.ResolveFiles( + Arg.Any>())) + .Do(_ => + { + Assert.Null(reference.SourcePath); + Assert.Null(reference.AssemblyIdentity); + reference.ResolvedPath = "partial-resolved-path.dll"; + manifestDiagnostics.Add(expectedDiagnostic); + + throw expectedException; + }); + + ClickOncePayloadFileResolver payloadResolver = new(); + List diagnostics = new(); + + ClickOnceFileGraphResolutionException exception = + Assert.Throws( + () => payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + applicationManifest, + diagnostics)); + + Assert.Equal(SourcePath, reference.SourcePath); + Assert.Same(identity, reference.AssemblyIdentity); + Assert.Null(reference.ResolvedPath); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestResolveFailed, + applicationManifestFile.FullName), + exception.Message); + Assert.Same(expectedException, exception.InnerException); + Assert.Same( + expectedDiagnostic, + Assert.Single(exception.Diagnostics)); + Assert.Same( + expectedDiagnostic, + Assert.Single(diagnostics)); + } + + [Fact] + public void DeploymentResolver_WhenResolveFilesThrows_RestoresHintsPreservesResolvedPathAndDiagnostics() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo deploymentManifestFile = + ClickOnceFileGraphTestUtilities.CreateFile( + root, + DeploymentManifestFileName); + AssemblyIdentity identity = new( + "Application", + ClickOnceFileGraphTestUtilities.ManifestVersion); + AssemblyReference entryPoint = new() + { + AssemblyIdentity = identity, + SourcePath = SourcePath, + TargetPath = ApplicationManifestFileName + }; + DeployManifest deploymentModel = new(); + + deploymentModel.AssemblyReferences.Add(entryPoint); + deploymentModel.EntryPoint = entryPoint; + + List diagnostics = new(); + ClickOnceManifestDiagnostic expectedDiagnostic = + CreateWarningDiagnostic(); + UnauthorizedAccessException expectedException = new(); + IDeployManifest deploymentManifest = + Substitute.For(); + + deploymentManifest.AssemblyReferences.Returns( + deploymentModel.AssemblyReferences); + deploymentManifest.EntryPoint.Returns(entryPoint); + deploymentManifest.FileReferences.Returns( + deploymentModel.FileReferences); + deploymentManifest.Diagnostics.Returns(diagnostics); + deploymentManifest + .When(manifest => manifest.ResolveFiles( + Arg.Any>())) + .Do(_ => + { + Assert.Null(entryPoint.SourcePath); + Assert.Null(entryPoint.AssemblyIdentity); + entryPoint.ResolvedPath = + "partial-application-manifest-path"; + diagnostics.Add(expectedDiagnostic); + + throw expectedException; + }); + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + new ClickOncePayloadFileResolver()); + + ClickOnceFileGraphResolutionException exception = + Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Equal(SourcePath, entryPoint.SourcePath); + Assert.Same(identity, entryPoint.AssemblyIdentity); + Assert.Equal( + "partial-application-manifest-path", + entryPoint.ResolvedPath); + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestResolveFailed, + deploymentManifestFile.FullName), + exception.Message); + Assert.Same(expectedException, exception.InnerException); + Assert.Same( + expectedDiagnostic, + Assert.Single(exception.Diagnostics)); + } + + [Fact] + public void ExplicitApplicationResolver_WhenManifestIsMalformed_ThrowsReadFailureWithXmlException() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = + ClickOnceFileGraphTestUtilities.WriteMalformedManifest( + temporaryDirectory.Directory, + ApplicationManifestFileName); + ClickOnceApplicationManifestFileGraphResolver resolver = new( + new ClickOnceManifestReader(), + new ClickOncePayloadFileResolver()); + + ClickOnceFileGraphResolutionException exception = + Assert.Throws( + () => resolver.TryResolve( + applicationManifestFile, + out _)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestReadFailed, + applicationManifestFile.FullName), + exception.Message); + Assert.IsType(exception.InnerException); + Assert.Empty(exception.Diagnostics); + } + + [Fact] + public void ExplicitApplicationResolver_WhenManifestIsMissing_ThrowsReadFailureWithFileNotFoundException() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = new( + Path.Combine( + temporaryDirectory.Directory.FullName, + ApplicationManifestFileName)); + ClickOnceApplicationManifestFileGraphResolver resolver = new( + new ClickOnceManifestReader(), + new ClickOncePayloadFileResolver()); + + ClickOnceFileGraphResolutionException exception = + Assert.Throws( + () => resolver.TryResolve( + applicationManifestFile, + out _)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestReadFailed, + applicationManifestFile.FullName), + exception.Message); + Assert.IsType(exception.InnerException); + Assert.Empty(exception.Diagnostics); + } + + private static ClickOnceManifestDiagnostic CreateWarningDiagnostic() + { + return new ClickOnceManifestDiagnostic( + WarningMessageName, + WarningTargetPath, + OutputMessageType.Warning); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs new file mode 100644 index 00000000..501b3b71 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs @@ -0,0 +1,370 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Sign.TestInfrastructure; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceTargetPathCompatibilityTests : IDisposable + { + private const string ApplicationDirectory = + @"Application Files\App_1_0_0_0"; + private const string ApplicationManifestFileName = + "App.exe.manifest"; + private const string DeploySuffix = ".deploy"; + private const string DeploymentManifestFileName = + "App.application"; + private const string PayloadFileName = "payload.dll"; + + private readonly DirectoryService _directoryService; + + public ClickOnceTargetPathCompatibilityTests() + { + _directoryService = new( + Substitute.For>()); + } + + public static TheoryData SupportedTargetPaths + { + get + { + string driveRoot = Path.GetPathRoot( + Environment.CurrentDirectory)!; + string drive = driveRoot[..2]; + + return new TheoryData() + { + Path.Combine( + driveRoot, + "published", + "rooted.dll"), + $@"{drive}published\drive-relative.dll", + @"\published\root-relative.dll", + @"\\sign-cli.invalid\share\unc.dll", + $@"\\?\{driveRoot}published\device.dll", + @"..\parent.dll" + }; + } + } + + public void Dispose() + { + _directoryService.Dispose(); + } + + [Theory] + [MemberData(nameof(SupportedTargetPaths))] + public void ExplicitApplicationResolver_PreservesSupportedTargetPathAndWindowsCandidate( + string targetPath) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = + ClickOnceFileGraphTestUtilities.CreateFile( + root, + ApplicationManifestFileName); + ApplicationManifest applicationModel = + ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + FileReference reference = new() + { + TargetPath = targetPath + }; + + applicationModel.FileReferences.Add(reference); + + List resolutionSearches = new(); + IApplicationManifest applicationManifest = + CreateApplicationManifestSubstitute( + applicationModel, + resolutionSearches); + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = applicationManifest; + return true; + }); + + List probeCandidates = new(); + ClickOncePayloadFileResolver payloadResolver = new( + file => + { + probeCandidates.Add(file.FullName); + + return true; + }); + ClickOnceApplicationManifestFileGraphResolver resolver = new( + manifestReader, + payloadResolver); + + Assert.True( + resolver.TryResolve( + applicationManifestFile, + out ClickOnceFileGraph? graph)); + + Assert.NotNull(graph); + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + string expectedCandidate = GetCandidatePath(root, targetPath); + + Assert.Equal(targetPath, payload.TargetPath); + Assert.Equal(expectedCandidate, payload.Source.FullName); + Assert.Same(reference, payload.ManifestReference); + Assert.Equal( + expectedCandidate, + Assert.Single(probeCandidates)); + AssertSearchPaths( + Assert.Single(resolutionSearches), + root.FullName); + } + + [Theory] + [MemberData(nameof(SupportedTargetPaths))] + public void DeploymentResolver_PreservesSupportedTargetPathAndWindowsCandidate( + string targetPath) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo deploymentManifestFile = + ClickOnceFileGraphTestUtilities.CreateFile( + root, + DeploymentManifestFileName); + FileInfo applicationManifestFile = + ClickOnceFileGraphTestUtilities.CreateFile( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}"); + AssemblyReference deploymentEntryPoint = new() + { + ResolvedPath = applicationManifestFile.FullName, + TargetPath = Path.GetRelativePath( + root.FullName, + applicationManifestFile.FullName) + }; + DeployManifest deploymentModel = new(); + + deploymentModel.AssemblyReferences.Add(deploymentEntryPoint); + deploymentModel.EntryPoint = deploymentEntryPoint; + + List deploymentResolutionSearches = new(); + IDeployManifest deploymentManifest = + CreateDeployManifestSubstitute( + deploymentModel, + deploymentResolutionSearches); + + ApplicationManifest applicationModel = + ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + FileReference reference = new() + { + TargetPath = targetPath + }; + + applicationModel.FileReferences.Add(reference); + + List applicationResolutionSearches = new(); + IApplicationManifest applicationManifest = + CreateApplicationManifestSubstitute( + applicationModel, + applicationResolutionSearches); + IClickOnceManifestReader manifestReader = + CreateManifestReader( + deploymentManifest, + applicationManifest); + + List probeCandidates = new(); + ClickOncePayloadFileResolver payloadResolver = new( + file => + { + probeCandidates.Add(file.FullName); + + return true; + }); + ClickOnceDeployManifestFileGraphResolver resolver = new( + manifestReader, + payloadResolver); + + ClickOnceFileGraph graph = + resolver.Resolve(deploymentManifestFile); + + ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + string expectedCandidate = GetCandidatePath( + applicationManifestFile.Directory!, + targetPath); + + Assert.Equal(targetPath, payload.TargetPath); + Assert.Equal(expectedCandidate, payload.Source.FullName); + Assert.Same(reference, payload.ManifestReference); + Assert.Equal( + expectedCandidate, + Assert.Single(probeCandidates)); + AssertSearchPaths( + Assert.Single(deploymentResolutionSearches), + root.FullName); + Assert.Collection( + applicationResolutionSearches, + directories => + AssertSearchPaths( + directories, + applicationManifestFile.DirectoryName!), + directories => + AssertSearchPaths( + directories, + applicationManifestFile.DirectoryName!, + root.FullName)); + } + + [Fact] + public void DeploymentResolver_WhenOnlyMappedPayloadExistsInDeploymentDirectory_UsesFallbackAndPreservesFirstAttemptDiagnostic() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo payload = + ClickOnceFileGraphTestUtilities.CreateFile( + root, + $"{PayloadFileName}{DeploySuffix}"); + FileInfo applicationManifest = + ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}", + PayloadFileName); + FileInfo deploymentManifest = + ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath( + root.FullName, + applicationManifest.FullName), + mapFileExtensions: true); + ClickOncePayloadFileResolver payloadResolver = new(); + ClickOnceDeployManifestFileGraphResolver resolver = new( + new ClickOnceManifestReader(), + payloadResolver); + + ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + + ClickOnceFileGraphEntry entry = Assert.Single(graph.Payloads); + + Assert.Equal(payload.FullName, entry.Source.FullName); + Assert.Equal(PayloadFileName, entry.TargetPath); + Assert.Equal(DeploySuffix, entry.MappingAddedSuffix); + Assert.Collection( + graph.Diagnostics, + diagnostic => + { + Assert.Equal(OutputMessageType.Error, diagnostic.Type); + Assert.Contains( + PayloadFileName, + diagnostic.Text, + StringComparison.Ordinal); + }, + diagnostic => + { + Assert.Equal(OutputMessageType.Error, diagnostic.Type); + Assert.Contains( + PayloadFileName, + diagnostic.Text, + StringComparison.Ordinal); + }); + } + + private static IApplicationManifest CreateApplicationManifestSubstitute( + ApplicationManifest model, + ICollection resolutionSearches) + { + IApplicationManifest manifest = + Substitute.For(); + + manifest.AssemblyReferences.Returns(model.AssemblyReferences); + manifest.EntryPoint.Returns(model.EntryPoint); + manifest.FileReferences.Returns(model.FileReferences); + manifest.Diagnostics.Returns( + Array.Empty()); + manifest + .When(value => value.ResolveFiles( + Arg.Any>())) + .Do(callInfo => + resolutionSearches.Add( + ((IReadOnlyList)callInfo[0]!) + .Select(directory => directory.FullName) + .ToArray())); + + return manifest; + } + + private static IDeployManifest CreateDeployManifestSubstitute( + DeployManifest model, + ICollection resolutionSearches) + { + IDeployManifest manifest = Substitute.For(); + + manifest.AssemblyReferences.Returns(model.AssemblyReferences); + manifest.EntryPoint.Returns(model.EntryPoint); + manifest.FileReferences.Returns(model.FileReferences); + manifest.Diagnostics.Returns( + Array.Empty()); + manifest + .When(value => value.ResolveFiles( + Arg.Any>())) + .Do(callInfo => + resolutionSearches.Add( + ((IReadOnlyList)callInfo[0]!) + .Select(directory => directory.FullName) + .ToArray())); + + return manifest; + } + + private static IClickOnceManifestReader CreateManifestReader( + IDeployManifest deploymentManifest, + IApplicationManifest applicationManifest) + { + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = applicationManifest; + return true; + }); + + return manifestReader; + } + + private static string GetCandidatePath( + DirectoryInfo searchDirectory, + string targetPath) + { + return new FileInfo( + Path.Combine( + searchDirectory.FullName, + targetPath)).FullName; + } + + private static void AssertSearchPaths( + IEnumerable actual, + params string[] expected) + { + Assert.True( + expected.SequenceEqual( + actual, + StringComparer.OrdinalIgnoreCase)); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoFileGraphTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoFileGraphTests.cs new file mode 100644 index 00000000..b8022e10 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoFileGraphTests.cs @@ -0,0 +1,133 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using System.Xml.Linq; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Sign.TestInfrastructure; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceVstoFileGraphTests : IDisposable + { + private const string ApplicationDirectory = + @"Application Files\VstoTestAddIn_1_0_0_0"; + private const string ApplicationManifestFileName = + "VstoApplication.manifest"; + private const string DeploymentManifestFileName = + "VstoTestAddIn.vsto"; + private const string PayloadFileName = "payload.dll"; + private const string VstaV3Namespace = + "urn:schemas-microsoft-com:vsta.v3"; + private const string VstoV4Namespace = + "urn:schemas-microsoft-com:vsto.v4"; + + private readonly DirectoryService _directoryService; + + public ClickOnceVstoFileGraphTests() + { + _directoryService = new( + Substitute.For>()); + } + + public void Dispose() + { + _directoryService.Dispose(); + } + + [Fact] + public void DeploymentResolver_WhenApplicationIsRealVstoFixture_ResolvesGraphAndPreservesModelState() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = new( + Path.Combine( + root.FullName, + ApplicationDirectory, + ApplicationManifestFileName)); + applicationManifestFile.Directory!.Create(); + File.Copy( + ClickOnceFileGraphTestUtilities.GetVstoManifestPath(), + applicationManifestFile.FullName); + FileInfo payload = new( + Path.Combine( + applicationManifestFile.DirectoryName!, + PayloadFileName)); + File.Copy( + typeof(ClickOnceVstoFileGraphTests).Assembly.Location, + payload.FullName); + FileInfo deploymentManifestFile = + ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + root, + DeploymentManifestFileName, + Path.GetRelativePath( + root.FullName, + applicationManifestFile.FullName)); + applicationManifestFile.Refresh(); + payload.Refresh(); + + ClickOnceDeployManifestFileGraphResolver resolver = new( + new ClickOnceManifestReader(), + new ClickOncePayloadFileResolver()); + + ClickOnceFileGraph graph = + resolver.Resolve(deploymentManifestFile); + + Assert.NotNull(graph.DeploymentManifest); + Assert.Equal( + deploymentManifestFile.FullName, + graph.DeploymentManifest.Source.FullName); + Assert.NotNull(graph.DeployManifest); + Assert.Equal( + applicationManifestFile.FullName, + graph.ApplicationManifest.Source.FullName); + Assert.Equal( + "VstoTestAddIn.dll", + graph.ApplicationManifestModel.AssemblyIdentity.Name); + Assert.False(graph.ApplicationManifestModel.ReadOnly); + Assert.Empty(graph.Diagnostics); + + ClickOnceFileGraphEntry payloadEntry = + Assert.Single(graph.Payloads); + AssemblyReference manifestReference = + Assert.IsType( + payloadEntry.ManifestReference); + + Assert.Equal(payload.FullName, payloadEntry.Source.FullName); + Assert.Equal(PayloadFileName, payloadEntry.TargetPath); + Assert.Equal( + payload.FullName, + manifestReference.ResolvedPath); + Assert.Equal( + "VstoTestAddIn", + manifestReference.AssemblyIdentity.Name); + Assert.Same( + manifestReference, + Assert.Single( + graph.ApplicationManifestModel + .AssemblyReferences + .Cast())); + + FileInfo output = new( + Path.Combine( + root.FullName, + "roundtrip.manifest")); + + graph.ApplicationManifestModel.Write(output); + + XDocument document = XDocument.Load(output.FullName); + XElement addIn = Assert.Single( + document.Descendants( + XName.Get("addIn", VstaV3Namespace))); + XElement appAddIn = Assert.Single( + addIn.Descendants( + XName.Get("appAddIn", VstoV4Namespace))); + + Assert.Equal( + "VstoTestAddIn", + appAddIn.Attribute("keyName")?.Value); + } + } +} From a43fa29ebc250c05bc85065118c01ec8244aac9c Mon Sep 17 00:00:00 2001 From: Damon Tivel Date: Sat, 5 Sep 2026 20:50:22 -0700 Subject: [PATCH 2/4] Strengthen ClickOnce publish layout resolution Add typed resolved models and enforce deployment, payload, mapping, diagnostic, and target-path invariants. Preserve manifest input, validate unsupported deployment shapes, and expand resolver regression coverage. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: de6a34fe-6989-49f6-a128-ee13323c7c9e --- docs/specs/ClickOnce-Signing-Algorithm.md | 1 + src/Sign.Core/Resources.Designer.cs | 9 + src/Sign.Core/Resources.resx | 12 +- ....cs => ClickOnceAdjacentExecutableKind.cs} | 5 +- ...ckOnceApplicationPublishLayoutResolver.cs} | 31 +- ...ickOnceDeploymentPublishLayoutResolver.cs} | 116 ++-- .../Tools/ClickOnce/ClickOnceFileGraph.cs | 41 -- .../ClickOnce/ClickOnceFileGraphEntry.cs | 34 -- .../ClickOnce/ClickOnceManifestReader.cs | 95 +++- ...esolver.cs => ClickOncePayloadResolver.cs} | 60 ++- ...ckOncePublishLayoutResolutionException.cs} | 4 +- .../Tools/ClickOnce/DeployManifestAdapter.cs | 12 + .../Tools/ClickOnce/IDeployManifest.cs | 1 + .../ResolvedClickOnceAdjacentExecutable.cs | 43 ++ .../ClickOnce/ResolvedClickOnceApplication.cs | 27 + .../ClickOnce/ResolvedClickOnceDeployment.cs | 40 ++ .../ClickOnce/ResolvedClickOncePayload.cs | 67 +++ .../ResolvedClickOncePublishLayout.cs | 40 ++ src/Sign.Core/xlf/Resources.cs.xlf | 21 +- src/Sign.Core/xlf/Resources.de.xlf | 21 +- src/Sign.Core/xlf/Resources.es.xlf | 21 +- src/Sign.Core/xlf/Resources.fr.xlf | 21 +- src/Sign.Core/xlf/Resources.it.xlf | 21 +- src/Sign.Core/xlf/Resources.ja.xlf | 21 +- src/Sign.Core/xlf/Resources.ko.xlf | 21 +- src/Sign.Core/xlf/Resources.pl.xlf | 21 +- src/Sign.Core/xlf/Resources.pt-BR.xlf | 21 +- src/Sign.Core/xlf/Resources.ru.xlf | 21 +- src/Sign.Core/xlf/Resources.tr.xlf | 21 +- src/Sign.Core/xlf/Resources.zh-Hans.xlf | 21 +- src/Sign.Core/xlf/Resources.zh-Hant.xlf | 21 +- ...kOnceDeploymentReferenceValidationTests.cs | 226 ++++++-- .../ClickOnceDiagnosticOrderingTests.cs | 42 +- .../ClickOnce/ClickOnceFileGraphModelTests.cs | 225 -------- .../ClickOnceManifestDiagnosticTests.cs | 34 ++ .../ClickOnce/ClickOnceManifestReaderTests.cs | 70 +++ ...cePublishLayoutResolutionExceptionTests.cs | 58 ++ ... ClickOncePublishLayoutResolutionTests.cs} | 507 ++++++++++-------- .../ClickOnceResolutionFailureTests.cs | 152 +++++- ...cs => ClickOnceResolutionTestUtilities.cs} | 2 +- .../ClickOnceTargetPathCompatibilityTests.cs | 294 ++++++++-- ...> ClickOnceVstoManifestResolutionTests.cs} | 41 +- ...esolvedClickOnceAdjacentExecutableTests.cs | 68 +++ .../ResolvedClickOnceApplicationTests.cs | 75 +++ .../ResolvedClickOnceDeploymentTests.cs | 82 +++ .../ResolvedClickOncePayloadTests.cs | 139 +++++ .../ResolvedClickOncePublishLayoutTests.cs | 133 +++++ 47 files changed, 2202 insertions(+), 857 deletions(-) rename src/Sign.Core/Tools/ClickOnce/{ClickOnceFileGraphEntryKind.cs => ClickOnceAdjacentExecutableKind.cs} (69%) rename src/Sign.Core/Tools/ClickOnce/{ClickOnceApplicationManifestFileGraphResolver.cs => ClickOnceApplicationPublishLayoutResolver.cs} (69%) rename src/Sign.Core/Tools/ClickOnce/{ClickOnceDeployManifestFileGraphResolver.cs => ClickOnceDeploymentPublishLayoutResolver.cs} (77%) delete mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs delete mode 100644 src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs rename src/Sign.Core/Tools/ClickOnce/{ClickOncePayloadFileResolver.cs => ClickOncePayloadResolver.cs} (90%) rename src/Sign.Core/Tools/ClickOnce/{ClickOnceFileGraphResolutionException.cs => ClickOncePublishLayoutResolutionException.cs} (83%) create mode 100644 src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutable.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceApplication.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceDeployment.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePayload.cs create mode 100644 src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePublishLayout.cs delete mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestDiagnosticTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionExceptionTests.cs rename test/Sign.Core.Test/Tools/ClickOnce/{ClickOnceFileGraphResolverTests.cs => ClickOncePublishLayoutResolutionTests.cs} (77%) rename test/Sign.Core.Test/Tools/ClickOnce/{ClickOnceFileGraphTestUtilities.cs => ClickOnceResolutionTestUtilities.cs} (98%) rename test/Sign.Core.Test/Tools/ClickOnce/{ClickOnceVstoFileGraphTests.cs => ClickOnceVstoManifestResolutionTests.cs} (75%) create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutableTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceApplicationTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceDeploymentTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePayloadTests.cs create mode 100644 test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePublishLayoutTests.cs diff --git a/docs/specs/ClickOnce-Signing-Algorithm.md b/docs/specs/ClickOnce-Signing-Algorithm.md index 2e324cc9..1ce2f42d 100644 --- a/docs/specs/ClickOnce-Signing-Algorithm.md +++ b/docs/specs/ClickOnce-Signing-Algorithm.md @@ -238,6 +238,7 @@ Apply the application-manifest flows below only to files identified as ClickOnce #### Deployment-manifest input 1. Read the file using [`ManifestReader.ReadManifest(...)`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.manifestreader.readmanifest?view=msbuild-17-netcore#microsoft-build-tasks-deployment-manifestutilities-manifestreader-readmanifest(system-io-stream-system-boolean)). If reading fails or the returned [`Manifest`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.manifest?view=msbuild-17-netcore) is not a [`DeployManifest`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.deploymanifest?view=msbuild-17-netcore), fail the operation without signing the file. +1. Before resolving files, require exactly one assembly dependency and no file references. The sole assembly dependency must be [`DeployManifest.EntryPoint`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.deploymanifest.entrypoint?view=msbuild-17-netcore), must represent the application manifest, and must not be a prerequisite, optional, or resource-fallback dependency. Inspect the preserved manifest XML for resource-fallback attributes because `ManifestUtilities` does not expose or preserve them in its object model. Fail with a clear error and suggest `--clickonce-signing-version 2 --no-update-clickonce-manifest` if the reference structure does not satisfy these ClickOnce runtime requirements. This fail-fast validation also prevents `ManifestUtilities` or `mage.exe` from reordering or rewriting unsupported references before signing. 1. Ensure [`Manifest.ReadOnly`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.manifest.readonly?view=msbuild-17-netcore) is `false` so the deployment manifest can be updated. 1. Call [`DeployManifest.ResolveFiles(string[])`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.manifest.resolvefiles?view=msbuild-17-netcore) with the deployment manifest's directory to resolve its references, including the application-manifest entry point. 1. Log all messages in [`Manifest.OutputMessages`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.manifest.outputmessages?view=msbuild-17-netcore). Continue when diagnostics do not prevent resolving required files; otherwise fail with a clear error. diff --git a/src/Sign.Core/Resources.Designer.cs b/src/Sign.Core/Resources.Designer.cs index 1ba103c8..0bd96416 100644 --- a/src/Sign.Core/Resources.Designer.cs +++ b/src/Sign.Core/Resources.Designer.cs @@ -159,6 +159,15 @@ internal static string ClickOnceDeploymentManifestApplicationManifestNotFound { } } + /// + /// Looks up a localized string similar to Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory.. + /// + internal static string ClickOnceDeploymentManifestInvalidTargetPath { + get { + return ResourceManager.GetString("ClickOnceDeploymentManifestInvalidTargetPath", resourceCulture); + } + } + /// /// Looks up a localized string similar to Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'.. /// diff --git a/src/Sign.Core/Resources.resx b/src/Sign.Core/Resources.resx index 9d069623..b4999dc4 100644 --- a/src/Sign.Core/Resources.resx +++ b/src/Sign.Core/Resources.resx @@ -160,15 +160,19 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -192,11 +196,11 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntryKind.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceAdjacentExecutableKind.cs similarity index 69% rename from src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntryKind.cs rename to src/Sign.Core/Tools/ClickOnce/ClickOnceAdjacentExecutableKind.cs index 3c4b76f9..90b3746f 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntryKind.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceAdjacentExecutableKind.cs @@ -4,11 +4,8 @@ namespace Sign.Core { - internal enum ClickOnceFileGraphEntryKind + internal enum ClickOnceAdjacentExecutableKind { - DeploymentManifest, - ApplicationManifest, - Payload, Setup, Launcher } diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationManifestFileGraphResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs similarity index 69% rename from src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationManifestFileGraphResolver.cs rename to src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs index 3cb4e682..1446979a 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationManifestFileGraphResolver.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs @@ -6,14 +6,14 @@ namespace Sign.Core { - internal sealed class ClickOnceApplicationManifestFileGraphResolver + internal sealed class ClickOnceApplicationPublishLayoutResolver { private readonly IClickOnceManifestReader _manifestReader; - private readonly ClickOncePayloadFileResolver _payloadResolver; + private readonly ClickOncePayloadResolver _payloadResolver; - internal ClickOnceApplicationManifestFileGraphResolver( + internal ClickOnceApplicationPublishLayoutResolver( IClickOnceManifestReader manifestReader, - ClickOncePayloadFileResolver payloadResolver) + ClickOncePayloadResolver payloadResolver) { ArgumentNullException.ThrowIfNull(manifestReader, nameof(manifestReader)); ArgumentNullException.ThrowIfNull(payloadResolver, nameof(payloadResolver)); @@ -22,7 +22,7 @@ internal ClickOnceApplicationManifestFileGraphResolver( _payloadResolver = payloadResolver; } - internal bool TryResolve(FileInfo applicationManifestFile, out ClickOnceFileGraph? graph) + internal bool TryResolve(FileInfo applicationManifestFile, out ResolvedClickOncePublishLayout? layout) { ArgumentNullException.ThrowIfNull(applicationManifestFile, nameof(applicationManifestFile)); @@ -36,7 +36,7 @@ internal bool TryResolve(FileInfo applicationManifestFile, out ClickOnceFileGrap stream, out applicationManifest)) { - graph = null; + layout = null; return false; } @@ -47,7 +47,7 @@ UnauthorizedAccessException or InvalidOperationException or System.Xml.XmlException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceApplicationManifestReadFailed, @@ -58,21 +58,18 @@ InvalidOperationException or applicationManifest.ReadOnly = false; List diagnostics = new(); - IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, applicationManifest, diagnostics); - graph = new ClickOnceFileGraph( - deploymentManifest: null, - deployManifest: null, - new ClickOnceFileGraphEntry( + layout = new ResolvedClickOncePublishLayout( + deployment: null, + new ResolvedClickOnceApplication( applicationManifestFile, - applicationManifestFile.Name, - ClickOnceFileGraphEntryKind.ApplicationManifest), - applicationManifest, - payloads, - adjacentExecutables: Array.Empty(), + applicationManifest, + payloads), + adjacentExecutables: Array.Empty(), diagnostics); return true; diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceDeployManifestFileGraphResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceDeploymentPublishLayoutResolver.cs similarity index 77% rename from src/Sign.Core/Tools/ClickOnce/ClickOnceDeployManifestFileGraphResolver.cs rename to src/Sign.Core/Tools/ClickOnce/ClickOnceDeploymentPublishLayoutResolver.cs index 1454545f..7bb72571 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceDeployManifestFileGraphResolver.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceDeploymentPublishLayoutResolver.cs @@ -7,25 +7,22 @@ namespace Sign.Core { - internal sealed class ClickOnceDeployManifestFileGraphResolver + internal sealed class ClickOnceDeploymentPublishLayoutResolver { - private const string LauncherFileName = "Launcher.exe"; - private const string SetupFileName = "setup.exe"; - private readonly IClickOnceManifestReader _manifestReader; - private readonly ClickOncePayloadFileResolver _payloadResolver; + private readonly ClickOncePayloadResolver _payloadResolver; private readonly Func _fileExists; - internal ClickOnceDeployManifestFileGraphResolver( + internal ClickOnceDeploymentPublishLayoutResolver( IClickOnceManifestReader manifestReader, - ClickOncePayloadFileResolver payloadResolver) + ClickOncePayloadResolver payloadResolver) : this(manifestReader, payloadResolver, ClickOnceFileSystem.IsFile) { } - internal ClickOnceDeployManifestFileGraphResolver( + internal ClickOnceDeploymentPublishLayoutResolver( IClickOnceManifestReader manifestReader, - ClickOncePayloadFileResolver payloadResolver, + ClickOncePayloadResolver payloadResolver, Func fileExists) { ArgumentNullException.ThrowIfNull(manifestReader, nameof(manifestReader)); @@ -37,7 +34,7 @@ internal ClickOnceDeployManifestFileGraphResolver( _fileExists = fileExists; } - internal ClickOnceFileGraph Resolve(FileInfo deploymentManifestFile) + internal ResolvedClickOncePublishLayout Resolve(FileInfo deploymentManifestFile) { ArgumentNullException.ThrowIfNull(deploymentManifestFile, nameof(deploymentManifestFile)); @@ -51,7 +48,7 @@ internal ClickOnceFileGraph Resolve(FileInfo deploymentManifestFile) (entryPoint is not null && string.IsNullOrWhiteSpace(entryPoint.TargetPath))) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestMissingEntryPoint, @@ -63,6 +60,10 @@ internal ClickOnceFileGraph Resolve(FileInfo deploymentManifestFile) deploymentManifestFile, deploymentManifest, entryPoint); + ValidateTargetPath( + deploymentManifestFile, + entryPoint, + diagnostics); deploymentManifest.ReadOnly = false; try @@ -97,33 +98,29 @@ UnauthorizedAccessException or diagnostics); applicationManifest.ReadOnly = false; - IReadOnlyList payloads = _payloadResolver.ResolveForDeployment( + IReadOnlyList payloads = _payloadResolver.ResolveForDeployment( applicationManifestFile, applicationManifest, deploymentManifestFile.Directory!, deploymentManifest.MapFileExtensions, diagnostics); - IReadOnlyList adjacentExecutables = + IReadOnlyList adjacentExecutables = ResolveAdjacentExecutables( deploymentManifestFile, deploymentManifestFile.Directory!, payloads, diagnostics); - return new ClickOnceFileGraph( - new ClickOnceFileGraphEntry( + return new ResolvedClickOncePublishLayout( + new ResolvedClickOnceDeployment( deploymentManifestFile, - deploymentManifestFile.Name, - ClickOnceFileGraphEntryKind.DeploymentManifest), - deploymentManifest, - new ClickOnceFileGraphEntry( - applicationManifestFile, - entryPoint.TargetPath, - ClickOnceFileGraphEntryKind.ApplicationManifest, + deploymentManifest, entryPoint), - applicationManifest, - payloads, + new ResolvedClickOnceApplication( + applicationManifestFile, + applicationManifest, + payloads), adjacentExecutables, diagnostics); } @@ -147,7 +144,7 @@ UnauthorizedAccessException or InvalidOperationException or System.Xml.XmlException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestReadFailed, @@ -155,7 +152,7 @@ InvalidOperationException or innerException: exception); } - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestWrongType, @@ -167,15 +164,21 @@ private static AssemblyReference ValidateReferences( IDeployManifest deploymentManifest, AssemblyReference? entryPoint) { + // Mirrors System.Deployment's deployment-role checks: + // Ex_DepApplicationDependencyRequired, Ex_DepFileNotAllowed, and + // Ex_DepAppRefPrereqOrOptionalOrResourceFallback. Fail before + // ManifestUtilities or mage can reorder or rewrite invalid references. if (deploymentManifest.AssemblyReferences.Count != 1 || deploymentManifest.FileReferences.Count != 0 || entryPoint is null || entryPoint.IsPrerequisite || + entryPoint.IsOptional || + deploymentManifest.HasUnsupportedResourceFallback || !ReferenceEquals( entryPoint, deploymentManifest.AssemblyReferences[0])) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestUnsupportedReferences, @@ -186,6 +189,23 @@ entryPoint is null || return entryPoint; } + private static void ValidateTargetPath( + FileInfo deploymentManifestFile, + AssemblyReference entryPoint, + IReadOnlyCollection diagnostics) + { + if (Path.IsPathRooted(entryPoint.TargetPath)) + { + throw new ClickOncePublishLayoutResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestInvalidTargetPath, + deploymentManifestFile.FullName, + entryPoint.TargetPath), + diagnostics); + } + } + private IApplicationManifest ReadApplicationManifest( FileInfo deploymentManifestFile, FileInfo applicationManifestFile, @@ -208,7 +228,7 @@ UnauthorizedAccessException or InvalidOperationException or System.Xml.XmlException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestReferencedApplicationReadFailed, @@ -218,7 +238,7 @@ InvalidOperationException or exception); } - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestReferencedApplicationWrongType, @@ -240,7 +260,7 @@ private FileInfo GetApplicationManifestFile( deploymentManifestFile.DirectoryName!, entryPoint.TargetPath); - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestUnresolvedApplicationManifest, @@ -255,7 +275,7 @@ private FileInfo GetApplicationManifestFile( { if (!_fileExists(applicationManifestFile)) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestApplicationManifestNotFound, @@ -270,7 +290,7 @@ UnauthorizedAccessException or ArgumentException or NotSupportedException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestReferencedApplicationReadFailed, @@ -312,17 +332,20 @@ private static void ResolveFilesWithTargetOnlyEntryPoint( } } - private IReadOnlyList ResolveAdjacentExecutables( + private IReadOnlyList ResolveAdjacentExecutables( FileInfo deploymentManifestFile, DirectoryInfo deploymentDirectory, - IReadOnlyList payloads, + IReadOnlyList payloads, IReadOnlyCollection diagnostics) { HashSet payloadPaths = payloads .Select(payload => Path.GetFullPath(payload.Source.FullName)) .ToHashSet(StringComparer.OrdinalIgnoreCase); - List adjacentExecutables = new(); - FileInfo setup = new(Path.Combine(deploymentDirectory.FullName, SetupFileName)); + List adjacentExecutables = new(); + FileInfo setup = new( + Path.Combine( + deploymentDirectory.FullName, + ResolvedClickOnceAdjacentExecutable.SetupFileName)); if (IsAdjacentFile( setup, @@ -331,13 +354,15 @@ private IReadOnlyList ResolveAdjacentExecutables( diagnostics)) { adjacentExecutables.Add( - new ClickOnceFileGraphEntry( + new ResolvedClickOnceAdjacentExecutable( setup, - setup.Name, - ClickOnceFileGraphEntryKind.Setup)); + ClickOnceAdjacentExecutableKind.Setup)); } - FileInfo launcher = new(Path.Combine(deploymentDirectory.FullName, LauncherFileName)); + FileInfo launcher = new( + Path.Combine( + deploymentDirectory.FullName, + ResolvedClickOnceAdjacentExecutable.LauncherFileName)); if (!payloadPaths.Contains(Path.GetFullPath(launcher.FullName)) && IsAdjacentFile( @@ -347,10 +372,9 @@ private IReadOnlyList ResolveAdjacentExecutables( diagnostics)) { adjacentExecutables.Add( - new ClickOnceFileGraphEntry( + new ResolvedClickOnceAdjacentExecutable( launcher, - launcher.Name, - ClickOnceFileGraphEntryKind.Launcher)); + ClickOnceAdjacentExecutableKind.Launcher)); } return adjacentExecutables; @@ -370,7 +394,7 @@ private bool IsAdjacentFile( exception is IOException or UnauthorizedAccessException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, failureMessageFormat, @@ -381,12 +405,12 @@ exception is IOException or } } - private static ClickOnceFileGraphResolutionException CreateResolutionException( + private static ClickOncePublishLayoutResolutionException CreateResolutionException( FileInfo deploymentManifestFile, IEnumerable diagnostics, Exception innerException) { - return new ClickOnceFileGraphResolutionException( + return new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceDeploymentManifestResolveFailed, diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs deleted file mode 100644 index 74818bd2..00000000 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraph.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE.txt file in the project root for more information. - -namespace Sign.Core -{ - internal sealed class ClickOnceFileGraph - { - internal ClickOnceFileGraph( - ClickOnceFileGraphEntry? deploymentManifest, - IDeployManifest? deployManifest, - ClickOnceFileGraphEntry applicationManifest, - IApplicationManifest applicationManifestModel, - IEnumerable payloads, - IEnumerable adjacentExecutables, - IEnumerable diagnostics) - { - ArgumentNullException.ThrowIfNull(applicationManifest, nameof(applicationManifest)); - ArgumentNullException.ThrowIfNull(applicationManifestModel, nameof(applicationManifestModel)); - ArgumentNullException.ThrowIfNull(payloads, nameof(payloads)); - ArgumentNullException.ThrowIfNull(adjacentExecutables, nameof(adjacentExecutables)); - ArgumentNullException.ThrowIfNull(diagnostics, nameof(diagnostics)); - - DeploymentManifest = deploymentManifest; - DeployManifest = deployManifest; - ApplicationManifest = applicationManifest; - ApplicationManifestModel = applicationManifestModel; - Payloads = payloads.ToArray(); - AdjacentExecutables = adjacentExecutables.ToArray(); - Diagnostics = diagnostics.ToArray(); - } - - internal ClickOnceFileGraphEntry? DeploymentManifest { get; } - internal IDeployManifest? DeployManifest { get; } - internal ClickOnceFileGraphEntry ApplicationManifest { get; } - internal IApplicationManifest ApplicationManifestModel { get; } - internal IReadOnlyList Payloads { get; } - internal IReadOnlyList AdjacentExecutables { get; } - internal IReadOnlyList Diagnostics { get; } - } -} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs deleted file mode 100644 index 2aebbe95..00000000 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphEntry.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE.txt file in the project root for more information. - -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; - -namespace Sign.Core -{ - internal sealed class ClickOnceFileGraphEntry - { - internal ClickOnceFileGraphEntry( - FileInfo source, - string targetPath, - ClickOnceFileGraphEntryKind kind, - BaseReference? manifestReference = null, - string? mappingAddedSuffix = null) - { - ArgumentNullException.ThrowIfNull(source, nameof(source)); - ArgumentException.ThrowIfNullOrWhiteSpace(targetPath, nameof(targetPath)); - - Source = source; - TargetPath = targetPath; - Kind = kind; - ManifestReference = manifestReference; - MappingAddedSuffix = mappingAddedSuffix; - } - - internal FileInfo Source { get; } - internal string TargetPath { get; } - internal ClickOnceFileGraphEntryKind Kind { get; } - internal BaseReference? ManifestReference { get; } - internal string? MappingAddedSuffix { get; } - } -} diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestReader.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestReader.cs index a9b06221..15c0c500 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestReader.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceManifestReader.cs @@ -11,6 +11,8 @@ namespace Sign.Core { internal sealed class ClickOnceManifestReader : IClickOnceManifestReader { + private const string AssemblyV1Namespace = + "urn:schemas-microsoft-com:asm.v1"; private const string AssemblyV2Namespace = "urn:schemas-microsoft-com:asm.v2"; private const string SignatureNamespace = @@ -52,8 +54,12 @@ public bool TryReadDeployManifest( return false; } - ReplaceManifestInputStream(deployManifest); - manifest = new DeployManifestAdapter(deployManifest); + ReplaceManifestInputStream( + deployManifest, + out bool hasUnsupportedResourceFallback); + manifest = new DeployManifestAdapter( + deployManifest, + hasUnsupportedResourceFallback); return true; } @@ -83,17 +89,41 @@ private static Manifest ReadManifest(Stream stream) nameof(stream)); } - return ManifestReader.ReadManifest(stream, preserveStream: true); + try + { + return ManifestReader.ReadManifest( + stream, + preserveStream: true); + } + catch (Exception exception) when ( + exception is ArgumentException or + InvalidCastException) + { + throw new InvalidOperationException( + "The manifest content could not be read.", + exception); + } } private static void ReplaceManifestInputStream(Manifest manifest) + { + ReplaceManifestInputStream( + manifest, + out _); + } + + private static void ReplaceManifestInputStream( + Manifest manifest, + out bool hasUnsupportedResourceFallback) { Stream input = manifest.InputStream; Stream? output = null; try { - output = CreateSanitizedManifestInputStream(input); + output = CreateSanitizedManifestInputStream( + input, + out hasUnsupportedResourceFallback); manifest.InputStream = output; output = null; } @@ -104,7 +134,9 @@ private static void ReplaceManifestInputStream(Manifest manifest) } } - private static Stream CreateSanitizedManifestInputStream(Stream input) + private static Stream CreateSanitizedManifestInputStream( + Stream input, + out bool hasUnsupportedResourceFallback) { input.Position = 0; MemoryStream output = new(); @@ -136,6 +168,9 @@ private static Stream CreateSanitizedManifestInputStream(Stream input) throw new XmlException( "The manifest XML does not have a document element."); + hasUnsupportedResourceFallback = + HasUnsupportedResourceFallback(root); + for (XmlNode? node = root.FirstChild; node is not null;) { @@ -167,6 +202,56 @@ private static Stream CreateSanitizedManifestInputStream(Stream input) } } + private static bool HasUnsupportedResourceFallback( + XmlElement root) + { + foreach (XmlNode dependencyNode in root.ChildNodes) + { + if (dependencyNode is not XmlElement dependency || + dependency.LocalName != "dependency" || + !IsAssemblyNamespace(dependency.NamespaceURI)) + { + continue; + } + + foreach (XmlNode dependentAssemblyNode in + dependency.ChildNodes) + { + if (dependentAssemblyNode is XmlElement dependentAssembly && + dependentAssembly.LocalName == "dependentAssembly" && + IsAssemblyNamespace( + dependentAssembly.NamespaceURI) && + (HasAttribute( + dependentAssembly, + "resourceFallbackCulture") || + HasAttribute( + dependentAssembly, + "resourceFallbackCultureInternal"))) + { + return true; + } + } + } + + return false; + } + + private static bool HasAttribute( + XmlElement element, + string localName) + { + return element.HasAttribute(localName) || + element.HasAttribute( + localName, + AssemblyV2Namespace); + } + + private static bool IsAssemblyNamespace(string namespaceUri) + { + return namespaceUri == AssemblyV1Namespace || + namespaceUri == AssemblyV2Namespace; + } + private static bool IsStaleSigningElement(XmlElement element) { bool isPublisherIdentity = diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadFileResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadResolver.cs similarity index 90% rename from src/Sign.Core/Tools/ClickOnce/ClickOncePayloadFileResolver.cs rename to src/Sign.Core/Tools/ClickOnce/ClickOncePayloadResolver.cs index 4363dca2..039ab6d5 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadFileResolver.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadResolver.cs @@ -7,26 +7,26 @@ namespace Sign.Core { - internal sealed class ClickOncePayloadFileResolver + internal sealed class ClickOncePayloadResolver { private const string ClrPlatformAssemblyName = "Microsoft.Windows.CommonLanguageRuntime"; private const string DeploySuffix = ".deploy"; private readonly Func _fileExists; - internal ClickOncePayloadFileResolver() + internal ClickOncePayloadResolver() : this(ClickOnceFileSystem.IsFile) { } - internal ClickOncePayloadFileResolver(Func fileExists) + internal ClickOncePayloadResolver(Func fileExists) { ArgumentNullException.ThrowIfNull(fileExists, nameof(fileExists)); _fileExists = fileExists; } - internal IReadOnlyList ResolveForDeployment( + internal IReadOnlyList ResolveForDeployment( FileInfo applicationManifestFile, IApplicationManifest applicationManifest, DirectoryInfo deploymentDirectory, @@ -56,7 +56,7 @@ internal IReadOnlyList ResolveForDeployment( diagnostics); } - internal IReadOnlyList ResolveForExplicitApplication( + internal IReadOnlyList ResolveForExplicitApplication( FileInfo applicationManifestFile, IApplicationManifest applicationManifest, ICollection diagnostics) @@ -74,7 +74,7 @@ internal IReadOnlyList ResolveForExplicitApplication( diagnostics); } - private IReadOnlyList Resolve( + private IReadOnlyList Resolve( FileInfo applicationManifestFile, IApplicationManifest applicationManifest, DirectoryInfo[] searchDirectories, @@ -83,6 +83,9 @@ private IReadOnlyList Resolve( ICollection diagnostics) { List references = GetPhysicalReferences(applicationManifest); + int diagnosticCount = 0; + + AddDiagnostics(applicationManifest, diagnostics, ref diagnosticCount); foreach (BaseReference reference in references) { @@ -93,8 +96,6 @@ private IReadOnlyList Resolve( diagnostics); } - int diagnosticCount = 0; - try { using TargetOnlyResolutionScope resolutionScope = new(references); @@ -112,7 +113,7 @@ UnauthorizedAccessException or { AddDiagnostics(applicationManifest, diagnostics, ref diagnosticCount); - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceApplicationManifestResolveFailed, @@ -129,7 +130,7 @@ UnauthorizedAccessException or ClearResolvedPaths(applicationManifest); } - List payloads = new(references.Count); + List payloads = new(references.Count); foreach (BaseReference reference in references) { @@ -137,7 +138,7 @@ UnauthorizedAccessException or if (string.IsNullOrWhiteSpace(targetPath)) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceApplicationManifestMissingTargetPath, @@ -146,7 +147,6 @@ UnauthorizedAccessException or } FileInfo source; - string? mappingAddedSuffix; try { @@ -156,18 +156,14 @@ UnauthorizedAccessException or searchDirectories, lookupKind, diagnostics, - out source, - out mappingAddedSuffix)) + out source)) { reference.ResolvedPath = source.FullName; payloads.Add( - new ClickOnceFileGraphEntry( + new ResolvedClickOncePayload( source, - targetPath, - ClickOnceFileGraphEntryKind.Payload, - reference, - mappingAddedSuffix)); + reference)); continue; } @@ -177,7 +173,7 @@ exception is ArgumentException or NotSupportedException or PathTooLongException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceApplicationManifestInvalidTargetPath, @@ -186,7 +182,7 @@ NotSupportedException or diagnostics, exception); } - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceApplicationManifestRequiredFileNotFound, @@ -256,6 +252,17 @@ private static void ValidateTargetPath( return; } + if (Path.IsPathRooted(targetPath)) + { + throw new ClickOncePublishLayoutResolutionException( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestInvalidTargetPath, + applicationManifestFile.FullName, + targetPath), + diagnostics); + } + try { foreach (DirectoryInfo directory in searchDirectories) @@ -267,7 +274,7 @@ private static void ValidateTargetPath( exception is ArgumentException or PathTooLongException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceApplicationManifestInvalidTargetPath, @@ -284,8 +291,7 @@ private bool TryResolve( IEnumerable searchDirectories, PayloadLookupKind lookupKind, ICollection diagnostics, - out FileInfo source, - out string? mappingAddedSuffix) + out FileInfo source) { foreach (DirectoryInfo directory in searchDirectories) { @@ -300,7 +306,6 @@ private bool TryResolve( diagnostics)) { source = unmappedSource; - mappingAddedSuffix = null; return true; } @@ -317,15 +322,12 @@ private bool TryResolve( diagnostics)) { source = mappedSource; - mappingAddedSuffix = DeploySuffix; return true; } } } - source = null!; - mappingAddedSuffix = null; return false; } @@ -348,7 +350,7 @@ private bool IsFile( exception is IOException or UnauthorizedAccessException) { - throw new ClickOnceFileGraphResolutionException( + throw new ClickOncePublishLayoutResolutionException( string.Format( CultureInfo.CurrentCulture, Resources.ClickOnceApplicationManifestPayloadProbeFailed, diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphResolutionException.cs b/src/Sign.Core/Tools/ClickOnce/ClickOncePublishLayoutResolutionException.cs similarity index 83% rename from src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphResolutionException.cs rename to src/Sign.Core/Tools/ClickOnce/ClickOncePublishLayoutResolutionException.cs index 25178368..7d8e08a2 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceFileGraphResolutionException.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOncePublishLayoutResolutionException.cs @@ -4,9 +4,9 @@ namespace Sign.Core { - internal sealed class ClickOnceFileGraphResolutionException : Exception + internal sealed class ClickOncePublishLayoutResolutionException : Exception { - internal ClickOnceFileGraphResolutionException( + internal ClickOncePublishLayoutResolutionException( string message, IEnumerable? diagnostics = null, Exception? innerException = null) diff --git a/src/Sign.Core/Tools/ClickOnce/DeployManifestAdapter.cs b/src/Sign.Core/Tools/ClickOnce/DeployManifestAdapter.cs index 490986c6..834b82ea 100644 --- a/src/Sign.Core/Tools/ClickOnce/DeployManifestAdapter.cs +++ b/src/Sign.Core/Tools/ClickOnce/DeployManifestAdapter.cs @@ -11,10 +11,22 @@ internal sealed class DeployManifestAdapter : IDeployManifest { internal DeployManifestAdapter(DeployManifest manifest) + : this( + manifest, + hasUnsupportedResourceFallback: false) + { + } + + internal DeployManifestAdapter( + DeployManifest manifest, + bool hasUnsupportedResourceFallback) : base(manifest) { + HasUnsupportedResourceFallback = + hasUnsupportedResourceFallback; } + public bool HasUnsupportedResourceFallback { get; } public bool MapFileExtensions => Manifest.MapFileExtensions; } } diff --git a/src/Sign.Core/Tools/ClickOnce/IDeployManifest.cs b/src/Sign.Core/Tools/ClickOnce/IDeployManifest.cs index ee8fa2fc..9ee417c7 100644 --- a/src/Sign.Core/Tools/ClickOnce/IDeployManifest.cs +++ b/src/Sign.Core/Tools/ClickOnce/IDeployManifest.cs @@ -6,6 +6,7 @@ namespace Sign.Core { internal interface IDeployManifest : IClickOnceManifest { + bool HasUnsupportedResourceFallback { get; } bool MapFileExtensions { get; } } } diff --git a/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutable.cs b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutable.cs new file mode 100644 index 00000000..616ecd2f --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutable.cs @@ -0,0 +1,43 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core +{ + internal sealed class ResolvedClickOnceAdjacentExecutable + { + internal const string LauncherFileName = "Launcher.exe"; + internal const string SetupFileName = "setup.exe"; + + internal ResolvedClickOnceAdjacentExecutable( + FileInfo source, + ClickOnceAdjacentExecutableKind kind) + { + ArgumentNullException.ThrowIfNull(source, nameof(source)); + + string expectedFileName = kind switch + { + ClickOnceAdjacentExecutableKind.Setup => SetupFileName, + ClickOnceAdjacentExecutableKind.Launcher => LauncherFileName, + _ => throw new ArgumentOutOfRangeException(nameof(kind)) + }; + + if (!string.Equals( + source.Name, + expectedFileName, + StringComparison.OrdinalIgnoreCase)) + { + throw new ArgumentException( + "The source file name does not match the adjacent executable kind.", + nameof(source)); + } + + Source = source; + Kind = kind; + } + + internal FileInfo Source { get; } + internal string TargetPath => Source.Name; + internal ClickOnceAdjacentExecutableKind Kind { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceApplication.cs b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceApplication.cs new file mode 100644 index 00000000..28bce596 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceApplication.cs @@ -0,0 +1,27 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core +{ + internal sealed class ResolvedClickOnceApplication + { + internal ResolvedClickOnceApplication( + FileInfo source, + IApplicationManifest manifest, + IEnumerable payloads) + { + ArgumentNullException.ThrowIfNull(source, nameof(source)); + ArgumentNullException.ThrowIfNull(manifest, nameof(manifest)); + ArgumentNullException.ThrowIfNull(payloads, nameof(payloads)); + + Source = source; + Manifest = manifest; + Payloads = payloads.ToArray(); + } + + internal FileInfo Source { get; } + internal IApplicationManifest Manifest { get; } + internal IReadOnlyList Payloads { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceDeployment.cs b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceDeployment.cs new file mode 100644 index 00000000..191b0ac7 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOnceDeployment.cs @@ -0,0 +1,40 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core +{ + internal sealed class ResolvedClickOnceDeployment + { + internal ResolvedClickOnceDeployment( + FileInfo source, + IDeployManifest manifest, + AssemblyReference applicationManifestReference) + { + ArgumentNullException.ThrowIfNull(source, nameof(source)); + ArgumentNullException.ThrowIfNull(manifest, nameof(manifest)); + ArgumentNullException.ThrowIfNull( + applicationManifestReference, + nameof(applicationManifestReference)); + + if (!ReferenceEquals( + manifest.EntryPoint, + applicationManifestReference)) + { + throw new ArgumentException( + "The application manifest reference must be the deployment manifest entry point.", + nameof(applicationManifestReference)); + } + + Source = source; + Manifest = manifest; + ApplicationManifestReference = applicationManifestReference; + } + + internal FileInfo Source { get; } + internal IDeployManifest Manifest { get; } + internal AssemblyReference ApplicationManifestReference { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePayload.cs b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePayload.cs new file mode 100644 index 00000000..44d74f6d --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePayload.cs @@ -0,0 +1,67 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core +{ + internal sealed class ResolvedClickOncePayload + { + private const string DeploySuffix = ".deploy"; + + internal ResolvedClickOncePayload( + FileInfo source, + BaseReference reference) + { + ArgumentNullException.ThrowIfNull(source, nameof(source)); + ArgumentNullException.ThrowIfNull(reference, nameof(reference)); + ArgumentException.ThrowIfNullOrWhiteSpace( + reference.TargetPath, + nameof(reference)); + + string targetPath = reference.TargetPath; + string targetFileName = Path.GetFileName(targetPath); + + if (string.IsNullOrWhiteSpace(targetFileName)) + { + throw new ArgumentException( + "The reference target path must identify a file.", + nameof(reference)); + } + + bool isFileExtensionMapped; + + if (string.Equals( + source.Name, + targetFileName, + StringComparison.OrdinalIgnoreCase)) + { + isFileExtensionMapped = false; + } + else if (string.Equals( + source.Name, + $"{targetFileName}{DeploySuffix}", + StringComparison.OrdinalIgnoreCase)) + { + isFileExtensionMapped = true; + } + else + { + throw new ArgumentException( + "The source file name does not match the reference target path.", + nameof(source)); + } + + Source = source; + Reference = reference; + TargetPath = targetPath; + IsFileExtensionMapped = isFileExtensionMapped; + } + + internal FileInfo Source { get; } + internal string TargetPath { get; } + internal BaseReference Reference { get; } + internal bool IsFileExtensionMapped { get; } + } +} diff --git a/src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePublishLayout.cs b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePublishLayout.cs new file mode 100644 index 00000000..9da5dbd5 --- /dev/null +++ b/src/Sign.Core/Tools/ClickOnce/ResolvedClickOncePublishLayout.cs @@ -0,0 +1,40 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core +{ + internal sealed class ResolvedClickOncePublishLayout + { + internal ResolvedClickOncePublishLayout( + ResolvedClickOnceDeployment? deployment, + ResolvedClickOnceApplication application, + IEnumerable adjacentExecutables, + IEnumerable diagnostics) + { + ArgumentNullException.ThrowIfNull(application, nameof(application)); + ArgumentNullException.ThrowIfNull(adjacentExecutables, nameof(adjacentExecutables)); + ArgumentNullException.ThrowIfNull(diagnostics, nameof(diagnostics)); + + ResolvedClickOnceAdjacentExecutable[] resolvedAdjacentExecutables = + adjacentExecutables.ToArray(); + + if (deployment is null && resolvedAdjacentExecutables.Length != 0) + { + throw new ArgumentException( + "Adjacent executables require a resolved deployment.", + nameof(adjacentExecutables)); + } + + Deployment = deployment; + Application = application; + AdjacentExecutables = resolvedAdjacentExecutables; + Diagnostics = diagnostics.ToArray(); + } + + internal ResolvedClickOnceDeployment? Deployment { get; } + internal ResolvedClickOnceApplication Application { get; } + internal IReadOnlyList AdjacentExecutables { get; } + internal IReadOnlyList Diagnostics { get; } + } +} diff --git a/src/Sign.Core/xlf/Resources.cs.xlf b/src/Sign.Core/xlf/Resources.cs.xlf index 06ce179a..3f54f3f7 100644 --- a/src/Sign.Core/xlf/Resources.cs.xlf +++ b/src/Sign.Core/xlf/Resources.cs.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.de.xlf b/src/Sign.Core/xlf/Resources.de.xlf index c7a7e662..4678e3b6 100644 --- a/src/Sign.Core/xlf/Resources.de.xlf +++ b/src/Sign.Core/xlf/Resources.de.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.es.xlf b/src/Sign.Core/xlf/Resources.es.xlf index cabd09e4..966bcbdc 100644 --- a/src/Sign.Core/xlf/Resources.es.xlf +++ b/src/Sign.Core/xlf/Resources.es.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.fr.xlf b/src/Sign.Core/xlf/Resources.fr.xlf index 1bdccb62..ab271e36 100644 --- a/src/Sign.Core/xlf/Resources.fr.xlf +++ b/src/Sign.Core/xlf/Resources.fr.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.it.xlf b/src/Sign.Core/xlf/Resources.it.xlf index 7da0ecb2..3bce7bb5 100644 --- a/src/Sign.Core/xlf/Resources.it.xlf +++ b/src/Sign.Core/xlf/Resources.it.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.ja.xlf b/src/Sign.Core/xlf/Resources.ja.xlf index 11213871..cd18b469 100644 --- a/src/Sign.Core/xlf/Resources.ja.xlf +++ b/src/Sign.Core/xlf/Resources.ja.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.ko.xlf b/src/Sign.Core/xlf/Resources.ko.xlf index 5dd1fcf0..2508b521 100644 --- a/src/Sign.Core/xlf/Resources.ko.xlf +++ b/src/Sign.Core/xlf/Resources.ko.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.pl.xlf b/src/Sign.Core/xlf/Resources.pl.xlf index 5703feeb..cbfb39d8 100644 --- a/src/Sign.Core/xlf/Resources.pl.xlf +++ b/src/Sign.Core/xlf/Resources.pl.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.pt-BR.xlf b/src/Sign.Core/xlf/Resources.pt-BR.xlf index 1b8b417f..1d8ec827 100644 --- a/src/Sign.Core/xlf/Resources.pt-BR.xlf +++ b/src/Sign.Core/xlf/Resources.pt-BR.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.ru.xlf b/src/Sign.Core/xlf/Resources.ru.xlf index a32b5855..7bc46f9f 100644 --- a/src/Sign.Core/xlf/Resources.ru.xlf +++ b/src/Sign.Core/xlf/Resources.ru.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.tr.xlf b/src/Sign.Core/xlf/Resources.tr.xlf index 044f71e9..749812f8 100644 --- a/src/Sign.Core/xlf/Resources.tr.xlf +++ b/src/Sign.Core/xlf/Resources.tr.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.zh-Hans.xlf b/src/Sign.Core/xlf/Resources.zh-Hans.xlf index 8e375c3f..ee0009db 100644 --- a/src/Sign.Core/xlf/Resources.zh-Hans.xlf +++ b/src/Sign.Core/xlf/Resources.zh-Hans.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/src/Sign.Core/xlf/Resources.zh-Hant.xlf b/src/Sign.Core/xlf/Resources.zh-Hant.xlf index 3e629f60..0475fe93 100644 --- a/src/Sign.Core/xlf/Resources.zh-Hant.xlf +++ b/src/Sign.Core/xlf/Resources.zh-Hant.xlf @@ -63,18 +63,23 @@ {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. + + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' references application manifest target path '{1}', which cannot be represented beneath the staging directory. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is an invalid application manifest target path. + Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. Failed to access launcher candidate '{0}' associated with deployment manifest '{1}'. {NumberedPlaceholder="{0}"} is the absolute launcher candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' does not identify an application manifest. - Deployment manifest '{0}' does not identify an application manifest. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' does not identify an application manifest. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. @@ -103,13 +108,13 @@ {NumberedPlaceholder="{0}"} is the absolute setup bootstrapper candidate path. {NumberedPlaceholder="{1}"} is a deployment manifest file path. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. - Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' did not resolve its referenced application manifest '{1}'. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. - Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one non-prerequisite application manifest dependency and no file references. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. + Deployment manifest '{0}' has a reference structure unsupported by the ClickOnce runtime. It must contain exactly one assembly dependency: the application manifest. That dependency must not be a prerequisite, optional, or resource-fallback dependency, and the deployment manifest must not contain file references. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs index b2da6937..81aeaac0 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDeploymentReferenceValidationTests.cs @@ -13,6 +13,8 @@ namespace Sign.Core.Test { public sealed class ClickOnceDeploymentReferenceValidationTests : IDisposable { + private const string AssemblyV2Namespace = + "urn:schemas-microsoft-com:asm.v2"; private const string ApplicationManifestFileName = "App.exe.manifest"; private const string DeploymentManifestFileName = @@ -37,45 +39,45 @@ public void Dispose() [Theory] [InlineData(DeploymentManifestFileName)] [InlineData(VstoManifestFileName)] - public void DeploymentResolver_WhenSerializedManifestHasOneApplicationDependencyAndNoFiles_Succeeds( + public void DeploymentPublishLayoutResolver_WhenSerializedManifestHasOneApplicationDependencyAndNoFiles_Succeeds( string deploymentManifestFileName) { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo applicationManifest = - ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + ClickOnceResolutionTestUtilities.WriteApplicationManifest( root, ApplicationManifestFileName); FileInfo deploymentManifest = - ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + ClickOnceResolutionTestUtilities.WriteDeploymentManifest( root, deploymentManifestFileName, applicationManifest.Name); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( new ClickOnceManifestReader(), - new ClickOncePayloadFileResolver()); + new ClickOncePayloadResolver()); - ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifest); IDeployManifest deployManifest = Assert.IsAssignableFrom( - graph.DeployManifest); - ClickOnceFileGraphEntry deploymentManifestEntry = - Assert.IsType( - graph.DeploymentManifest); + layout.Deployment!.Manifest); Assert.Equal( deploymentManifest.FullName, - deploymentManifestEntry.Source.FullName); + layout.Deployment!.Source.FullName); Assert.Equal( applicationManifest.FullName, - graph.ApplicationManifest.Source.FullName); + layout.Application.Source.FullName); Assert.Single(deployManifest.AssemblyReferences); + Assert.Same( + deployManifest.EntryPoint, + layout.Deployment.ApplicationManifestReference); Assert.Empty(deployManifest.FileReferences); - Assert.Empty(graph.Payloads); + Assert.Empty(layout.Application.Payloads); } [Fact] - public void DeploymentResolver_WhenSerializedManifestHasExtraInstallDependency_RejectsBeforeResolution() + public void DeploymentPublishLayoutResolver_WhenSerializedManifestHasExtraInstallDependency_RejectsBeforeResolution() { AssertSerializedManifestRejected( manifest => @@ -88,7 +90,7 @@ public void DeploymentResolver_WhenSerializedManifestHasExtraInstallDependency_R } [Fact] - public void DeploymentResolver_WhenSerializedManifestHasFileReference_RejectsBeforeResolution() + public void DeploymentPublishLayoutResolver_WhenSerializedManifestHasFileReference_RejectsBeforeResolution() { AssertSerializedManifestRejected( manifest => @@ -99,7 +101,7 @@ public void DeploymentResolver_WhenSerializedManifestHasFileReference_RejectsBef } [Fact] - public void DeploymentResolver_WhenSerializedManifestHasExtraPrerequisite_RejectsBeforeResolution() + public void DeploymentPublishLayoutResolver_WhenSerializedManifestHasExtraPrerequisite_RejectsBeforeResolution() { AssertSerializedManifestRejected( manifest => @@ -113,7 +115,7 @@ public void DeploymentResolver_WhenSerializedManifestHasExtraPrerequisite_Reject } [Fact] - public void DeploymentResolver_WhenSerializedManifestHasDuplicateDependency_RejectsBeforeResolution() + public void DeploymentPublishLayoutResolver_WhenSerializedManifestHasDuplicateDependency_RejectsBeforeResolution() { AssertSerializedManifestRejected( _ => @@ -127,7 +129,7 @@ public void DeploymentResolver_WhenSerializedManifestHasDuplicateDependency_Reje } [Fact] - public void DeploymentResolver_WhenSerializedManifestHasSolePrerequisite_RejectsBeforeResolution() + public void DeploymentPublishLayoutResolver_WhenSerializedManifestHasSolePrerequisite_RejectsBeforeResolution() { AssertSerializedManifestRejected( _ => @@ -143,11 +145,128 @@ public void DeploymentResolver_WhenSerializedManifestHasSolePrerequisite_Rejects } [Fact] - public void DeploymentResolver_WhenEntryPointIsNotTheSoleCollectionReference_RejectsBeforeResolution() + public void DeploymentPublishLayoutResolver_WhenEntryPointIsOptional_RejectsBeforeResolution() { using TemporaryDirectory temporaryDirectory = new(_directoryService); FileInfo deploymentManifestFile = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( + temporaryDirectory.Directory, + DeploymentManifestFileName); + DeployManifest model = CreateDeploymentManifest(); + AssemblyReference entryPoint = model.EntryPoint!; + + entryPoint.IsOptional = true; + + IDeployManifest deploymentManifest = + Substitute.For(); + + deploymentManifest.AssemblyReferences.Returns( + model.AssemblyReferences); + deploymentManifest.EntryPoint.Returns(entryPoint); + deploymentManifest.FileReferences.Returns(model.FileReferences); + deploymentManifest.Diagnostics.Returns( + Array.Empty()); + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + AssertUnsupportedReferences( + deploymentManifestFile, + () => new ClickOnceDeploymentPublishLayoutResolver( + manifestReader, + new ClickOncePayloadResolver()) + .Resolve(deploymentManifestFile)); + deploymentManifest.DidNotReceive().ResolveFiles( + Arg.Any>()); + } + + [Fact] + public void DeploymentPublishLayoutResolver_WhenReferencesAndEntryPointTargetAreUnsupported_ReportsReferencesFirst() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo deploymentManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + temporaryDirectory.Directory, + DeploymentManifestFileName); + DeployManifest model = CreateDeploymentManifest(); + AssemblyReference entryPoint = model.EntryPoint!; + + entryPoint.TargetPath = Path.Combine( + temporaryDirectory.Directory.FullName, + ApplicationManifestFileName); + model.AssemblyReferences.Add( + new AssemblyReference("extra.dll")); + + IDeployManifest deploymentManifest = + Substitute.For(); + + deploymentManifest.AssemblyReferences.Returns( + model.AssemblyReferences); + deploymentManifest.EntryPoint.Returns(entryPoint); + deploymentManifest.FileReferences.Returns(model.FileReferences); + deploymentManifest.Diagnostics.Returns( + Array.Empty()); + + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + AssertUnsupportedReferences( + deploymentManifestFile, + () => new ClickOnceDeploymentPublishLayoutResolver( + manifestReader, + new ClickOncePayloadResolver()) + .Resolve(deploymentManifestFile)); + deploymentManifest.DidNotReceive().ResolveFiles( + Arg.Any>()); + } + + [Theory] + [InlineData("resourceFallbackCulture", false)] + [InlineData("resourceFallbackCultureInternal", false)] + [InlineData("resourceFallbackCulture", true)] + [InlineData("resourceFallbackCultureInternal", true)] + public void DeploymentPublishLayoutResolver_WhenEntryPointHasResourceFallbackCulture_RejectsBeforeResolution( + string attributeName, + bool useQualifiedAttribute) + { + AssertSerializedManifestRejected( + _ => + { + }, + deploymentManifest => + SetSoleDependentAssemblyResourceFallback( + deploymentManifest, + attributeName, + useQualifiedAttribute), + manifest => + Assert.True( + manifest.HasUnsupportedResourceFallback)); + } + + [Fact] + public void DeploymentPublishLayoutResolver_WhenEntryPointIsNotTheSoleCollectionReference_RejectsBeforeResolution() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo deploymentManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( temporaryDirectory.Directory, DeploymentManifestFileName); AssemblyReference collectionReference = new() @@ -192,9 +311,9 @@ public void DeploymentResolver_WhenEntryPointIsNotTheSoleCollectionReference_Rej }); int fileProbeCount = 0; - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, - new ClickOncePayloadFileResolver(), + new ClickOncePayloadResolver(), _ => { ++fileProbeCount; @@ -216,7 +335,7 @@ private void AssertSerializedManifestRejected( using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo applicationManifest = - ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + ClickOnceResolutionTestUtilities.WriteApplicationManifest( root, ApplicationManifestFileName); DeployManifest model = CreateDeploymentManifest(); @@ -225,7 +344,7 @@ private void AssertSerializedManifestRejected( mutateManifest(model); FileInfo deploymentManifestFile = - ClickOnceFileGraphTestUtilities.WriteManifest( + ClickOnceResolutionTestUtilities.WriteManifest( root, DeploymentManifestFileName, model); @@ -257,6 +376,8 @@ private void AssertSerializedManifestRejected( parsedManifest.EntryPoint); recordingManifest.FileReferences.Returns( parsedManifest.FileReferences); + recordingManifest.HasUnsupportedResourceFallback.Returns( + parsedManifest.HasUnsupportedResourceFallback); recordingManifest.Diagnostics.Returns( parsedManifest.Diagnostics); recordingManifest @@ -287,9 +408,9 @@ private void AssertSerializedManifestRejected( }); int fileProbeCount = 0; - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, - new ClickOncePayloadFileResolver(), + new ClickOncePayloadResolver(), _ => { ++fileProbeCount; @@ -310,9 +431,9 @@ private static DeployManifest CreateDeploymentManifest() manifest.AssemblyIdentity.Name = "TestDeployment"; manifest.AssemblyIdentity.Version = - ClickOnceFileGraphTestUtilities.ManifestVersion; + ClickOnceResolutionTestUtilities.ManifestVersion; manifest.AssemblyIdentity.ProcessorArchitecture = - ClickOnceFileGraphTestUtilities.ProcessorArchitecture; + ClickOnceResolutionTestUtilities.ProcessorArchitecture; AssemblyReference entryPoint = new( ApplicationManifestFileName); @@ -329,7 +450,7 @@ private static AssemblyReference CreatePrerequisiteReference() { AssemblyIdentity = new AssemblyIdentity( "Prerequisite", - ClickOnceFileGraphTestUtilities.ManifestVersion), + ClickOnceResolutionTestUtilities.ManifestVersion), IsPrerequisite = true, TargetPath = PrerequisiteFileName }; @@ -352,6 +473,17 @@ private static void DuplicateDependency(FileInfo deploymentManifest) private static void MakeSoleDependencyPrerequisite( FileInfo deploymentManifest) + { + SetSoleDependentAssemblyAttribute( + deploymentManifest, + "dependencyType", + "preRequisite"); + } + + private static void SetSoleDependentAssemblyAttribute( + FileInfo deploymentManifest, + string attributeName, + string attributeValue) { XDocument document = XDocument.Load( deploymentManifest.FullName); @@ -361,8 +493,36 @@ private static void MakeSoleDependencyPrerequisite( element.Name.LocalName == "dependentAssembly"); dependentAssembly.SetAttributeValue( - "dependencyType", - "preRequisite"); + attributeName, + attributeValue); + document.Save( + deploymentManifest.FullName, + SaveOptions.DisableFormatting); + deploymentManifest.Refresh(); + } + + private static void SetSoleDependentAssemblyResourceFallback( + FileInfo deploymentManifest, + string attributeName, + bool useQualifiedAttribute) + { + XDocument document = XDocument.Load( + deploymentManifest.FullName); + XElement dependentAssembly = Assert.Single( + document.Descendants(), + element => + element.Name.LocalName == "dependentAssembly"); + + XName resourceFallbackAttribute = useQualifiedAttribute + ? XName.Get( + attributeName, + AssemblyV2Namespace) + : attributeName; + + dependentAssembly.SetAttributeValue( + resourceFallbackAttribute, + "en-US"); + document.Save( deploymentManifest.FullName, SaveOptions.DisableFormatting); @@ -396,8 +556,8 @@ private static void AssertUnsupportedReferences( FileInfo deploymentManifestFile, Action resolve) { - ClickOnceFileGraphResolutionException exception = - Assert.Throws( + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( resolve); Assert.Equal( diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs index a4bcdf20..c3eaddc1 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs @@ -41,7 +41,7 @@ public void Dispose() public void ApplicationManifestAdapter_AdaptsMultipleRealOutputMessagesInOrder() { ApplicationManifest manifest = - ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + ClickOnceResolutionTestUtilities.CreateApplicationManifest(); manifest.FileReferences.Add( new FileReference() @@ -71,38 +71,38 @@ public void ApplicationManifestAdapter_AdaptsMultipleRealOutputMessagesInOrder() } [Fact] - public void DeploymentResolver_WhenFallbackSucceeds_PreservesRealDeploymentThenApplicationDiagnosticOrder() + public void DeploymentPublishLayoutResolver_WhenFallbackSucceeds_PreservesRealDeploymentThenApplicationDiagnosticOrder() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo payload = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, FallbackPayloadTargetPath); FileInfo applicationManifest = - ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + ClickOnceResolutionTestUtilities.WriteApplicationManifest( root, $@"{ApplicationDirectory}\{ApplicationManifestFileName}", FallbackPayloadTargetPath); FileInfo deploymentManifest = - ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + ClickOnceResolutionTestUtilities.WriteDeploymentManifest( root, DeploymentManifestFileName, Path.GetRelativePath( root.FullName, applicationManifest.FullName)); - ClickOnceDeployManifestFileGraphResolver resolver = - CreateResolverWithDeploymentDiagnostic( + ClickOnceDeploymentPublishLayoutResolver resolver = + CreateDeploymentPublishLayoutResolverWithDiagnostic( applicationManifest, DeploymentWarningTargetPath); - ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifest); Assert.Equal( payload.FullName, - Assert.Single(graph.Payloads).Source.FullName); + Assert.Single(layout.Application.Payloads).Source.FullName); Assert.Collection( - graph.Diagnostics, + layout.Diagnostics, diagnostic => AssertDiagnostic( diagnostic, @@ -114,34 +114,34 @@ public void DeploymentResolver_WhenFallbackSucceeds_PreservesRealDeploymentThenA } [Fact] - public void DeploymentResolver_WhenFallbackCannotResolveEveryPayload_PreservesRealCrossManifestDiagnosticOrder() + public void DeploymentPublishLayoutResolver_WhenFallbackCannotResolveEveryPayload_PreservesRealCrossManifestDiagnosticOrder() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, FallbackPayloadTargetPath); FileInfo applicationManifest = - ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + ClickOnceResolutionTestUtilities.WriteApplicationManifest( root, $@"{ApplicationDirectory}\{ApplicationManifestFileName}", FallbackPayloadTargetPath, MissingPayloadTargetPath); FileInfo deploymentManifest = - ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + ClickOnceResolutionTestUtilities.WriteDeploymentManifest( root, DeploymentManifestFileName, Path.GetRelativePath( root.FullName, applicationManifest.FullName)); - ClickOnceDeployManifestFileGraphResolver resolver = - CreateResolverWithDeploymentDiagnostic( + ClickOnceDeploymentPublishLayoutResolver resolver = + CreateDeploymentPublishLayoutResolverWithDiagnostic( applicationManifest, DeploymentWarningTargetPath); - ClickOnceFileGraphResolutionException exception = - Assert.Throws( + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( () => resolver.Resolve(deploymentManifest)); Assert.Contains( @@ -182,7 +182,7 @@ private static void AssertDiagnostic( StringComparison.Ordinal); } - private static ClickOnceDeployManifestFileGraphResolver CreateResolverWithDeploymentDiagnostic( + private static ClickOnceDeploymentPublishLayoutResolver CreateDeploymentPublishLayoutResolverWithDiagnostic( FileInfo applicationManifestFile, string deploymentDiagnosticTargetPath) { @@ -246,9 +246,9 @@ private static ClickOnceDeployManifestFileGraphResolver CreateResolverWithDeploy return true; }); - return new ClickOnceDeployManifestFileGraphResolver( + return new ClickOnceDeploymentPublishLayoutResolver( manifestReader, - new ClickOncePayloadFileResolver()); + new ClickOncePayloadResolver()); } } } diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs deleted file mode 100644 index 43980cbd..00000000 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphModelTests.cs +++ /dev/null @@ -1,225 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE.txt file in the project root for more information. - -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using NSubstitute; - -namespace Sign.Core.Test -{ - public sealed class ClickOnceFileGraphModelTests - { - private const string ApplicationManifestFileName = "App.exe.manifest"; - private const string DeploySuffix = ".deploy"; - private const string DeploymentManifestFileName = "App.application"; - private const string PayloadFileName = "payload.dll"; - private const string ResolutionFailedMessage = "Resolution failed."; - private const string SetupFileName = "setup.exe"; - private const string WarningMessageName = "GenerateManifest.ResolveFailedInReadWriteMode"; - private const string WarningTargetPath = "warning.txt"; - private const string Whitespace = " "; - - [Fact] - public void FileGraphEntry_Constructor_PreservesValues() - { - FileInfo source = new(fileName: $"{PayloadFileName}{DeploySuffix}"); - FileReference manifestReference = new(); - - ClickOnceFileGraphEntry entry = new( - source, - PayloadFileName, - ClickOnceFileGraphEntryKind.Payload, - manifestReference, - DeploySuffix); - - Assert.Same(source, entry.Source); - Assert.Equal(PayloadFileName, entry.TargetPath); - Assert.Equal(ClickOnceFileGraphEntryKind.Payload, entry.Kind); - Assert.Same(manifestReference, entry.ManifestReference); - Assert.Equal(DeploySuffix, entry.MappingAddedSuffix); - } - - [Fact] - public void FileGraphEntry_Constructor_ValidatesRequiredArguments() - { - FileInfo source = new(fileName: PayloadFileName); - - Assert.Throws( - () => new ClickOnceFileGraphEntry( - source: null!, - targetPath: PayloadFileName, - kind: ClickOnceFileGraphEntryKind.Payload)); - Assert.Throws( - () => new ClickOnceFileGraphEntry( - source, - targetPath: Whitespace, - kind: ClickOnceFileGraphEntryKind.Payload)); - } - - [Fact] - public void FileGraph_Constructor_PreservesModelsAndSnapshotsCollections() - { - ClickOnceFileGraphEntry deploymentManifest = CreateEntry( - DeploymentManifestFileName, - ClickOnceFileGraphEntryKind.DeploymentManifest); - ClickOnceFileGraphEntry applicationManifest = CreateEntry( - ApplicationManifestFileName, - ClickOnceFileGraphEntryKind.ApplicationManifest); - ClickOnceFileGraphEntry payload = CreateEntry( - PayloadFileName, - ClickOnceFileGraphEntryKind.Payload); - ClickOnceFileGraphEntry adjacentExecutable = CreateEntry( - SetupFileName, - ClickOnceFileGraphEntryKind.Setup); - IDeployManifest deployManifest = Substitute.For(); - IApplicationManifest applicationManifestModel = - Substitute.For(); - List payloads = new() { payload }; - List adjacentExecutables = new() { adjacentExecutable }; - List diagnostics = new() { CreateDiagnostic() }; - - ClickOnceFileGraph graph = new( - deploymentManifest, - deployManifest, - applicationManifest, - applicationManifestModel, - payloads, - adjacentExecutables, - diagnostics); - - payloads.Clear(); - adjacentExecutables.Clear(); - diagnostics.Clear(); - - Assert.Same(deploymentManifest, graph.DeploymentManifest); - Assert.Same(deployManifest, graph.DeployManifest); - Assert.Same(applicationManifest, graph.ApplicationManifest); - Assert.Same(applicationManifestModel, graph.ApplicationManifestModel); - Assert.Same(payload, Assert.Single(graph.Payloads)); - Assert.Same(adjacentExecutable, Assert.Single(graph.AdjacentExecutables)); - Assert.Single(graph.Diagnostics); - } - - [Fact] - public void FileGraph_Constructor_ValidatesRequiredArguments() - { - ClickOnceFileGraphEntry applicationManifest = CreateEntry( - ApplicationManifestFileName, - ClickOnceFileGraphEntryKind.ApplicationManifest); - IApplicationManifest applicationManifestModel = - Substitute.For(); - ClickOnceFileGraphEntry[] entries = Array.Empty(); - ClickOnceManifestDiagnostic[] diagnostics = Array.Empty(); - - Assert.Throws( - () => new ClickOnceFileGraph( - deploymentManifest: null, - deployManifest: null, - applicationManifest: null!, - applicationManifestModel, - payloads: entries, - adjacentExecutables: entries, - diagnostics)); - Assert.Throws( - () => new ClickOnceFileGraph( - deploymentManifest: null, - deployManifest: null, - applicationManifest, - applicationManifestModel: null!, - payloads: entries, - adjacentExecutables: entries, - diagnostics)); - Assert.Throws( - () => new ClickOnceFileGraph( - deploymentManifest: null, - deployManifest: null, - applicationManifest, - applicationManifestModel, - payloads: null!, - adjacentExecutables: entries, - diagnostics)); - Assert.Throws( - () => new ClickOnceFileGraph( - deploymentManifest: null, - deployManifest: null, - applicationManifest, - applicationManifestModel, - payloads: entries, - adjacentExecutables: null!, - diagnostics)); - Assert.Throws( - () => new ClickOnceFileGraph( - deploymentManifest: null, - deployManifest: null, - applicationManifest, - applicationManifestModel, - payloads: entries, - adjacentExecutables: entries, - diagnostics: null!)); - } - - [Fact] - public void FileGraphResolutionException_Constructor_PreservesValuesAndSnapshotsDiagnostics() - { - ClickOnceManifestDiagnostic diagnostic = CreateDiagnostic(); - List diagnostics = new() { diagnostic }; - InvalidOperationException innerException = new(); - - ClickOnceFileGraphResolutionException exception = new( - ResolutionFailedMessage, - diagnostics, - innerException); - - diagnostics.Clear(); - - Assert.Equal(ResolutionFailedMessage, exception.Message); - Assert.Same(diagnostic, Assert.Single(exception.Diagnostics)); - Assert.Same(innerException, exception.InnerException); - } - - [Fact] - public void FileGraphResolutionException_Constructor_DefaultsDiagnosticsAndValidatesMessage() - { - ClickOnceFileGraphResolutionException exception = new(message: ResolutionFailedMessage); - - Assert.Empty(exception.Diagnostics); - Assert.Throws( - () => new ClickOnceFileGraphResolutionException(message: Whitespace)); - } - - [Fact] - public void ManifestDiagnostic_Constructor_PreservesValues() - { - ClickOnceManifestDiagnostic diagnostic = new( - WarningMessageName, - WarningTargetPath, - OutputMessageType.Warning); - - Assert.Equal(WarningMessageName, diagnostic.Name); - Assert.Equal(WarningTargetPath, diagnostic.Text); - Assert.Equal(OutputMessageType.Warning, diagnostic.Type); - } - - [Fact] - public void ManifestDiagnostic_Constructor_ValidatesMessage() - { - Assert.Throws( - () => new ClickOnceManifestDiagnostic(message: null!)); - } - - private static ClickOnceFileGraphEntry CreateEntry( - string path, - ClickOnceFileGraphEntryKind kind) - { - return new ClickOnceFileGraphEntry(new FileInfo(path), path, kind); - } - - private static ClickOnceManifestDiagnostic CreateDiagnostic() - { - return new ClickOnceManifestDiagnostic( - WarningMessageName, - WarningTargetPath, - OutputMessageType.Warning); - } - } -} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestDiagnosticTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestDiagnosticTests.cs new file mode 100644 index 00000000..64ef1ab4 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestDiagnosticTests.cs @@ -0,0 +1,34 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core.Test +{ + public sealed class ClickOnceManifestDiagnosticTests + { + private const string WarningMessageName = "GenerateManifest.ResolveFailedInReadWriteMode"; + private const string WarningTargetPath = "warning.txt"; + + [Fact] + public void Constructor_WithValidMessage_PreservesValues() + { + ClickOnceManifestDiagnostic diagnostic = new( + WarningMessageName, + WarningTargetPath, + OutputMessageType.Warning); + + Assert.Equal(WarningMessageName, diagnostic.Name); + Assert.Equal(WarningTargetPath, diagnostic.Text); + Assert.Equal(OutputMessageType.Warning, diagnostic.Type); + } + + [Fact] + public void Constructor_WithNullMessage_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ClickOnceManifestDiagnostic(message: null!)); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs index d6a1dba3..d6ce1fc8 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceManifestReaderTests.cs @@ -136,6 +136,76 @@ public void TryReadApplicationManifest_WhenManifestIsSideBySide_ReturnsFalse() Assert.Null(manifest); } + [Theory] + [InlineData( + "", + typeof(ArgumentException))] + [InlineData( + """ + + + + """, + typeof(InvalidCastException))] + public void TryReadApplicationManifest_WhenManifestUtilitiesThrowsContentException_ThrowsInvalidOperationException( + string xml, + Type expectedInnerExceptionType) + { + using MemoryStream stream = CreateStream(xml); + ClickOnceManifestReader reader = new(); + + InvalidOperationException exception = + Assert.Throws( + () => reader.TryReadApplicationManifest( + stream, + out _)); + + Assert.IsType( + expectedInnerExceptionType, + exception.InnerException); + } + + [Theory] + [InlineData( + "", + typeof(ArgumentException))] + [InlineData( + """ + + + + """, + typeof(InvalidCastException))] + public void TryReadDeployManifest_WhenManifestUtilitiesThrowsContentException_ThrowsInvalidOperationException( + string xml, + Type expectedInnerExceptionType) + { + using MemoryStream stream = CreateStream(xml); + ClickOnceManifestReader reader = new(); + + InvalidOperationException exception = + Assert.Throws( + () => reader.TryReadDeployManifest( + stream, + out _)); + + Assert.IsType( + expectedInnerExceptionType, + exception.InnerException); + } + + [Fact] + public void ManifestReader_WhenXmlRootIsUnrecognized_ThrowsArgumentException() + { + using MemoryStream stream = CreateStream( + ""); + + Assert.Throws( + () => ManifestReader.ReadManifest( + stream, + preserveStream: true)); + } + [Fact] public void TryReadApplicationManifest_WhenManifestIsVsto_PreservesVstoXml() { diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionExceptionTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionExceptionTests.cs new file mode 100644 index 00000000..32ff4336 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionExceptionTests.cs @@ -0,0 +1,58 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core.Test +{ + public sealed class ClickOncePublishLayoutResolutionExceptionTests + { + private const string ResolutionFailedMessage = "Resolution failed."; + private const string WarningMessageName = "GenerateManifest.ResolveFailedInReadWriteMode"; + private const string WarningTargetPath = "warning.txt"; + + [Fact] + public void Constructor_WithValues_PreservesValuesAndSnapshotsDiagnostics() + { + ClickOnceManifestDiagnostic diagnostic = CreateDiagnostic(); + List diagnostics = new() { diagnostic }; + InvalidOperationException innerException = new(); + + ClickOncePublishLayoutResolutionException exception = new( + ResolutionFailedMessage, + diagnostics, + innerException); + + diagnostics.Clear(); + + Assert.Equal(ResolutionFailedMessage, exception.Message); + Assert.Same(diagnostic, Assert.Single(exception.Diagnostics)); + Assert.Same(innerException, exception.InnerException); + } + + [Fact] + public void Constructor_WithoutDiagnostics_DefaultsToEmptyDiagnostics() + { + ClickOncePublishLayoutResolutionException exception = new( + message: ResolutionFailedMessage); + + Assert.Empty(exception.Diagnostics); + } + + [Fact] + public void Constructor_WithWhitespaceMessage_ThrowsArgumentException() + { + Assert.Throws( + () => new ClickOncePublishLayoutResolutionException(message: " ")); + } + + private static ClickOnceManifestDiagnostic CreateDiagnostic() + { + return new ClickOnceManifestDiagnostic( + WarningMessageName, + WarningTargetPath, + OutputMessageType.Warning); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphResolverTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionTests.cs similarity index 77% rename from test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphResolverTests.cs rename to test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionTests.cs index b8cc02d0..55e15f9d 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphResolverTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionTests.cs @@ -12,7 +12,7 @@ namespace Sign.Core.Test { - public sealed class ClickOnceFileGraphResolverTests : IDisposable + public sealed class ClickOncePublishLayoutResolutionTests : IDisposable { private const string ApplicationDirectory = @"Application Files\App_1_0_0_0"; private const string ApplicationManifestFileName = "App.exe.manifest"; @@ -24,6 +24,7 @@ public sealed class ClickOnceFileGraphResolverTests : IDisposable private const string LauncherFileName = "Launcher.exe"; private const string ManifestVersion = "1.0.0.0"; private const string MissingTargetPathMessage = "without a target path"; + private const string NoUpdateManifestOption = "--clickonce-signing-version 2 --no-update-clickonce-manifest"; private const string OptionalPayloadFileName = "optional.txt"; private const string PayloadFileName = "payload.dll"; private const string ProcessorArchitecture = "msil"; @@ -35,22 +36,22 @@ public sealed class ClickOnceFileGraphResolverTests : IDisposable private const string WarningTwoTargetPath = "warning-two.txt"; private readonly DirectoryService _directoryService; - private readonly ClickOnceApplicationManifestFileGraphResolver _applicationResolver; - private readonly ClickOnceDeployManifestFileGraphResolver _deploymentResolver; - private readonly ClickOncePayloadFileResolver _payloadResolver; + private readonly ClickOnceApplicationPublishLayoutResolver _applicationPublishLayoutResolver; + private readonly ClickOnceDeploymentPublishLayoutResolver _deploymentPublishLayoutResolver; + private readonly ClickOncePayloadResolver _payloadResolver; - public ClickOnceFileGraphResolverTests() + public ClickOncePublishLayoutResolutionTests() { _directoryService = new( Substitute.For>()); ClickOnceManifestReader manifestReader = new(); - _payloadResolver = new ClickOncePayloadFileResolver(); + _payloadResolver = new ClickOncePayloadResolver(); - _applicationResolver = new ClickOnceApplicationManifestFileGraphResolver( + _applicationPublishLayoutResolver = new ClickOnceApplicationPublishLayoutResolver( manifestReader, _payloadResolver); - _deploymentResolver = new ClickOnceDeployManifestFileGraphResolver( + _deploymentPublishLayoutResolver = new ClickOnceDeploymentPublishLayoutResolver( manifestReader, _payloadResolver); } @@ -61,7 +62,7 @@ public void Dispose() } [Fact] - public void DeploymentResolver_WhenMultipleVersionsAndManifestsExist_UsesReferencedApplicationManifest() + public void DeploymentPublishLayoutResolver_WhenMultipleVersionsAndManifestsExist_UsesReferencedApplicationManifest() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -95,21 +96,21 @@ public void DeploymentResolver_WhenMultipleVersionsAndManifestsExist_UsesReferen DeploymentManifestFileName, Path.GetRelativePath(root.FullName, currentManifest.FullName)); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.Equal(currentManifest.FullName, graph.ApplicationManifest.Source.FullName); - Assert.False(graph.DeployManifest!.ReadOnly); - Assert.False(graph.ApplicationManifestModel.ReadOnly); + Assert.Equal(currentManifest.FullName, layout.Application.Source.FullName); + Assert.False(layout.Deployment!.Manifest.ReadOnly); + Assert.False(layout.Application.Manifest.ReadOnly); Assert.Equal( currentManifest.FullName, - graph.DeployManifest.EntryPoint!.ResolvedPath); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + layout.Deployment!.Manifest.EntryPoint!.ResolvedPath); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(currentPayload.FullName, payload.Source.FullName); Assert.Equal(CurrentPayloadFileName, payload.TargetPath); } [Fact] - public void DeploymentResolver_WhenSameIdentityApplicationManifestExistsAtRoot_UsesTargetPath() + public void DeploymentPublishLayoutResolver_WhenSameIdentityApplicationManifestExistsAtRoot_UsesTargetPath() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -137,19 +138,19 @@ public void DeploymentResolver_WhenSameIdentityApplicationManifestExistsAtRoot_U applicationManifestPath, applicationManifestIdentity: application.AssemblyIdentity); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.Equal(expectedApplicationManifest.FullName, graph.ApplicationManifest.Source.FullName); - Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); - Assert.Equal(application.AssemblyIdentity.Name, graph.DeployManifest!.EntryPoint!.AssemblyIdentity.Name); - Assert.Equal(application.AssemblyIdentity.Version, graph.DeployManifest.EntryPoint.AssemblyIdentity.Version); + Assert.Equal(expectedApplicationManifest.FullName, layout.Application.Source.FullName); + Assert.Equal(expectedPayload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); + Assert.Equal(application.AssemblyIdentity.Name, layout.Deployment!.Manifest.EntryPoint!.AssemblyIdentity.Name); + Assert.Equal(application.AssemblyIdentity.Version, layout.Deployment!.Manifest.EntryPoint.AssemblyIdentity.Version); Assert.Equal( application.AssemblyIdentity.ProcessorArchitecture, - graph.DeployManifest.EntryPoint.AssemblyIdentity.ProcessorArchitecture); + layout.Deployment!.Manifest.EntryPoint.AssemblyIdentity.ProcessorArchitecture); } [Fact] - public void DeploymentResolver_WhenSameIdentityFusionManifestExistsAtRoot_UsesTargetPath() + public void DeploymentPublishLayoutResolver_WhenSameIdentityFusionManifestExistsAtRoot_UsesTargetPath() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -174,19 +175,19 @@ public void DeploymentResolver_WhenSameIdentityFusionManifestExistsAtRoot_UsesTa applicationManifestPath, applicationManifestIdentity: application.AssemblyIdentity); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.Equal(expectedApplicationManifest.FullName, graph.ApplicationManifest.Source.FullName); - Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); - Assert.Equal(application.AssemblyIdentity.Name, graph.DeployManifest!.EntryPoint!.AssemblyIdentity.Name); - Assert.Equal(application.AssemblyIdentity.Version, graph.DeployManifest.EntryPoint.AssemblyIdentity.Version); + Assert.Equal(expectedApplicationManifest.FullName, layout.Application.Source.FullName); + Assert.Equal(expectedPayload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); + Assert.Equal(application.AssemblyIdentity.Name, layout.Deployment!.Manifest.EntryPoint!.AssemblyIdentity.Name); + Assert.Equal(application.AssemblyIdentity.Version, layout.Deployment!.Manifest.EntryPoint.AssemblyIdentity.Version); Assert.Equal( application.AssemblyIdentity.ProcessorArchitecture, - graph.DeployManifest.EntryPoint.AssemblyIdentity.ProcessorArchitecture); + layout.Deployment!.Manifest.EntryPoint.AssemblyIdentity.ProcessorArchitecture); } [Fact] - public void DeploymentResolver_WhenVstoDeploymentManifestIsValid_ResolvesFileGraph() + public void DeploymentPublishLayoutResolver_WhenVstoDeploymentManifestIsValid_ResolvesPublishLayout() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -203,16 +204,15 @@ public void DeploymentResolver_WhenVstoDeploymentManifestIsValid_ResolvesFileGra VstoManifestFileName, Path.GetRelativePath(root.FullName, applicationManifest.FullName)); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.NotNull(graph.DeploymentManifest); - Assert.Equal(deploymentManifest.FullName, graph.DeploymentManifest.Source.FullName); - Assert.Equal(applicationManifest.FullName, graph.ApplicationManifest.Source.FullName); - Assert.Equal(payload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Equal(deploymentManifest.FullName, layout.Deployment!.Source.FullName); + Assert.Equal(applicationManifest.FullName, layout.Application.Source.FullName); + Assert.Equal(payload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); } [Fact] - public void DeploymentResolver_WhenFileExtensionsAreMapped_ResolvesApplicationManifestSeparately() + public void DeploymentPublishLayoutResolver_WhenFileExtensionsAreMapped_ResolvesApplicationManifestSeparately() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -237,17 +237,17 @@ public void DeploymentResolver_WhenFileExtensionsAreMapped_ResolvesApplicationMa applicationManifestPath, mapFileExtensions: true); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.Equal(applicationManifest.FullName, graph.ApplicationManifest.Source.FullName); - Assert.NotEqual(mappedApplicationManifest.FullName, graph.ApplicationManifest.Source.FullName); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.Equal(applicationManifest.FullName, layout.Application.Source.FullName); + Assert.NotEqual(mappedApplicationManifest.FullName, layout.Application.Source.FullName); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(mappedPayload.FullName, payload.Source.FullName); - Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + Assert.True(payload.IsFileExtensionMapped); } [Fact] - public void DeploymentResolver_WhenOnlyMappedApplicationManifestExists_DoesNotUseIt() + public void DeploymentPublishLayoutResolver_WhenOnlyMappedApplicationManifestExists_DoesNotUseIt() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -263,8 +263,8 @@ public void DeploymentResolver_WhenOnlyMappedApplicationManifestExists_DoesNotUs applicationManifestPath, mapFileExtensions: true); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains( Path.Combine(root.FullName, applicationManifestPath), @@ -274,7 +274,7 @@ public void DeploymentResolver_WhenOnlyMappedApplicationManifestExists_DoesNotUs } [Fact] - public void DeploymentResolver_WhenPayloadExistsInBothDirectories_PrefersApplicationDirectory() + public void DeploymentPublishLayoutResolver_WhenPayloadExistsInBothDirectories_PrefersApplicationDirectory() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -294,13 +294,13 @@ public void DeploymentResolver_WhenPayloadExistsInBothDirectories_PrefersApplica DeploymentManifestFileName, Path.GetRelativePath(root.FullName, applicationManifest.FullName)); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Equal(expectedPayload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); } [Fact] - public void DeploymentResolver_WhenPayloadIsMissingFromApplicationDirectory_UsesDeploymentDirectory() + public void DeploymentPublishLayoutResolver_WhenPayloadIsMissingFromApplicationDirectory_UsesDeploymentDirectory() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -318,16 +318,19 @@ public void DeploymentResolver_WhenPayloadIsMissingFromApplicationDirectory_Uses DeploymentManifestFileName, Path.GetRelativePath(root.FullName, applicationManifest.FullName)); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); - ClickOnceManifestDiagnostic diagnostic = Assert.Single(graph.Diagnostics); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); + Assert.Equal(expectedPayload.FullName, payload.Source.FullName); + Assert.Equal(PayloadTargetPath, payload.TargetPath); + Assert.False(payload.IsFileExtensionMapped); + ClickOnceManifestDiagnostic diagnostic = Assert.Single(layout.Diagnostics); Assert.Equal(OutputMessageType.Error, diagnostic.Type); Assert.Contains(PayloadTargetPath, diagnostic.Text, StringComparison.Ordinal); } [Fact] - public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeFails_DoesNotUseDeploymentDirectory() + public void DeploymentPublishLayoutResolver_WhenApplicationDirectoryPayloadProbeFails_DoesNotUseDeploymentDirectory() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -348,16 +351,16 @@ public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeFails_DoesNot DeploymentManifestFileName, Path.GetRelativePath(root.FullName, applicationManifest.FullName)); UnauthorizedAccessException expectedException = new(); - ClickOncePayloadFileResolver payloadResolver = new( + ClickOncePayloadResolver payloadResolver = new( file => file.FullName.Equals(inaccessiblePayloadPath, StringComparison.OrdinalIgnoreCase) ? throw expectedException : file.Exists); - ClickOnceDeployManifestFileGraphResolver deploymentResolver = new( + ClickOnceDeploymentPublishLayoutResolver deploymentPublishLayoutResolver = new( new ClickOnceManifestReader(), payloadResolver); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Same(expectedException, exception.InnerException); Assert.Equal( @@ -374,7 +377,7 @@ public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeFails_DoesNot } [Fact] - public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeHasIoFailure_DoesNotUseDeploymentDirectory() + public void DeploymentPublishLayoutResolver_WhenApplicationDirectoryPayloadProbeHasIoFailure_DoesNotUseDeploymentDirectory() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -395,16 +398,16 @@ public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeHasIoFailure_ DeploymentManifestFileName, Path.GetRelativePath(root.FullName, applicationManifest.FullName)); IOException expectedException = new(); - ClickOncePayloadFileResolver payloadResolver = new( + ClickOncePayloadResolver payloadResolver = new( file => file.FullName.Equals(failedPayloadPath, StringComparison.OrdinalIgnoreCase) ? throw expectedException : file.Exists); - ClickOnceDeployManifestFileGraphResolver deploymentResolver = new( + ClickOnceDeploymentPublishLayoutResolver deploymentPublishLayoutResolver = new( new ClickOnceManifestReader(), payloadResolver); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Same(expectedException, exception.InnerException); Assert.Equal( @@ -421,7 +424,7 @@ public void DeploymentResolver_WhenApplicationDirectoryPayloadProbeHasIoFailure_ } [Fact] - public void DeploymentResolver_WhenMappedApplicationDirectoryPayloadProbeFails_DoesNotUseDeploymentDirectory() + public void DeploymentPublishLayoutResolver_WhenMappedApplicationDirectoryPayloadProbeFails_DoesNotUseDeploymentDirectory() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -443,16 +446,16 @@ public void DeploymentResolver_WhenMappedApplicationDirectoryPayloadProbeFails_D Path.GetRelativePath(root.FullName, applicationManifest.FullName), mapFileExtensions: true); UnauthorizedAccessException expectedException = new(); - ClickOncePayloadFileResolver payloadResolver = new( + ClickOncePayloadResolver payloadResolver = new( file => file.FullName.Equals(failedPayloadPath, StringComparison.OrdinalIgnoreCase) ? throw expectedException : file.Exists); - ClickOnceDeployManifestFileGraphResolver deploymentResolver = new( + ClickOnceDeploymentPublishLayoutResolver deploymentPublishLayoutResolver = new( new ClickOnceManifestReader(), payloadResolver); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Same(expectedException, exception.InnerException); Assert.Equal( @@ -469,7 +472,7 @@ public void DeploymentResolver_WhenMappedApplicationDirectoryPayloadProbeFails_D } [Fact] - public void DeploymentResolver_WhenFileExtensionsAreMapped_RecordsMappingAddedSuffix() + public void DeploymentPublishLayoutResolver_WhenFileExtensionsAreMapped_SetsIsFileExtensionMapped() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -488,18 +491,18 @@ public void DeploymentResolver_WhenFileExtensionsAreMapped_RecordsMappingAddedSu Path.GetRelativePath(root.FullName, applicationManifest.FullName), mapFileExtensions: true); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); Assert.Equal(PayloadTargetPath, payload.TargetPath); - Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + Assert.True(payload.IsFileExtensionMapped); Assert.Equal($"{PayloadTargetPath}{DeploySuffix}", payload.Source.Name); Assert.Equal(FileContents, File.ReadAllText(expectedPayload.FullName)); } [Fact] - public void DeploymentResolver_WhenMappedPayloadExistsInBothDirectories_PrefersApplicationDirectory() + public void DeploymentPublishLayoutResolver_WhenMappedPayloadExistsInBothDirectories_PrefersApplicationDirectory() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -521,13 +524,13 @@ public void DeploymentResolver_WhenMappedPayloadExistsInBothDirectories_PrefersA Path.GetRelativePath(root.FullName, applicationManifest.FullName), mapFileExtensions: true); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - Assert.Equal(expectedPayload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Equal(expectedPayload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); } [Fact] - public void DeploymentResolver_WhenFileExtensionsAreMapped_DoesNotUseExactTarget() + public void DeploymentPublishLayoutResolver_WhenFileExtensionsAreMapped_DoesNotUseExactTarget() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -546,14 +549,14 @@ public void DeploymentResolver_WhenFileExtensionsAreMapped_DoesNotUseExactTarget Path.GetRelativePath(root.FullName, applicationManifest.FullName), mapFileExtensions: true); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); } [Fact] - public void DeploymentResolver_WhenFileExtensionsAreNotMapped_DoesNotUseMappedTarget() + public void DeploymentPublishLayoutResolver_WhenFileExtensionsAreNotMapped_DoesNotUseMappedTarget() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -571,14 +574,14 @@ public void DeploymentResolver_WhenFileExtensionsAreNotMapped_DoesNotUseMappedTa DeploymentManifestFileName, Path.GetRelativePath(root.FullName, applicationManifest.FullName)); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); } [Fact] - public void DeploymentResolver_WhenMappedTargetAlreadyEndsInDeploy_AddsExactlyOneSuffix() + public void DeploymentPublishLayoutResolver_WhenMappedTargetAlreadyEndsInDeploy_AddsExactlyOneSuffix() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -599,15 +602,15 @@ public void DeploymentResolver_WhenMappedTargetAlreadyEndsInDeploy_AddsExactlyOn Path.GetRelativePath(root.FullName, applicationManifest.FullName), mapFileExtensions: true); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); - Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + Assert.True(payload.IsFileExtensionMapped); } [Fact] - public void DeploymentResolver_ClassifiesReferencedAndAdjacentExecutables() + public void DeploymentPublishLayoutResolver_ClassifiesReferencedAndAdjacentExecutables() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -631,27 +634,51 @@ public void DeploymentResolver_ClassifiesReferencedAndAdjacentExecutables() DeploymentManifestFileName, Path.GetRelativePath(root.FullName, applicationManifest.FullName)); - ClickOnceFileGraph graph = _deploymentResolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(referencedLauncher.FullName, payload.Source.FullName); - Assert.Equal(ClickOnceFileGraphEntryKind.Payload, payload.Kind); Assert.Contains( - graph.AdjacentExecutables, + layout.AdjacentExecutables, entry => entry.Source.FullName == setup.FullName && - entry.Kind == ClickOnceFileGraphEntryKind.Setup); + entry.Kind == ClickOnceAdjacentExecutableKind.Setup); Assert.Contains( - graph.AdjacentExecutables, + layout.AdjacentExecutables, entry => entry.Source.FullName == adjacentLauncher.FullName && - entry.Kind == ClickOnceFileGraphEntryKind.Launcher); - Assert.Equal(expected: 2, actual: graph.AdjacentExecutables.Count); + entry.Kind == ClickOnceAdjacentExecutableKind.Launcher); + Assert.Equal(expected: 2, actual: layout.AdjacentExecutables.Count); + } + + [Fact] + public void DeploymentPublishLayoutResolver_WhenRootSetupIsReferenced_ClassifiesItAsPayloadAndAdjacent() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo setup = CreateFile(root, SetupFileName); + ApplicationManifest application = CreateApplicationManifest(); + AddAssemblyReference(application, SetupFileName, isEntryPoint: true); + FileInfo applicationManifest = WriteManifest( + root, + ApplicationManifestFileName, + application); + FileInfo deploymentManifest = WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifest.Name); + + ResolvedClickOncePublishLayout layout = _deploymentPublishLayoutResolver.Resolve(deploymentManifest); + + Assert.Equal(setup.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); + ResolvedClickOnceAdjacentExecutable adjacent = Assert.Single(layout.AdjacentExecutables); + Assert.Equal(setup.FullName, adjacent.Source.FullName); + Assert.Equal(ClickOnceAdjacentExecutableKind.Setup, adjacent.Kind); } [Fact] - public void DeploymentResolver_WhenRootLauncherIsReferenced_DoesNotClassifyItAsAdjacent() + public void DeploymentPublishLayoutResolver_WhenRootLauncherIsReferenced_DoesNotClassifyItAsAdjacent() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -667,7 +694,7 @@ public void DeploymentResolver_WhenRootLauncherIsReferenced_DoesNotClassifyItAsA DeploymentManifestFileName, applicationManifest.Name); List adjacentProbeCandidates = new(); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( new ClickOnceManifestReader(), _payloadResolver, file => @@ -677,10 +704,10 @@ public void DeploymentResolver_WhenRootLauncherIsReferenced_DoesNotClassifyItAsA return ClickOnceFileSystem.IsFile(file); }); - ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifest); - Assert.Equal(launcher.FullName, Assert.Single(graph.Payloads).Source.FullName); - Assert.Empty(graph.AdjacentExecutables); + Assert.Equal(launcher.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); + Assert.Empty(layout.AdjacentExecutables); Assert.DoesNotContain( launcher.FullName, adjacentProbeCandidates, @@ -690,7 +717,7 @@ public void DeploymentResolver_WhenRootLauncherIsReferenced_DoesNotClassifyItAsA [Theory] [InlineData(false)] [InlineData(true)] - public void DeploymentResolver_WhenSetupProbeFails_PreservesDiagnosticsAndThrows( + public void DeploymentPublishLayoutResolver_WhenSetupProbeFails_PreservesDiagnosticsAndThrows( bool isUnauthorizedAccess) { AssertAdjacentExecutableProbeFailure( @@ -702,7 +729,7 @@ public void DeploymentResolver_WhenSetupProbeFails_PreservesDiagnosticsAndThrows [Theory] [InlineData(false)] [InlineData(true)] - public void DeploymentResolver_WhenLauncherProbeFails_PreservesDiagnosticsAndThrows( + public void DeploymentPublishLayoutResolver_WhenLauncherProbeFails_PreservesDiagnosticsAndThrows( bool isUnauthorizedAccess) { AssertAdjacentExecutableProbeFailure( @@ -767,7 +794,7 @@ private void AssertAdjacentExecutableProbeFailure( Exception expectedException = isUnauthorizedAccess ? new UnauthorizedAccessException() : new IOException(); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, _payloadResolver, file => @@ -780,8 +807,8 @@ private void AssertAdjacentExecutableProbeFailure( return ClickOnceFileSystem.IsFile(file); }); - ClickOnceFileGraphResolutionException exception = - Assert.Throws( + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( () => resolver.Resolve(deploymentManifestFile)); Assert.Same(expectedException, exception.InnerException); @@ -798,7 +825,7 @@ private void AssertAdjacentExecutableProbeFailure( [Theory] [InlineData(DeploymentManifestFileName)] [InlineData(VstoManifestFileName)] - public void DeploymentResolver_WhenDeploymentManifestIsWrongType_Throws(string fileName) + public void DeploymentPublishLayoutResolver_WhenDeploymentManifestIsWrongType_Throws(string fileName) { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -807,8 +834,8 @@ public void DeploymentResolver_WhenDeploymentManifestIsWrongType_Throws(string f fileName, CreateApplicationManifest()); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(deploymentManifest.FullName, exception.Message, StringComparison.Ordinal); const string ExpectedMessage = "not a deployment manifest"; @@ -819,14 +846,14 @@ public void DeploymentResolver_WhenDeploymentManifestIsWrongType_Throws(string f [Theory] [InlineData(DeploymentManifestFileName)] [InlineData(VstoManifestFileName)] - public void DeploymentResolver_WhenDeploymentManifestIsMalformed_Throws(string fileName) + public void DeploymentPublishLayoutResolver_WhenDeploymentManifestIsMalformed_Throws(string fileName) { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo deploymentManifest = CreateFile(root, fileName); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Equal( string.Format( @@ -838,7 +865,7 @@ public void DeploymentResolver_WhenDeploymentManifestIsMalformed_Throws(string f } [Fact] - public void DeploymentResolver_WhenReferencedApplicationManifestIsWrongType_Throws() + public void DeploymentPublishLayoutResolver_WhenReferencedApplicationManifestIsWrongType_Throws() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -849,8 +876,8 @@ public void DeploymentResolver_WhenReferencedApplicationManifestIsWrongType_Thro DeploymentManifestFileName, wrongTypeManifest.Name); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(wrongTypeManifest.FullName, exception.Message, StringComparison.Ordinal); const string ExpectedMessage = "not an application manifest"; @@ -859,7 +886,7 @@ public void DeploymentResolver_WhenReferencedApplicationManifestIsWrongType_Thro } [Fact] - public void DeploymentResolver_WhenReferencedApplicationManifestIsMalformed_Throws() + public void DeploymentPublishLayoutResolver_WhenReferencedApplicationManifestIsMalformed_Throws() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -870,8 +897,8 @@ public void DeploymentResolver_WhenReferencedApplicationManifestIsMalformed_Thro DeploymentManifestFileName, malformedManifest.Name); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Equal( string.Format( @@ -884,7 +911,7 @@ public void DeploymentResolver_WhenReferencedApplicationManifestIsMalformed_Thro } [Fact] - public void DeploymentResolver_WhenReferencedApplicationManifestIsMissing_ThrowsWithExpectedPath() + public void DeploymentPublishLayoutResolver_WhenReferencedApplicationManifestIsMissing_ThrowsWithExpectedPath() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -895,13 +922,17 @@ public void DeploymentResolver_WhenReferencedApplicationManifestIsMissing_Throws DeploymentManifestFileName, MissingManifest); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains( Path.Combine(root.FullName, MissingManifest), exception.Message, StringComparison.Ordinal); + Assert.Contains( + NoUpdateManifestOption, + exception.Message, + StringComparison.Ordinal); Assert.Contains( exception.Diagnostics, diagnostic => diagnostic.Type == OutputMessageType.Error); @@ -910,44 +941,52 @@ public void DeploymentResolver_WhenReferencedApplicationManifestIsMissing_Throws [Theory] [InlineData(ApplicationManifestFileName)] [InlineData(@"missing\App.exe.manifest")] - public void DeploymentResolver_WhenResolvedApplicationManifestIsMissing_ThrowsNotFound( + public void DeploymentPublishLayoutResolver_WhenResolvedApplicationManifestIsMissing_ThrowsNotFound( string applicationManifestPath) { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; string resolvedPath = Path.Combine(root.FullName, applicationManifestPath); - ClickOnceFileGraphResolutionException exception = ResolveWithApplicationManifestProbe( + ClickOncePublishLayoutResolutionException exception = ResolveWithApplicationManifestProbe( root, resolvedPath, ClickOnceFileSystem.IsFile); Assert.Contains(resolvedPath, exception.Message, StringComparison.Ordinal); Assert.Contains("file does not exist", exception.Message, StringComparison.Ordinal); + Assert.Contains( + NoUpdateManifestOption, + exception.Message, + StringComparison.Ordinal); Assert.Null(exception.InnerException); } [Fact] - public void DeploymentResolver_WhenResolvedApplicationManifestIsDirectory_ThrowsNotFound() + public void DeploymentPublishLayoutResolver_WhenResolvedApplicationManifestIsDirectory_ThrowsNotFound() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; string resolvedPath = Path.Combine(root.FullName, ApplicationManifestFileName); Directory.CreateDirectory(resolvedPath); - ClickOnceFileGraphResolutionException exception = ResolveWithApplicationManifestProbe( + ClickOncePublishLayoutResolutionException exception = ResolveWithApplicationManifestProbe( root, resolvedPath, ClickOnceFileSystem.IsFile); Assert.Contains(resolvedPath, exception.Message, StringComparison.Ordinal); Assert.Contains("file does not exist", exception.Message, StringComparison.Ordinal); + Assert.Contains( + NoUpdateManifestOption, + exception.Message, + StringComparison.Ordinal); Assert.Null(exception.InnerException); } [Theory] [InlineData(false)] [InlineData(true)] - public void DeploymentResolver_WhenApplicationManifestProbeFails_ThrowsReadFailure( + public void DeploymentPublishLayoutResolver_WhenApplicationManifestProbeFails_ThrowsReadFailure( bool unauthorized) { using TemporaryDirectory temporaryDirectory = new(_directoryService); @@ -957,7 +996,7 @@ public void DeploymentResolver_WhenApplicationManifestProbeFails_ThrowsReadFailu ? new UnauthorizedAccessException() : new IOException(); - ClickOnceFileGraphResolutionException exception = ResolveWithApplicationManifestProbe( + ClickOncePublishLayoutResolutionException exception = ResolveWithApplicationManifestProbe( root, resolvedPath, _ => throw expectedException); @@ -975,7 +1014,7 @@ public void DeploymentResolver_WhenApplicationManifestProbeFails_ThrowsReadFailu [InlineData(true, null)] [InlineData(true, "")] [InlineData(true, " ")] - public void DeploymentResolver_WhenEntryPointIsMissingOrHasNoTargetPath_Throws( + public void DeploymentPublishLayoutResolver_WhenEntryPointIsMissingOrHasNoTargetPath_Throws( bool hasEntryPoint, string? targetPath) { @@ -1005,22 +1044,26 @@ public void DeploymentResolver_WhenEntryPointIsMissingOrHasNoTargetPath_Throws( return true; }); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, _payloadResolver); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => resolver.Resolve(deploymentManifestFile)); Assert.Contains(deploymentManifestFile.FullName, exception.Message, StringComparison.Ordinal); Assert.Contains("does not identify an application manifest", exception.Message, StringComparison.Ordinal); + Assert.Contains( + NoUpdateManifestOption, + exception.Message, + StringComparison.Ordinal); ClickOnceManifestDiagnostic diagnostic = Assert.Single(exception.Diagnostics); Assert.Equal(OutputMessageType.Warning, diagnostic.Type); Assert.Contains(WarningOneTargetPath, diagnostic.Text, StringComparison.Ordinal); } [Fact] - public void DeploymentResolver_WhenEntryPointIsUnresolved_DoesNotUseTargetPathAsFallback() + public void DeploymentPublishLayoutResolver_WhenEntryPointIsUnresolved_DoesNotUseTargetPathAsFallback() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1052,14 +1095,18 @@ public void DeploymentResolver_WhenEntryPointIsUnresolved_DoesNotUseTargetPathAs return true; }); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, _payloadResolver); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => resolver.Resolve(deploymentManifestFile)); Assert.Contains(applicationManifestFile.FullName, exception.Message, StringComparison.Ordinal); + Assert.Contains( + NoUpdateManifestOption, + exception.Message, + StringComparison.Ordinal); deploymentManifest.Received(1).ResolveFiles( Arg.Is>(directories => directories != null && @@ -1071,7 +1118,7 @@ public void DeploymentResolver_WhenEntryPointIsUnresolved_DoesNotUseTargetPathAs } [Fact] - public void DeploymentResolver_WhenRequiredPayloadIsMissing_ThrowsWithTargetPath() + public void DeploymentPublishLayoutResolver_WhenRequiredPayloadIsMissing_ThrowsWithTargetPath() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1088,8 +1135,8 @@ public void DeploymentResolver_WhenRequiredPayloadIsMissing_ThrowsWithTargetPath DeploymentManifestFileName, applicationManifest.Name); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); Assert.Contains( @@ -1100,7 +1147,7 @@ public void DeploymentResolver_WhenRequiredPayloadIsMissing_ThrowsWithTargetPath } [Fact] - public void DeploymentResolver_WhenApplicationResolutionProducesWarning_PreservesDiagnosticAndSucceeds() + public void DeploymentPublishLayoutResolver_WhenApplicationResolutionProducesWarning_PreservesDiagnosticAndSucceeds() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1166,15 +1213,15 @@ public void DeploymentResolver_WhenApplicationResolutionProducesWarning_Preserve return true; }); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, _payloadResolver); - ClickOnceFileGraph graph = resolver.Resolve(deploymentManifestFile); + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifestFile); - Assert.Equal(payload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Equal(payload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); Assert.Collection( - graph.Diagnostics, + layout.Diagnostics, diagnostic => { Assert.Equal(OutputMessageType.Warning, diagnostic.Type); @@ -1188,7 +1235,7 @@ public void DeploymentResolver_WhenApplicationResolutionProducesWarning_Preserve } [Fact] - public void DeploymentResolver_WhenApplicationResolutionRetries_PreservesEachDiagnosticOnceInOrder() + public void DeploymentPublishLayoutResolver_WhenApplicationResolutionRetries_PreservesEachDiagnosticOnceInOrder() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1255,16 +1302,16 @@ public void DeploymentResolver_WhenApplicationResolutionRetries_PreservesEachDia return true; }); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, _payloadResolver); - ClickOnceFileGraph graph = resolver.Resolve(deploymentManifestFile); + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifestFile); Assert.Equal(expected: 2, actual: resolutionAttempt); - Assert.Equal(payload.FullName, Assert.Single(graph.Payloads).Source.FullName); + Assert.Equal(payload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); Assert.Collection( - graph.Diagnostics, + layout.Diagnostics, diagnostic => { Assert.Equal(OutputMessageType.Warning, diagnostic.Type); @@ -1278,7 +1325,7 @@ public void DeploymentResolver_WhenApplicationResolutionRetries_PreservesEachDia } [Fact] - public void ApplicationResolver_WhenTargetExists_UsesTargetWithoutMappingSuffix() + public void ApplicationPublishLayoutResolver_WhenTargetExists_UsesTargetWithoutMappingSuffix() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1293,16 +1340,17 @@ public void ApplicationResolver_WhenTargetExists_UsesTargetWithoutMappingSuffix( ApplicationManifestFileName, application); - Assert.True(_applicationResolver.TryResolve(applicationManifest, out ClickOnceFileGraph? graph)); + Assert.True(_applicationPublishLayoutResolver.TryResolve(applicationManifest, out ResolvedClickOncePublishLayout? layout)); - Assert.NotNull(graph); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.NotNull(layout); + Assert.Null(layout.Deployment); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); - Assert.Null(payload.MappingAddedSuffix); + Assert.False(payload.IsFileExtensionMapped); } [Fact] - public void ApplicationResolver_WhenOnlyMappedTargetExists_RecordsOneMappingAddedSuffix() + public void ApplicationPublishLayoutResolver_WhenOnlyMappedTargetExists_SetsIsFileExtensionMapped() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1316,17 +1364,17 @@ public void ApplicationResolver_WhenOnlyMappedTargetExists_RecordsOneMappingAdde ApplicationManifestFileName, application); - Assert.True(_applicationResolver.TryResolve(applicationManifest, out ClickOnceFileGraph? graph)); + Assert.True(_applicationPublishLayoutResolver.TryResolve(applicationManifest, out ResolvedClickOncePublishLayout? layout)); - Assert.NotNull(graph); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.NotNull(layout); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); Assert.Equal(PayloadTargetPath, payload.TargetPath); - Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + Assert.True(payload.IsFileExtensionMapped); } [Fact] - public void ApplicationResolver_WhenExactPayloadProbeFails_DoesNotUseMappedTarget() + public void ApplicationPublishLayoutResolver_WhenExactPayloadProbeFails_DoesNotUseMappedTarget() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1340,16 +1388,16 @@ public void ApplicationResolver_WhenExactPayloadProbeFails_DoesNotUseMappedTarge ApplicationManifestFileName, application); UnauthorizedAccessException expectedException = new(); - ClickOncePayloadFileResolver payloadResolver = new( + ClickOncePayloadResolver payloadResolver = new( file => file.FullName.Equals(inaccessiblePayloadPath, StringComparison.OrdinalIgnoreCase) ? throw expectedException : file.Exists); - ClickOnceApplicationManifestFileGraphResolver applicationResolver = new( + ClickOnceApplicationPublishLayoutResolver applicationPublishLayoutResolver = new( new ClickOnceManifestReader(), payloadResolver); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => applicationResolver.TryResolve(applicationManifest, out _)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => applicationPublishLayoutResolver.TryResolve(applicationManifest, out _)); Assert.Same(expectedException, exception.InnerException); Assert.Equal( @@ -1366,7 +1414,7 @@ public void ApplicationResolver_WhenExactPayloadProbeFails_DoesNotUseMappedTarge } [Fact] - public void ApplicationResolver_WhenDirectoryOccupiesExactPayloadPath_UsesMappedTarget() + public void ApplicationPublishLayoutResolver_WhenDirectoryOccupiesExactPayloadPath_UsesMappedTarget() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1380,16 +1428,16 @@ public void ApplicationResolver_WhenDirectoryOccupiesExactPayloadPath_UsesMapped ApplicationManifestFileName, application); - Assert.True(_applicationResolver.TryResolve(applicationManifest, out ClickOnceFileGraph? graph)); + Assert.True(_applicationPublishLayoutResolver.TryResolve(applicationManifest, out ResolvedClickOncePublishLayout? layout)); - Assert.NotNull(graph); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.NotNull(layout); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); - Assert.Equal(DeploySuffix, payload.MappingAddedSuffix); + Assert.True(payload.IsFileExtensionMapped); } [Fact] - public void ApplicationResolver_WhenOnlyDoubleMappedTargetExists_DoesNotInventAdditionalSuffix() + public void ApplicationPublishLayoutResolver_WhenOnlyDoubleMappedTargetExists_DoesNotInventAdditionalSuffix() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1403,14 +1451,14 @@ public void ApplicationResolver_WhenOnlyDoubleMappedTargetExists_DoesNotInventAd ApplicationManifestFileName, application); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _applicationResolver.TryResolve(applicationManifest, out _)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _applicationPublishLayoutResolver.TryResolve(applicationManifest, out _)); Assert.Contains(PayloadFileName, exception.Message, StringComparison.Ordinal); } [Fact] - public void ApplicationResolver_DoesNotUseDeploymentDirectoryFallback() + public void ApplicationPublishLayoutResolver_DoesNotUseDeploymentDirectoryFallback() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1424,30 +1472,30 @@ public void ApplicationResolver_DoesNotUseDeploymentDirectoryFallback() $@"{ApplicationDirectory}\{ApplicationManifestFileName}", application); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _applicationResolver.TryResolve(applicationManifest, out _)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _applicationPublishLayoutResolver.TryResolve(applicationManifest, out _)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); } [Fact] - public void ApplicationResolver_WhenManifestIsNotClickOnce_ReturnsFalse() + public void ApplicationPublishLayoutResolver_WhenManifestIsNotClickOnce_ReturnsFalse() { using TemporaryDirectory temporaryDirectory = new(_directoryService); FileInfo fusionManifest = CreateFusionManifest( temporaryDirectory.Directory, DependencyManifestFileName); - bool result = _applicationResolver.TryResolve( + bool result = _applicationPublishLayoutResolver.TryResolve( fusionManifest, - out ClickOnceFileGraph? graph); + out ResolvedClickOncePublishLayout? layout); Assert.False(result); - Assert.Null(graph); + Assert.Null(layout); } [Fact] - public void ApplicationResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() + public void ApplicationPublishLayoutResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1460,8 +1508,8 @@ public void ApplicationResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnosti ApplicationManifestFileName, application); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _applicationResolver.TryResolve(applicationManifest, out _)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _applicationPublishLayoutResolver.TryResolve(applicationManifest, out _)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); Assert.Contains( @@ -1472,7 +1520,7 @@ public void ApplicationResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnosti } [Fact] - public void DeploymentResolver_WhenOptionalPayloadHasNoTargetPath_Throws() + public void DeploymentPublishLayoutResolver_WhenOptionalPayloadHasNoTargetPath_Throws() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1488,14 +1536,14 @@ public void DeploymentResolver_WhenOptionalPayloadHasNoTargetPath_Throws() DeploymentManifestFileName, applicationManifest.Name); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(MissingTargetPathMessage, exception.Message, StringComparison.Ordinal); } [Fact] - public void DeploymentResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() + public void DeploymentPublishLayoutResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1512,8 +1560,8 @@ public void DeploymentResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic DeploymentManifestFileName, applicationManifest.Name); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); Assert.Contains( @@ -1524,7 +1572,7 @@ public void DeploymentResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic } [Fact] - public void DeploymentResolver_WhenRequiredPayloadHasNoTargetPath_Throws() + public void DeploymentPublishLayoutResolver_WhenRequiredPayloadHasNoTargetPath_Throws() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1540,8 +1588,8 @@ public void DeploymentResolver_WhenRequiredPayloadHasNoTargetPath_Throws() DeploymentManifestFileName, applicationManifest.Name); - ClickOnceFileGraphResolutionException exception = Assert.Throws( - () => _deploymentResolver.Resolve(deploymentManifest)); + ClickOncePublishLayoutResolutionException exception = Assert.Throws( + () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(MissingTargetPathMessage, exception.Message, StringComparison.Ordinal); } @@ -1556,7 +1604,7 @@ public void PayloadResolver_WhenOptionalReferenceHasNoTargetPath_Throws() ApplicationManifest applicationManifest = CreateApplicationManifest(); applicationManifest.FileReferences.Add(new FileReference() { IsOptional = true }); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), @@ -1586,9 +1634,9 @@ public void PayloadResolver_WhenOptionalPhysicalReferenceProbeFails_Throws(bool } UnauthorizedAccessException expectedException = new(); - ClickOncePayloadFileResolver payloadResolver = new(_ => throw expectedException); + ClickOncePayloadResolver payloadResolver = new(_ => throw expectedException); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), @@ -1621,10 +1669,10 @@ public void PayloadResolver_WhenRequiredFileProbeFails_PreservesExistingDiagnost applicationManifest.FileReferences.Clear(); AddFileReference(applicationManifest, PayloadFileName); IOException expectedException = new(); - ClickOncePayloadFileResolver payloadResolver = new(_ => throw expectedException); + ClickOncePayloadResolver payloadResolver = new(_ => throw expectedException); List diagnostics = new(); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), @@ -1647,6 +1695,39 @@ public void PayloadResolver_WhenRequiredFileProbeFails_PreservesExistingDiagnost diagnostic.Type == existingDiagnostic.Type); } + [Fact] + public void PayloadResolver_WhenTargetPathIsRooted_PreservesExistingDiagnostics() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = CreateFile( + temporaryDirectory.Directory, + ApplicationManifestFileName); + ApplicationManifest applicationManifest = CreateApplicationManifest(); + AddFileReference(applicationManifest, WarningOneTargetPath); + applicationManifest.ResolveFiles( + new[] { temporaryDirectory.Directory.FullName }); + ClickOnceManifestDiagnostic existingDiagnostic = Assert.Single( + new ApplicationManifestAdapter(applicationManifest).Diagnostics); + applicationManifest.FileReferences.Clear(); + AddFileReference( + applicationManifest, + Path.Combine(temporaryDirectory.Directory.FullName, PayloadFileName)); + ClickOncePayloadResolver payloadResolver = new(); + List diagnostics = new(); + + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( + () => payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + new ApplicationManifestAdapter(applicationManifest), + diagnostics)); + + ClickOnceManifestDiagnostic diagnostic = Assert.Single(exception.Diagnostics); + Assert.Equal(existingDiagnostic.Name, diagnostic.Name); + Assert.Equal(existingDiagnostic.Text, diagnostic.Text); + Assert.Equal(existingDiagnostic.Type, diagnostic.Type); + } + [Fact] public void PayloadResolver_WhenRequiredFileProbeHasPathTooLongFailure_ReportsInvalidTargetPath() { @@ -1657,9 +1738,9 @@ public void PayloadResolver_WhenRequiredFileProbeHasPathTooLongFailure_ReportsIn ApplicationManifest applicationManifest = CreateApplicationManifest(); AddFileReference(applicationManifest, PayloadFileName); PathTooLongException expectedException = new(); - ClickOncePayloadFileResolver payloadResolver = new(_ => throw expectedException); + ClickOncePayloadResolver payloadResolver = new(_ => throw expectedException); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), @@ -1711,17 +1792,17 @@ public void PayloadResolver_IncludesOnlyPhysicalReferencesAndPreservesReferenceI CreateFile(root, entryPoint.TargetPath); CreateFile(root, fileReference.TargetPath); - IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), new List()); Assert.Equal(expected: 3, actual: payloads.Count); - Assert.Contains(payloads, payload => ReferenceEquals(payload.ManifestReference, assemblyReference)); - Assert.Contains(payloads, payload => ReferenceEquals(payload.ManifestReference, entryPoint)); - Assert.Contains(payloads, payload => ReferenceEquals(payload.ManifestReference, fileReference)); - Assert.DoesNotContain(payloads, payload => ReferenceEquals(payload.ManifestReference, prerequisiteReference)); - Assert.DoesNotContain(payloads, payload => ReferenceEquals(payload.ManifestReference, virtualReference)); + Assert.Contains(payloads, payload => ReferenceEquals(payload.Reference, assemblyReference)); + Assert.Contains(payloads, payload => ReferenceEquals(payload.Reference, entryPoint)); + Assert.Contains(payloads, payload => ReferenceEquals(payload.Reference, fileReference)); + Assert.DoesNotContain(payloads, payload => ReferenceEquals(payload.Reference, prerequisiteReference)); + Assert.DoesNotContain(payloads, payload => ReferenceEquals(payload.Reference, virtualReference)); Assert.Null(prerequisiteReference.ResolvedPath); Assert.Null(virtualReference.ResolvedPath); } @@ -1742,16 +1823,16 @@ public void PayloadResolver_WhenSourcePathCompetesWithTargetPath_UsesTargetPath( }; applicationManifest.AssemblyReferences.Add(reference); - IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), new List()); - ClickOnceFileGraphEntry payload = Assert.Single(payloads); + ResolvedClickOncePayload payload = Assert.Single(payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); Assert.Equal(sourcePathPayload.Name, reference.SourcePath); - Assert.Same(reference, payload.ManifestReference); + Assert.Same(reference, payload.Reference); } [Fact] @@ -1774,16 +1855,16 @@ public void PayloadResolver_WhenAssemblyIdentityCompetesWithTargetPath_UsesTarge applicationManifest.ResolveFiles(new[] { root.FullName }); Assert.Equal(identityPayload.FullName, reference.ResolvedPath); - IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), new List()); - ClickOnceFileGraphEntry payload = Assert.Single(payloads); + ResolvedClickOncePayload payload = Assert.Single(payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); Assert.Same(identity, reference.AssemblyIdentity); - Assert.Same(reference, payload.ManifestReference); + Assert.Same(reference, payload.Reference); } [Fact] @@ -1820,7 +1901,7 @@ public void PayloadResolver_DuringDiagnosticResolution_SuppressesAndRestoresComp reference.ResolvedPath = "diagnostic-path.dll"; }); - IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, applicationManifest, new List()); @@ -1853,15 +1934,15 @@ public void PayloadResolver_WhenResolvedPathCompetesWithTargetPath_UsesTargetPat applicationManifest.Diagnostics.Returns( Array.Empty()); - IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( + IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, applicationManifest, new List()); - ClickOnceFileGraphEntry payload = Assert.Single(payloads); + ResolvedClickOncePayload payload = Assert.Single(payloads); Assert.Equal(expectedPayload.FullName, payload.Source.FullName); Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); - Assert.Same(reference, payload.ManifestReference); + Assert.Same(reference, payload.Reference); } [Fact] @@ -1876,7 +1957,7 @@ public void PayloadResolver_WhenTargetPathIsInvalid_ThrowsLocalizedResolutionExc applicationManifest.FileReferences.Add(new FileReference() { TargetPath = InvalidTargetPath }); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), @@ -1897,7 +1978,7 @@ public void PayloadResolver_WhenRequiredReferenceHasNoTargetPath_Throws() ApplicationManifest applicationManifest = CreateApplicationManifest(); applicationManifest.FileReferences.Add(new FileReference()); - ClickOnceFileGraphResolutionException exception = Assert.Throws( + ClickOncePublishLayoutResolutionException exception = Assert.Throws( () => _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, new ApplicationManifestAdapter(applicationManifest), @@ -2055,7 +2136,7 @@ private static void ConfigureDeploymentManifestReferences( model.FileReferences); } - private static ClickOnceFileGraphResolutionException ResolveWithApplicationManifestProbe( + private static ClickOncePublishLayoutResolutionException ResolveWithApplicationManifestProbe( DirectoryInfo root, string resolvedPath, Func fileExists) @@ -2085,12 +2166,12 @@ private static ClickOnceFileGraphResolutionException ResolveWithApplicationManif return true; }); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, - new ClickOncePayloadFileResolver(), + new ClickOncePayloadResolver(), fileExists); - return Assert.Throws( + return Assert.Throws( () => resolver.Resolve(deploymentManifestFile)); } } diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs index da7f682e..7d86699c 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs @@ -17,6 +17,8 @@ public sealed class ClickOnceResolutionFailureTests : IDisposable "App.exe.manifest"; private const string DeploymentManifestFileName = "App.application"; + private const string NonManifestXml = + ""; private const string PayloadFileName = "payload.dll"; private const string SourcePath = "source-path.dll"; private const string WarningMessageName = @@ -42,14 +44,14 @@ public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPa using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo applicationManifestFile = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, ApplicationManifestFileName); ApplicationManifest applicationModel = - ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + ClickOnceResolutionTestUtilities.CreateApplicationManifest(); AssemblyIdentity identity = new( "Payload", - ClickOnceFileGraphTestUtilities.ManifestVersion); + ClickOnceResolutionTestUtilities.ManifestVersion); AssemblyReference reference = new() { AssemblyIdentity = identity, @@ -87,11 +89,11 @@ public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPa throw expectedException; }); - ClickOncePayloadFileResolver payloadResolver = new(); + ClickOncePayloadResolver payloadResolver = new(); List diagnostics = new(); - ClickOnceFileGraphResolutionException exception = - Assert.Throws( + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( () => payloadResolver.ResolveForExplicitApplication( applicationManifestFile, applicationManifest, @@ -116,17 +118,17 @@ public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPa } [Fact] - public void DeploymentResolver_WhenResolveFilesThrows_RestoresHintsPreservesResolvedPathAndDiagnostics() + public void DeploymentPublishLayoutResolver_WhenResolveFilesThrows_RestoresHintsPreservesResolvedPathAndDiagnostics() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo deploymentManifestFile = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, DeploymentManifestFileName); AssemblyIdentity identity = new( "Application", - ClickOnceFileGraphTestUtilities.ManifestVersion); + ClickOnceResolutionTestUtilities.ManifestVersion); AssemblyReference entryPoint = new() { AssemblyIdentity = identity, @@ -177,12 +179,12 @@ public void DeploymentResolver_WhenResolveFilesThrows_RestoresHintsPreservesReso return true; }); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, - new ClickOncePayloadFileResolver()); + new ClickOncePayloadResolver()); - ClickOnceFileGraphResolutionException exception = - Assert.Throws( + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( () => resolver.Resolve(deploymentManifestFile)); Assert.Equal(SourcePath, entryPoint.SourcePath); @@ -203,19 +205,19 @@ public void DeploymentResolver_WhenResolveFilesThrows_RestoresHintsPreservesReso } [Fact] - public void ExplicitApplicationResolver_WhenManifestIsMalformed_ThrowsReadFailureWithXmlException() + public void ExplicitApplicationPublishLayoutResolver_WhenManifestIsMalformed_ThrowsReadFailureWithXmlException() { using TemporaryDirectory temporaryDirectory = new(_directoryService); FileInfo applicationManifestFile = - ClickOnceFileGraphTestUtilities.WriteMalformedManifest( + ClickOnceResolutionTestUtilities.WriteMalformedManifest( temporaryDirectory.Directory, ApplicationManifestFileName); - ClickOnceApplicationManifestFileGraphResolver resolver = new( + ClickOnceApplicationPublishLayoutResolver resolver = new( new ClickOnceManifestReader(), - new ClickOncePayloadFileResolver()); + new ClickOncePayloadResolver()); - ClickOnceFileGraphResolutionException exception = - Assert.Throws( + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( () => resolver.TryResolve( applicationManifestFile, out _)); @@ -231,19 +233,121 @@ public void ExplicitApplicationResolver_WhenManifestIsMalformed_ThrowsReadFailur } [Fact] - public void ExplicitApplicationResolver_WhenManifestIsMissing_ThrowsReadFailureWithFileNotFoundException() + public void ExplicitApplicationPublishLayoutResolver_WhenXmlRootIsUnrecognized_ThrowsReadFailure() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo applicationManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + temporaryDirectory.Directory, + ApplicationManifestFileName, + NonManifestXml); + ClickOnceApplicationPublishLayoutResolver resolver = new( + new ClickOnceManifestReader(), + new ClickOncePayloadResolver()); + + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( + () => resolver.TryResolve( + applicationManifestFile, + out _)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestReadFailed, + applicationManifestFile.FullName), + exception.Message); + InvalidOperationException readException = + Assert.IsType( + exception.InnerException); + Assert.IsType( + readException.InnerException); + Assert.Empty(exception.Diagnostics); + } + + [Fact] + public void DeploymentPublishLayoutResolver_WhenXmlRootIsUnrecognized_ThrowsReadFailure() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + FileInfo deploymentManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + temporaryDirectory.Directory, + DeploymentManifestFileName, + NonManifestXml); + ClickOnceDeploymentPublishLayoutResolver resolver = new( + new ClickOnceManifestReader(), + new ClickOncePayloadResolver()); + + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReadFailed, + deploymentManifestFile.FullName), + exception.Message); + InvalidOperationException readException = + Assert.IsType( + exception.InnerException); + Assert.IsType( + readException.InnerException); + Assert.Empty(exception.Diagnostics); + } + + [Fact] + public void DeploymentPublishLayoutResolver_WhenReferencedApplicationXmlRootIsUnrecognized_ThrowsReadFailure() + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + root, + ApplicationManifestFileName, + NonManifestXml); + FileInfo deploymentManifestFile = + ClickOnceResolutionTestUtilities.WriteDeploymentManifest( + root, + DeploymentManifestFileName, + applicationManifestFile.Name); + ClickOnceDeploymentPublishLayoutResolver resolver = new( + new ClickOnceManifestReader(), + new ClickOncePayloadResolver()); + + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestReferencedApplicationReadFailed, + applicationManifestFile.FullName, + deploymentManifestFile.FullName), + exception.Message); + InvalidOperationException readException = + Assert.IsType( + exception.InnerException); + Assert.IsType( + readException.InnerException); + Assert.Empty(exception.Diagnostics); + } + + [Fact] + public void ExplicitApplicationPublishLayoutResolver_WhenManifestIsMissing_ThrowsReadFailureWithFileNotFoundException() { using TemporaryDirectory temporaryDirectory = new(_directoryService); FileInfo applicationManifestFile = new( Path.Combine( temporaryDirectory.Directory.FullName, ApplicationManifestFileName)); - ClickOnceApplicationManifestFileGraphResolver resolver = new( + ClickOnceApplicationPublishLayoutResolver resolver = new( new ClickOnceManifestReader(), - new ClickOncePayloadFileResolver()); + new ClickOncePayloadResolver()); - ClickOnceFileGraphResolutionException exception = - Assert.Throws( + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( () => resolver.TryResolve( applicationManifestFile, out _)); diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphTestUtilities.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionTestUtilities.cs similarity index 98% rename from test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphTestUtilities.cs rename to test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionTestUtilities.cs index 9057abfd..9b59569e 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceFileGraphTestUtilities.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionTestUtilities.cs @@ -6,7 +6,7 @@ namespace Sign.Core.Test { - internal static class ClickOnceFileGraphTestUtilities + internal static class ClickOnceResolutionTestUtilities { internal const string ManifestVersion = "1.0.0.0"; internal const string ProcessorArchitecture = "msil"; diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs index 501b3b71..74e3e966 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE.txt file in the project root for more information. +using System.Globalization; using Microsoft.Build.Tasks.Deployment.ManifestUtilities; using Microsoft.Extensions.Logging; using NSubstitute; @@ -28,7 +29,19 @@ public ClickOnceTargetPathCompatibilityTests() Substitute.For>()); } - public static TheoryData SupportedTargetPaths + public static TheoryData RelativeTargetPaths + { + get + { + return new TheoryData() + { + @"content\nested.dll", + @"..\parent.dll" + }; + } + } + + public static TheoryData RootedTargetPaths { get { @@ -45,8 +58,7 @@ public static TheoryData SupportedTargetPaths $@"{drive}published\drive-relative.dll", @"\published\root-relative.dll", @"\\sign-cli.invalid\share\unc.dll", - $@"\\?\{driveRoot}published\device.dll", - @"..\parent.dll" + $@"\\?\{driveRoot}published\device.dll" }; } } @@ -57,18 +69,18 @@ public void Dispose() } [Theory] - [MemberData(nameof(SupportedTargetPaths))] - public void ExplicitApplicationResolver_PreservesSupportedTargetPathAndWindowsCandidate( + [MemberData(nameof(RelativeTargetPaths))] + public void ExplicitApplicationPublishLayoutResolver_WithRelativeTargetPath_PreservesTargetPathAndWindowsCandidate( string targetPath) { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo applicationManifestFile = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, ApplicationManifestFileName); ApplicationManifest applicationModel = - ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + ClickOnceResolutionTestUtilities.CreateApplicationManifest(); FileReference reference = new() { TargetPath = targetPath @@ -94,29 +106,29 @@ public void ExplicitApplicationResolver_PreservesSupportedTargetPathAndWindowsCa }); List probeCandidates = new(); - ClickOncePayloadFileResolver payloadResolver = new( + ClickOncePayloadResolver payloadResolver = new( file => { probeCandidates.Add(file.FullName); return true; }); - ClickOnceApplicationManifestFileGraphResolver resolver = new( + ClickOnceApplicationPublishLayoutResolver resolver = new( manifestReader, payloadResolver); Assert.True( resolver.TryResolve( applicationManifestFile, - out ClickOnceFileGraph? graph)); + out ResolvedClickOncePublishLayout? layout)); - Assert.NotNull(graph); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + Assert.NotNull(layout); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); string expectedCandidate = GetCandidatePath(root, targetPath); Assert.Equal(targetPath, payload.TargetPath); Assert.Equal(expectedCandidate, payload.Source.FullName); - Assert.Same(reference, payload.ManifestReference); + Assert.Same(reference, payload.Reference); Assert.Equal( expectedCandidate, Assert.Single(probeCandidates)); @@ -126,18 +138,18 @@ public void ExplicitApplicationResolver_PreservesSupportedTargetPathAndWindowsCa } [Theory] - [MemberData(nameof(SupportedTargetPaths))] - public void DeploymentResolver_PreservesSupportedTargetPathAndWindowsCandidate( + [MemberData(nameof(RelativeTargetPaths))] + public void DeploymentPublishLayoutResolver_WithRelativeTargetPath_PreservesTargetPathAndWindowsCandidate( string targetPath) { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo deploymentManifestFile = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, DeploymentManifestFileName); FileInfo applicationManifestFile = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, $@"{ApplicationDirectory}\{ApplicationManifestFileName}"); AssemblyReference deploymentEntryPoint = new() @@ -159,7 +171,7 @@ public void DeploymentResolver_PreservesSupportedTargetPathAndWindowsCandidate( deploymentResolutionSearches); ApplicationManifest applicationModel = - ClickOnceFileGraphTestUtilities.CreateApplicationManifest(); + ClickOnceResolutionTestUtilities.CreateApplicationManifest(); FileReference reference = new() { TargetPath = targetPath @@ -178,28 +190,28 @@ public void DeploymentResolver_PreservesSupportedTargetPathAndWindowsCandidate( applicationManifest); List probeCandidates = new(); - ClickOncePayloadFileResolver payloadResolver = new( + ClickOncePayloadResolver payloadResolver = new( file => { probeCandidates.Add(file.FullName); return true; }); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( manifestReader, payloadResolver); - ClickOnceFileGraph graph = + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifestFile); - ClickOnceFileGraphEntry payload = Assert.Single(graph.Payloads); + ResolvedClickOncePayload payload = Assert.Single(layout.Application.Payloads); string expectedCandidate = GetCandidatePath( applicationManifestFile.Directory!, targetPath); Assert.Equal(targetPath, payload.TargetPath); Assert.Equal(expectedCandidate, payload.Source.FullName); - Assert.Same(reference, payload.ManifestReference); + Assert.Same(reference, payload.Reference); Assert.Equal( expectedCandidate, Assert.Single(probeCandidates)); @@ -219,42 +231,258 @@ public void DeploymentResolver_PreservesSupportedTargetPathAndWindowsCandidate( root.FullName)); } + [Theory] + [MemberData(nameof(RootedTargetPaths))] + public void ExplicitApplicationPublishLayoutResolver_WithRootedPayloadTargetPath_RejectsBeforeResolution( + string targetPath) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo applicationManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + root, + ApplicationManifestFileName); + ApplicationManifest applicationModel = + ClickOnceResolutionTestUtilities.CreateApplicationManifest(); + + applicationModel.FileReferences.Add( + new FileReference() + { + TargetPath = targetPath + }); + + List resolutionSearches = new(); + IApplicationManifest applicationManifest = + CreateApplicationManifestSubstitute( + applicationModel, + resolutionSearches); + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadApplicationManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = applicationManifest; + return true; + }); + + List probeCandidates = new(); + ClickOnceApplicationPublishLayoutResolver resolver = new( + manifestReader, + new ClickOncePayloadResolver( + file => + { + probeCandidates.Add(file.FullName); + return true; + })); + + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( + () => resolver.TryResolve( + applicationManifestFile, + out _)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestInvalidTargetPath, + applicationManifestFile.FullName, + targetPath), + exception.Message); + Assert.Empty(resolutionSearches); + Assert.Empty(probeCandidates); + } + + [Theory] + [MemberData(nameof(RootedTargetPaths))] + public void DeploymentPublishLayoutResolver_WithRootedPayloadTargetPath_RejectsBeforeApplicationResolution( + string targetPath) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo deploymentManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + root, + DeploymentManifestFileName); + FileInfo applicationManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + root, + $@"{ApplicationDirectory}\{ApplicationManifestFileName}"); + AssemblyReference deploymentEntryPoint = new() + { + ResolvedPath = applicationManifestFile.FullName, + TargetPath = Path.GetRelativePath( + root.FullName, + applicationManifestFile.FullName) + }; + DeployManifest deploymentModel = new(); + + deploymentModel.AssemblyReferences.Add(deploymentEntryPoint); + deploymentModel.EntryPoint = deploymentEntryPoint; + + List deploymentResolutionSearches = new(); + IDeployManifest deploymentManifest = + CreateDeployManifestSubstitute( + deploymentModel, + deploymentResolutionSearches); + ClickOnceManifestDiagnostic expectedDiagnostic = new( + "deployment-warning", + "deployment warning", + OutputMessageType.Warning); + + deploymentManifest.Diagnostics.Returns( + new[] { expectedDiagnostic }); + ApplicationManifest applicationModel = + ClickOnceResolutionTestUtilities.CreateApplicationManifest(); + + applicationModel.FileReferences.Add( + new FileReference() + { + TargetPath = targetPath + }); + + List applicationResolutionSearches = new(); + IApplicationManifest applicationManifest = + CreateApplicationManifestSubstitute( + applicationModel, + applicationResolutionSearches); + List probeCandidates = new(); + ClickOnceDeploymentPublishLayoutResolver resolver = new( + CreateManifestReader( + deploymentManifest, + applicationManifest), + new ClickOncePayloadResolver( + file => + { + probeCandidates.Add(file.FullName); + return true; + })); + + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceApplicationManifestInvalidTargetPath, + applicationManifestFile.FullName, + targetPath), + exception.Message); + Assert.Single(deploymentResolutionSearches); + Assert.Empty(applicationResolutionSearches); + Assert.Empty(probeCandidates); + Assert.Same(expectedDiagnostic, Assert.Single(exception.Diagnostics)); + } + + [Theory] + [MemberData(nameof(RootedTargetPaths))] + public void DeploymentPublishLayoutResolver_WithRootedEntryPointTargetPath_RejectsBeforeResolution( + string targetPath) + { + using TemporaryDirectory temporaryDirectory = new(_directoryService); + DirectoryInfo root = temporaryDirectory.Directory; + FileInfo deploymentManifestFile = + ClickOnceResolutionTestUtilities.CreateFile( + root, + DeploymentManifestFileName); + AssemblyReference entryPoint = new() + { + TargetPath = targetPath + }; + DeployManifest deploymentModel = new(); + + deploymentModel.AssemblyReferences.Add(entryPoint); + deploymentModel.EntryPoint = entryPoint; + + List resolutionSearches = new(); + IDeployManifest deploymentManifest = + CreateDeployManifestSubstitute( + deploymentModel, + resolutionSearches); + ClickOnceManifestDiagnostic expectedDiagnostic = new( + "deployment-warning", + "deployment warning", + OutputMessageType.Warning); + + deploymentManifest.Diagnostics.Returns( + new[] { expectedDiagnostic }); + IClickOnceManifestReader manifestReader = + Substitute.For(); + + manifestReader.TryReadDeployManifest( + Arg.Any(), + out Arg.Any()) + .Returns(callInfo => + { + callInfo[1] = deploymentManifest; + return true; + }); + + List probeCandidates = new(); + ClickOnceDeploymentPublishLayoutResolver resolver = new( + manifestReader, + new ClickOncePayloadResolver( + file => + { + probeCandidates.Add(file.FullName); + return true; + })); + + ClickOncePublishLayoutResolutionException exception = + Assert.Throws( + () => resolver.Resolve(deploymentManifestFile)); + + Assert.Equal( + string.Format( + CultureInfo.CurrentCulture, + Resources.ClickOnceDeploymentManifestInvalidTargetPath, + deploymentManifestFile.FullName, + targetPath), + exception.Message); + Assert.Empty(resolutionSearches); + Assert.Empty(probeCandidates); + Assert.Same(expectedDiagnostic, Assert.Single(exception.Diagnostics)); + } + [Fact] - public void DeploymentResolver_WhenOnlyMappedPayloadExistsInDeploymentDirectory_UsesFallbackAndPreservesFirstAttemptDiagnostic() + public void DeploymentPublishLayoutResolver_WhenOnlyMappedPayloadExistsInDeploymentDirectory_UsesFallbackAndPreservesFirstAttemptDiagnostic() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; FileInfo payload = - ClickOnceFileGraphTestUtilities.CreateFile( + ClickOnceResolutionTestUtilities.CreateFile( root, $"{PayloadFileName}{DeploySuffix}"); FileInfo applicationManifest = - ClickOnceFileGraphTestUtilities.WriteApplicationManifest( + ClickOnceResolutionTestUtilities.WriteApplicationManifest( root, $@"{ApplicationDirectory}\{ApplicationManifestFileName}", PayloadFileName); FileInfo deploymentManifest = - ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + ClickOnceResolutionTestUtilities.WriteDeploymentManifest( root, DeploymentManifestFileName, Path.GetRelativePath( root.FullName, applicationManifest.FullName), mapFileExtensions: true); - ClickOncePayloadFileResolver payloadResolver = new(); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOncePayloadResolver payloadResolver = new(); + ClickOnceDeploymentPublishLayoutResolver resolver = new( new ClickOnceManifestReader(), payloadResolver); - ClickOnceFileGraph graph = resolver.Resolve(deploymentManifest); + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifest); - ClickOnceFileGraphEntry entry = Assert.Single(graph.Payloads); + ResolvedClickOncePayload entry = Assert.Single(layout.Application.Payloads); Assert.Equal(payload.FullName, entry.Source.FullName); Assert.Equal(PayloadFileName, entry.TargetPath); - Assert.Equal(DeploySuffix, entry.MappingAddedSuffix); + Assert.True(entry.IsFileExtensionMapped); Assert.Collection( - graph.Diagnostics, + layout.Diagnostics, diagnostic => { Assert.Equal(OutputMessageType.Error, diagnostic.Type); diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoFileGraphTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoManifestResolutionTests.cs similarity index 75% rename from test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoFileGraphTests.cs rename to test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoManifestResolutionTests.cs index b8022e10..08bdfbbd 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoFileGraphTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceVstoManifestResolutionTests.cs @@ -10,7 +10,7 @@ namespace Sign.Core.Test { - public sealed class ClickOnceVstoFileGraphTests : IDisposable + public sealed class ClickOnceVstoManifestResolutionTests : IDisposable { private const string ApplicationDirectory = @"Application Files\VstoTestAddIn_1_0_0_0"; @@ -26,7 +26,7 @@ public sealed class ClickOnceVstoFileGraphTests : IDisposable private readonly DirectoryService _directoryService; - public ClickOnceVstoFileGraphTests() + public ClickOnceVstoManifestResolutionTests() { _directoryService = new( Substitute.For>()); @@ -38,7 +38,7 @@ public void Dispose() } [Fact] - public void DeploymentResolver_WhenApplicationIsRealVstoFixture_ResolvesGraphAndPreservesModelState() + public void DeploymentPublishLayoutResolver_WhenApplicationIsRealVstoFixture_ResolvesPublishLayoutAndPreservesModelState() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -49,17 +49,17 @@ public void DeploymentResolver_WhenApplicationIsRealVstoFixture_ResolvesGraphAnd ApplicationManifestFileName)); applicationManifestFile.Directory!.Create(); File.Copy( - ClickOnceFileGraphTestUtilities.GetVstoManifestPath(), + ClickOnceResolutionTestUtilities.GetVstoManifestPath(), applicationManifestFile.FullName); FileInfo payload = new( Path.Combine( applicationManifestFile.DirectoryName!, PayloadFileName)); File.Copy( - typeof(ClickOnceVstoFileGraphTests).Assembly.Location, + typeof(ClickOnceVstoManifestResolutionTests).Assembly.Location, payload.FullName); FileInfo deploymentManifestFile = - ClickOnceFileGraphTestUtilities.WriteDeploymentManifest( + ClickOnceResolutionTestUtilities.WriteDeploymentManifest( root, DeploymentManifestFileName, Path.GetRelativePath( @@ -68,32 +68,31 @@ public void DeploymentResolver_WhenApplicationIsRealVstoFixture_ResolvesGraphAnd applicationManifestFile.Refresh(); payload.Refresh(); - ClickOnceDeployManifestFileGraphResolver resolver = new( + ClickOnceDeploymentPublishLayoutResolver resolver = new( new ClickOnceManifestReader(), - new ClickOncePayloadFileResolver()); + new ClickOncePayloadResolver()); - ClickOnceFileGraph graph = + ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifestFile); - Assert.NotNull(graph.DeploymentManifest); Assert.Equal( deploymentManifestFile.FullName, - graph.DeploymentManifest.Source.FullName); - Assert.NotNull(graph.DeployManifest); + layout.Deployment!.Source.FullName); + Assert.NotNull(layout.Deployment!.Manifest); Assert.Equal( applicationManifestFile.FullName, - graph.ApplicationManifest.Source.FullName); + layout.Application.Source.FullName); Assert.Equal( "VstoTestAddIn.dll", - graph.ApplicationManifestModel.AssemblyIdentity.Name); - Assert.False(graph.ApplicationManifestModel.ReadOnly); - Assert.Empty(graph.Diagnostics); + layout.Application.Manifest.AssemblyIdentity.Name); + Assert.False(layout.Application.Manifest.ReadOnly); + Assert.Empty(layout.Diagnostics); - ClickOnceFileGraphEntry payloadEntry = - Assert.Single(graph.Payloads); + ResolvedClickOncePayload payloadEntry = + Assert.Single(layout.Application.Payloads); AssemblyReference manifestReference = Assert.IsType( - payloadEntry.ManifestReference); + payloadEntry.Reference); Assert.Equal(payload.FullName, payloadEntry.Source.FullName); Assert.Equal(PayloadFileName, payloadEntry.TargetPath); @@ -106,7 +105,7 @@ public void DeploymentResolver_WhenApplicationIsRealVstoFixture_ResolvesGraphAnd Assert.Same( manifestReference, Assert.Single( - graph.ApplicationManifestModel + layout.Application.Manifest .AssemblyReferences .Cast())); @@ -115,7 +114,7 @@ public void DeploymentResolver_WhenApplicationIsRealVstoFixture_ResolvesGraphAnd root.FullName, "roundtrip.manifest")); - graph.ApplicationManifestModel.Write(output); + layout.Application.Manifest.Write(output); XDocument document = XDocument.Load(output.FullName); XElement addIn = Assert.Single( diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutableTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutableTests.cs new file mode 100644 index 00000000..347ea48d --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceAdjacentExecutableTests.cs @@ -0,0 +1,68 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +namespace Sign.Core.Test +{ + public sealed class ResolvedClickOnceAdjacentExecutableTests + { + private const string LauncherFileName = "Launcher.exe"; + private const string SetupFileName = "setup.exe"; + + [Theory] + [InlineData(SetupFileName, (int)ClickOnceAdjacentExecutableKind.Setup)] + [InlineData("SETUP.EXE", (int)ClickOnceAdjacentExecutableKind.Setup)] + [InlineData(LauncherFileName, (int)ClickOnceAdjacentExecutableKind.Launcher)] + [InlineData("launcher.EXE", (int)ClickOnceAdjacentExecutableKind.Launcher)] + public void Constructor_WithMatchingFileName_PreservesValues( + string fileName, + int kindValue) + { + FileInfo source = new(fileName); + ClickOnceAdjacentExecutableKind kind = + (ClickOnceAdjacentExecutableKind)kindValue; + + ResolvedClickOnceAdjacentExecutable executable = new( + source, + kind); + + Assert.Same(source, executable.Source); + Assert.Equal(fileName, executable.TargetPath); + Assert.Equal(kind, executable.Kind); + } + + [Fact] + public void Constructor_WithNullSource_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOnceAdjacentExecutable( + source: null!, + ClickOnceAdjacentExecutableKind.Setup)); + } + + [Theory] + [InlineData(SetupFileName, (int)ClickOnceAdjacentExecutableKind.Launcher)] + [InlineData(LauncherFileName, (int)ClickOnceAdjacentExecutableKind.Setup)] + public void Constructor_WithMismatchedFileName_ThrowsArgumentException( + string fileName, + int kindValue) + { + ClickOnceAdjacentExecutableKind kind = + (ClickOnceAdjacentExecutableKind)kindValue; + + Assert.Throws( + () => new ResolvedClickOnceAdjacentExecutable( + new FileInfo(fileName), + kind)); + } + + [Fact] + public void Constructor_WithUndefinedKind_ThrowsArgumentOutOfRangeException() + { + Assert.Throws( + () => new ResolvedClickOnceAdjacentExecutable( + new FileInfo(SetupFileName), + kind: (ClickOnceAdjacentExecutableKind)(-1))); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceApplicationTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceApplicationTests.cs new file mode 100644 index 00000000..09bb4eee --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceApplicationTests.cs @@ -0,0 +1,75 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using NSubstitute; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core.Test +{ + public sealed class ResolvedClickOnceApplicationTests + { + private const string ApplicationManifestFileName = "App.exe.manifest"; + private const string PayloadFileName = "payload.dll"; + + [Fact] + public void Constructor_WithValidArguments_PreservesValuesAndSnapshotsPayloads() + { + FileInfo source = CreateSource(); + IApplicationManifest manifest = Substitute.For(); + ResolvedClickOncePayload payload = new( + new FileInfo(PayloadFileName), + new FileReference() + { + TargetPath = PayloadFileName + }); + List payloads = new() { payload }; + + ResolvedClickOnceApplication application = new( + source, + manifest, + payloads); + + payloads.Clear(); + + Assert.Same(source, application.Source); + Assert.Same(manifest, application.Manifest); + Assert.Same(payload, Assert.Single(application.Payloads)); + } + + [Fact] + public void Constructor_WithNullSource_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOnceApplication( + source: null!, + Substitute.For(), + payloads: Array.Empty())); + } + + [Fact] + public void Constructor_WithNullManifest_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOnceApplication( + CreateSource(), + manifest: null!, + payloads: Array.Empty())); + } + + [Fact] + public void Constructor_WithNullPayloads_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOnceApplication( + CreateSource(), + Substitute.For(), + payloads: null!)); + } + + private static FileInfo CreateSource() + { + return new FileInfo(ApplicationManifestFileName); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceDeploymentTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceDeploymentTests.cs new file mode 100644 index 00000000..e430b028 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOnceDeploymentTests.cs @@ -0,0 +1,82 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using NSubstitute; + +namespace Sign.Core.Test +{ + public sealed class ResolvedClickOnceDeploymentTests + { + private const string DeploymentManifestFileName = "App.application"; + + [Fact] + public void Constructor_WithValidArguments_PreservesValues() + { + FileInfo source = CreateSource(); + IDeployManifest manifest = Substitute.For(); + AssemblyReference applicationManifestReference = new(); + manifest.EntryPoint.Returns(applicationManifestReference); + + ResolvedClickOnceDeployment deployment = new( + source, + manifest, + applicationManifestReference); + + Assert.Same(source, deployment.Source); + Assert.Same(manifest, deployment.Manifest); + Assert.Same( + applicationManifestReference, + deployment.ApplicationManifestReference); + } + + [Fact] + public void Constructor_WithNullSource_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOnceDeployment( + source: null!, + Substitute.For(), + new AssemblyReference())); + } + + [Fact] + public void Constructor_WithNullManifest_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOnceDeployment( + CreateSource(), + manifest: null!, + new AssemblyReference())); + } + + [Fact] + public void Constructor_WithNullApplicationManifestReference_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOnceDeployment( + CreateSource(), + Substitute.For(), + applicationManifestReference: null!)); + } + + [Fact] + public void Constructor_WithReferenceOtherThanManifestEntryPoint_ThrowsArgumentException() + { + IDeployManifest manifest = Substitute.For(); + manifest.EntryPoint.Returns(new AssemblyReference()); + + Assert.Throws( + () => new ResolvedClickOnceDeployment( + CreateSource(), + manifest, + new AssemblyReference())); + } + + private static FileInfo CreateSource() + { + return new FileInfo(DeploymentManifestFileName); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePayloadTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePayloadTests.cs new file mode 100644 index 00000000..69b0bce8 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePayloadTests.cs @@ -0,0 +1,139 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; + +namespace Sign.Core.Test +{ + public sealed class ResolvedClickOncePayloadTests + { + private const string DeploySuffix = ".deploy"; + private const string PayloadFileName = "payload.dll"; + + [Fact] + public void Constructor_WithValidArguments_PreservesValues() + { + FileInfo source = new(fileName: $"{PayloadFileName}{DeploySuffix}"); + FileReference manifestReference = new() + { + TargetPath = PayloadFileName + }; + + ResolvedClickOncePayload payload = new( + source, + manifestReference); + + Assert.Same(source, payload.Source); + Assert.Equal(PayloadFileName, payload.TargetPath); + Assert.Same(manifestReference, payload.Reference); + Assert.True(payload.IsFileExtensionMapped); + } + + [Fact] + public void TargetPath_WhenReferenceTargetPathChanges_ReturnsResolvedValue() + { + FileReference manifestReference = new() + { + TargetPath = PayloadFileName + }; + ResolvedClickOncePayload payload = new( + new FileInfo(PayloadFileName), + manifestReference); + + manifestReference.TargetPath = "renamed.dll"; + + Assert.Equal(PayloadFileName, payload.TargetPath); + } + + [Fact] + public void Constructor_WithoutFileExtensionMapping_ClearsIsFileExtensionMapped() + { + ResolvedClickOncePayload payload = new( + new FileInfo(PayloadFileName), + new FileReference() + { + TargetPath = PayloadFileName + }); + + Assert.False(payload.IsFileExtensionMapped); + } + + [Fact] + public void Constructor_WhenTargetPathEndsInDeployAndSourceMatches_DoesNotSetIsFileExtensionMapped() + { + const string TargetPath = $"{PayloadFileName}{DeploySuffix}"; + ResolvedClickOncePayload payload = new( + new FileInfo(TargetPath), + new FileReference() + { + TargetPath = TargetPath + }); + + Assert.False(payload.IsFileExtensionMapped); + } + + [Fact] + public void Constructor_WhenTargetPathEndsInDeployAndSourceHasAdditionalDeploySuffix_SetsIsFileExtensionMapped() + { + const string TargetPath = $"{PayloadFileName}{DeploySuffix}"; + ResolvedClickOncePayload payload = new( + new FileInfo($"{TargetPath}{DeploySuffix}"), + new FileReference() + { + TargetPath = TargetPath + }); + + Assert.True(payload.IsFileExtensionMapped); + } + + [Fact] + public void Constructor_WithMismatchedSourceFileName_ThrowsArgumentException() + { + Assert.Throws( + () => new ResolvedClickOncePayload( + new FileInfo("other.dll"), + new FileReference() + { + TargetPath = PayloadFileName + })); + } + + [Fact] + public void Constructor_WithNullSource_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOncePayload( + source: null!, + new FileReference() + { + TargetPath = PayloadFileName + })); + } + + [Theory] + [InlineData(null)] + [InlineData("")] + [InlineData(" ")] + public void Constructor_WithInvalidReferenceTargetPath_ThrowsArgumentException( + string? targetPath) + { + Assert.ThrowsAny( + () => new ResolvedClickOncePayload( + new FileInfo(PayloadFileName), + new FileReference() + { + TargetPath = targetPath! + })); + } + + [Fact] + public void Constructor_WithNullReference_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOncePayload( + new FileInfo(PayloadFileName), + reference: null!)); + } + } +} diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePublishLayoutTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePublishLayoutTests.cs new file mode 100644 index 00000000..2eef3ba7 --- /dev/null +++ b/test/Sign.Core.Test/Tools/ClickOnce/ResolvedClickOncePublishLayoutTests.cs @@ -0,0 +1,133 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE.txt file in the project root for more information. + +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using NSubstitute; + +namespace Sign.Core.Test +{ + public sealed class ResolvedClickOncePublishLayoutTests + { + private const string ApplicationManifestFileName = "App.exe.manifest"; + private const string DeploymentManifestFileName = "App.application"; + private const string SetupFileName = "setup.exe"; + private const string WarningMessageName = "GenerateManifest.ResolveFailedInReadWriteMode"; + private const string WarningTargetPath = "warning.txt"; + + [Fact] + public void Constructor_WithValidArguments_PreservesValuesAndSnapshotsCollections() + { + FileInfo deploymentManifest = new(DeploymentManifestFileName); + ResolvedClickOnceAdjacentExecutable adjacentExecutable = new( + new FileInfo(SetupFileName), + ClickOnceAdjacentExecutableKind.Setup); + IDeployManifest deployManifest = Substitute.For(); + List adjacentExecutables = new() { adjacentExecutable }; + List diagnostics = new() { CreateDiagnostic() }; + AssemblyReference applicationManifestReference = new(); + deployManifest.EntryPoint.Returns(applicationManifestReference); + ResolvedClickOnceDeployment deployment = new( + deploymentManifest, + deployManifest, + applicationManifestReference); + ResolvedClickOnceApplication application = CreateApplication(); + + ResolvedClickOncePublishLayout layout = new( + deployment, + application, + adjacentExecutables, + diagnostics); + + adjacentExecutables.Clear(); + diagnostics.Clear(); + + Assert.Same(deployment, layout.Deployment); + Assert.Same(application, layout.Application); + Assert.Same(adjacentExecutable, Assert.Single(layout.AdjacentExecutables)); + Assert.Single(layout.Diagnostics); + } + + [Fact] + public void Constructor_WithoutDeployment_PreservesNullDeployment() + { + ResolvedClickOncePublishLayout layout = CreateLayout(); + + Assert.Null(layout.Deployment); + } + + [Fact] + public void Constructor_WithoutDeploymentAndWithAdjacentExecutables_ThrowsArgumentException() + { + Assert.Throws( + () => new ResolvedClickOncePublishLayout( + deployment: null, + CreateApplication(), + adjacentExecutables: + [ + new ResolvedClickOnceAdjacentExecutable( + new FileInfo(SetupFileName), + ClickOnceAdjacentExecutableKind.Setup) + ], + diagnostics: Array.Empty())); + } + + [Fact] + public void Constructor_WithNullApplication_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOncePublishLayout( + deployment: null, + application: null!, + adjacentExecutables: Array.Empty(), + diagnostics: Array.Empty())); + } + + [Fact] + public void Constructor_WithNullAdjacentExecutables_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOncePublishLayout( + deployment: null, + CreateApplication(), + adjacentExecutables: null!, + diagnostics: Array.Empty())); + } + + [Fact] + public void Constructor_WithNullDiagnostics_ThrowsArgumentNullException() + { + Assert.Throws( + () => new ResolvedClickOncePublishLayout( + deployment: null, + CreateApplication(), + adjacentExecutables: Array.Empty(), + diagnostics: null!)); + } + + private static ResolvedClickOncePublishLayout CreateLayout() + { + return new ResolvedClickOncePublishLayout( + deployment: null, + CreateApplication(), + adjacentExecutables: Array.Empty(), + diagnostics: Array.Empty()); + } + + private static ResolvedClickOnceApplication CreateApplication() + { + return new ResolvedClickOnceApplication( + new FileInfo(ApplicationManifestFileName), + Substitute.For(), + payloads: Array.Empty()); + } + + private static ClickOnceManifestDiagnostic CreateDiagnostic() + { + return new ClickOnceManifestDiagnostic( + WarningMessageName, + WarningTargetPath, + OutputMessageType.Warning); + } + } +} From 582e0cf9e3b6feb92cf793b112b3230584f85437 Mon Sep 17 00:00:00 2001 From: Damon Tivel Date: Thu, 17 Sep 2026 15:22:45 -0700 Subject: [PATCH 3/4] Annotate ClickOnce TryResolve nullability Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: de6a34fe-6989-49f6-a128-ee13323c7c9e --- .../ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs index 1446979a..08f9081f 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOnceApplicationPublishLayoutResolver.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE.txt file in the project root for more information. +using System.Diagnostics.CodeAnalysis; using System.Globalization; namespace Sign.Core @@ -22,7 +23,9 @@ internal ClickOnceApplicationPublishLayoutResolver( _payloadResolver = payloadResolver; } - internal bool TryResolve(FileInfo applicationManifestFile, out ResolvedClickOncePublishLayout? layout) + internal bool TryResolve( + FileInfo applicationManifestFile, + [NotNullWhen(true)] out ResolvedClickOncePublishLayout? layout) { ArgumentNullException.ThrowIfNull(applicationManifestFile, nameof(applicationManifestFile)); From ccd15845a4525e1654831ed561b53aae1e6fc46d Mon Sep 17 00:00:00 2001 From: Damon Tivel Date: Sat, 19 Sep 2026 15:50:33 -0700 Subject: [PATCH 4/4] Defer ClickOnce manifest validation Remove preliminary application manifest resolution attempts whose diagnostics can be superseded by supported publish-layout fallback. Reserve ManifestUtilities resolution for authoritative validation of the staged layout. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: de6a34fe-6989-49f6-a128-ee13323c7c9e --- docs/specs/ClickOnce-Signing-Algorithm.md | 12 +- src/Sign.Core/Resources.Designer.cs | 9 -- src/Sign.Core/Resources.resx | 4 - .../ClickOnce/ClickOncePayloadResolver.cs | 123 +----------------- src/Sign.Core/xlf/Resources.cs.xlf | 5 - src/Sign.Core/xlf/Resources.de.xlf | 5 - src/Sign.Core/xlf/Resources.es.xlf | 5 - src/Sign.Core/xlf/Resources.fr.xlf | 5 - src/Sign.Core/xlf/Resources.it.xlf | 5 - src/Sign.Core/xlf/Resources.ja.xlf | 5 - src/Sign.Core/xlf/Resources.ko.xlf | 5 - src/Sign.Core/xlf/Resources.pl.xlf | 5 - src/Sign.Core/xlf/Resources.pt-BR.xlf | 5 - src/Sign.Core/xlf/Resources.ru.xlf | 5 - src/Sign.Core/xlf/Resources.tr.xlf | 5 - src/Sign.Core/xlf/Resources.zh-Hans.xlf | 5 - src/Sign.Core/xlf/Resources.zh-Hant.xlf | 5 - .../ClickOnceDiagnosticOrderingTests.cs | 38 ++---- .../ClickOncePublishLayoutResolutionTests.cs | 103 ++++----------- .../ClickOnceResolutionFailureTests.cs | 46 +++---- .../ClickOnceTargetPathCompatibilityTests.cs | 37 +----- 21 files changed, 66 insertions(+), 371 deletions(-) diff --git a/docs/specs/ClickOnce-Signing-Algorithm.md b/docs/specs/ClickOnce-Signing-Algorithm.md index 1ce2f42d..3d2f29f3 100644 --- a/docs/specs/ClickOnce-Signing-Algorithm.md +++ b/docs/specs/ClickOnce-Signing-Algorithm.md @@ -244,14 +244,14 @@ Apply the application-manifest flows below only to files identified as ClickOnce 1. Log all messages in [`Manifest.OutputMessages`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.manifest.outputmessages?view=msbuild-17-netcore). Continue when diagnostics do not prevent resolving required files; otherwise fail with a clear error. 1. Obtain the full path of the application manifest file from [`DeployManifest.EntryPoint`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.deploymanifest.entrypoint?view=msbuild-17-netcore)[`.ResolvedPath`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.basereference.resolvedpath?view=msbuild-17-netcore#microsoft-build-tasks-deployment-manifestutilities-basereference.resolvedpath). If the path is empty or the file does not exist, fail signing with an error message that identifies the expected path and suggests `--clickonce-signing-version 2 --no-update-clickonce-manifest` when the user only needs to re-sign the deployment manifest. 1. Read the application manifest file using `ManifestReader.ReadManifest(...)`. If reading fails or the returned manifest is not an [`ApplicationManifest`](https://learn.microsoft.com/dotnet/api/microsoft.build.tasks.deployment.manifestutilities.applicationmanifest?view=msbuild-17-netcore), fail with a clear error. Ensure `Manifest.ReadOnly` is `false`. -1. Identify each application-manifest `AssemblyReference` and `FileReference` that represents a physical file published with the application, following the file-extension mapping rules above and searching the application manifest's directory first, then the deployment manifest's directory as a fallback (if different). Log all `OutputMessages` produced by resolution attempts. Continue when diagnostics do not prevent locating required files; otherwise fail with a clear error. +1. Identify each application-manifest `AssemblyReference` and `FileReference` that represents a physical file published with the application, following the file-extension mapping rules above and searching the application manifest's directory first, then the deployment manifest's directory as a fallback (if different). Use these Sign CLI lookup rules directly for source discovery rather than calling `ApplicationManifest.ResolveFiles(...)`, whose lookup semantics do not account for file-extension mapping or deployment-directory fallback. A failed intermediate candidate probe is not a diagnostic when a later allowed candidate resolves the reference. Fail with a clear error if no allowed candidate locates a required file. 1. Ensure staged files preserve their manifest-relative paths without writing outside the staging directory. If Sign CLI cannot represent a referenced layout within staging, fail before copying files and report that the layout is unsupported. 1. Copy the deployment manifest, application manifest, and located payload files to a temporary directory. Stage each payload at its manifest target path relative to the staged application manifest while preserving any mapping-added suffix. 1. Temporarily remove mapping-added suffixes from the staged payloads. -1. Before signing or updating manifest metadata, ensure that the application manifest's references resolve to the corresponding staged files. No `ResolvedPath` used by `UpdateFileInfo(...)` may identify a source file outside the staging directory. How the implementation establishes the staged paths is an implementation detail. Fail if any required staged file cannot be resolved. +1. Resolve the application manifest's references against the staged application directory using `ApplicationManifest.ResolveFiles(string[])`. Log every newly produced `OutputMessage`. Warnings are non-fatal; fail without signing any payload or updating or signing the application manifest if any newly produced message is an error. Independently verify that every required physical reference's `ResolvedPath` identifies its corresponding suffix-stripped staged file and remains within the staging directory; resolution to a different file does not satisfy this postcondition. 1. Treat any `Launcher.exe` referenced by the application manifest, including as its entry point, as a payload file. It must be staged and, when selected by the user's file-matching patterns, signed with the other selected payloads before application-manifest metadata is refreshed. Separately discover applicable adjacent executables by checking if `setup.exe` or an unreferenced `Launcher.exe` exists in the same directory as the deployment manifest. A launcher or bootstrapper in a different directory or with a different name is not implicitly discovered as an adjacent executable, but it will still be signed through standard Authenticode signing if matched by the user's file patterns. 1. Apply the standard signing behavior only to payloads selected by the user's file-matching patterns; leave excluded or unsupported payloads unchanged. Include every referenced payload when refreshing application-manifest metadata. -1. Call `ApplicationManifest.UpdateFileInfo("v4.5")` to refresh payload SHA-256 hashes and sizes, then restore the mapping-added suffixes. (`UpdateFileInfo(string)` hashes each reference's current `ResolvedPath`; ensure those paths identify the staged, suffix-stripped payloads before calling it.) For each payload that was signed, make its result available and complete its coordinated signing operation. Then sign the application manifest, make its signed result available, and complete its operation. +1. Immediately before calling `ApplicationManifest.UpdateFileInfo("v4.5")`, verify again that every required physical reference's `ResolvedPath` identifies its expected suffix-stripped staged file, that the file exists, and that it remains within the staging directory. Then refresh payload SHA-256 hashes and sizes and restore the mapping-added suffixes. (`UpdateFileInfo(string)` hashes each reference's current `ResolvedPath`.) For each payload that was signed, make its result available and complete its coordinated signing operation. Then sign the application manifest, make its signed result available, and complete its operation. 1. Signing the application manifest changes its signed bytes and can change its assembly identity, including its public key token. Ensure that the deployment manifest's entry-point `ResolvedPath` identifies the signed staged application manifest, then call `DeployManifest.UpdateFileInfo("v4.5")` to refresh the entry-point reference's SHA-256 hash and size. Ensure that the entry-point identity matches the signed application manifest before signing the deployment manifest. When signing the deployment manifest with `mage.exe -update`, the `-appm` parameter performs this entry-point update. Make the signed deployment manifest available and complete its operation. 1. Apply the standard signing behavior to applicable adjacent executables selected by the user's file-matching patterns, make their signed results available, and complete their operations. 1. Copy any remaining signed files back to their original locations and clean up the staging directory. @@ -260,13 +260,13 @@ Apply the application-manifest flows below only to files identified as ClickOnce 1. Read the file using `ManifestReader.ReadManifest(...)`. If reading fails or the returned manifest is not an `ApplicationManifest`, fail the operation without signing the file. 1. Ensure `Manifest.ReadOnly` is `false`. -1. Identify each `AssemblyReference` and `FileReference` that represents a physical file published with the application. Look for its manifest target path relative to the application manifest's directory first; if that path does not exist, look for the same path with one additional `.deploy` suffix and record that suffix as mapping-added. Log all `OutputMessages` produced by resolution attempts. Continue when diagnostics do not prevent locating required files; otherwise fail with a clear error. +1. Identify each `AssemblyReference` and `FileReference` that represents a physical file published with the application. Look for its manifest target path relative to the application manifest's directory first; if that path does not exist, look for the same path with one additional `.deploy` suffix and record that suffix as mapping-added. Use these Sign CLI lookup rules directly for source discovery rather than calling `ApplicationManifest.ResolveFiles(...)`, whose lookup semantics do not account for file-extension mapping. A failed exact-path probe is not a diagnostic when the mapped candidate resolves the reference. Fail with a clear error if neither candidate locates a required file. 1. Ensure staged files preserve their manifest-relative paths without writing outside the staging directory. If Sign CLI cannot represent a referenced layout within staging, fail before copying files and report that the layout is unsupported. 1. Copy the application manifest and located payload files to a temporary directory. Stage each payload at its manifest target path relative to the staged application manifest while preserving any mapping-added suffix. 1. Temporarily remove mapping-added suffixes from the staged payloads. -1. Before signing or updating manifest metadata, ensure that the application manifest's references resolve to the corresponding staged files. No `ResolvedPath` used by `UpdateFileInfo(...)` may identify a source file outside the staging directory. How the implementation establishes the staged paths is an implementation detail. Fail if any required staged file cannot be resolved. +1. Resolve the application manifest's references against the staged application directory using `ApplicationManifest.ResolveFiles(string[])`. Log every newly produced `OutputMessage`. Warnings are non-fatal; fail without signing any payload or updating or signing the application manifest if any newly produced message is an error. Independently verify that every required physical reference's `ResolvedPath` identifies its corresponding suffix-stripped staged file and remains within the staging directory; resolution to a different file does not satisfy this postcondition. 1. Apply the standard signing behavior only to payloads selected by the user's file-matching patterns; leave excluded or unsupported payloads unchanged. Include every referenced payload when refreshing application-manifest metadata. -1. Call `ApplicationManifest.UpdateFileInfo("v4.5")` and restore the mapping-added suffixes. For each payload that was signed, make its result available and complete its coordinated signing operation. +1. Immediately before calling `ApplicationManifest.UpdateFileInfo("v4.5")`, verify again that every required physical reference's `ResolvedPath` identifies its expected suffix-stripped staged file, that the file exists, and that it remains within the staging directory. Then update the file information and restore the mapping-added suffixes. For each payload that was signed, make its result available and complete its coordinated signing operation. 1. Sign the application manifest, make its signed result available, and complete its operation. 1. Copy any remaining signed files back to their original locations and clean up the staging directory. diff --git a/src/Sign.Core/Resources.Designer.cs b/src/Sign.Core/Resources.Designer.cs index 0bd96416..36151f1e 100644 --- a/src/Sign.Core/Resources.Designer.cs +++ b/src/Sign.Core/Resources.Designer.cs @@ -141,15 +141,6 @@ internal static string ClickOnceApplicationManifestRequiredFileNotFound { } } - /// - /// Looks up a localized string similar to Failed to resolve files referenced by application manifest '{0}'.. - /// - internal static string ClickOnceApplicationManifestResolveFailed { - get { - return ResourceManager.GetString("ClickOnceApplicationManifestResolveFailed", resourceCulture); - } - } - /// /// Looks up a localized string similar to Deployment manifest '{0}' references application manifest '{1}', but the file does not exist.. /// diff --git a/src/Sign.Core/Resources.resx b/src/Sign.Core/Resources.resx index b4999dc4..e1154c44 100644 --- a/src/Sign.Core/Resources.resx +++ b/src/Sign.Core/Resources.resx @@ -155,10 +155,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. {NumberedPlaceholder="{0}"} is a deployment manifest file path. {NumberedPlaceholder="{1}"} is the expected application manifest file path. diff --git a/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadResolver.cs b/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadResolver.cs index 039ab6d5..e9660412 100644 --- a/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadResolver.cs +++ b/src/Sign.Core/Tools/ClickOnce/ClickOncePayloadResolver.cs @@ -42,16 +42,11 @@ internal IReadOnlyList ResolveForDeployment( DirectoryInfo[] searchDirectories = PathsEqual(applicationDirectory.FullName, deploymentDirectory.FullName) ? new[] { applicationDirectory } : new[] { applicationDirectory, deploymentDirectory }; - DirectoryInfo[][] resolutionSearchDirectories = searchDirectories.Length == 1 - ? new[] { searchDirectories } - // Preserve diagnostics from the application-directory attempt before retrying with fallback. - : new[] { new[] { applicationDirectory }, searchDirectories }; return Resolve( applicationManifestFile, applicationManifest, searchDirectories, - resolutionSearchDirectories, mapFileExtensions ? PayloadLookupKind.Mapped : PayloadLookupKind.Unmapped, diagnostics); } @@ -69,7 +64,6 @@ internal IReadOnlyList ResolveForExplicitApplication( applicationManifestFile, applicationManifest, new[] { applicationManifestFile.Directory! }, - new[] { new[] { applicationManifestFile.Directory! } }, PayloadLookupKind.UnmappedThenMapped, diagnostics); } @@ -78,14 +72,12 @@ private IReadOnlyList Resolve( FileInfo applicationManifestFile, IApplicationManifest applicationManifest, DirectoryInfo[] searchDirectories, - DirectoryInfo[][] resolutionSearchDirectories, PayloadLookupKind lookupKind, ICollection diagnostics) { List references = GetPhysicalReferences(applicationManifest); - int diagnosticCount = 0; - AddDiagnostics(applicationManifest, diagnostics, ref diagnosticCount); + AddDiagnostics(applicationManifest, diagnostics); foreach (BaseReference reference in references) { @@ -96,40 +88,6 @@ private IReadOnlyList Resolve( diagnostics); } - try - { - using TargetOnlyResolutionScope resolutionScope = new(references); - - foreach (DirectoryInfo[] resolutionDirectories in resolutionSearchDirectories) - { - try - { - applicationManifest.ResolveFiles(resolutionDirectories); - } - catch (Exception exception) when ( - exception is IOException or - UnauthorizedAccessException or - ArgumentException) - { - AddDiagnostics(applicationManifest, diagnostics, ref diagnosticCount); - - throw new ClickOncePublishLayoutResolutionException( - string.Format( - CultureInfo.CurrentCulture, - Resources.ClickOnceApplicationManifestResolveFailed, - applicationManifestFile.FullName), - diagnostics, - exception); - } - - AddDiagnostics(applicationManifest, diagnostics, ref diagnosticCount); - } - } - finally - { - ClearResolvedPaths(applicationManifest); - } - List payloads = new(references.Count); foreach (BaseReference reference in references) @@ -194,24 +152,6 @@ NotSupportedException or return payloads; } - private static void ClearResolvedPaths(IApplicationManifest applicationManifest) - { - foreach (AssemblyReference reference in applicationManifest.AssemblyReferences) - { - reference.ResolvedPath = null; - } - - foreach (FileReference reference in applicationManifest.FileReferences) - { - reference.ResolvedPath = null; - } - - if (applicationManifest.EntryPoint is not null) - { - applicationManifest.EntryPoint.ResolvedPath = null; - } - } - private static List GetPhysicalReferences(IApplicationManifest applicationManifest) { List references = applicationManifest.AssemblyReferences @@ -364,17 +304,12 @@ exception is IOException or private static void AddDiagnostics( IClickOnceManifest manifest, - ICollection diagnostics, - ref int diagnosticCount) + ICollection diagnostics) { - IReadOnlyList manifestDiagnostics = manifest.Diagnostics; - - for (int i = diagnosticCount; i < manifestDiagnostics.Count; ++i) + foreach (ClickOnceManifestDiagnostic diagnostic in manifest.Diagnostics) { - diagnostics.Add(manifestDiagnostics[i]); + diagnostics.Add(diagnostic); } - - diagnosticCount = manifestDiagnostics.Count; } private static bool PathsEqual(string left, string right) @@ -391,55 +326,5 @@ private enum PayloadLookupKind Mapped, UnmappedThenMapped } - - private sealed class TargetOnlyResolutionScope : IDisposable - { - private readonly IReadOnlyList _states; - - internal TargetOnlyResolutionScope(IEnumerable references) - { - _states = references - .Distinct(ReferenceEqualityComparer.Instance) - .Select(reference => new ReferenceState(reference)) - .ToArray(); - - foreach (ReferenceState state in _states) - { - state.Reference.SourcePath = null; - - if (state.Reference is AssemblyReference assemblyReference) - { - assemblyReference.AssemblyIdentity = null; - } - } - } - - public void Dispose() - { - foreach (ReferenceState state in _states) - { - state.Reference.SourcePath = state.SourcePath; - - if (state.Reference is AssemblyReference assemblyReference) - { - assemblyReference.AssemblyIdentity = state.AssemblyIdentity; - } - } - } - - private sealed class ReferenceState - { - internal ReferenceState(BaseReference reference) - { - Reference = reference; - SourcePath = reference.SourcePath; - AssemblyIdentity = (reference as AssemblyReference)?.AssemblyIdentity; - } - - internal BaseReference Reference { get; } - internal string? SourcePath { get; } - internal AssemblyIdentity? AssemblyIdentity { get; } - } - } } } diff --git a/src/Sign.Core/xlf/Resources.cs.xlf b/src/Sign.Core/xlf/Resources.cs.xlf index 3f54f3f7..220256ac 100644 --- a/src/Sign.Core/xlf/Resources.cs.xlf +++ b/src/Sign.Core/xlf/Resources.cs.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.de.xlf b/src/Sign.Core/xlf/Resources.de.xlf index 4678e3b6..e05a2bcb 100644 --- a/src/Sign.Core/xlf/Resources.de.xlf +++ b/src/Sign.Core/xlf/Resources.de.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.es.xlf b/src/Sign.Core/xlf/Resources.es.xlf index 966bcbdc..acbe0606 100644 --- a/src/Sign.Core/xlf/Resources.es.xlf +++ b/src/Sign.Core/xlf/Resources.es.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.fr.xlf b/src/Sign.Core/xlf/Resources.fr.xlf index ab271e36..1dbc47fe 100644 --- a/src/Sign.Core/xlf/Resources.fr.xlf +++ b/src/Sign.Core/xlf/Resources.fr.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.it.xlf b/src/Sign.Core/xlf/Resources.it.xlf index 3bce7bb5..c0981af0 100644 --- a/src/Sign.Core/xlf/Resources.it.xlf +++ b/src/Sign.Core/xlf/Resources.it.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.ja.xlf b/src/Sign.Core/xlf/Resources.ja.xlf index cd18b469..0cdaf753 100644 --- a/src/Sign.Core/xlf/Resources.ja.xlf +++ b/src/Sign.Core/xlf/Resources.ja.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.ko.xlf b/src/Sign.Core/xlf/Resources.ko.xlf index 2508b521..eb6c7c10 100644 --- a/src/Sign.Core/xlf/Resources.ko.xlf +++ b/src/Sign.Core/xlf/Resources.ko.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.pl.xlf b/src/Sign.Core/xlf/Resources.pl.xlf index cbfb39d8..3e0d574c 100644 --- a/src/Sign.Core/xlf/Resources.pl.xlf +++ b/src/Sign.Core/xlf/Resources.pl.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.pt-BR.xlf b/src/Sign.Core/xlf/Resources.pt-BR.xlf index 1d8ec827..9918734b 100644 --- a/src/Sign.Core/xlf/Resources.pt-BR.xlf +++ b/src/Sign.Core/xlf/Resources.pt-BR.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.ru.xlf b/src/Sign.Core/xlf/Resources.ru.xlf index 7bc46f9f..cdcad61d 100644 --- a/src/Sign.Core/xlf/Resources.ru.xlf +++ b/src/Sign.Core/xlf/Resources.ru.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.tr.xlf b/src/Sign.Core/xlf/Resources.tr.xlf index 749812f8..0d9af859 100644 --- a/src/Sign.Core/xlf/Resources.tr.xlf +++ b/src/Sign.Core/xlf/Resources.tr.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.zh-Hans.xlf b/src/Sign.Core/xlf/Resources.zh-Hans.xlf index ee0009db..713ed6c1 100644 --- a/src/Sign.Core/xlf/Resources.zh-Hans.xlf +++ b/src/Sign.Core/xlf/Resources.zh-Hans.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/src/Sign.Core/xlf/Resources.zh-Hant.xlf b/src/Sign.Core/xlf/Resources.zh-Hant.xlf index 0475fe93..7ceebff2 100644 --- a/src/Sign.Core/xlf/Resources.zh-Hant.xlf +++ b/src/Sign.Core/xlf/Resources.zh-Hant.xlf @@ -57,11 +57,6 @@ Application manifest '{0}' references required file '{1}', but it could not be found. {NumberedPlaceholder="{0}"} is an application manifest file path. {NumberedPlaceholder="{1}"} is a referenced target path. - - Failed to resolve files referenced by application manifest '{0}'. - Failed to resolve files referenced by application manifest '{0}'. - {NumberedPlaceholder="{0}"} is an application manifest file path. - Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. Deployment manifest '{0}' references application manifest '{1}', but the file does not exist. To sign without updating ClickOnce manifest metadata, use '--clickonce-signing-version 2 --no-update-clickonce-manifest'. diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs index c3eaddc1..8afd91ee 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceDiagnosticOrderingTests.cs @@ -71,7 +71,7 @@ public void ApplicationManifestAdapter_AdaptsMultipleRealOutputMessagesInOrder() } [Fact] - public void DeploymentPublishLayoutResolver_WhenFallbackSucceeds_PreservesRealDeploymentThenApplicationDiagnosticOrder() + public void DeploymentPublishLayoutResolver_WhenFallbackSucceeds_PreservesDeploymentDiagnostic() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -101,20 +101,13 @@ public void DeploymentPublishLayoutResolver_WhenFallbackSucceeds_PreservesRealDe Assert.Equal( payload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); - Assert.Collection( - layout.Diagnostics, - diagnostic => - AssertDiagnostic( - diagnostic, - DeploymentWarningTargetPath), - diagnostic => - AssertDiagnostic( - diagnostic, - FallbackPayloadTargetPath)); + AssertDiagnostic( + Assert.Single(layout.Diagnostics), + DeploymentWarningTargetPath); } [Fact] - public void DeploymentPublishLayoutResolver_WhenFallbackCannotResolveEveryPayload_PreservesRealCrossManifestDiagnosticOrder() + public void DeploymentPublishLayoutResolver_WhenFallbackCannotResolveEveryPayload_PreservesDeploymentDiagnostic() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -148,24 +141,9 @@ public void DeploymentPublishLayoutResolver_WhenFallbackCannotResolveEveryPayloa MissingPayloadTargetPath, exception.Message, StringComparison.Ordinal); - Assert.Collection( - exception.Diagnostics, - diagnostic => - AssertDiagnostic( - diagnostic, - DeploymentWarningTargetPath), - diagnostic => - AssertDiagnostic( - diagnostic, - FallbackPayloadTargetPath), - diagnostic => - AssertDiagnostic( - diagnostic, - MissingPayloadTargetPath), - diagnostic => - AssertDiagnostic( - diagnostic, - MissingPayloadTargetPath)); + AssertDiagnostic( + Assert.Single(exception.Diagnostics), + DeploymentWarningTargetPath); } private static void AssertDiagnostic( diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionTests.cs index 55e15f9d..a446c0f9 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOncePublishLayoutResolutionTests.cs @@ -324,9 +324,7 @@ public void DeploymentPublishLayoutResolver_WhenPayloadIsMissingFromApplicationD Assert.Equal(expectedPayload.FullName, payload.Source.FullName); Assert.Equal(PayloadTargetPath, payload.TargetPath); Assert.False(payload.IsFileExtensionMapped); - ClickOnceManifestDiagnostic diagnostic = Assert.Single(layout.Diagnostics); - Assert.Equal(OutputMessageType.Error, diagnostic.Type); - Assert.Contains(PayloadTargetPath, diagnostic.Text, StringComparison.Ordinal); + Assert.Empty(layout.Diagnostics); } [Fact] @@ -371,9 +369,7 @@ public void DeploymentPublishLayoutResolver_WhenApplicationDirectoryPayloadProbe SharedPayloadFileName, inaccessiblePayloadPath), exception.Message); - Assert.Contains( - exception.Diagnostics, - diagnostic => diagnostic.Text.Contains(SharedPayloadFileName, StringComparison.Ordinal)); + Assert.Empty(exception.Diagnostics); } [Fact] @@ -418,9 +414,7 @@ public void DeploymentPublishLayoutResolver_WhenApplicationDirectoryPayloadProbe SharedPayloadFileName, failedPayloadPath), exception.Message); - Assert.Contains( - exception.Diagnostics, - diagnostic => diagnostic.Text.Contains(SharedPayloadFileName, StringComparison.Ordinal)); + Assert.Empty(exception.Diagnostics); } [Fact] @@ -466,9 +460,7 @@ public void DeploymentPublishLayoutResolver_WhenMappedApplicationDirectoryPayloa SharedPayloadFileName, failedPayloadPath), exception.Message); - Assert.Contains( - exception.Diagnostics, - diagnostic => diagnostic.Text.Contains(SharedPayloadFileName, StringComparison.Ordinal)); + Assert.Empty(exception.Diagnostics); } [Fact] @@ -1139,15 +1131,11 @@ public void DeploymentPublishLayoutResolver_WhenRequiredPayloadIsMissing_ThrowsW () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); - Assert.Contains( - exception.Diagnostics, - diagnostic => - diagnostic.Type == OutputMessageType.Error && - diagnostic.Text.Contains(PayloadTargetPath, StringComparison.Ordinal)); + Assert.Empty(exception.Diagnostics); } [Fact] - public void DeploymentPublishLayoutResolver_WhenApplicationResolutionProducesWarning_PreservesDiagnosticAndSucceeds() + public void DeploymentPublishLayoutResolver_WhenApplicationManifestHasDiagnostics_PreservesDiagnosticsAndSucceeds() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1173,7 +1161,11 @@ public void DeploymentPublishLayoutResolver_WhenApplicationResolutionProducesWar ApplicationManifest applicationModel = CreateApplicationManifest(); AddFileReference(applicationModel, payload.Name); - List applicationDiagnostics = new(); + List applicationDiagnostics = new() + { + CreateWarningDiagnostic(WarningOneTargetPath), + CreateWarningDiagnostic(WarningTwoTargetPath) + }; IApplicationManifest applicationManifest = Substitute.For(); @@ -1184,15 +1176,6 @@ public void DeploymentPublishLayoutResolver_WhenApplicationResolutionProducesWar applicationManifest.FileReferences.Returns( applicationModel.FileReferences); applicationManifest.Diagnostics.Returns(applicationDiagnostics); - applicationManifest - .When(manifest => manifest.ResolveFiles( - Arg.Any>())) - .Do(_ => - { - applicationDiagnostics.Add(CreateWarningDiagnostic(WarningOneTargetPath)); - applicationDiagnostics.Add(CreateWarningDiagnostic(WarningTwoTargetPath)); - }); - IClickOnceManifestReader manifestReader = Substitute.For(); @@ -1235,7 +1218,7 @@ public void DeploymentPublishLayoutResolver_WhenApplicationResolutionProducesWar } [Fact] - public void DeploymentPublishLayoutResolver_WhenApplicationResolutionRetries_PreservesEachDiagnosticOnceInOrder() + public void DeploymentPublishLayoutResolver_DoesNotResolveApplicationManifestDuringDiscovery() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1262,26 +1245,17 @@ public void DeploymentPublishLayoutResolver_WhenApplicationResolutionRetries_Pre ApplicationManifest applicationModel = CreateApplicationManifest(); AddFileReference(applicationModel, payload.Name); - List applicationDiagnostics = new(); IApplicationManifest applicationManifest = Substitute.For(); - int resolutionAttempt = 0; applicationManifest.AssemblyReferences.Returns(applicationModel.AssemblyReferences); applicationManifest.EntryPoint.Returns(applicationModel.EntryPoint); applicationManifest.FileReferences.Returns(applicationModel.FileReferences); - applicationManifest.Diagnostics.Returns(applicationDiagnostics); + applicationManifest.Diagnostics.Returns( + Array.Empty()); applicationManifest .When(manifest => manifest.ResolveFiles( Arg.Any>())) - .Do(_ => - { - ++resolutionAttempt; - applicationDiagnostics.Add( - CreateWarningDiagnostic( - resolutionAttempt == 1 - ? WarningOneTargetPath - : WarningTwoTargetPath)); - }); + .Do(_ => throw new InvalidOperationException()); IClickOnceManifestReader manifestReader = Substitute.For(); @@ -1308,20 +1282,10 @@ public void DeploymentPublishLayoutResolver_WhenApplicationResolutionRetries_Pre ResolvedClickOncePublishLayout layout = resolver.Resolve(deploymentManifestFile); - Assert.Equal(expected: 2, actual: resolutionAttempt); Assert.Equal(payload.FullName, Assert.Single(layout.Application.Payloads).Source.FullName); - Assert.Collection( - layout.Diagnostics, - diagnostic => - { - Assert.Equal(OutputMessageType.Warning, diagnostic.Type); - Assert.Contains(WarningOneTargetPath, diagnostic.Text, StringComparison.Ordinal); - }, - diagnostic => - { - Assert.Equal(OutputMessageType.Warning, diagnostic.Type); - Assert.Contains(WarningTwoTargetPath, diagnostic.Text, StringComparison.Ordinal); - }); + Assert.Empty(layout.Diagnostics); + applicationManifest.DidNotReceive().ResolveFiles( + Arg.Any>()); } [Fact] @@ -1408,9 +1372,7 @@ public void ApplicationPublishLayoutResolver_WhenExactPayloadProbeFails_DoesNotU PayloadFileName, inaccessiblePayloadPath), exception.Message); - Assert.Contains( - exception.Diagnostics, - diagnostic => diagnostic.Text.Contains(PayloadFileName, StringComparison.Ordinal)); + Assert.Empty(exception.Diagnostics); } [Fact] @@ -1495,7 +1457,7 @@ public void ApplicationPublishLayoutResolver_WhenManifestIsNotClickOnce_ReturnsF } [Fact] - public void ApplicationPublishLayoutResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() + public void ApplicationPublishLayoutResolver_WhenOptionalPayloadIsMissing_Throws() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1512,11 +1474,7 @@ public void ApplicationPublishLayoutResolver_WhenOptionalPayloadIsMissing_Throws () => _applicationPublishLayoutResolver.TryResolve(applicationManifest, out _)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); - Assert.Contains( - exception.Diagnostics, - diagnostic => - diagnostic.Type == OutputMessageType.Error && - diagnostic.Text.Contains(PayloadTargetPath, StringComparison.Ordinal)); + Assert.Empty(exception.Diagnostics); } [Fact] @@ -1543,7 +1501,7 @@ public void DeploymentPublishLayoutResolver_WhenOptionalPayloadHasNoTargetPath_T } [Fact] - public void DeploymentPublishLayoutResolver_WhenOptionalPayloadIsMissing_ThrowsWithDiagnostic() + public void DeploymentPublishLayoutResolver_WhenOptionalPayloadIsMissing_Throws() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1564,11 +1522,7 @@ public void DeploymentPublishLayoutResolver_WhenOptionalPayloadIsMissing_ThrowsW () => _deploymentPublishLayoutResolver.Resolve(deploymentManifest)); Assert.Contains(PayloadTargetPath, exception.Message, StringComparison.Ordinal); - Assert.Contains( - exception.Diagnostics, - diagnostic => - diagnostic.Type == OutputMessageType.Error && - diagnostic.Text.Contains(PayloadTargetPath, StringComparison.Ordinal)); + Assert.Empty(exception.Diagnostics); } [Fact] @@ -1868,7 +1822,7 @@ public void PayloadResolver_WhenAssemblyIdentityCompetesWithTargetPath_UsesTarge } [Fact] - public void PayloadResolver_DuringDiagnosticResolution_SuppressesAndRestoresCompetingHints() + public void PayloadResolver_DoesNotResolveManifestAndUsesTargetPath() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -1894,12 +1848,7 @@ public void PayloadResolver_DuringDiagnosticResolution_SuppressesAndRestoresComp applicationManifest .When(manifest => manifest.ResolveFiles( Arg.Any>())) - .Do(_ => - { - Assert.Null(reference.SourcePath); - Assert.Null(reference.AssemblyIdentity); - reference.ResolvedPath = "diagnostic-path.dll"; - }); + .Do(_ => throw new InvalidOperationException()); IReadOnlyList payloads = _payloadResolver.ResolveForExplicitApplication( applicationManifestFile, @@ -1910,6 +1859,8 @@ public void PayloadResolver_DuringDiagnosticResolution_SuppressesAndRestoresComp Assert.Equal(SourcePath, reference.SourcePath); Assert.Same(identity, reference.AssemblyIdentity); Assert.Equal(expectedPayload.FullName, reference.ResolvedPath); + applicationManifest.DidNotReceive().ResolveFiles( + Arg.Any>()); } [Fact] diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs index 7d86699c..5ce6fda4 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceResolutionFailureTests.cs @@ -39,7 +39,7 @@ public void Dispose() } [Fact] - public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPathAndPreservesDiagnostics() + public void PayloadResolver_DoesNotResolveManifestAndPreservesExistingDiagnostics() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -47,6 +47,10 @@ public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPa ClickOnceResolutionTestUtilities.CreateFile( root, ApplicationManifestFileName); + FileInfo payload = + ClickOnceResolutionTestUtilities.CreateFile( + root, + PayloadFileName); ApplicationManifest applicationModel = ClickOnceResolutionTestUtilities.CreateApplicationManifest(); AssemblyIdentity identity = new( @@ -62,10 +66,10 @@ public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPa applicationModel.AssemblyReferences.Add(reference); - List manifestDiagnostics = new(); ClickOnceManifestDiagnostic expectedDiagnostic = CreateWarningDiagnostic(); - IOException expectedException = new(); + List manifestDiagnostics = + new() { expectedDiagnostic }; IApplicationManifest applicationManifest = Substitute.For(); @@ -79,42 +83,26 @@ public void PayloadResolver_WhenResolveFilesThrows_RestoresHintsClearsResolvedPa applicationManifest .When(manifest => manifest.ResolveFiles( Arg.Any>())) - .Do(_ => - { - Assert.Null(reference.SourcePath); - Assert.Null(reference.AssemblyIdentity); - reference.ResolvedPath = "partial-resolved-path.dll"; - manifestDiagnostics.Add(expectedDiagnostic); - - throw expectedException; - }); + .Do(_ => throw new InvalidOperationException()); ClickOncePayloadResolver payloadResolver = new(); List diagnostics = new(); - ClickOncePublishLayoutResolutionException exception = - Assert.Throws( - () => payloadResolver.ResolveForExplicitApplication( - applicationManifestFile, - applicationManifest, - diagnostics)); + IReadOnlyList payloads = + payloadResolver.ResolveForExplicitApplication( + applicationManifestFile, + applicationManifest, + diagnostics); Assert.Equal(SourcePath, reference.SourcePath); Assert.Same(identity, reference.AssemblyIdentity); - Assert.Null(reference.ResolvedPath); - Assert.Equal( - string.Format( - CultureInfo.CurrentCulture, - Resources.ClickOnceApplicationManifestResolveFailed, - applicationManifestFile.FullName), - exception.Message); - Assert.Same(expectedException, exception.InnerException); - Assert.Same( - expectedDiagnostic, - Assert.Single(exception.Diagnostics)); + Assert.Equal(payload.FullName, reference.ResolvedPath); + Assert.Equal(payload.FullName, Assert.Single(payloads).Source.FullName); Assert.Same( expectedDiagnostic, Assert.Single(diagnostics)); + applicationManifest.DidNotReceive().ResolveFiles( + Arg.Any>()); } [Fact] diff --git a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs index 74e3e966..9198586e 100644 --- a/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs +++ b/test/Sign.Core.Test/Tools/ClickOnce/ClickOnceTargetPathCompatibilityTests.cs @@ -132,9 +132,7 @@ public void ExplicitApplicationPublishLayoutResolver_WithRelativeTargetPath_Pres Assert.Equal( expectedCandidate, Assert.Single(probeCandidates)); - AssertSearchPaths( - Assert.Single(resolutionSearches), - root.FullName); + Assert.Empty(resolutionSearches); } [Theory] @@ -218,17 +216,7 @@ public void DeploymentPublishLayoutResolver_WithRelativeTargetPath_PreservesTarg AssertSearchPaths( Assert.Single(deploymentResolutionSearches), root.FullName); - Assert.Collection( - applicationResolutionSearches, - directories => - AssertSearchPaths( - directories, - applicationManifestFile.DirectoryName!), - directories => - AssertSearchPaths( - directories, - applicationManifestFile.DirectoryName!, - root.FullName)); + Assert.Empty(applicationResolutionSearches); } [Theory] @@ -448,7 +436,7 @@ public void DeploymentPublishLayoutResolver_WithRootedEntryPointTargetPath_Rejec } [Fact] - public void DeploymentPublishLayoutResolver_WhenOnlyMappedPayloadExistsInDeploymentDirectory_UsesFallbackAndPreservesFirstAttemptDiagnostic() + public void DeploymentPublishLayoutResolver_WhenOnlyMappedPayloadExistsInDeploymentDirectory_UsesFallbackWithoutPreliminaryDiagnostic() { using TemporaryDirectory temporaryDirectory = new(_directoryService); DirectoryInfo root = temporaryDirectory.Directory; @@ -481,24 +469,7 @@ public void DeploymentPublishLayoutResolver_WhenOnlyMappedPayloadExistsInDeploym Assert.Equal(payload.FullName, entry.Source.FullName); Assert.Equal(PayloadFileName, entry.TargetPath); Assert.True(entry.IsFileExtensionMapped); - Assert.Collection( - layout.Diagnostics, - diagnostic => - { - Assert.Equal(OutputMessageType.Error, diagnostic.Type); - Assert.Contains( - PayloadFileName, - diagnostic.Text, - StringComparison.Ordinal); - }, - diagnostic => - { - Assert.Equal(OutputMessageType.Error, diagnostic.Type); - Assert.Contains( - PayloadFileName, - diagnostic.Text, - StringComparison.Ordinal); - }); + Assert.Empty(layout.Diagnostics); } private static IApplicationManifest CreateApplicationManifestSubstitute(