PR feedback

Author: JohnMcPMS

src/AppInstallerCLI.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36811.4 d17.14
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AppInstallerCLIPackage", "AppInstallerCLIPackage\AppInstallerCLIPackage.wapproj", "{6AA3791A-0713-4548-A357-87A323E7AC3A}"
 	ProjectSection(ProjectDependencies) = postProject

src/AppInstallerCLIE2ETests/DSCv3SourceResourceCommand.cs

@@ -489,7 +489,12 @@ private static void AssertExistingSourceResourceData(SourceResourceData output,
             Assert.IsNotNull(output);
             Assert.True(output.Exist);
             Assert.AreEqual(DefaultSourceName, output.Name);
-            Assert.AreEqual(argument, output.Argument);
+
+            if (argument != null)
+            {
+                Assert.AreEqual(argument, output.Argument);
+            }
+
             Assert.AreEqual(DefaultSourceType, output.Type);
 
             if (trustLevel != null)

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -3536,7 +3536,7 @@ An unlocalized JSON fragment will follow on another line.</comment>
     <comment>Column title for listing the new value.</comment>
   </data>
   <data name="SourcePriorityArgumentDescription" xml:space="preserve">
-    <value>Priority with higher numbers first</value>
+    <value>Priority; higher numbers first</value>
     <comment>This argument sets the numerical priority of the source. Higher values will be first in priority.</comment>
   </data>
   <data name="SourceListPriority" xml:space="preserve">

src/AppInstallerCLITests/Sources.cpp

@@ -388,12 +388,10 @@ TEST_CASE("RepoSources_ThreeSources", "[sources]")
     SetSetting(Stream::UserSources, s_ThreeSources);
     SetSetting(Stream::SourcesMetadata, s_ThreeSourcesMetadata);
 
-    std::vector<SourceDetails> sources = GetSources();
-    REQUIRE(sources.size() == 3);
-
-    const char* suffixUnsorted[3] = { "", "2", "3" };
-    const char* suffixPrioritySorted[3] = { "2", "3", "" };
-    const char** suffix = nullptr;
+    const char* suffixStrings[3] = { "", "2", "3" };
+    size_t suffixUnsorted[3] = { 0, 1, 2 };
+    size_t suffixPrioritySorted[3] = { 1, 2, 0 };
+    size_t* suffix = nullptr;
     std::unique_ptr<TestHook::SetSingleExperimentalFeature_Override> override;
 
     SECTION("Unsorted")
@@ -406,15 +404,20 @@ TEST_CASE("RepoSources_ThreeSources", "[sources]")
         suffix = suffixPrioritySorted;
     }
 
-    for (size_t i = 0; i < 3; ++i)
+    std::vector<SourceDetails> sources = GetSources();
+    REQUIRE(sources.size() == 3);
+
+    for (size_t index = 0; index < 3; ++index)
     {
-        INFO("Source #" << i);
-        REQUIRE(sources[i].Name == "testName"s + suffix[i]);
-        REQUIRE(sources[i].Type == "testType"s + suffix[i]);
-        REQUIRE(sources[i].Arg == "testArg"s + suffix[i]);
-        REQUIRE(sources[i].Data == "testData"s + suffix[i]);
-        REQUIRE(sources[i].LastUpdateTime == ConvertUnixEpochToSystemClock(i));
-        REQUIRE(sources[i].Origin == SourceOrigin::User);
+        size_t i = suffix[index];
+
+        INFO("Source #" << index << " [" << i << "]");
+        REQUIRE(sources[index].Name == "testName"s + suffixStrings[i]);
+        REQUIRE(sources[index].Type == "testType"s + suffixStrings[i]);
+        REQUIRE(sources[index].Arg == "testArg"s + suffixStrings[i]);
+        REQUIRE(sources[index].Data == "testData"s + suffixStrings[i]);
+        REQUIRE(sources[index].LastUpdateTime == ConvertUnixEpochToSystemClock(i));
+        REQUIRE(sources[index].Origin == SourceOrigin::User);
     }
 }
 

src/AppInstallerCLITests/TestSource.cpp

@@ -489,7 +489,10 @@ namespace TestCommon
 
     bool AddSource(const AppInstaller::Repository::SourceDetails& details, AppInstaller::IProgressCallback& progress)
     {
-        Repository::Source source{ details.Name, details.Arg, details.Type, Repository::SourceTrustLevel::None, {} };
+        Repository::SourceEdit additionalProperties;
+        additionalProperties.Explicit = details.Explicit;
+        additionalProperties.Priority = details.Priority;
+        Repository::Source source{ details.Name, details.Arg, details.Type, Repository::SourceTrustLevel::None, additionalProperties };
         return source.Add(progress);
     }
 

src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Cmdlets/AddSourceCmdlet.cs

@@ -42,9 +42,16 @@ public sealed class AddSourceCmdlet : PSCmdlet
         [Parameter(
             ValueFromPipeline = true,
             ValueFromPipelineByPropertyName = true)]
+#if AICLI_DISABLE_TEST_HOOKS
         [ValidateSet(
             "Microsoft.Rest",
             "Microsoft.PreIndexed.Package")]
+#else
+        [ValidateSet(
+            "Microsoft.Rest",
+            "Microsoft.PreIndexed.Package",
+            "Microsoft.Test.Configurable")]
+#endif
         public string Type { get; set; }
 
         /// <summary>

src/PowerShell/tests/Microsoft.WinGet.Client.Tests.ps1

@@ -504,6 +504,9 @@ Describe 'Install-WinGetPackage Source Priority' {
     }
 
     It 'Install higher Priority' {
+        $ogSettings = @{ experimentalFeatures= @{sourcePriority=$true}}
+        SetWinGetSettingsHelper $ogSettings
+
         RemoveTestSource
         Add-WinGetSource -Name 'TestSource' -Arg 'https://localhost:5001/TestKit/' -Priority 1
         Add-WinGetSource -Name 'dummyPackageSource' -Type 'Microsoft.Test.Configurable' -Arg '{"ContainsPackage":true}'
@@ -523,14 +526,15 @@ Describe 'Install-WinGetPackage Source Priority' {
     }
 
     AfterEach {
-        Remove-WinGetSource  -Name 'dummyPackageSource'
-        RemoveTestSource
-        
         $testExe = Get-WinGetPackage -Id AppInstallerTest.TestExeInstaller -MatchOption Equals
         if ($testExe.Count -gt 0)
         {
             Uninstall-WinGetPackage -Id AppInstallerTest.TestExeInstaller 
         }
+
+        Remove-WinGetSource  -Name 'dummyPackageSource'
+        RemoveTestSource
+        RestoreWinGetSettings
     }
 }
 

src/PowerShell/tests/Microsoft.WinGet.DSC.Tests.ps1

@@ -130,6 +130,8 @@ Describe 'WinGetUserSettings' {
 
 Describe 'WinGetSource' {
     BeforeAll {
+        InvokeWinGetDSC -Name WinGetUserSettings -Method Set -Property @{ Settings = @{ experimentalFeatures = @{ sourcePriority = $true } } }
+
         $testSourceName = 'TestSource'
         $testSourceArg = 'https://localhost:5001/TestKit/'
         $testSourceType = 'Microsoft.PreIndexed.Package'