commit 2a749eb7de4d1d6350e8fa4de544e85cba2717bc
parent c6650aa2fbb5688a8e1a418e15d470069d454e0f
Author: Chacón <lechacon@users.noreply.github.com>
Date: Mon, 13 Dec 2021 15:35:36 -0800
Fix some build warnings (#1794)
Diffstat:
5 files changed, 70 insertions(+), 73 deletions(-)
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
@@ -22,6 +22,7 @@ appxmanifest
appxrecipe
appxsdk
APSTUDIO
+archs
argc
args
argv
diff --git a/src/AppInstallerCLICore/Workflows/WorkflowBase.cpp b/src/AppInstallerCLICore/Workflows/WorkflowBase.cpp
@@ -318,7 +318,6 @@ namespace AppInstaller::CLI::Workflow
return;
}
-
context << HandleSourceAgreements(source);
if (context.IsTerminated())
{
diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
@@ -472,7 +472,7 @@
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Good-DefaultExpectedReturnCodeInInstallerSuccessCodes.yaml">
<DeploymentContent>true</DeploymentContent>
- </CopyFileToFolders>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Encoding-ANSI.yaml">
<DeploymentContent>true</DeploymentContent>
</CopyFileToFolders>
diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
@@ -192,12 +192,18 @@
<None Include="Run-TestsInPackage.ps1" />
</ItemGroup>
<ItemGroup>
+ <CopyFileToFolders Include="TestData\Manifest-Bad-AppsAndFeaturesEntriesOnMSIX.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Bad-ArchInvalid.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Bad-ArchMissing.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Bad-Channel-NotSupported.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Bad-DifferentCase-camelCase.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
@@ -267,15 +273,24 @@
<CopyFileToFolders Include="TestData\Manifest-Bad-InvalidManifestVersionValue.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Bad-InvalidUpdateBehavior.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Bad-LicenseMissing.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Bad-NameMissing.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Bad-PackageFamilyNameOnMSI.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Bad-PublisherMissing.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Bad-ProductCodeOnMSIX.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Bad-Sha256Invalid.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
@@ -303,6 +318,36 @@
<CopyFileToFolders Include="TestData\Manifest-Bad-VersionMissing.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Encoding-ANSI.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF8.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16LE-BOM.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF8-BOM.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16BE.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16BE-BOM.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16LE.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Good.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Good-AllDependencyTypes.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Good-DefaultExpectedReturnCodeInInstallerSuccessCodes.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Good-InstallerTypeExeRoot-Silent.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
@@ -333,9 +378,15 @@
<CopyFileToFolders Include="TestData\Manifest-Good-MultiLocale.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Good-Spaces.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Manifest-Good-Switches.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
+ <CopyFileToFolders Include="TestData\Manifest-Good-SystemReferenceComplex.yaml">
+ <Filter>TestData</Filter>
+ </CopyFileToFolders>
<CopyFileToFolders Include="TestData\index.1.0.0.0.msix">
<Filter>TestData</Filter>
</CopyFileToFolders>
@@ -345,9 +396,6 @@
<CopyFileToFolders Include="TestData\TestSignedApp.msix">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Good.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
<CopyFileToFolders Include="TestData\InstallFlowTest_NoApplicableArchitecture.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
@@ -384,67 +432,40 @@
<CopyFileToFolders Include="TestData\InstallerArgTest_Inno_NoSwitches.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Good-Spaces.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Encoding-ANSI.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF8.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16LE-BOM.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF8-BOM.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16BE.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16BE-BOM.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Encoding-UTF16LE.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Good-SystemReferenceComplex.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Bad-PackageFamilyNameOnMSI.yaml">
+ <CopyFileToFolders Include="TestData\UpdateFlowTest_Exe.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Bad-ProductCodeOnMSIX.yaml">
+ <CopyFileToFolders Include="TestData\UpdateFlowTest_Exe_2.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Bad-AppsAndFeaturesEntriesOnMSIX.yaml">
+ <CopyFileToFolders Include="TestData\UpdateFlowTest_Exe_2_LicenseAgreement.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Bad-InvalidUpdateBehavior.yaml">
+ <CopyFileToFolders Include="TestData\UpdateFlowTest_ExeDependencies.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\UpdateFlowTest_Exe.yaml">
+ <CopyFileToFolders Include="TestData\UpdateFlowTest_Msix.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\UpdateFlowTest_Exe.yaml">
+ <CopyFileToFolders Include="TestData\UpdateFlowTest_Msix_LicenseAgreement.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\UpdateFlowTest_Exe_2_LicenseAgreement.yaml">
+ <CopyFileToFolders Include="TestData\ImportFile-Good.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\UpdateFlowTest_Msix.yaml">
+ <CopyFileToFolders Include="TestData\ImportFile-Good-AlreadyInstalled.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\UpdateFlowTest_Msix_LicenseAgreement.yaml">
+ <CopyFileToFolders Include="TestData\ImportFile-Good-WithLicenseAgreement.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\ImportFile-Good.json">
+ <CopyFileToFolders Include="TestData\ImportFile-Good-Dependencies.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\ImportFile-Good-AlreadyInstalled.json">
+ <CopyFileToFolders Include="TestData\ImportFile-Good-MachineScope.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\ImportFile-Good-WithLicenseAgreement.json">
+ <CopyFileToFolders Include="TestData\ImportFile-Bad-Invalid.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\ImportFile-Bad-Malformed.json">
@@ -459,9 +480,6 @@
<CopyFileToFolders Include="TestData\ImportFile-Bad-UnknownSource.json">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\ImportFile-Bad-Invalid.json">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
<CopyFileToFolders Include="TestData\InputNames.txt">
<Filter>TestData</Filter>
</CopyFileToFolders>
@@ -490,41 +508,20 @@
<Filter>TestData\MultiFileManifestV1</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\MultiFileManifestV1_1\ManifestV1_1-MultiFile-DefaultLocale.yaml">
- <Filter>TestData\MultiFileManifestV1</Filter>
+ <Filter>TestData\MultiFileManifestV1_1</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\MultiFileManifestV1_1\ManifestV1_1-MultiFile-Installer.yaml">
- <Filter>TestData\MultiFileManifestV1</Filter>
+ <Filter>TestData\MultiFileManifestV1_1</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\MultiFileManifestV1_1\ManifestV1_1-MultiFile-Locale.yaml">
- <Filter>TestData\MultiFileManifestV1</Filter>
+ <Filter>TestData\MultiFileManifestV1_1</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\MultiFileManifestV1_1\ManifestV1_1-MultiFile-Version.yaml">
- <Filter>TestData\MultiFileManifestV1</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Bad-Channel-NotSupported.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\UpdateFlowTest_Exe_2.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\ImportFile-Good-MachineScope.json">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Good-AllDependencyTypes.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\Manifest-Good-DefaultExpectedReturnCodeInInstallerSuccessCodes.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
- <CopyFileToFolders Include="TestData\ImportFile-Good-Dependencies.json">
- <Filter>TestData</Filter>
+ <Filter>TestData\MultiFileManifestV1_1</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="TestData\Installer_Exe_Dependencies.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
- <CopyFileToFolders Include="TestData\UpdateFlowTest_ExeDependencies.yaml">
- <Filter>TestData</Filter>
- </CopyFileToFolders>
<CopyFileToFolders Include="TestData\Installer_Msix_WFDependency.yaml">
<Filter>TestData</Filter>
</CopyFileToFolders>
diff --git a/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj b/src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj
@@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.16.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
- <PackageReference Include="Microsoft.Msix.Utils" Version="1.0.200918001" />
+ <PackageReference Include="Microsoft.Msix.Utils" Version="2.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Moq" Version="4.15.2" />
<PackageReference Include="xunit" Version="2.4.0" />
