From 024a331ebbb84bc09d5746d06c6fe0110f753192 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Jun 2021 16:22:53 +0200 Subject: [PATCH 1/7] Update dotnet SDK to 6.0 Preview 4 Update the minimum and target version of the SDK to 6.0 Preview 4. Part of https://github.com/dotnet/runtime/issues/53411 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 0d4187dbda82a..a07e37e710976 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.3.21202.5", + "version": "6.0.100-preview.4.21255.9", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.3.21202.5" + "dotnet": "6.0.100-preview.4.21255.9" }, "native-tools": { "cmake": "3.16.4", From 6abb38cdd60c7631cc4fc4ed85788915995ac26f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Jun 2021 20:34:47 +0200 Subject: [PATCH 2/7] Update scripts.csproj --- src/tests/Common/scripts/scripts.csproj | 36 +++++++------------------ 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/src/tests/Common/scripts/scripts.csproj b/src/tests/Common/scripts/scripts.csproj index c7b9426b09861..0142dbcf52c39 100644 --- a/src/tests/Common/scripts/scripts.csproj +++ b/src/tests/Common/scripts/scripts.csproj @@ -1,33 +1,15 @@ - - - - - - 1.0.0-alpha-build0040 - - - 1.0.0-alpha-build0040 - - - 1.0.0-alpha-build0040 - - - 1.0.0-alpha-build0040 - - - $(MicrosoftDotNetXUnitConsoleRunnerVersion) - - - 1.0.0-prerelease-00629-04 - - + netstandard1.3 - .NETStandard win7-x86;win7-x64 false - - + + + + + + + + From 64fab232834f87db9d366059ebd2e116e851b078 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Jun 2021 08:34:51 +0200 Subject: [PATCH 3/7] Update scripts.csproj --- src/tests/Common/scripts/scripts.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/Common/scripts/scripts.csproj b/src/tests/Common/scripts/scripts.csproj index 0142dbcf52c39..35f48e7f11ae8 100644 --- a/src/tests/Common/scripts/scripts.csproj +++ b/src/tests/Common/scripts/scripts.csproj @@ -5,11 +5,11 @@ false - + From 40fc9c02a57077d0d6680b5458a4d400a61d491a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 8 Jun 2021 12:14:56 +0200 Subject: [PATCH 4/7] Switch to using eng/targetingpacks.targets for redirecting runtime pack location in src/mono/sample --- src/mono/sample/Android/AndroidSampleApp.csproj | 5 ++--- src/mono/sample/Directory.Build.targets | 8 ++++++++ src/mono/sample/HelloWorld/HelloWorld.csproj | 11 ----------- src/mono/sample/iOS/Program.csproj | 15 ++------------- .../sample/mbr/DeltaHelper/DeltaHelper.csproj | 1 - src/mono/sample/mbr/apple/AppleDelta.csproj | 15 ++------------- src/mono/sample/mbr/console/ConsoleDelta.csproj | 12 ------------ 7 files changed, 14 insertions(+), 53 deletions(-) create mode 100644 src/mono/sample/Directory.Build.targets diff --git a/src/mono/sample/Android/AndroidSampleApp.csproj b/src/mono/sample/Android/AndroidSampleApp.csproj index dd52a30abf241..f9ea822e0e1e6 100644 --- a/src/mono/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/sample/Android/AndroidSampleApp.csproj @@ -3,11 +3,10 @@ Exe false $(NetCoreAppToolCurrent) - false android-$(TargetArchitecture) true Link - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\runtimes\android-$(TargetArchitecture)\ + $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\ false @@ -75,7 +74,7 @@ ProjectName="HelloAndroid" ForceInterpreter="$(MonoForceInterpreter)" ForceAOT="$(ForceAOT)" - MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)\native\include\mono-2.0" + MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\android-$(TargetArchitecture)\native\include\mono-2.0" Assemblies="@(BundleAssemblies)" MainLibraryFileName="$(AssemblyName).dll" StripDebugSymbols="$(StripDebugSymbols)" diff --git a/src/mono/sample/Directory.Build.targets b/src/mono/sample/Directory.Build.targets new file mode 100644 index 0000000000000..f72d0bc70d5c1 --- /dev/null +++ b/src/mono/sample/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/mono/sample/HelloWorld/HelloWorld.csproj b/src/mono/sample/HelloWorld/HelloWorld.csproj index 15b0ef8697cbc..db05235fce86c 100644 --- a/src/mono/sample/HelloWorld/HelloWorld.csproj +++ b/src/mono/sample/HelloWorld/HelloWorld.csproj @@ -2,16 +2,5 @@ Exe $(NetCoreAppToolCurrent) - false - - - - - - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration) - - - - diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index b9718a6bdb5f2..362c5385f2304 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -5,8 +5,7 @@ $(NetCoreAppToolCurrent) iOS iOSSimulator - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\ - false + $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\ $(TargetOS.ToLower())-$(TargetArchitecture) $(DefineConstants);CI_TEST @@ -21,16 +20,6 @@ adhoc - - - - - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration) - - - - - @@ -80,7 +69,7 @@ TargetOS="$(TargetOS)" Arch="$(TargetArchitecture)" ProjectName="HelloiOS" - MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)native\include\mono-2.0" + MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\native\include\mono-2.0" Assemblies="@(BundleAssemblies)" MainLibraryFileName="Program.dll" GenerateXcodeProject="True" diff --git a/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj b/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj index 47bb08e4c66e9..6a27072a4b5fe 100644 --- a/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj +++ b/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj @@ -1,6 +1,5 @@ $(NetCoreAppToolCurrent) - false diff --git a/src/mono/sample/mbr/apple/AppleDelta.csproj b/src/mono/sample/mbr/apple/AppleDelta.csproj index 2b040dab21f00..090fe47dc7afa 100644 --- a/src/mono/sample/mbr/apple/AppleDelta.csproj +++ b/src/mono/sample/mbr/apple/AppleDelta.csproj @@ -3,8 +3,7 @@ Exe bin $(NetCoreAppToolCurrent) - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\ - false + $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\ $(TargetOS.ToLower())-$(TargetArchitecture) $(DefineConstants);CI_TEST true @@ -29,16 +28,6 @@ - - - - - - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration) - - - - - @@ -63,7 +52,7 @@ TargetOS="$(TargetOS)" Arch="$(TargetArchitecture)" ProjectName="AppleDelta" - MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)native\include\mono-2.0" + MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\native\include\mono-2.0" Assemblies="@(BundleAssemblies)" NativeMainSource="$(MSBuildThisFileDirectory)\main.m" MainLibraryFileName="AppleDelta.dll" diff --git a/src/mono/sample/mbr/console/ConsoleDelta.csproj b/src/mono/sample/mbr/console/ConsoleDelta.csproj index 04059b0272b7f..195513429594c 100644 --- a/src/mono/sample/mbr/console/ConsoleDelta.csproj +++ b/src/mono/sample/mbr/console/ConsoleDelta.csproj @@ -2,7 +2,6 @@ Exe $(NetCoreAppToolCurrent) - false false @@ -21,17 +20,6 @@ 1 - - - - - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(BuiltRuntimeConfiguration) - - - - - - From 77da330bde10e4aa17703a45aeb84045825bc599 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Tue, 8 Jun 2021 13:52:48 -0700 Subject: [PATCH 5/7] Fix binder tracing tests --- src/tests/Loader/binding/tracing/BinderTracingTest.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.targets b/src/tests/Loader/binding/tracing/BinderTracingTest.targets index 732b2ce139923..426a5556093f1 100644 --- a/src/tests/Loader/binding/tracing/BinderTracingTest.targets +++ b/src/tests/Loader/binding/tracing/BinderTracingTest.targets @@ -40,9 +40,9 @@ fr-FR - + - + From f2ddc6dbefc55d7fed8f5bc1040005041722940e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 10 Jun 2021 20:26:49 +0200 Subject: [PATCH 6/7] Set UseMonoRuntime property so the dotnet SDK can pull the mono runtime packs This is necessary after the changes from https://github.com/dotnet/sdk/pull/16909. --- eng/Subsets.props | 3 +++ eng/targetingpacks.targets | 11 +++++++++-- eng/testing/linker/SupportFiles/Directory.Build.props | 3 +++ eng/testing/linker/project.csproj.template | 1 + eng/testing/linker/trimmingTests.targets | 1 + src/mono/sample/Android/AndroidSampleApp.csproj | 10 ---------- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index bf6b25bffc731..9d955e99196a9 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -39,6 +39,9 @@ Mono Mono CoreCLR + + + true diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index da9407c5090d0..59b6c8c96e645 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -15,15 +15,22 @@ + + diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template index 95298969cf61a..7f8ccaba79441 100644 --- a/eng/testing/linker/project.csproj.template +++ b/eng/testing/linker/project.csproj.template @@ -10,6 +10,7 @@ {RepositoryEngineeringDir} {NetCoreAppCurrent} {RuntimeIdentifier} + {UseMonoRuntime} {TargetingPackDir} {NetCoreAppMaximumVersion} {MicrosoftNETCoreAppVersion} diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets index 0473cfcd03636..f43dbee3b4e1f 100644 --- a/eng/testing/linker/trimmingTests.targets +++ b/eng/testing/linker/trimmingTests.targets @@ -74,6 +74,7 @@ .Replace('{NetCoreAppMaximumVersion}', '$(NetCoreAppMaximumVersion)') .Replace('{TargetingPackDir}','$(MicrosoftNetCoreAppRefPackDir)') .Replace('{RuntimeIdentifier}','%(TestConsoleApps.TestRuntimeIdentifier)') + .Replace('{UseMonoRuntime}','$(UseMonoRuntime)') .Replace('{MicrosoftNETILLinkTasksVersion}', '$(MicrosoftNETILLinkTasksVersion)') .Replace('{ExtraTrimmerArgs}', '%(TestConsoleApps.ExtraTrimmerArgs)') .Replace('{AdditionalProjectReferences}', '$(_additionalProjectReferencesString)') diff --git a/src/mono/sample/Android/AndroidSampleApp.csproj b/src/mono/sample/Android/AndroidSampleApp.csproj index f9ea822e0e1e6..7dced61883747 100644 --- a/src/mono/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/sample/Android/AndroidSampleApp.csproj @@ -10,16 +10,6 @@ false - - - - - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration) - - - - - From cd94cc1d354446951a5c56354553bf33d3b27877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 11 Jun 2021 10:43:27 +0200 Subject: [PATCH 7/7] Move UseMonoRuntimeProperty and set it to false in coreclr --- Directory.Build.props | 3 +++ eng/Subsets.props | 3 --- src/coreclr/Directory.Build.props | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c0adfc01c6439..7efd3a5729169 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -226,6 +226,9 @@ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src')) $([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj')) $([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj')) + + + true diff --git a/eng/Subsets.props b/eng/Subsets.props index 9d955e99196a9..bf6b25bffc731 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -39,9 +39,6 @@ Mono Mono CoreCLR - - - true diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 0117eb8dbe3d8..4b18a3a329a2f 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -7,6 +7,8 @@ Debug Release Checked + + false