Merge branch 'main' into wasi_socket

dotnet · Aug 29, 2024 · f8c2ff3 · f8c2ff3
2 parents 7330d07 + e1851a5
commit f8c2ff3
Show file tree

Hide file tree

Showing 987 changed files with 10,910 additions and 6,009 deletions.
diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -587,6 +587,7 @@
  <AdditionalProperties Condition="'%(ProjectToBuild.Category)' == 'tools'">%(AdditionalProperties);Configuration=$(ToolsConfiguration)</AdditionalProperties>
 
  <!-- Propagate configurations for cross-subset builds -->
+ <AdditionalProperties>%(AdditionalProperties);RuntimeConfiguration=$(RuntimeConfiguration)</AdditionalProperties>
  <AdditionalProperties>%(AdditionalProperties);LibrariesConfiguration=$(LibrariesConfiguration)</AdditionalProperties>
  <AdditionalProperties>%(AdditionalProperties);HostConfiguration=$(HostConfiguration)</AdditionalProperties>
  <AdditionalProperties>%(AdditionalProperties);TasksConfiguration=$(TasksConfiguration)</AdditionalProperties>

diff --git a/eng/install-native-dependencies.sh b/eng/install-native-dependencies.sh
@@ -23,14 +23,14 @@ case "$os" in
  if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
  apt update
 
- apt install -y build-essential gettext locales cmake llvm clang lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
+ apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
  libssl-dev libkrb5-dev zlib1g-dev
 
  localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
  elif [ "$ID" = "fedora" ]; then
  dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel
  elif [ "$ID" = "alpine" ]; then
- apk add build-base cmake bash curl clang llvm-dev krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev
+ apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev
  else
  echo "Unsupported distro. distro: $ID"
  exit 1

diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -78,13 +78,13 @@ jobs:
  - name: runtimeFlavorArgs
  value: '-nativeaot'
 
- - name: testTreeFilterArg
+ - name: testFilterArg
  value: ''
 
  # Only build GCSimulator tests when the gc-simulator group is specified.
  - ${{ if eq(parameters.testGroup, 'gc-simulator') }}:
- - name: testTreeFilterArg
- value: 'tree GC/Scenarios/GCSimulator'
+ - name: testFilterArg
+ value: 'test GC/Scenarios/GC-simulator.csproj'
 
  - template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
  parameters:
@@ -110,7 +110,7 @@ jobs:
  displayName: Disk Usage before Build
 
  # Build managed test components
- - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testTreeFilterArg) ci /p:TargetOS=AnyOS
+ - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testFilterArg) ci /p:TargetOS=AnyOS
  displayName: Build managed test components
 
  - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}:

diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -119,13 +119,13 @@ jobs:
  - name: LogNamePrefix
  value: TestRunLogs_R2R_CG2_HotColdSplitting
 
- - name: testTreeFilterArg
+ - name: testFilterArg
  value: ''
 
  # Only build GCSimulator tests when the gc-simulator group is specified.
  - ${{ if eq(parameters.testGroup, 'gc-simulator') }}:
- - name: testTreeFilterArg
- value: 'tree GC/Scenarios/GCSimulator'
+  - name: testFilterArg
+  value: 'test GC/Scenarios/GC-simulator.csproj'
 
  - template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
  parameters:
@@ -232,7 +232,7 @@ jobs:
  # and directly unzip them there after download). Unfortunately the logic to copy
  # the native artifacts to the final test folders is dependent on availability of the
  # managed test artifacts. This step also generates the final test execution scripts.
- - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) copynativeonly $(logRootNameArg)Native $(testTreeFilterArg) $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(priorityArg) $(librariesOverrideArg) $(codeFlowEnforcementArg)
+ - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) copynativeonly $(logRootNameArg)Native $(testFilterArg) $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(priorityArg) $(librariesOverrideArg) $(codeFlowEnforcementArg)
  displayName: Copy native test components to test output folder
 
 
@@ -609,28 +609,29 @@ jobs:
  displayName: 'Upload artifacts SuperPMI $(CollectionName)-$(CollectionType) collection'
  condition: always()
 
- # Add authenticated pip feed
- - task: PipAuthenticate@1
- displayName: 'Pip Authenticate'
- inputs:
- artifactFeeds: public/dotnet-public-pypi
- onlyAddExtraIndex: false
- condition: always()
+ - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ # Add authenticated pip feed
+ - task: PipAuthenticate@1
+ displayName: 'Pip Authenticate'
+ inputs:
+ artifactFeeds: public/dotnet-public-pypi
+ onlyAddExtraIndex: false
+ condition: always()
 
- # Ensure the Python azure-storage-blob package is installed before doing the upload.
- - script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall && $(PipScript) install azure.identity==1.16.1 --force-reinstall
- displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
- condition: always()
+  # Ensure the Python azure-storage-blob package is installed before doing the upload.
+  - script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall && $(PipScript) install azure.identity==1.16.1 --force-reinstall
+  displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
+  condition: always()
 
- - task: AzureCLI@2
- displayName: 'Upload SuperPMI $(CollectionName)-$(CollectionType) collection to Azure Storage'
- inputs:
- azureSubscription: 'superpmi-collect-rw'
- scriptType: 'pscore'
- scriptLocation: 'inlineScript'
- inlineScript: |
- $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch $(archType) -build_type $(buildConfig) -mch_files $(MergedMchFileLocation)$(CollectionName).$(CollectionType).$(MchFileTag).mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)
- condition: always()
+  - task: AzureCLI@2
+  displayName: 'Upload SuperPMI $(CollectionName)-$(CollectionType) collection to Azure Storage'
+  inputs:
+  azureSubscription: 'superpmi-collect-rw'
+  scriptType: 'pscore'
+  scriptLocation: 'inlineScript'
+  inlineScript: |
+  $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch $(archType) -build_type $(buildConfig) -mch_files $(MergedMchFileLocation)$(CollectionName).$(CollectionType).$(MchFileTag).mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)
+  condition: always()
 
  - task: CopyFiles@2
  displayName: Copying superpmi.log of all partitions