Merge pull request #8379 from dotnet/darc-release/9.0.1xx-rc2-3d93700…

…3-2b64-41ce-8fbe-9930ebb89ae0

[release/9.0.1xx-rc2] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -19,14 +19,14 @@
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24408.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24466.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
+ <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
  </Dependency>
  <!-- Intermediate is necessary for source build. -->
- <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24408.2">
+ <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24466.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
+ <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
  <Dependency Name="System.Formats.Asn1" Version="8.0.1">

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;

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}";

eng/common/core-templates/job/job.yml

@@ -33,11 +33,6 @@ parameters:
  artifactPublishSteps: []
  runAsPublic: false
 
-# Sbom related params
- enableSbom: true
- PackageVersion: 9.0.0
- BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
-
 # 1es specific parameters
  is1ESPipeline: ''
 

eng/common/internal/Tools.csproj

@@ -4,6 +4,7 @@
  <PropertyGroup>
  <TargetFramework>net472</TargetFramework>
  <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
+ <BuildWithNetFrameworkHostedCompiler>false</BuildWithNetFrameworkHostedCompiler>
  </PropertyGroup>
  <ItemGroup>
  <!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->

eng/common/templates-official/job/job.yml

@@ -1,8 +1,22 @@
+parameters:
+# Sbom related params
+ enableSbom: true
+ PackageVersion: 9.0.0
+ BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+
 jobs:
 - template: /eng/common/core-templates/job/job.yml
  parameters:
  is1ESPipeline: true
 
+ componentGovernanceSteps:
+ - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
+ - template: /eng/common/templates/steps/generate-sbom.yml
+ parameters:
+ PackageVersion: ${{ parameters.packageVersion }}
+ BuildDropPath: ${{ parameters.buildDropPath }}
+ publishArtifacts: false
+
  # publish artifacts
  # for 1ES managed templates, use the templateContext.output to handle multiple outputs.
  templateContext:

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 }}

eng/common/templates/job/job.yml

@@ -19,71 +19,63 @@ jobs:
  steps:
  - ${{ each step in parameters.steps }}:
  - ${{ step }}
- 
+
  componentGovernanceSteps:
- - template: /eng/common/templates/steps/component-governance.yml
- parameters:
- ${{ if eq(parameters.disableComponentGovernance, '') }}:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
- disableComponentGovernance: false
- ${{ else }}:
- disableComponentGovernance: true
+ - template: /eng/common/templates/steps/component-governance.yml
+ parameters:
+ ${{ if eq(parameters.disableComponentGovernance, '') }}:
+ ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
+ disableComponentGovernance: false
  ${{ else }}:
- disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
- componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
-
- - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
- - template: /eng/common/templates/steps/generate-sbom.yml
- parameters:
- PackageVersion: ${{ parameters.packageVersion }}
- BuildDropPath: ${{ parameters.buildDropPath }}
- publishArtifacts: false
-
+ disableComponentGovernance: true
+ ${{ else }}:
+ disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
+ componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
 
  artifactPublishSteps:
- - ${{ if ne(parameters.artifacts.publish, '') }}:
- - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
- - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- parameters:
- is1ESPipeline: false
- args:
- displayName: Publish pipeline artifacts
- pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
- publishLocation: Container
- artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
- continueOnError: true
- condition: always()
- - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
- - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
- parameters:
- is1ESPipeline: false
- args:
- targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log'
- artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
- displayName: 'Publish logs'
- continueOnError: true
- condition: always()
- sbomEnabled: false # we don't need SBOM for logs
-
- - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
+ - ${{ if ne(parameters.artifacts.publish, '') }}:
+ - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
  - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
  parameters:
  is1ESPipeline: false
  args:
- displayName: Publish Logs
- pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
+ displayName: Publish pipeline artifacts
+ pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
  publishLocation: Container
- artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
+ artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
  continueOnError: true
  condition: always()
-
- - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
+ - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
  - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
  parameters:
  is1ESPipeline: false
  args:
- targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
- artifactName: 'BuildConfiguration'
- displayName: 'Publish build retry configuration'
+ targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log'
+ artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
+ displayName: 'Publish logs'
  continueOnError: true
- sbomEnabled: false # we don't need SBOM for BuildConfiguration
+ condition: always()
+ sbomEnabled: false # we don't need SBOM for logs
+
+ - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
+ - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
+ parameters:
+ is1ESPipeline: false
+ args:
+ displayName: Publish Logs
+ pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
+ publishLocation: Container
+ artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
+ continueOnError: true
+ condition: always()
+
+ - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
+ - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+ parameters:
+ is1ESPipeline: false
+ args:
+ targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
+ artifactName: 'BuildConfiguration'
+ displayName: 'Publish build retry configuration'
+ continueOnError: true
+ sbomEnabled: false # we don't need SBOM for BuildConfiguration

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 }}

global.json

@@ -1,8 +1,8 @@
 {
  "tools": {
- "dotnet": "9.0.100-preview.5.24307.3"
+ "dotnet": "9.0.100-rc.1.24452.12"
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2"
  }
 }

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();
+ }
  }
  }