Skip to content

Commit f8c2ff3

Browse files
committed
Merge branch 'main' into wasi_socket
2 parents 7330d07 + e1851a5 commit f8c2ff3

File tree

987 files changed

+10910
-6009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

987 files changed

+10910
-6009
lines changed

eng/Subsets.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,7 @@
587587
<AdditionalProperties Condition="'%(ProjectToBuild.Category)' == 'tools'">%(AdditionalProperties);Configuration=$(ToolsConfiguration)</AdditionalProperties>
588588

589589
<!-- Propagate configurations for cross-subset builds -->
590+
<AdditionalProperties>%(AdditionalProperties);RuntimeConfiguration=$(RuntimeConfiguration)</AdditionalProperties>
590591
<AdditionalProperties>%(AdditionalProperties);LibrariesConfiguration=$(LibrariesConfiguration)</AdditionalProperties>
591592
<AdditionalProperties>%(AdditionalProperties);HostConfiguration=$(HostConfiguration)</AdditionalProperties>
592593
<AdditionalProperties>%(AdditionalProperties);TasksConfiguration=$(TasksConfiguration)</AdditionalProperties>

eng/install-native-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ case "$os" in
2323
if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
2424
apt update
2525

26-
apt install -y build-essential gettext locales cmake llvm clang lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
26+
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
2727
libssl-dev libkrb5-dev zlib1g-dev
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
3030
elif [ "$ID" = "fedora" ]; then
3131
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel
3232
elif [ "$ID" = "alpine" ]; then
33-
apk add build-base cmake bash curl clang llvm-dev krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev
33+
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev
3434
else
3535
echo "Unsupported distro. distro: $ID"
3636
exit 1

eng/pipelines/common/templates/runtimes/build-test-job.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ jobs:
7878
- name: runtimeFlavorArgs
7979
value: '-nativeaot'
8080

81-
- name: testTreeFilterArg
81+
- name: testFilterArg
8282
value: ''
8383

8484
# Only build GCSimulator tests when the gc-simulator group is specified.
8585
- ${{ if eq(parameters.testGroup, 'gc-simulator') }}:
86-
- name: testTreeFilterArg
87-
value: 'tree GC/Scenarios/GCSimulator'
86+
- name: testFilterArg
87+
value: 'test GC/Scenarios/GC-simulator.csproj'
8888

8989
- template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
9090
parameters:
@@ -110,7 +110,7 @@ jobs:
110110
displayName: Disk Usage before Build
111111
112112
# Build managed test components
113-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testTreeFilterArg) ci /p:TargetOS=AnyOS
113+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testFilterArg) ci /p:TargetOS=AnyOS
114114
displayName: Build managed test components
115115

116116
- ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}:

eng/pipelines/common/templates/runtimes/run-test-job.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ jobs:
119119
- name: LogNamePrefix
120120
value: TestRunLogs_R2R_CG2_HotColdSplitting
121121

122-
- name: testTreeFilterArg
122+
- name: testFilterArg
123123
value: ''
124124

125125
# Only build GCSimulator tests when the gc-simulator group is specified.
126126
- ${{ if eq(parameters.testGroup, 'gc-simulator') }}:
127-
- name: testTreeFilterArg
128-
value: 'tree GC/Scenarios/GCSimulator'
127+
- name: testFilterArg
128+
value: 'test GC/Scenarios/GC-simulator.csproj'
129129

130130
- template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
131131
parameters:
@@ -232,7 +232,7 @@ jobs:
232232
# and directly unzip them there after download). Unfortunately the logic to copy
233233
# the native artifacts to the final test folders is dependent on availability of the
234234
# managed test artifacts. This step also generates the final test execution scripts.
235-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) copynativeonly $(logRootNameArg)Native $(testTreeFilterArg) $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(priorityArg) $(librariesOverrideArg) $(codeFlowEnforcementArg)
235+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) copynativeonly $(logRootNameArg)Native $(testFilterArg) $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(priorityArg) $(librariesOverrideArg) $(codeFlowEnforcementArg)
236236
displayName: Copy native test components to test output folder
237237

238238

@@ -609,28 +609,29 @@ jobs:
609609
displayName: 'Upload artifacts SuperPMI $(CollectionName)-$(CollectionType) collection'
610610
condition: always()
611611

612-
# Add authenticated pip feed
613-
- task: PipAuthenticate@1
614-
displayName: 'Pip Authenticate'
615-
inputs:
616-
artifactFeeds: public/dotnet-public-pypi
617-
onlyAddExtraIndex: false
618-
condition: always()
612+
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
613+
# Add authenticated pip feed
614+
- task: PipAuthenticate@1
615+
displayName: 'Pip Authenticate'
616+
inputs:
617+
artifactFeeds: public/dotnet-public-pypi
618+
onlyAddExtraIndex: false
619+
condition: always()
619620

620-
# Ensure the Python azure-storage-blob package is installed before doing the upload.
621-
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall && $(PipScript) install azure.identity==1.16.1 --force-reinstall
622-
displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
623-
condition: always()
621+
# Ensure the Python azure-storage-blob package is installed before doing the upload.
622+
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall && $(PipScript) install azure.identity==1.16.1 --force-reinstall
623+
displayName: Upgrade Pip to latest and install azure-storage-blob and azure-identity Python packages
624+
condition: always()
624625

625-
- task: AzureCLI@2
626-
displayName: 'Upload SuperPMI $(CollectionName)-$(CollectionType) collection to Azure Storage'
627-
inputs:
628-
azureSubscription: 'superpmi-collect-rw'
629-
scriptType: 'pscore'
630-
scriptLocation: 'inlineScript'
631-
inlineScript: |
632-
$(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)
633-
condition: always()
626+
- task: AzureCLI@2
627+
displayName: 'Upload SuperPMI $(CollectionName)-$(CollectionType) collection to Azure Storage'
628+
inputs:
629+
azureSubscription: 'superpmi-collect-rw'
630+
scriptType: 'pscore'
631+
scriptLocation: 'inlineScript'
632+
inlineScript: |
633+
$(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)
634+
condition: always()
634635

635636
- task: CopyFiles@2
636637
displayName: Copying superpmi.log of all partitions

0 commit comments

Comments
 (0)