From e8f437319ae578b022f9133ee492b6b0e55b289a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Apr 2021 09:09:56 -0400 Subject: [PATCH] [main] Update dependencies from dotnet/installer (#11175) * 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 * 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 * 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 * same P4 specific fix as ccb43cba563366b5a9e41b3f98cd140a86342317 but the ICU support was added based on P3 but merged after ^ * 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 * 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 * 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 * Update to new package names Thanks @pjcollins for the heads up https://github.com/xamarin/xamarin-macios/pull/11175#issuecomment-819936692 * 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 * Fix build (path changed to include '.mono') * remove more '.mono' special case that are not needed anymore * 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 * Fix building apps (it now finds the native libs) Credits to @filipnavara https://github.com/filipnavara/xamarin-macios/commit/8325f8dadcd51252c9a0935e476d8af9e55d66e7 * Add back IsTrimmable (or nothing gets linked) * 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 * Keep downloading the CoreCLR runtime packs. * [runtime] Adjust the build to link with the correct runtime library for CoreCLR. * [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 * [dotnet][msbuild] Add more (missing) '\' Fix satellite/location assemblies and some unit tests Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alex Soto Co-authored-by: Manuel de la Pena Co-authored-by: Sebastien Pouliot Co-authored-by: Sebastien Pouliot Co-authored-by: Rolf Bjarne Kvinge --- Make.config | 3 +++ builds/Makefile | 3 ++- .../package-download/download-packages.proj | 9 +++----- .../Xamarin.Shared.Sdk.DefaultItems.targets | 23 +++---------------- dotnet/targets/Xamarin.Shared.Sdk.targets | 8 +++---- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- runtime/Makefile | 22 ++++++++---------- .../Foundation/NSTimeZoneTest.cs | 3 +++ 9 files changed, 30 insertions(+), 47 deletions(-) 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 60b5f240bc73..141f2855994d 100644 --- a/builds/package-download/download-packages.proj +++ b/builds/package-download/download-packages.proj @@ -6,14 +6,11 @@ - - - - - + - + + diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets index 824bf0757697..3e2a856b778d 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets @@ -18,6 +18,9 @@ false + + true + false @@ -85,24 +88,4 @@ - - - - - - - diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index c4e356eedeae..479b9d184477 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) @@ -685,12 +685,12 @@ diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c5a05cd7a47..874fe3209d15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - aee38a6dd446b512b1ae510d80d2ed1c1f24e79a + 2455d34cebebfa62772f57be93b2cf99d14dbad2 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 4366758a380d..ae91c39cd1f3 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.21218.6 6.0.100-preview.2.21212.1 6.0.100-preview.2.21212.1 6.0.0-beta.21212.6 diff --git a/runtime/Makefile b/runtime/Makefile index 45220ea126d7..441f687de181 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -671,13 +671,9 @@ $(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.$(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)) @@ -695,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))))) 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) {