fix remaining

yao-msft · Nov 3, 2023 · abe58c3 · abe58c3
1 parent 7585e34
commit abe58c3
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/src/AppInstallerCLICore/ConfigurationWingetDscModuleUnitValidation.cpp b/src/AppInstallerCLICore/ConfigurationWingetDscModuleUnitValidation.cpp
@@ -350,7 +350,7 @@ namespace AppInstaller::CLI::Configuration
                        {
                            if (!package.Version.empty())
                            {
-                               auto versionKeys = searchResult.Matches.at(0).Package->GetAvailableVersionKeys();
+                               auto versionKeys = searchResult.Matches.at(0).Package->GetAvailableVersionKeys(Repository::PinBehavior::IgnorePins);
                                bool foundVersion = false;
                                for (auto const& versionKey : versionKeys)
                                {

diff --git a/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp b/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp
@@ -1401,7 +1401,7 @@ namespace AppInstaller::CLI::Workflow
             auto moduleName = Utility::ConvertToUTF8(unit.Details().ModuleName());
             if (Utility::CaseInsensitiveEquals(wingetUnitValidator.ModuleName(), moduleName))
             {
-                auto result = wingetUnitValidator.ValidateConfigurationSetUnit(context, unit);
+                bool result = wingetUnitValidator.ValidateConfigurationSetUnit(context, unit);
                 if (!result)
                 {
                     foundIssues = true;

diff --git a/src/AppInstallerCLIE2ETests/ConfigureValidateCommand.cs b/src/AppInstallerCLIE2ETests/ConfigureValidateCommand.cs
@@ -260,7 +260,7 @@ public void ValidateWinGetDscResource_PackageNotFound()
         [Test]
         public void ValidateWinGetDscResource_PackageVersionNotFound()
         {
-            var result = TestCommon.RunAICLICommand(Command, TestCommon.GetTestDataFile("Configuration\\inGetDscResourceValidate_PackageVersionNotFound.yml"), timeOut: 120000);
+            var result = TestCommon.RunAICLICommand(Command, TestCommon.GetTestDataFile("Configuration\\WinGetDscResourceValidate_PackageVersionNotFound.yml"), timeOut: 120000);
             Assert.AreEqual(Constants.ErrorCode.S_FALSE, result.ExitCode);
             Assert.True(result.StdOut.Contains("WinGetPackage configuration unit package cannot be validated. Package version not found. Package Id: AppInstallerTest.TestExeInstaller; Version 101.0.101.0"));
         }

diff --git a/...rCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_DependencySourceMissing.yml b/...rCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_DependencySourceMissing.yml
@@ -9,5 +9,5 @@ properties:
       settings:
         id: AppInstallerTest.TestExeInstaller
         source: TestSource
-        version: 1.0.1.0
+        version: "1.0.1.0"
 
diff --git a/src/AppInstallerCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_Good.yml b/src/AppInstallerCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_Good.yml
@@ -20,5 +20,5 @@ properties:
       settings:
         id: AppInstallerTest.TestExeInstaller
         source: TestSource
-        version: 1.0.1.0
+        version: "1.0.1.0"
 
diff --git a/...InstallerCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_PackageNotFound.yml b/...InstallerCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_PackageNotFound.yml
@@ -20,5 +20,5 @@ properties:
       settings:
         id: AppInstallerTest.DoesNotExist
         source: TestSource
-        version: 1.0.1.0
+        version: "1.0.1.0"
 
diff --git a/...erCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_PackageVersionNotFound.yml b/...erCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_PackageVersionNotFound.yml
@@ -20,5 +20,5 @@ properties:
       settings:
         id: AppInstallerTest.TestExeInstaller
         source: TestSource
-        version: 101.0.101.0
+        version: "101.0.101.0"
 
diff --git a/...nstallerCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_SourceOpenFailed.yml b/...nstallerCLIE2ETests/TestData/Configuration/WinGetDscResourceValidate_SourceOpenFailed.yml
@@ -20,5 +20,5 @@ properties:
       settings:
         id: AppInstallerTest.TestExeInstaller
         source: TestSourceV2
-        version: 1.0.1.0
+        version: "1.0.1.0"
 
diff --git a/...a/Configuration/WinGetDscResourceValidate_VersionSpecifiedWithOnlyOneVersionAvailable.yml b/...a/Configuration/WinGetDscResourceValidate_VersionSpecifiedWithOnlyOneVersionAvailable.yml
@@ -20,5 +20,5 @@ properties:
       settings:
         id: AppInstallerTest.TestValidManifest
         source: TestSource
-        version: 1.0.0.0
+        version: "1.0.0.0"
 
diff --git a/...ETests/TestData/Configuration/WinGetDscResourceValidate_VersionSpecifiedWithUseLatest.yml b/...ETests/TestData/Configuration/WinGetDscResourceValidate_VersionSpecifiedWithUseLatest.yml
@@ -20,6 +20,6 @@ properties:
       settings:
         id: AppInstallerTest.TestExeInstaller
         source: TestSource
-        version: 1.0.1.0
+        version: "1.0.1.0"
         useLatest: true
 
diff --git a/src/LocalhostWebServer/Run-LocalhostWebServer.ps1 b/src/LocalhostWebServer/Run-LocalhostWebServer.ps1
@@ -51,4 +51,4 @@ if (-not [System.String]::IsNullOrEmpty($sourceCert))
 
 cd $BuildRoot
 
-Start-Process -FilePath "LocalhostWebServer.exe" -ArgumentList "StaticFileRoot=$StaticFileRoot CertPath=$CertPath CertPassword=$CertPassword OutCertFile=$OutCertFile LocalSourceJson=$LocalSourceJson TestDataPath=$TestDaaPath"
+Start-Process -FilePath "LocalhostWebServer.exe" -ArgumentList "StaticFileRoot=$StaticFileRoot CertPath=$CertPath CertPassword=$CertPassword OutCertFile=$OutCertFile LocalSourceJson=$LocalSourceJson TestDataPath=$TestDataPath"