Skip to content

Add missing ReturnResponseUrl to WinGetUtilInterop manifest #5035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yao-msft merged 1 commit into from
Dec 4, 2024
Merged

Add missing ReturnResponseUrl to WinGetUtilInterop manifest #5035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/WinGetUtilInterop.UnitTests/ManifestUnitTest/V1ManifestReadTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ private void ValidateManifestFields(Manifest manifest, TestManifestVersion manif

Assert.True(manifest.DisplayInstallWarnings);
Assert.True(manifest.DownloadCommandProhibited);

Assert.Equal("https://defaultReturnResponseUrl.com", manifest.ExpectedReturnCodes[0].ReturnResponseUrl);
}

if (manifestVersion >= TestManifestVersion.V170)
Expand Down Expand Up @@ -373,6 +375,8 @@ private void ValidateManifestFields(Manifest manifest, TestManifestVersion manif

Assert.True(installer1.DisplayInstallWarnings);
Assert.True(installer1.DownloadCommandProhibited);

Assert.Equal("https://returnResponseUrl.com", installer1.ExpectedReturnCodes[0].ReturnResponseUrl);
}

if (manifestVersion >= TestManifestVersion.V170)
Expand Down
1 change: 0 additions & 1 deletion src/WinGetUtilInterop.UnitTests/TestCollateral/V1_1ManifestMerged.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ ExpectedReturnCodes:
ReturnResponse: contactSupport
- InstallerReturnCode: 3
ReturnResponse: custom
ReturnResponseUrl: https://defaultReturnResponseUrl.com
FileExtensions:
- appx
- msix
Expand Down
11 changes: 6 additions & 5 deletions src/WinGetUtilInterop.UnitTests/TestCollateral/V1_6ManifestMerged.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ Markets:
- US
ExpectedReturnCodes:
- InstallerReturnCode: 2
ReturnResponse: contactSupport
ReturnResponse: contactSupport
ReturnResponseUrl: https://defaultReturnResponseUrl.com
- InstallerReturnCode: 3
ReturnResponse: custom
ReturnResponseUrl: https://defaultReturnResponseUrl.com
UnsupportedArguments:
- log
NestedInstallerType: msi
Expand Down Expand Up @@ -225,8 +225,9 @@ Installers:
ExcludedMarkets:
- "US"
ExpectedReturnCodes:
- InstallerReturnCode: 2
ReturnResponse: contactSupport
- InstallerReturnCode: 2
ReturnResponse: contactSupport
ReturnResponseUrl: https://returnResponseUrl.com
DownloadCommandProhibited: true
InstallationMetadata:
DefaultInstallLocation: "%ProgramFiles%\\TestApp"
Expand All @@ -242,4 +243,4 @@ Installers:
InstallerType: exe
ProductCode: '{Bar}'
ManifestType: merged
ManifestVersion: 1.6.0
ManifestVersion: 1.6.0
11 changes: 6 additions & 5 deletions src/WinGetUtilInterop.UnitTests/TestCollateral/V1_7ManifestMerged.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ Markets:
- US
ExpectedReturnCodes:
- InstallerReturnCode: 2
ReturnResponse: contactSupport
ReturnResponse: contactSupport
ReturnResponseUrl: https://defaultReturnResponseUrl.com
- InstallerReturnCode: 3
ReturnResponse: custom
ReturnResponseUrl: https://defaultReturnResponseUrl.com
UnsupportedArguments:
- log
NestedInstallerType: msi
Expand Down Expand Up @@ -228,8 +228,9 @@ Installers:
ExcludedMarkets:
- "US"
ExpectedReturnCodes:
- InstallerReturnCode: 2
ReturnResponse: contactSupport
- InstallerReturnCode: 2
ReturnResponse: contactSupport
ReturnResponseUrl: https://returnResponseUrl.com
DownloadCommandProhibited: true
RepairBehavior: modify
InstallationMetadata:
Expand All @@ -246,4 +247,4 @@ Installers:
InstallerType: exe
ProductCode: '{Bar}'
ManifestType: merged
ManifestVersion: 1.7.0
ManifestVersion: 1.7.0
9 changes: 5 additions & 4 deletions src/WinGetUtilInterop.UnitTests/TestCollateral/V1_9ManifestMerged.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ Markets:
- US
ExpectedReturnCodes:
- InstallerReturnCode: 2
ReturnResponse: contactSupport
ReturnResponse: contactSupport
ReturnResponseUrl: https://defaultReturnResponseUrl.com
- InstallerReturnCode: 3
ReturnResponse: custom
ReturnResponseUrl: https://defaultReturnResponseUrl.com
UnsupportedArguments:
- log
NestedInstallerType: msi
Expand Down Expand Up @@ -229,8 +229,9 @@ Installers:
ExcludedMarkets:
- "US"
ExpectedReturnCodes:
- InstallerReturnCode: 2
ReturnResponse: contactSupport
- InstallerReturnCode: 2
ReturnResponse: contactSupport
ReturnResponseUrl: https://returnResponseUrl.com
DownloadCommandProhibited: true
ArchiveBinariesDependOnPath: false
RepairBehavior: modify
Expand Down
11 changes: 8 additions & 3 deletions src/WinGetUtilInterop/Manifest/V1/InstallerExpectedReturnCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// <copyright file="InstallerExpectedReturnCode.cs" company="Microsoft Corporation">
// Copyright (c) Microsoft Corporation. Licensed under the MIT License.
// </copyright>
Expand All @@ -19,6 +19,11 @@ public class InstallerExpectedReturnCode
/// <summary>
/// Gets or sets the corresponding response category.
/// </summary>
public string ReturnResponse { get; set; }
public string ReturnResponse { get; set; }

/// <summary>
/// Gets or sets the corresponding response url.
/// </summary>
public string ReturnResponseUrl { get; set; }
}
}
}
Loading