From 11ea53e896c0decbbbd1b9a25c2bcf9bc8b0b8e1 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 23 Aug 2023 22:38:38 +0200 Subject: [PATCH 01/11] Test linux-x64 full AOT llvm job --- src/tests/issues.targets | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index e142ff1292411..3e2efc82dabf3 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -2542,6 +2542,18 @@ Reflection.Emit is not supported on fullaot + + needs triage + + + needs triage + + + needs triage + + + needs triage + From 0683ef455d5d052d7f7704f7e5a4c22b2d0c57ca Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 24 Aug 2023 00:50:36 +0200 Subject: [PATCH 02/11] Test linux-x64 full AOT llvm job --- .../runtimes/build-runtime-tests-and-send-to-helix.yml | 6 ++++-- .../extra-platforms/runtime-extra-platforms-other.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml index 93fef95d6a20f..5f2f3171d105f 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml @@ -57,11 +57,13 @@ steps: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} displayName: "LLVM AOT compile CoreCLR tests" - target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} + - ${{ if ne(parameters.osGroup, 'osx') }}: + target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} - ${{ if eq(parameters.runtimeVariant, 'llvmfullaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} displayName: "LLVM AOT compile CoreCLR tests" - target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} + - ${{ if ne(parameters.osGroup, 'osx') }}: + target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} - ${{ if eq(parameters.archType, 'arm64') }}: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} $(_monoAotCrossCompileArg) /p:RuntimeVariant=llvmfullaot -maxcpucount:2 diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index c279c318e34d5..87109f8629cf3 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -362,6 +362,8 @@ jobs: runtimeFlavor: mono platforms: - linux_x64 + - osx_x64 + - osx_arm64 # - linux_arm64 variables: - name: timeoutPerTestInMinutes From 8e6989cd60a769475f26588790ee222362c10fd8 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 24 Aug 2023 00:53:54 +0200 Subject: [PATCH 03/11] Test linux-x64 full AOT llvm job --- .../runtimes/build-runtime-tests-and-send-to-helix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml index 5f2f3171d105f..8a43b6d1b167c 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml @@ -57,12 +57,12 @@ steps: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} displayName: "LLVM AOT compile CoreCLR tests" - - ${{ if ne(parameters.osGroup, 'osx') }}: + ${{ if ne(parameters.osGroup, 'osx') }}: target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} - ${{ if eq(parameters.runtimeVariant, 'llvmfullaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} displayName: "LLVM AOT compile CoreCLR tests" - - ${{ if ne(parameters.osGroup, 'osx') }}: + ${{ if ne(parameters.osGroup, 'osx') }}: target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} - ${{ if eq(parameters.archType, 'arm64') }}: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: From 1921d457c79325e6243a4f45c2a2d10c5ad1aa8b Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 24 Aug 2023 07:34:02 +0200 Subject: [PATCH 04/11] Test osx-arm64 full AOT llvm job --- src/tasks/AotCompilerTask/MonoAOTCompiler.props | 2 +- .../ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj | 1 + .../ReturnTypeValidation/OverrideSameSigAsDecl.ilproj | 1 + .../MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj | 1 + .../UnsafeAccessors/UnsafeAccessorsTests.csproj | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.props b/src/tasks/AotCompilerTask/MonoAOTCompiler.props index 1c7bc065d2a47..3e14282b789c3 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.props +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.props @@ -6,7 +6,7 @@ - + diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj index 6d1c8eeacf644..069e57bfefda1 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj @@ -1,6 +1,7 @@ Exe + true diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj index 44613b6015366..b99ac536932e7 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj @@ -1,6 +1,7 @@ Exe + true diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj index ee9dc11d5bc88..074d67ce1ed30 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj @@ -1,6 +1,7 @@ Exe + true diff --git a/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj b/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj index 98cadb5e8d61d..bd602f416b9a2 100644 --- a/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj +++ b/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj @@ -2,6 +2,7 @@ Exe true + true From ecbaf7ab6caf1db8b5f0365d715330d5c85887e3 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 24 Aug 2023 15:01:40 +0200 Subject: [PATCH 05/11] Increase timeout and test linux-arm64 job --- eng/pipelines/common/templates/pipeline-with-resources.yml | 2 +- .../extra-platforms/runtime-extra-platforms-other.yml | 4 ++-- src/mono/msbuild/apple/build/AppleBuild.targets | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index c30ce8597808d..17319245f59c1 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -15,7 +15,7 @@ resources: ROOTFS_DIR: /crossrootfs/armv6 - container: linux_arm64 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-biarch-amd64-arm64-alpine env: ROOTFS_DIR: /crossrootfs/arm64 diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index 87109f8629cf3..dd04f17dcdc9b 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -362,9 +362,9 @@ jobs: runtimeFlavor: mono platforms: - linux_x64 + - linux_arm64 - osx_x64 - osx_arm64 - # - linux_arm64 variables: - name: timeoutPerTestInMinutes value: 60 @@ -375,7 +375,7 @@ jobs: nameSuffix: AllSubsets_Mono_LLVMFullAot_RuntimeTests runtimeVariant: llvmfullaot buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true - timeoutInMinutes: 300 + timeoutInMinutes: 360 condition: >- or( diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets index 936bb275516e1..b097daaa175a5 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.targets @@ -173,7 +173,7 @@ - + From 1f3b2b598cd1a8b84ec1de6414cf7b0e489b84fb Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 24 Aug 2023 15:13:15 +0200 Subject: [PATCH 06/11] Increase timeout and test linux-arm64 job --- eng/pipelines/common/templates/pipeline-with-resources.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index 17319245f59c1..c30ce8597808d 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -15,7 +15,7 @@ resources: ROOTFS_DIR: /crossrootfs/armv6 - container: linux_arm64 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-biarch-amd64-arm64-alpine + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 env: ROOTFS_DIR: /crossrootfs/arm64 From 3251323262936e3171fa41774ababed961d4c355 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 6 Sep 2023 13:12:40 +0200 Subject: [PATCH 07/11] Use biarch linux image --- eng/pipelines/common/templates/pipeline-with-resources.yml | 3 ++- .../runtimes/build-runtime-tests-and-send-to-helix.yml | 6 ++---- .../extra-platforms/runtime-extra-platforms-other.yml | 4 +--- src/mono/mono.proj | 1 + src/mono/msbuild/apple/build/AppleBuild.targets | 2 +- src/tasks/AotCompilerTask/MonoAOTCompiler.props | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index c30ce8597808d..bbb99c2ad49ba 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -15,8 +15,9 @@ resources: ROOTFS_DIR: /crossrootfs/armv6 - container: linux_arm64 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-biarch-amd64-arm64 env: + ROOTFS_HOSTDIR: /crossrootfs/x64 ROOTFS_DIR: /crossrootfs/arm64 - container: linux_musl_x64 diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml index 8a43b6d1b167c..93fef95d6a20f 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml @@ -57,13 +57,11 @@ steps: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} displayName: "LLVM AOT compile CoreCLR tests" - ${{ if ne(parameters.osGroup, 'osx') }}: - target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} + target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} - ${{ if eq(parameters.runtimeVariant, 'llvmfullaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} displayName: "LLVM AOT compile CoreCLR tests" - ${{ if ne(parameters.osGroup, 'osx') }}: - target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} + target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }} - ${{ if eq(parameters.archType, 'arm64') }}: - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} $(_monoAotCrossCompileArg) /p:RuntimeVariant=llvmfullaot -maxcpucount:2 diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index dd04f17dcdc9b..ca839ab509686 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -363,8 +363,6 @@ jobs: platforms: - linux_x64 - linux_arm64 - - osx_x64 - - osx_arm64 variables: - name: timeoutPerTestInMinutes value: 60 @@ -375,7 +373,7 @@ jobs: nameSuffix: AllSubsets_Mono_LLVMFullAot_RuntimeTests runtimeVariant: llvmfullaot buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true - timeoutInMinutes: 360 + timeoutInMinutes: 300 condition: >- or( diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 6be683f8e2eb2..31ff581367be3 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -12,6 +12,7 @@ --> + $(ROOTFSHOST_DIR) $(ROOTFS_DIR) false .cmd diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets index b097daaa175a5..936bb275516e1 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.targets @@ -173,7 +173,7 @@ - + diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.props b/src/tasks/AotCompilerTask/MonoAOTCompiler.props index 3e14282b789c3..1c7bc065d2a47 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.props +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.props @@ -6,7 +6,7 @@ - + From 1e53b99c823c8fe643f342b4e113e068f1b4e369 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 6 Sep 2023 14:23:32 +0200 Subject: [PATCH 08/11] Fix naming --- eng/pipelines/common/templates/pipeline-with-resources.yml | 2 +- src/mono/mono.proj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index bbb99c2ad49ba..cc6ddf1ce05bc 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -17,7 +17,7 @@ resources: - container: linux_arm64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-biarch-amd64-arm64 env: - ROOTFS_HOSTDIR: /crossrootfs/x64 + ROOTFS_HOST_DIR: /crossrootfs/x64 ROOTFS_DIR: /crossrootfs/arm64 - container: linux_musl_x64 diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 31ff581367be3..a4947f23f6050 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -12,7 +12,7 @@ --> - $(ROOTFSHOST_DIR) + $(ROOTFS_HOST_DIR) $(ROOTFS_DIR) false .cmd From da22b866e68ce12fdec96ff070031bd39bed52b1 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 7 Sep 2023 12:32:15 +0200 Subject: [PATCH 09/11] Use host ROOTFS_DIR when bulding mono-aot-cross --- src/mono/mono.proj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index a4947f23f6050..008fd6b53d143 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -12,7 +12,6 @@ --> - $(ROOTFS_HOST_DIR) $(ROOTFS_DIR) false .cmd @@ -811,6 +810,10 @@ + + $(ROOTFS_HOST_DIR) + + @@ -860,7 +863,7 @@ <_MonoSkipInitCompiler Condition="'$(CrossBuild)' == 'true'">false <_MonoAotCrossOffsetsCommand Condition="'$(MonoUseCrossTool)' == 'true'">$(PythonCmd) $(MonoProjectRoot)mono/tools/offsets-tool/offsets-tool.py @(MonoAotCrossOffsetsToolParams, ' ') <_MonoAotCMakeConfigureCommand>cmake @(MonoAOTCMakeArgs, ' ') $(MonoCMakeExtraArgs) "$(MonoProjectRoot.TrimEnd('\/'))" - <_MonoAotCMakeConfigureCommand Condition="'$(_MonoSkipInitCompiler)' != 'true' and '$(HostOS)' != 'windows'">sh -c 'build_arch="$(_CompilerTargetArch)" compiler="$(MonoCCompiler)" . "$(RepositoryEngineeringCommonDir)native/init-compiler.sh" && @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand)' + <_MonoAotCMakeConfigureCommand Condition="'$(_MonoSkipInitCompiler)' != 'true' and '$(HostOS)' != 'windows'">sh -c 'build_arch="$(_CompilerTargetArch)" ROOTFS_DIR="$(MonoCrossDir)" compiler="$(MonoCCompiler)" . "$(RepositoryEngineeringCommonDir)native/init-compiler.sh" && @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand)' <_MonoAotCMakeConfigureCommand Condition="'$(_MonoSkipInitCompiler)' == 'true' and '$(HostOS)' != 'windows'">$(_MonoAOTCCOption) $(_MonoAOTCXXOption) @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand) <_MonoAotCMakeConfigureCommand Condition="'$(HostOS)' == 'windows'">call "$(RepositoryEngineeringDir)native\init-vs-env.cmd" $(_CompilerTargetArch) && cd /D "$(MonoObjCrossDir)" && @(_MonoAotBuildEnv, ' ') $(_MonoAotCMakeConfigureCommand) <_MonoAotCMakeBuildCommand>cmake --build . --target install --config $(Configuration) From 5bbb910668203cc19a7a7096ade7c3cd61df9f20 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 7 Sep 2023 14:41:57 +0200 Subject: [PATCH 10/11] Use host rootfs when TARGET_BUILD_ARCH matches --- src/mono/mono.proj | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 008fd6b53d143..62a075843e388 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -810,8 +810,14 @@ - - $(ROOTFS_HOST_DIR) + + + $(ROOTFS_HOST_DIR) From ea6b9418f4f34fd48a70b365e4a78d947d4976ad Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 7 Sep 2023 14:42:08 +0200 Subject: [PATCH 11/11] Revert disabled tests --- .../ImplicitOverrideSameSigAsDecl.ilproj | 1 - .../OverrideSameSigAsDecl.ilproj | 1 - .../CovariantReturns/UnitTest/UnitTest_GVM.ilproj | 1 - .../UnsafeAccessors/UnsafeAccessorsTests.csproj | 1 - src/tests/issues.targets | 12 ------------ 5 files changed, 16 deletions(-) diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj index 069e57bfefda1..6d1c8eeacf644 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj @@ -1,7 +1,6 @@ Exe - true diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj index b99ac536932e7..44613b6015366 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj @@ -1,7 +1,6 @@ Exe - true diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj index 074d67ce1ed30..ee9dc11d5bc88 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj @@ -1,7 +1,6 @@ Exe - true diff --git a/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj b/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj index bd602f416b9a2..98cadb5e8d61d 100644 --- a/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj +++ b/src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.csproj @@ -2,7 +2,6 @@ Exe true - true diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 3613208f485d0..8135214089db2 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -2539,18 +2539,6 @@ Reflection.Emit is not supported on fullaot - - needs triage - - - needs triage - - - needs triage - - - needs triage -