Add parameter to search in custom nuget seource when resolving curren…

…t sf package (#143) * Add parameter to search in custom nuget seource when resolving current sf package * Bump version
Sitefinity · Jun 18, 2021 · 681456a · 681456a
1 parent f38975e
commit 681456a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Sitefinity CLI/Commands/UpgradeCommand.cs b/Sitefinity CLI/Commands/UpgradeCommand.cs
@@ -131,7 +131,7 @@ protected virtual async Task ExecuteUpgrade()
                 }
             }
 
-            await this.GenerateUpgradeConfig(sitefinityProjectFilePaths, newSitefinityPackage);
+            await this.GenerateUpgradeConfig(sitefinityProjectFilePaths, newSitefinityPackage, packageSources);
 
             var updaterPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, Constants.SitefinityUpgradePowershellFolderName, "Updater.ps1");
             this.visualStudioWorker.Initialize(this.SolutionPath);
@@ -278,7 +278,7 @@ private string ReadAllTextFromFile(string path)
             }
         }
 
-        private async Task GenerateUpgradeConfig(IEnumerable<string> projectFilePaths, NuGetPackage newSitefinityVersionPackageTree)
+        private async Task GenerateUpgradeConfig(IEnumerable<string> projectFilePaths, NuGetPackage newSitefinityVersionPackageTree, IEnumerable<string> packageSources)
         {
             this.logger.LogInformation("Exporting upgrade config...");
 
@@ -288,15 +288,15 @@ private async Task GenerateUpgradeConfig(IEnumerable<string> projectFilePaths, N
 
             foreach (string projectFilePath in projectFilePaths)
             {
-                await this.GenerateProjectUpgradeConfigSection(powerShellXmlConfig, powerShellXmlConfigNode, projectFilePath, newSitefinityVersionPackageTree);
+                await this.GenerateProjectUpgradeConfigSection(powerShellXmlConfig, powerShellXmlConfigNode, projectFilePath, newSitefinityVersionPackageTree, packageSources);
             }
 
             powerShellXmlConfig.Save(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Constants.SitefinityUpgradePowershellFolderName, "config.xml"));
 
             this.logger.LogInformation("Successfully exported upgrade config!");
         }
 
-        private async Task GenerateProjectUpgradeConfigSection(XmlDocument powerShellXmlConfig, XmlElement powerShellXmlConfigNode, string projectFilePath, NuGetPackage newSitefinityVersionPackageTree)
+        private async Task GenerateProjectUpgradeConfigSection(XmlDocument powerShellXmlConfig, XmlElement powerShellXmlConfigNode, string projectFilePath, NuGetPackage newSitefinityVersionPackageTree, IEnumerable<string> packageSources)
         {
             XmlElement projectNode = powerShellXmlConfig.CreateElement("project");
             XmlAttribute projectNameAttribute = powerShellXmlConfig.CreateAttribute("name");
@@ -315,7 +315,7 @@ private async Task GenerateProjectUpgradeConfigSection(XmlDocument powerShellXml
             this.logger.LogInformation($"Detected sitefinity version for '{projectFilePath}' - '{currentSitefinityVersion}'.");
 
             this.logger.LogInformation($"Collecting Sitefinity NuGet package tree for '{projectFilePath}'...");
-            NuGetPackage currentSitefinityVersionPackageTree = await this.sitefinityPackageManager.GetSitefinityPackageTree(currentSitefinityVersion.ToString());
+            NuGetPackage currentSitefinityVersionPackageTree = await this.sitefinityPackageManager.GetSitefinityPackageTree(currentSitefinityVersion.ToString(), packageSources);
 
             this.processedPackagesPerProjectCache[projectFilePath] = new HashSet<string>();
             if (!this.TryAddPackageTreeToProjectUpgradeConfigSection(powerShellXmlConfig, projectNode, projectFilePath, currentSitefinityVersionPackageTree, newSitefinityVersionPackageTree))

diff --git a/Sitefinity CLI/Sitefinity CLI.csproj b/Sitefinity CLI/Sitefinity CLI.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>sf</AssemblyName>
     <RootNamespace>Sitefinity_CLI</RootNamespace>
-    <AssemblyVersion>1.1.0.21</AssemblyVersion>
+    <AssemblyVersion>1.1.0.22</AssemblyVersion>
     <Version>1.1.0</Version>
-    <FileVersion>1.1.0.21</FileVersion>
+    <FileVersion>1.1.0.22</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
   </PropertyGroup>