Remove zip installer type from 1.0 and 1.1 manifests #3006
Conversation
|
Holey smokes, I didn’t see they were implemented so many places! Thanks for catching my miss |
Nah, that's my mistake. I didn't realize the tests also were also affected. |
| @@ -4,14 +4,10 @@ Version: 1.7.32 | |||
| Publisher: Microsoft | |||
| License: MIT License | |||
| Description: A complex system reference test file. | |||
| InstallerType: Zip | |||
| InstallerType: EXE | |||
There was a problem hiding this comment.
Nit: You use inconsistent case (EXE vs exe) on these
There was a problem hiding this comment.
I changed all the installer types in this test manifest to lowercase to match other yamls.
| - InstallerType: Zip | ||
| Arch: x86 | ||
| Url: https://rubengustorage.blob.core.windows.net/publiccontainer/msixsdkx86.zip | ||
| Sha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82 |
There was a problem hiding this comment.
I'm assuming you made sure that we don't lose coverage by removing this?
There was a problem hiding this comment.
Yes, the v1.4 manifest tests cover this scenario and ensure that fields from the root get passed to the installer if they are not defined.
| REQUIRE(installer1.Scope == ScopeEnum::User); | ||
| REQUIRE(installer1.PackageFamilyName == ""); | ||
| REQUIRE(installer1.ProductCode == ""); | ||
| REQUIRE(installer1.ProductCode == "{Foo}"); |
There was a problem hiding this comment.
I think for the older manifests, fields were not passed to the zip installer but that behavior has since changed. Since I changed the installertype to EXE, the productCode specified from the root is now being passed to the installer node.
|
|
||
| // MSIX installer does inherit | ||
| REQUIRE(manifest.Installers[1].BaseInstallerType == InstallerTypeEnum::Msix); |
There was a problem hiding this comment.
It's probably not worth changing, but we could do something like
auto& installer = manifest.Installer[0];
REQUIRE(installer.BaseInstallerType == InstallerTypeEnum::Msix);
...
so that we don't have to change the index in all places. Though I doubt we'll have to do it again...
There was a problem hiding this comment.
Changed to suggested so that we never have to think about this again :)
Continuation of #2996
Removes zip installer type from 1.0 and 1.1 manifests as zip is not supported until 1.4 client.
Also fixes the unit tests accordingly so that they do not rely on the zip installertype.
Microsoft Reviewers: Open in CodeFlow