44using System ;
55using System . Diagnostics ;
66using System . IO ;
7- using System . Threading ;
7+ #if ! NET7_0_OR_GREATER
88using NuGet . Common ;
9+ #endif
910
1011namespace NuGet . Protocol . Core . Types
1112{
@@ -18,6 +19,7 @@ public class SourceCacheContext : IDisposable
1819 /// Path of temp folder if requested by GeneratedTempFolder
1920 /// </summary>
2021 private string ? _generatedTempFolder ;
22+ private readonly object _generatedTempFolderLock = new object ( ) ;
2123
2224 /// <summary>
2325 /// Default amount of time to cache version lists.
@@ -97,19 +99,30 @@ public virtual string GeneratedTempFolder
9799 {
98100 get
99101 {
100- if ( _generatedTempFolder == null )
102+ lock ( _generatedTempFolderLock )
101103 {
102- var newTempFolder = Path . Combine (
103- NuGetEnvironment . GetFolderPath ( NuGetFolderPath . Temp ) ,
104- Guid . NewGuid ( ) . ToString ( ) ) ;
104+ if ( _generatedTempFolder == null )
105+ {
106+ #if NET7_0_OR_GREATER
107+ _generatedTempFolder = Directory . CreateTempSubdirectory ( "NuGet-" ) . FullName ;
108+ #else
109+ _generatedTempFolder = Path . Combine (
110+ NuGetEnvironment . GetFolderPath ( NuGetFolderPath . Temp ) ,
111+ Guid . NewGuid ( ) . ToString ( ) ) ;
112+ #endif
113+ }
105114
106- Interlocked . CompareExchange ( ref _generatedTempFolder , newTempFolder , comparand : null ) ;
115+ return _generatedTempFolder ;
107116 }
108-
109- return _generatedTempFolder ;
110117 }
111118
112- set => Interlocked . CompareExchange ( ref _generatedTempFolder , value , comparand : null ) ;
119+ set
120+ {
121+ lock ( _generatedTempFolderLock )
122+ {
123+ _generatedTempFolder ??= value ;
124+ }
125+ }
113126 }
114127
115128 public bool IgnoreFailedSources { get ; set ; }
@@ -128,7 +141,10 @@ public virtual SourceCacheContext Clone()
128141 RefreshMemoryCache = RefreshMemoryCache ,
129142 SessionId = SessionId
130143 } ;
131- clone . _generatedTempFolder = _generatedTempFolder ;
144+ lock ( _generatedTempFolderLock )
145+ {
146+ clone . _generatedTempFolder = _generatedTempFolder ;
147+ }
132148 return clone ;
133149 }
134150
@@ -154,7 +170,11 @@ public void Dispose()
154170
155171 protected virtual void Dispose ( bool disposing )
156172 {
157- var currentTempFolder = Interlocked . CompareExchange ( ref _generatedTempFolder , value : null , comparand : null ) ;
173+ string ? currentTempFolder ;
174+ lock ( _generatedTempFolderLock )
175+ {
176+ currentTempFolder = _generatedTempFolder ;
177+ }
158178
159179 if ( currentTempFolder != null )
160180 {
0 commit comments