From 120ef2f48aa72134f7c2234e02ef12da2dbe5767 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Apr 2021 12:24:00 +0000 Subject: [PATCH 01/19] Update dependencies from https://github.com/dotnet/installer build 20210408.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21208.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd58d364789d..c8b99cd691af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - aee38a6dd446b512b1ae510d80d2ed1c1f24e79a + 70dc4a6c09211d48f2979e7bf17cfe46f7baf129 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index d2331a8170c9..04a0532beda8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.3.21202.5 + 6.0.100-preview.4.21208.1 6.0.100-preview.2.21205.2 6.0.100-preview.2.21205.2 From 6b2203c492cbe84d95a73d2b7686be67d0f1e170 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Apr 2021 12:24:32 +0000 Subject: [PATCH 02/19] Update dependencies from https://github.com/dotnet/installer build 20210409.4 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21209.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8b99cd691af..f45c2fb8efd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 70dc4a6c09211d48f2979e7bf17cfe46f7baf129 + f1b8e73e579f9c520ed5fa8fa5a20743e64b59e6 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 04a0532beda8..cada17ba01f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21208.1 + 6.0.100-preview.4.21209.4 6.0.100-preview.2.21205.2 6.0.100-preview.2.21205.2 From 8a477c881d3372245f4a9ae862e63507fb816d8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 11 Apr 2021 12:18:04 +0000 Subject: [PATCH 03/19] Update dependencies from https://github.com/dotnet/installer build 20210410.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21210.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f45c2fb8efd0..0a88bcafd35d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - f1b8e73e579f9c520ed5fa8fa5a20743e64b59e6 + ae55aee247b7aeb1fef48a3fb1c8b4f6112a2fb3 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index cada17ba01f9..530390fe2085 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21209.4 + 6.0.100-preview.4.21210.1 6.0.100-preview.2.21205.2 6.0.100-preview.2.21205.2 From 27e8d31871d581ee81dfbfe314a626b52869045c Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Mon, 12 Apr 2021 11:14:47 -0400 Subject: [PATCH 04/19] same P4 specific fix as ccb43cba563366b5a9e41b3f98cd140a86342317 but the ICU support was added based on P3 but merged after ^ --- dotnet/targets/Xamarin.Shared.Sdk.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index e7b5a3990b12..5604a147b43c 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -699,7 +699,7 @@ Condition="'%(Extension)' == '.dylib'" /> From 2d9d5da93ab7be0ccb86dc21373d743c5b2951df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Apr 2021 12:23:55 +0000 Subject: [PATCH 05/19] Update dependencies from https://github.com/dotnet/installer build 20210412.5 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21212.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93de96cbbea7..58f5297fdeaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - ae55aee247b7aeb1fef48a3fb1c8b4f6112a2fb3 + c6e6c1b622701ea76e946882375c426bc422763d https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 342c3f4bdc11..48e0722efa73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21210.1 + 6.0.100-preview.4.21212.5 6.0.100-preview.2.21212.1 6.0.100-preview.2.21212.1 From bf962705f3c5c42b85460eb36c4bdfff66f93563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Apr 2021 12:14:22 +0000 Subject: [PATCH 06/19] Update dependencies from https://github.com/dotnet/installer build 20210413.70 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21213.70 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58f5297fdeaa..e1d80f566824 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - c6e6c1b622701ea76e946882375c426bc422763d + a069111a95b4b908235febeeb3966b3b078720d1 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 48e0722efa73..15cbc9819bbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21212.5 + 6.0.100-preview.4.21213.70 6.0.100-preview.2.21212.1 6.0.100-preview.2.21212.1 From 56bb3d7d77e656774fbc8eb2d50bbae4db12f7c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Apr 2021 21:04:58 +0000 Subject: [PATCH 07/19] Update dependencies from https://github.com/dotnet/installer build 20210414.14 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21214.14 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1d80f566824..3f2f1f7ec3d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - a069111a95b4b908235febeeb3966b3b078720d1 + 96ec2dfcbf28a768e19801f006cda23d23f00d7d https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 15cbc9819bbe..2e943b2bdc59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21213.70 + 6.0.100-preview.4.21214.14 6.0.100-preview.2.21212.1 6.0.100-preview.2.21212.1 From ed3ac894ae6dc36878fcf04380d2a15dedc96ba6 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Wed, 14 Apr 2021 21:41:30 -0400 Subject: [PATCH 08/19] Update to new package names Thanks @pjcollins for the heads up https://github.com/xamarin/xamarin-macios/pull/11175#issuecomment-819936692 --- builds/package-download/download-packages.proj | 7 +------ dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/builds/package-download/download-packages.proj b/builds/package-download/download-packages.proj index 60b5f240bc73..3218369f8477 100644 --- a/builds/package-download/download-packages.proj +++ b/builds/package-download/download-packages.proj @@ -7,13 +7,8 @@ - - - - - - + diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets index 58b80d8c9d4b..361e378c7e43 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets @@ -18,6 +18,8 @@ false + + true From 44e02cf47219badbd165fa38654d3f57bf14de80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Apr 2021 12:23:16 +0000 Subject: [PATCH 09/19] Update dependencies from https://github.com/dotnet/installer build 20210415.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21215.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f2f1f7ec3d4..3da59eb4f546 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 96ec2dfcbf28a768e19801f006cda23d23f00d7d + be57cb9130b2d7ad0e6dc8744b035cbdbc954679 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 2e943b2bdc59..8bba51baf472 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21214.14 + 6.0.100-preview.4.21215.1 6.0.100-preview.2.21212.1 6.0.100-preview.2.21212.1 From a22402ec0fea9ecba81cadbb1b838a3c0a6e3e40 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Thu, 15 Apr 2021 11:21:20 -0400 Subject: [PATCH 10/19] Fix build (path changed to include '.mono') --- runtime/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/Makefile b/runtime/Makefile index 45220ea126d7..24f7809d353d 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -677,7 +677,7 @@ DOTNET_osx-arm64_LIBDIR=$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mo define DotNetLibXamarinTemplate -DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime.$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native +DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native DOTNET$(6)_$(2)_DYLIB_FLAGS = $(DOTNET_$(1)_DYLIB_FLAGS) -Wl,-install_name,libxamarin$(5).dylib -framework Foundation -framework CFNetwork -lz -L$(abspath $(DOTNET$(6)_$(2)_LIBDIR)) DOTNET_$(2)_$(3)$(4)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_SOURCE_STEMS)) $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_$(shell echo $(3) | tr a-z A-Z)_SOURCE_STEMS)) From 9a02e48b673df8a4ebff496780361cf02ecdc110 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Thu, 15 Apr 2021 22:22:17 -0400 Subject: [PATCH 11/19] remove more '.mono' special case that are not needed anymore --- .../Xamarin.Shared.Sdk.DefaultItems.targets | 21 ------------------- runtime/Makefile | 4 ---- 2 files changed, 25 deletions(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets index 361e378c7e43..bb4dd19fbeff 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets @@ -80,7 +80,6 @@ RuntimePackNamePatterns="Microsoft.$(_PlatformName).Runtime.**RID**" RuntimePackRuntimeIdentifiers="$(_RuntimePackRuntimeIdentifiers)" Profile="$(_PlatformName)" - IsTrimmable="true" /> @@ -88,24 +87,4 @@ - - - - - - - diff --git a/runtime/Makefile b/runtime/Makefile index 24f7809d353d..3df68dffcfb0 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -671,10 +671,6 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIM # https://github.com/dotnet/runtime/issues/48508 DOTNET_tvos-arm64_LIBDIR=$(TOP)/builds/mono-ios-sdk-destdir/ios-libs/tvos -# The runtime pack is different for macOS/Mono (it has '.Mono' at the end), so add a special case here. -DOTNET_osx-x64_LIBDIR=$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.osx-x64/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/osx-x64/native -DOTNET_osx-arm64_LIBDIR=$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.osx-arm64/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/osx-arm64/native - define DotNetLibXamarinTemplate DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native From 0ac93208dcfcbf30adff857003da051b5741de44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Apr 2021 12:25:17 +0000 Subject: [PATCH 12/19] Update dependencies from https://github.com/dotnet/installer build 20210415.12 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21215.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9354d05cfd6e..46cbef586d00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - be57cb9130b2d7ad0e6dc8744b035cbdbc954679 + c1eb61ac8152d6777b0d685e37b32885fd37775d https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index c19d38f98479..b3c040fa5690 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21215.1 + 6.0.100-preview.4.21215.12 6.0.100-preview.2.21212.1 6.0.100-preview.2.21212.1 6.0.0-beta.21212.6 From 106defd7ae065a40bb32356c19f00d4197b39c87 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Fri, 16 Apr 2021 13:20:16 -0400 Subject: [PATCH 13/19] Fix building apps (it now finds the native libs) Credits to @filipnavara https://github.com/filipnavara/xamarin-macios/commit/8325f8dadcd51252c9a0935e476d8af9e55d66e7 --- dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets | 3 ++- dotnet/targets/Xamarin.Shared.Sdk.targets | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets index bb4dd19fbeff..3e2a856b778d 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets @@ -19,7 +19,8 @@ false - true + true + false diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index 7d7b9d417524..13b22d26a410 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -382,7 +382,7 @@ - <_PackageIdInfix Condition="'$(_XamarinRuntime)' != 'CoreCLR' And '$(_PlatformName)' == 'macOS'">Mono. + <_PackageIdInfix Condition="'$(UseMonoRuntime)' == 'true'">Mono. <_MonoNugetPackageId>Microsoft.NETCore.App.Runtime.$(_PackageIdInfix)$(RuntimeIdentifier) From c837f583f9938384209a020ae3e6b9e68750069e Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Fri, 16 Apr 2021 16:41:40 -0400 Subject: [PATCH 14/19] Add back IsTrimmable (or nothing gets linked) --- dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets index 3e2a856b778d..0022015b749f 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets @@ -81,6 +81,7 @@ RuntimePackNamePatterns="Microsoft.$(_PlatformName).Runtime.**RID**" RuntimePackRuntimeIdentifiers="$(_RuntimePackRuntimeIdentifiers)" Profile="$(_PlatformName)" + IsTrimmable="true" /> From 898b76408d695962dc3f5814843c15077290623b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Apr 2021 12:15:02 +0000 Subject: [PATCH 15/19] Update dependencies from https://github.com/dotnet/installer build 20210418.6 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.3.21202.5 -> To Version 6.0.100-preview.4.21218.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46cbef586d00..874fe3209d15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - c1eb61ac8152d6777b0d685e37b32885fd37775d + 2455d34cebebfa62772f57be93b2cf99d14dbad2 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index b3c040fa5690..ae91c39cd1f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21215.12 + 6.0.100-preview.4.21218.6 6.0.100-preview.2.21212.1 6.0.100-preview.2.21212.1 6.0.0-beta.21212.6 From e146bd004f3ae5a9553e3ec9e0aec07bab267237 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 19 Apr 2021 19:25:45 +0200 Subject: [PATCH 16/19] Keep downloading the CoreCLR runtime packs. --- Make.config | 3 +++ builds/Makefile | 3 ++- builds/package-download/download-packages.proj | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Make.config b/Make.config index a1aeebd95259..b74941b7e8fe 100644 --- a/Make.config +++ b/Make.config @@ -575,6 +575,9 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(eval DOTNET_$(platform)_RUNTIME_IDENTIF # Create a variable with all the runtime identifiers DOTNET_RUNTIME_IDENTIFIERS=$(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS)) +# Create a variable with all the CoreCLR runtime identifiers +DOTNET_CORECLR_RUNTIME_IDENTIFIERS=$(foreach platform,$(DOTNET_CORECLR_PLATFORMS),$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS)) + # Create a variable with the platform in uppercase DOTNET_PLATFORMS_UPPERCASE:=$(shell echo $(DOTNET_PLATFORMS) | tr a-z A-Z) diff --git a/builds/Makefile b/builds/Makefile index 4b988d81ab40..f153b646a6e9 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -114,8 +114,9 @@ $(eval $(call FixMacCatalystAssembly,System.Net.Http)) /t:WriteBundledNETCorePlatformsPackageVersion \ /p:WriteFilePath=$(CURDIR)/BundledNETCorePlatformsPackageVersion.txt \ /p:PackageRuntimeIdentifiers="$(DOTNET_RUNTIME_IDENTIFIERS)" \ + /p:PackageRuntimeIdentifiersCoreCLR="$(DOTNET_CORECLR_RUNTIME_IDENTIFIERS)" \ /bl \ - /v:quiet + $(DOTNET_BUILD_VERBOSITY) $(Q) touch $@ BundledNETCorePlatformsPackageVersion.txt: .stamp-download-dotnet-packages diff --git a/builds/package-download/download-packages.proj b/builds/package-download/download-packages.proj index 3218369f8477..141f2855994d 100644 --- a/builds/package-download/download-packages.proj +++ b/builds/package-download/download-packages.proj @@ -6,9 +6,11 @@ + + From 1e376e7ffc4994241191dfcb4268fc22f869d083 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 19 Apr 2021 19:26:15 +0200 Subject: [PATCH 17/19] [runtime] Adjust the build to link with the correct runtime library for CoreCLR. --- runtime/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/runtime/Makefile b/runtime/Makefile index 3df68dffcfb0..441f687de181 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -673,7 +673,7 @@ DOTNET_tvos-arm64_LIBDIR=$(TOP)/builds/mono-ios-sdk-destdir/ios-libs/tvos define DotNetLibXamarinTemplate -DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native +DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime$(7).$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native DOTNET$(6)_$(2)_DYLIB_FLAGS = $(DOTNET_$(1)_DYLIB_FLAGS) -Wl,-install_name,libxamarin$(5).dylib -framework Foundation -framework CFNetwork -lz -L$(abspath $(DOTNET$(6)_$(2)_LIBDIR)) DOTNET_$(2)_$(3)$(4)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_SOURCE_STEMS)) $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_$(shell echo $(3) | tr a-z A-Z)_SOURCE_STEMS)) @@ -691,14 +691,14 @@ endef # foreach (var platform in DOTNET_PLATFORMS) # foreach (var rid in DOTNET__RUNTIME_IDENTIFIERS)) # foreach (var arch in DOTNET__ARCHITECTURES) -# 1 2 3 4 5 6 -# call DotNetLibXamarinTemplate (platform, rid, arch, , "-dotnet",) -# call DotNetLibXamarinTemplate (platform, rid, arch, _DEBUG, "-dotnet-debug",) -# call DotNetLibXamarinTemplate (platform, rid, arch, _CORECLR, "-dotnet-coreclr", _CORECLR) -# call DotNetLibXamarinTemplate (platform, rid, arch, _CORECLR_DEBUG, "-dotnet-coreclr-debug", _CORECLR) - -$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(foreach arch,$(DOTNET_$(rid)_ARCHITECTURES),$(eval $(call DotNetLibXamarinTemplate,$(DOTNET_$(rid)_SDK_PLATFORM),$(rid),$(arch),,-dotnet,))))) -$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(foreach arch,$(DOTNET_$(rid)_ARCHITECTURES),$(eval $(call DotNetLibXamarinTemplate,$(DOTNET_$(rid)_SDK_PLATFORM),$(rid),$(arch),_DEBUG,-dotnet-debug,))))) +# 1 2 3 4 5 6 7 +# call DotNetLibXamarinTemplate (platform, rid, arch, , "-dotnet", ,.mono) +# call DotNetLibXamarinTemplate (platform, rid, arch, _DEBUG, "-dotnet-debug", ,.mono) +# call DotNetLibXamarinTemplate (platform, rid, arch, _CORECLR, "-dotnet-coreclr", _CORECLR,) +# call DotNetLibXamarinTemplate (platform, rid, arch, _CORECLR_DEBUG, "-dotnet-coreclr-debug", _CORECLR,) + +$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(foreach arch,$(DOTNET_$(rid)_ARCHITECTURES),$(eval $(call DotNetLibXamarinTemplate,$(DOTNET_$(rid)_SDK_PLATFORM),$(rid),$(arch),,-dotnet,,.mono))))) +$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(foreach arch,$(DOTNET_$(rid)_ARCHITECTURES),$(eval $(call DotNetLibXamarinTemplate,$(DOTNET_$(rid)_SDK_PLATFORM),$(rid),$(arch),_DEBUG,-dotnet-debug,,.mono))))) $(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(foreach arch,$(DOTNET_$(rid)_ARCHITECTURES),$(eval $(call DotNetLibXamarinTemplate,$(DOTNET_$(rid)_SDK_PLATFORM),$(rid),$(arch),_CORECLR,-dotnet-coreclr,_CORECLR))))) $(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(foreach arch,$(DOTNET_$(rid)_ARCHITECTURES),$(eval $(call DotNetLibXamarinTemplate,$(DOTNET_$(rid)_SDK_PLATFORM),$(rid),$(arch),_CORECLR_DEBUG,-dotnet-coreclr-debug,_CORECLR))))) From 5fdd4e2dec744e8741beb2edf9c3d20873107283 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Mon, 19 Apr 2021 15:39:56 -0400 Subject: [PATCH 18/19] [tests][monotouch-test] Ignore NSTimeZoneTest / All_28300 on dotnet as it hangs Introduced with https://github.com/dotnet/runtime/pull/48931 Issue https://unicode-org.atlassian.net/browse/ICU-21591 PR https://github.com/unicode-org/icu/pull/1699 --- tests/monotouch-test/Foundation/NSTimeZoneTest.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/monotouch-test/Foundation/NSTimeZoneTest.cs b/tests/monotouch-test/Foundation/NSTimeZoneTest.cs index 421937aab713..a82c61b77965 100644 --- a/tests/monotouch-test/Foundation/NSTimeZoneTest.cs +++ b/tests/monotouch-test/Foundation/NSTimeZoneTest.cs @@ -39,6 +39,9 @@ public void AbbreviationTest () } [Test] +#if NET + [Ignore ("https://github.com/xamarin/xamarin-macios/issues/11222")] +#endif public void All_28300 () { foreach (var name in NSTimeZone.KnownTimeZoneNames) { From 52ca9625ea37e519971ee9a029fad8e0f2e44e9e Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Mon, 19 Apr 2021 15:43:34 -0400 Subject: [PATCH 19/19] [dotnet][msbuild] Add more (missing) '\' Fix satellite/location assemblies and some unit tests --- dotnet/targets/Xamarin.Shared.Sdk.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index ba6da570a77e..479b9d184477 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -685,12 +685,12 @@