[main] Update dependencies from dotnet/arcade (#8308)

dotnet-maestro[bot] · v-wuzhai · web-flow · commit 806e55c3cc64 · 2024-08-23T07:32:12.000-07:00
* Update dependencies from https://github.com/dotnet/arcade build 20240820.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24416.2 -> To Version 9.0.0-beta.24420.6 * Update dependencies from https://github.com/dotnet/arcade build 20240821.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24420.6 -> To Version 9.0.0-beta.24421.2 * Use ReaderWriterLockSlim * Update dependencies from https://github.com/dotnet/arcade build 20240821.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24421.2 -> To Version 9.0.0-beta.24421.7 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -19,14 +19,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24416.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24421.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
+      <Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24416.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24421.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
+      <Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.Formats.Asn1" Version="8.0.1">
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
     AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
 }
 
-$dotnetVersions = @('5','6','7','8')
+$dotnetVersions = @('5','6','7','8','9')
 
 foreach ($dotnetVersion in $dotnetVersions) {
     $feedPrefix = "dotnet" + $dotnetVersion;
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
     PackageSources+=('dotnet3.1-internal-transport')
 fi
 
-DotNetVersions=('5' '6' '7' '8')
+DotNetVersions=('5' '6' '7' '8' '9')
 
 for DotNetVersion in ${DotNetVersions[@]} ; do
     FeedPrefix="dotnet${DotNetVersion}";
diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml
@@ -4,4 +4,4 @@ steps:
     is1ESPipeline: true
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml
@@ -4,4 +4,4 @@ steps:
     is1ESPipeline: false
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/global.json b/global.json
@@ -1,8 +1,8 @@
 {
   "tools": {
-    "dotnet": "9.0.100-preview.5.24307.3"
+    "dotnet": "9.0.100-preview.7.24407.12"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.7"
   }
 }
diff --git a/src/Microsoft.TemplateEngine.Utils/InMemoryFileSystem.cs b/src/Microsoft.TemplateEngine.Utils/InMemoryFileSystem.cs
@@ -771,7 +771,7 @@ public FileSystemDirectory(string name, string fullPath)
 
         private class FileSystemFile
         {
-            private readonly object _sync = new();
+            private readonly ReaderWriterLockSlim _lock = new();
             private byte[] _data;
             private int _currentReaders;
             private int _currentWriters;
@@ -798,15 +798,31 @@ public Stream OpenRead()
                     throw new IOException("File is currently locked for writing");
                 }
 
-                lock (_sync)
+                _lock.EnterReadLock();
+                try
                 {
                     if (_currentWriters > 0)
                     {
                         throw new IOException("File is currently locked for writing");
                     }
 
                     ++_currentReaders;
-                    return new DisposingStream(new MemoryStream(_data, false), () => { lock (_sync) { --_currentReaders; } });
+                    return new DisposingStream(new MemoryStream(_data, false), () =>
+                            {
+                                _lock.EnterWriteLock();
+                                try
+                                {
+                                    --_currentReaders;
+                                }
+                                finally
+                                {
+                                    _lock.ExitWriteLock();
+                                }
+                            });
+                }
+                finally
+                {
+                    _lock.ExitReadLock();
                 }
             }
 
@@ -822,7 +838,8 @@ public Stream OpenWrite()
                     throw new IOException("File is currently locked for writing");
                 }
 
