From 2faed88f320090c6cae2da276be8309947576a57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 11 Sep 2022 00:48:11 +0000 Subject: [PATCH] [main] Update dependencies from 7 repositories (#75055) [main] Update dependencies from 7 repositories - Support LLVM 14.x - Fix LLVMOrcError issue, it was renamed to LLVMOrcShared See https://github.com/llvm/llvm-project/commit/1d0676b54c4e3a517719220def96dfdbc26d8048 - Disable LLVM JIT - Fix xml issue - Disable failing tests --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 152 +++++++++++++------------- eng/Versions.props | 74 ++++++------- global.json | 2 +- src/mono/CMakeLists.txt | 38 ++++--- src/tests/Common/testenvironment.proj | 3 +- src/tests/issues.targets | 14 +++ 7 files changed, 151 insertions(+), 134 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 35ce79965cd..4fc2d315fd7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22451.1", + "version": "1.0.0-prerelease.22456.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4921121138b..07ddded340c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 6746a706f7bf80c43e672d26bc98d9f45fdfb651 + 39d0002522b739b76ee4558b754e5d07a8f88fbf https://github.com/dotnet/msquic @@ -16,37 +16,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 - + https://github.com/dotnet/llvm-project - ce127716e4d7e310739a1cd8fbd45f3552a3a62b + 8688ea2538ef1287c6619d35a26b5750d355cc18 https://github.com/dotnet/command-line-api @@ -126,77 +126,77 @@ https://github.com/dotnet/arcade fca51250390d403827cf50c0df9dbc632514b739 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/llvm-project - 30887307035be29a93a01709ac9a33f7b82177e1 + 782c3f1b2b0dd6e898fd513c933651f221378152 - + https://github.com/dotnet/llvm-project - 30887307035be29a93a01709ac9a33f7b82177e1 + 782c3f1b2b0dd6e898fd513c933651f221378152 - + https://github.com/dotnet/llvm-project - 30887307035be29a93a01709ac9a33f7b82177e1 + 782c3f1b2b0dd6e898fd513c933651f221378152 - + https://github.com/dotnet/llvm-project - 30887307035be29a93a01709ac9a33f7b82177e1 + 782c3f1b2b0dd6e898fd513c933651f221378152 - + https://github.com/dotnet/llvm-project - 30887307035be29a93a01709ac9a33f7b82177e1 + 782c3f1b2b0dd6e898fd513c933651f221378152 - + https://github.com/dotnet/llvm-project - 30887307035be29a93a01709ac9a33f7b82177e1 + 782c3f1b2b0dd6e898fd513c933651f221378152 https://github.com/dotnet/llvm-project @@ -206,41 +206,41 @@ https://github.com/dotnet/llvm-project 30887307035be29a93a01709ac9a33f7b82177e1 - + https://github.com/dotnet/runtime - 48a3dbe5509f53f89db0a48c8285a2eec0758fea + 75e65e99af5b3c8a2fd0abd5e887f8b14bd45362 - + https://github.com/dotnet/runtime - 48a3dbe5509f53f89db0a48c8285a2eec0758fea + 75e65e99af5b3c8a2fd0abd5e887f8b14bd45362 - + https://github.com/dotnet/runtime - 48a3dbe5509f53f89db0a48c8285a2eec0758fea + 75e65e99af5b3c8a2fd0abd5e887f8b14bd45362 - + https://github.com/dotnet/runtime - 48a3dbe5509f53f89db0a48c8285a2eec0758fea + 75e65e99af5b3c8a2fd0abd5e887f8b14bd45362 - + https://github.com/dotnet/runtime - 48a3dbe5509f53f89db0a48c8285a2eec0758fea + 75e65e99af5b3c8a2fd0abd5e887f8b14bd45362 https://github.com/dotnet/linker f0b2510bfd53a35df0aeae48996d2905c1067022 - + https://github.com/dotnet/xharness - 919daad8a314e5b0e16f15db62352c367a306c85 + 55e8420fb913c035522bbb30e28d4fd7181ecd69 - + https://github.com/dotnet/xharness - 919daad8a314e5b0e16f15db62352c367a306c85 + 55e8420fb913c035522bbb30e28d4fd7181ecd69 - + https://github.com/dotnet/xharness - 919daad8a314e5b0e16f15db62352c367a306c85 + 55e8420fb913c035522bbb30e28d4fd7181ecd69 https://github.com/dotnet/arcade @@ -262,17 +262,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 45633fd5ebcbf81ffa26fb2348bdefbd8014cca3 - + https://github.com/dotnet/hotreload-utils - 0352ad5372767d455ab32dbd57b9ca5381abb9ad + ff20bb1f646f5e5c75c7e03748faece79597acf7 - + https://github.com/dotnet/runtime-assets - a2bc40b6bcd0c0262f01811b1e360c09c8a18fd5 + 3453104731a7fd5af1b7613bb9dc9dfa6263b312 - + https://github.com/dotnet/roslyn-analyzers - 03344a064a80c1f66e50b67e3abe7335cb8ba072 + a26d1a203d0116aa769bce0fd3a917cc70d88a66 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7a64cfa5e92..aec1c21346c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,7 +46,7 @@ 4.4.0-1.final 4.4.0-1.final 4.4.0-1.final - 7.0.0-preview1.22451.2 + 7.0.0-preview1.22452.2 4.4.0-1.final 6.0.0-preview.1.102 - 8.0.0-alpha.1.22427.5 + 8.0.0-alpha.1.22454.3 6.0.0 - 8.0.0-alpha.1.22427.5 - 1.0.0-alpha.1.22431.4 - 1.0.0-alpha.1.22431.4 - 1.0.0-alpha.1.22431.4 - 1.0.0-alpha.1.22431.4 - 1.0.0-alpha.1.22431.4 - 1.0.0-alpha.1.22431.4 - 1.0.0-alpha.1.22431.4 - 1.0.0-alpha.1.22431.4 + 8.0.0-alpha.1.22454.3 + 1.0.0-alpha.1.22458.3 + 1.0.0-alpha.1.22458.3 + 1.0.0-alpha.1.22458.3 + 1.0.0-alpha.1.22458.3 + 1.0.0-alpha.1.22458.3 + 1.0.0-alpha.1.22458.3 + 1.0.0-alpha.1.22458.3 + 1.0.0-alpha.1.22458.3 6.0.0 1.1.1 @@ -113,25 +113,25 @@ 5.0.0 5.0.0 4.9.0 - 8.0.0-alpha.1.22427.5 + 8.0.0-alpha.1.22454.3 6.0.0 4.5.4 4.5.0 - 8.0.0-alpha.1.22427.5 + 8.0.0-alpha.1.22454.3 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 - 7.0.0-beta.22451.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 + 7.0.0-beta.22456.1 1.0.0-prerelease.22415.6 1.0.0-prerelease.22415.6 @@ -154,10 +154,10 @@ 1.1.0 17.4.0-preview-20220707-01 - 1.0.0-prerelease.22451.1 - 1.0.0-prerelease.22451.1 - 1.0.0-prerelease.22451.1 - 1.1.0-alpha.0.22451.2 + 1.0.0-prerelease.22456.1 + 1.0.0-prerelease.22456.1 + 1.0.0-prerelease.22456.1 + 1.1.0-alpha.0.22456.2 2.4.2 1.0.0 2.4.5 @@ -184,17 +184,17 @@ 7.0.100-1.22451.5 $(MicrosoftNETILLinkTasksVersion) - 8.0.0-alpha.1.22451.5 + 8.0.0-alpha.1.22458.2 2.1.1 7.0.0-alpha.1.22406.1 - 11.1.0-alpha.1.22451.2 - 11.1.0-alpha.1.22451.2 - 11.1.0-alpha.1.22451.2 - 11.1.0-alpha.1.22451.2 - 11.1.0-alpha.1.22451.2 - 11.1.0-alpha.1.22451.2 + 14.0.0-alpha.1.22455.3 + 14.0.0-alpha.1.22455.3 + 14.0.0-alpha.1.22455.3 + 14.0.0-alpha.1.22455.3 + 14.0.0-alpha.1.22455.3 + 14.0.0-alpha.1.22455.3 11.1.0-alpha.1.22451.2 11.1.0-alpha.1.22451.2 diff --git a/global.json b/global.json index 63e65927f1b..94673802e3d 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22455.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", - "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22427.5" + "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22454.3" } } diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index 6dbf542183b..85a0f819da4 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -560,22 +560,6 @@ if(GCC) endif() endif() -###################################### -# LLVM FLAGS AND LIBRARIES -###################################### - -# llvm-config --libs analysis core bitwriter mcjit orcjit -set(MONO_llvm_core_libs_1100 "LLVMOrcJIT" "LLVMPasses" "LLVMCoroutines" "LLVMipo" "LLVMInstrumentation" "LLVMVectorize" "LLVMScalarOpts" "LLVMLinker" "LLVMIRReader" "LLVMAsmParser" "LLVMInstCombine" "LLVMFrontendOpenMP" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMOrcError" "LLVMJITLink" "LLVMMCJIT" "LLVMExecutionEngine" "LLVMTarget" "LLVMRuntimeDyld" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMDebugInfoMSF" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMBinaryFormat" "LLVMSupport" "LLVMDemangle") - -# llvm-config --libs x86codegen -set(MONO_llvm_extra_libs_x86codegen_1100 "LLVMX86CodeGen" "LLVMCFGuard" "LLVMGlobalISel" "LLVMX86Desc" "LLVMX86Info" "LLVMMCDisassembler" "LLVMSelectionDAG" "LLVMAsmPrinter" "LLVMDebugInfoDWARF" "LLVMCodeGen" "LLVMTarget" "LLVMScalarOpts" "LLVMInstCombine" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMDebugInfoMSF" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMBinaryFormat" "LLVMSupport" "LLVMDemangle") - -# llvm-config --libs armcodegen -set(MONO_llvm_extra_libs_armcodegen_1100 "LLVMARMCodeGen" "LLVMCFGuard" "LLVMGlobalISel" "LLVMSelectionDAG" "LLVMAsmPrinter" "LLVMDebugInfoDWARF" "LLVMCodeGen" "LLVMTarget" "LLVMScalarOpts" "LLVMInstCombine" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMARMDesc" "LLVMMCDisassembler" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMDebugInfoMSF" "LLVMBinaryFormat" "LLVMARMUtils" "LLVMARMInfo" "LLVMSupport" "LLVMDemangle") - -# llvm-config --libs aarch64codegen -set(MONO_llvm_extra_libs_aarch64codegen_1100 "LLVMAArch64CodeGen" "LLVMCFGuard" "LLVMGlobalISel" "LLVMSelectionDAG" "LLVMAsmPrinter" "LLVMDebugInfoDWARF" "LLVMCodeGen" "LLVMTarget" "LLVMScalarOpts" "LLVMInstCombine" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMAArch64Desc" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMDebugInfoMSF" "LLVMBinaryFormat" "LLVMAArch64Utils" "LLVMAArch64Info" "LLVMSupport" "LLVMDemangle") - ###################################### # LLVM CHECKS ###################################### @@ -603,6 +587,24 @@ if(LLVM_PREFIX) file(STRINGS ${llvm_config_path} llvm_api_version_line REGEX "MONO_API_VERSION ") string(REGEX REPLACE ".*MONO_API_VERSION ([0-9]+)" "\\1" llvm_api_version ${llvm_api_version_line}) + # llvm-config --libs analysis core bitwriter mcjit orcjit + set(MONO_llvm_core_libs "LLVMOrcJIT" "LLVMPasses" "LLVMCoroutines" "LLVMipo" "LLVMInstrumentation" "LLVMVectorize" "LLVMScalarOpts" "LLVMLinker" "LLVMIRReader" "LLVMAsmParser" "LLVMInstCombine" "LLVMFrontendOpenMP" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMJITLink" "LLVMMCJIT" "LLVMExecutionEngine" "LLVMTarget" "LLVMRuntimeDyld" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMBinaryFormat" "LLVMSupport" "LLVMDemangle") + if(${llvm_api_version} LESS 1200) + set(MONO_llvm_core_libs ${MONO_llvm_core_libs} "LLVMOrcError" "LLVMDebugInfoMSF") + else() + set(MONO_llvm_core_libs ${MONO_llvm_core_libs} "LLVMObjCARCOpts" "LLVMMCDisassembler" "LLVMOrcTargetProcess" "LLVMOrcShared" "LLVMDebugInfoDWARF") + endif() + + # llvm-config --libs x86codegen + set(MONO_llvm_extra_libs_x86codegen "LLVMX86CodeGen" "LLVMCFGuard" "LLVMGlobalISel" "LLVMX86Desc" "LLVMX86Info" "LLVMMCDisassembler" "LLVMSelectionDAG" "LLVMAsmPrinter" "LLVMDebugInfoDWARF" "LLVMCodeGen" "LLVMTarget" "LLVMScalarOpts" "LLVMInstCombine" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMDebugInfoMSF" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMBinaryFormat" "LLVMSupport" "LLVMDemangle") + + # llvm-config --libs armcodegen + set(MONO_llvm_extra_libs_armcodegen "LLVMARMCodeGen" "LLVMCFGuard" "LLVMGlobalISel" "LLVMSelectionDAG" "LLVMAsmPrinter" "LLVMDebugInfoDWARF" "LLVMCodeGen" "LLVMTarget" "LLVMScalarOpts" "LLVMInstCombine" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMARMDesc" "LLVMMCDisassembler" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMDebugInfoMSF" "LLVMBinaryFormat" "LLVMARMUtils" "LLVMARMInfo" "LLVMSupport" "LLVMDemangle") + + # llvm-config --libs aarch64codegen + set(MONO_llvm_extra_libs_aarch64codegen "LLVMAArch64CodeGen" "LLVMCFGuard" "LLVMGlobalISel" "LLVMSelectionDAG" "LLVMAsmPrinter" "LLVMDebugInfoDWARF" "LLVMCodeGen" "LLVMTarget" "LLVMScalarOpts" "LLVMInstCombine" "LLVMAggressiveInstCombine" "LLVMTransformUtils" "LLVMBitWriter" "LLVMAnalysis" "LLVMProfileData" "LLVMObject" "LLVMTextAPI" "LLVMMCParser" "LLVMBitReader" "LLVMCore" "LLVMRemarks" "LLVMBitstreamReader" "LLVMAArch64Desc" "LLVMMC" "LLVMDebugInfoCodeView" "LLVMDebugInfoMSF" "LLVMBinaryFormat" "LLVMAArch64Utils" "LLVMAArch64Info" "LLVMSupport" "LLVMDemangle") + + # llvm-config --cflags set(llvm_cflags "") set(llvm_cxxflags "") @@ -612,10 +614,10 @@ if(LLVM_PREFIX) set(llvm_system_libs "-lz" "-lrt" "-ldl" "-lpthread" "-lm") # llvm-config --libs analysis core bitwriter mcjit orcjit - set(llvm_core_libs ${MONO_llvm_core_libs_${llvm_api_version}}) + set(llvm_core_libs ${MONO_llvm_core_libs}) # Check codegen libs and add needed libraries. - set(llvm_extra ${MONO_llvm_extra_libs_${llvm_codegen_libs}_${llvm_api_version}}) + set(llvm_extra ${MONO_llvm_extra_libs_${llvm_codegen_libs}}) if("${llvm_extra}" STREQUAL "") message(FATAL_ERROR "FIXME: ${TARGET_ARCH}") endif() diff --git a/src/tests/Common/testenvironment.proj b/src/tests/Common/testenvironment.proj index 85fa1cd07e4..4428fdf8742 100644 --- a/src/tests/Common/testenvironment.proj +++ b/src/tests/Common/testenvironment.proj @@ -294,7 +294,8 @@ <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'monointerpreter'" Include="export MONO_ENV_OPTIONS=--interpreter" /> - <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmaot'" Include="export MONO_ENV_OPTIONS=--llvm" /> + + <_TestEnvFileLine Condition="'false' == 'true' and '$(RuntimeVariant)' == 'llvmaot'" Include="export MONO_ENV_OPTIONS=--llvm" /> <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmfullaot'" Include="export MONO_ENV_OPTIONS=--full-aot" /> diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 721d3e864f1..98ecfc2fc83 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -2734,6 +2734,13 @@ https://github.com/dotnet/runtime/issues/72460 + + + https://github.com/dotnet/runtime/issues/75359 + + + https://github.com/dotnet/runtime/issues/75359 + @@ -3025,6 +3032,13 @@ https://github.com/dotnet/runtime/issues/72460 + + + https://github.com/dotnet/runtime/issues/75359 + + + https://github.com/dotnet/runtime/issues/75359 + -- GitLab