Merge branch 'hotfix/3.4.2'

* hotfix/3.4.2: (#46) Fix use of BasePath throwing exception (#46) Fix incorrect variable used as lock directory base (build) Starhing building 3.4.2 on new hotfix branch
chocolatey · Aug 2, 2023 · 98878d8 · 98878d8
2 parents daf48dd + d73a6a8
commit 98878d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/build/config.props b/build/config.props
@@ -14,7 +14,7 @@
     <!-- when changing any of the NuGetVersion props below, run tools-local\ship-public-apis -->
     <MajorNuGetVersion Condition="'$(MajorNuGetVersion)' == ''">3</MajorNuGetVersion>
     <MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">4</MinorNuGetVersion>
-    <PatchNuGetVersion Condition="'$(PatchNuGetVersion)' == ''">1</PatchNuGetVersion>
+    <PatchNuGetVersion Condition="'$(PatchNuGetVersion)' == ''">2</PatchNuGetVersion>
     <SemanticVersion Condition=" '$(SemanticVersion)' == '' ">$(MajorNuGetVersion).$(MinorNuGetVersion).$(PatchNuGetVersion)</SemanticVersion>
 
     <!-- ** Change for each new preview/rc -->

diff --git a/src/NuGet.Core/NuGet.Common/ConcurrencyUtilities.cs b/src/NuGet.Core/NuGet.Common/ConcurrencyUtilities.cs
@@ -36,7 +36,10 @@ public async static Task<T> ExecuteWithFileLockedAsync<T>(string filePath,
             CancellationToken token,
             string lockFileDirectoryPath)
         {
-            var originalBasePath = BasePath;
+            // We use the field here, as the BasePath variable
+            // will try to create a lock file, even if the path is not writable by the current user.
+            string originalBasePath = _basePath;
+
             BasePath = lockFileDirectoryPath;
 
             try

diff --git a/src/NuGet.Core/NuGet.Packaging/PackageExtractor.cs b/src/NuGet.Core/NuGet.Packaging/PackageExtractor.cs
@@ -389,7 +389,7 @@ public static async Task<bool> InstallFromSourceAsync(
                 // Start - Chocolatey Specific Modification
                 //////////////////////////////////////////////////////////
 
-                var lockDirectory = Path.GetDirectoryName(targetNupkg) ?? Environment.CurrentDirectory;
+                var lockDirectory = Path.GetDirectoryName(targetPath) ?? Environment.CurrentDirectory;
 
                 //////////////////////////////////////////////////////////
                 // End - Chocolatey Specific Modification
@@ -645,7 +645,7 @@ public static async Task<bool> InstallFromSourceAsync(
                 // Start - Chocolatey Specific Modification
                 //////////////////////////////////////////////////////////
 
-                var lockDirectory = Path.GetDirectoryName(targetNupkg) ?? Environment.CurrentDirectory;
+                var lockDirectory = Path.GetDirectoryName(targetPath) ?? Environment.CurrentDirectory;
 
                 //////////////////////////////////////////////////////////
                 // End - Chocolatey Specific Modification