-                lock (_sync)
+                _lock.EnterWriteLock();
+                try
                 {
                     if (_currentReaders > 0)
                     {
@@ -838,16 +855,25 @@ public Stream OpenWrite()
                     MemoryStream target = new();
                     return new DisposingStream(target, () =>
                     {
-                        lock (_sync)
+                        _lock.EnterWriteLock();
+                        try
                         {
                             --_currentWriters;
                             _data = new byte[target.Length];
                             target.Position = 0;
                             _ = target.Read(_data, 0, _data.Length);
                             LastWriteTimeUtc = DateTime.UtcNow;
                         }
+                        finally
+                        {
+                            _lock.ExitWriteLock();
+                        }
                     });
                 }
+                finally
+                {
+                    _lock.ExitWriteLock();
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {`
`157`	`157`	`AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password`
`158`	`158`	`}`
`159`	`159`
`160`		`-$dotnetVersions = @('5','6','7','8')`
	`160`	`+$dotnetVersions = @('5','6','7','8','9')`
`161`	`161`
`162`	`162`	`foreach ($dotnetVersion in $dotnetVersions) {`
`163`	`163`	`$feedPrefix = "dotnet" + $dotnetVersion;`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"tools": {`
`3`		`- "dotnet": "9.0.100-preview.5.24307.3"`
	`3`	`+ "dotnet": "9.0.100-preview.7.24407.12"`
`4`	`4`	`},`
`5`	`5`	`"msbuild-sdks": {`
`6`		`- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2"`
	`6`	`+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.7"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ public FileSystemDirectory(string name, string fullPath)`
`771`	`771`
`772`	`772`	`private class FileSystemFile`
`773`	`773`	`{`
`774`		`- private readonly object _sync = new();`
	`774`	`+ private readonly ReaderWriterLockSlim _lock = new();`
`775`	`775`	`private byte[] _data;`
`776`	`776`	`private int _currentReaders;`
`777`	`777`	`private int _currentWriters;`
`@@ -798,15 +798,31 @@ public Stream OpenRead()`
`798`	`798`	`throw new IOException("File is currently locked for writing");`
`799`	`799`	`}`
`800`	`800`
`801`		`- lock (_sync)`
	`801`	`+ _lock.EnterReadLock();`
	`802`	`+ try`
`802`	`803`	`{`
`803`	`804`	`if (_currentWriters > 0)`
`804`	`805`	`{`
`805`	`806`	`throw new IOException("File is currently locked for writing");`
`806`	`807`	`}`
`807`	`808`
`808`	`809`	`++_currentReaders;`
`809`		`- return new DisposingStream(new MemoryStream(_data, false), () => { lock (_sync) { --_currentReaders; } });`
	`810`	`+ return new DisposingStream(new MemoryStream(_data, false), () =>`
	`811`	`+ {`
	`812`	`+ _lock.EnterWriteLock();`
	`813`	`+ try`
	`814`	`+ {`
	`815`	`+ --_currentReaders;`
	`816`	`+ }`
	`817`	`+ finally`
	`818`	`+ {`
	`819`	`+ _lock.ExitWriteLock();`
	`820`	`+ }`
	`821`	`+ });`
	`822`	`+ }`
	`823`	`+ finally`
	`824`	`+ {`
	`825`	`+ _lock.ExitReadLock();`
`810`	`826`	`}`
`811`	`827`	`}`
`812`	`828`
`@@ -822,7 +838,8 @@ public Stream OpenWrite()`
`822`	`838`	`throw new IOException("File is currently locked for writing");`
`823`	`839`	`}`
`824`	`840`
`825`		`- lock (_sync)`
	`841`	`+ _lock.EnterWriteLock();`
	`842`	`+ try`
`826`	`843`	`{`
`827`	`844`	`if (_currentReaders > 0)`
`828`	`845`	`{`
`@@ -838,16 +855,25 @@ public Stream OpenWrite()`
`838`	`855`	`MemoryStream target = new();`
`839`	`856`	`return new DisposingStream(target, () =>`
`840`	`857`	`{`
`841`		`- lock (_sync)`
	`858`	`+ _lock.EnterWriteLock();`
	`859`	`+ try`
`842`	`860`	`{`
`843`	`861`	`--_currentWriters;`
`844`	`862`	`_data = new byte[target.Length];`
`845`	`863`	`target.Position = 0;`
`846`	`864`	`_ = target.Read(_data, 0, _data.Length);`
`847`	`865`	`LastWriteTimeUtc = DateTime.UtcNow;`
`848`	`866`	`}`
	`867`	`+ finally`
	`868`	`+ {`
	`869`	`+ _lock.ExitWriteLock();`
	`870`	`+ }`
`849`	`871`	`});`
`850`	`872`	`}`
	`873`	`+ finally`
	`874`	`+ {`
	`875`	`+ _lock.ExitWriteLock();`
	`876`	`+ }`
`851`	`877`	`}`
`852`	`878`	`}`
`853`	`879`