Merge branch 'release/3.802.0'

VirtoCommerce · Jun 6, 2024 · acdfd54 · acdfd54
2 parents ace98b4 + eea2aed
commit acdfd54
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,7 +6,7 @@
     <Copyright>Copyright © VirtoCommerce 2011-2022</Copyright>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>3.801.0</VersionPrefix>
+    <VersionPrefix>3.802.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.Build/Build.cs b/src/VirtoCommerce.Build/Build.cs
@@ -191,7 +191,7 @@ public static Solution Solution
     protected static GitRepository GitRepository => GitRepository.FromLocalDirectory(RootDirectory / ".git");
 
     protected static AbsolutePath SourceDirectory => RootDirectory / "src";
-    protected static bool IsPlatformSource => SourceDirectory.Exists();
+    protected static bool IsPlatformSource => Directory.Exists(Path.Combine(SourceDirectory, "VirtoCommerce.Platform.Web"));
     protected static AbsolutePath TestsDirectory => RootDirectory / "tests";
     protected static AbsolutePath SamplesDirectory => RootDirectory / "samples";
 
@@ -272,7 +272,7 @@ protected static TelemetryClient TelemetryClient
     private static string GetSafeCmdArguments()
     {
         var safeArgs = EnvironmentInfo.CommandLineArguments.Join(" ");
-        foreach(var arg in EnvironmentInfo.CommandLineArguments.Where(a => TokenArguments.Contains(a.Replace("-", ""), StringComparer.InvariantCultureIgnoreCase)))
+        foreach (var arg in EnvironmentInfo.CommandLineArguments.Where(a => TokenArguments.Contains(a.Replace("-", ""), StringComparer.InvariantCultureIgnoreCase)))
         {
             var argValue = EnvironmentInfo.GetNamedArgument<string>(arg);
             safeArgs = safeArgs.Replace(argValue, "***");
@@ -302,10 +302,14 @@ protected override void OnTargetFailed(string target)
         .Before(Restore)
         .Executes(() =>
         {
-            List<AbsolutePath> ignorePaths = [WebProject.Directory / "modules"];
-            if (ThereAreCustomApps)
+            var ignorePaths = new List<AbsolutePath>();
+            if (WebProject != null)
             {
-                ignorePaths.Add(WebProject.Directory / "App");
+                ignorePaths.Add(WebProject.Directory / "modules");
+                if (ThereAreCustomApps)
+                {
+                    ignorePaths.Add(WebProject.Directory / "App");
+                }
             }
 
             CleanSolution(cleanSearchPattern, ignorePaths.ToArray());

diff --git a/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs b/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs
@@ -46,6 +46,13 @@ internal partial class Build
 
         [Parameter("Azure PAT")]
         public static string AzureToken { get; set; }
+
+        [Parameter("Azure PAT for the Universal Packages")]
+        public static string AzureUniversalPackagesPat { get; set; }
+
+        [Parameter("Azure Blob SAS Token")]
+        public static string AzureSasToken { get; set; }
+
         [Parameter("GitLab Token")]
         public static string GitLabToken { get; set; }
 
@@ -495,9 +502,9 @@ private static ManifestModuleInfo LoadModuleInfo(ModuleItem module, ManifestModu
         private static ModuleInstallerBase GetModuleInstaller(ModuleSource moduleSource) => moduleSource switch
         {
             AzurePipelineArtifacts => new AzurePipelineArtifactsModuleInstaller(AzureToken, GetDiscoveryPath()),
-            AzureUniversalPackages => new AzureUniversalPackagesModuleInstaller(AzureToken, GetDiscoveryPath()),
+            AzureUniversalPackages => new AzureUniversalPackagesModuleInstaller(AzureUniversalPackagesPat ?? AzureToken, GetDiscoveryPath()),
             GithubPrivateRepos => new GithubPrivateModulesInstaller(GitHubToken, GetDiscoveryPath()),
-            AzureBlob _ => new AzureBlobModuleInstaller(AzureToken, GetDiscoveryPath()),
+            AzureBlob _ => new AzureBlobModuleInstaller(AzureSasToken ?? AzureToken, GetDiscoveryPath()),
             GitlabJobArtifacts _ => new GitlabJobArtifactsModuleInstaller(GitLabServer, GitLabToken, GetDiscoveryPath()),
             Local _ => new LocalModuleInstaller(GetDiscoveryPath()),
             _ => throw new NotImplementedException("Unknown module source"),