From 28b9d24b07b4671aa3188f03f8d23c50b28b16c8 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Tue, 22 Mar 2022 17:41:03 -0400 Subject: [PATCH 1/5] [CI] Undo a merge done by Github/VSTS when we do the checkout so that both jobs (build & test) use the same commit. (#14443) --- tools/devops/automation/templates/build/build.yml | 7 +++++++ tools/devops/automation/templates/tests/build.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/tools/devops/automation/templates/build/build.yml b/tools/devops/automation/templates/build/build.yml index 601ae861ed..af36934169 100644 --- a/tools/devops/automation/templates/build/build.yml +++ b/tools/devops/automation/templates/build/build.yml @@ -49,6 +49,13 @@ steps: submodules: recursive path: s/xamarin-macios + +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - pwsh: | + git reset --hard HEAD^2 + displayName: "Undo Github merge" + workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-macios + - checkout: maccore clean: true persistCredentials: true # hugely important, else there are some scripts that check a single file from maccore that will fail diff --git a/tools/devops/automation/templates/tests/build.yml b/tools/devops/automation/templates/tests/build.yml index ba0cc4ce6d..79ec21be85 100644 --- a/tools/devops/automation/templates/tests/build.yml +++ b/tools/devops/automation/templates/tests/build.yml @@ -51,6 +51,13 @@ steps: - checkout: self path: s/xamarin-macios + +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - pwsh: | + git reset --hard HEAD^2 + displayName: "Undo Github merge" + workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-macios + - checkout: maccore persistCredentials: true # hugely important, else there are some scripts that check a single file from maccore that will fail From e44d0fd0473168096c9a158db92344dd488c8812 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 23 Mar 2022 08:07:34 +0100 Subject: [PATCH 2/5] [.NET] Rename several DOTNET6_* variables to to DOTNET_*. (#14463) Also rename DOTNET_VERSION to SYSTEM_DOTNET_VERSION to make it clear what it's referring to (and to not clash with DOTNET6_VERSION which has now been renamed to DOTNET_VERSION). .NET 7 is right around the corner. --- Make.config | 30 +++---- Makefile | 2 +- builds/Makefile | 18 ++-- dotnet/Makefile | 34 +++---- src/Makefile | 88 +++++++++---------- system-dependencies.sh | 2 +- tests/Makefile | 4 +- tests/common/Configuration.cs | 6 +- tests/generator/BGenTool.cs | 2 +- tests/generator/GeneratorTests.cs | 2 +- .../custom-type-assembly/Makefile | 2 +- tools/devops/Makefile | 6 +- .../automation/templates/tests/run-tests.yml | 6 +- tools/devops/build-provisioning.csx.in | 2 +- tools/devops/device-tests-provisioning.csx.in | 2 +- tools/devops/mac-tests-provisioning.csx.in | 2 +- tools/dotnet-linker/Makefile | 2 +- tools/mmp/Makefile | 8 +- tools/mtouch/Makefile | 2 +- 19 files changed, 110 insertions(+), 110 deletions(-) diff --git a/Make.config b/Make.config index be47fbf63b..077b95ac84 100644 --- a/Make.config +++ b/Make.config @@ -522,8 +522,8 @@ endif -include $(TOP)/dotnet.config $(TOP)/dotnet.config: $(TOP)/eng/Versions.props - $(Q) grep -A1 \"sdk\": $(TOP)/global.json | sed -e '1d' -e 's/[ \t]*"version": /DOTNET_VERSION=/' -e 's/"//g' > $@.tmp - $(Q) grep MicrosoftDotnetSdkInternalPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET6_VERSION=/' >> $@.tmp + $(Q) grep -A1 \"sdk\": $(TOP)/global.json | sed -e '1d' -e 's/[ \t]*"version": /SYSTEM_DOTNET_VERSION=/' -e 's/"//g' > $@.tmp + $(Q) grep MicrosoftDotnetSdkInternalPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> $@.tmp $(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> $@.tmp $(Q) grep MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>//g' -e 's/[ \t]*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=/' >> $@.tmp $(Q) mv $@.tmp $@ @@ -551,30 +551,30 @@ DOTNET_PKG_DIR ?= $(DOTNET_DESTDIR)/pkgs CUSTOM_DOTNET_VERSION=6.0.0-dev ifdef CUSTOM_DOTNET -DOTNET6_BCL_VERSION=$(CUSTOM_DOTNET_VERSION) +DOTNET_BCL_VERSION=$(CUSTOM_DOTNET_VERSION) export CUSTOM_DOTNET_VERSION else -DOTNET6_BCL_VERSION=$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION) +DOTNET_BCL_VERSION=$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION) endif DOTNET_TFM=net6.0 -DOTNET6_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET6_VERSION))) -DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$(DOTNET6_VERSION)/dotnet-sdk-$(DOTNET6_VERSION)-osx-x64.tar.gz -DOTNET6_TARBALL_NAME=$(notdir $(DOTNET6_TARBALL)) -DOTNET6_DIR=$(abspath $(TOP)/builds/downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME)))) -DOTNET=$(DOTNET6_DIR)/dotnet -DOTNET6_BCL_DIR:=$(abspath $(TOP)/builds/downloads/microsoft.netcore.app.ref/$(DOTNET6_BCL_VERSION)/ref/net6.0) +DOTNET_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET_VERSION))) +DOTNET_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$(DOTNET_VERSION)/dotnet-sdk-$(DOTNET_VERSION)-osx-x64.tar.gz +DOTNET_TARBALL_NAME=$(notdir $(DOTNET_TARBALL)) +DOTNET_DIR=$(abspath $(TOP)/builds/downloads/$(basename $(basename $(DOTNET_TARBALL_NAME)))) +DOTNET=$(DOTNET_DIR)/dotnet +DOTNET_BCL_DIR:=$(abspath $(TOP)/builds/downloads/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/$(DOTNET_TFM)) # Use the System.Runtime.InteropServices.NFloat.Internal package to get the System.Runtime.InteropServices.dll reference assembly for # .NET 6. This is no longer needed for .NET 7, when we can switch back to the usual BCL reference assemblies. ifeq ($(DOTNET_TFM),net6.0) DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR:=$(abspath $(TOP)/builds/downloads/system.runtime.interopservices.nfloat.internal/6.0.1/ref/net6.0) else -DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR:=$(DOTNET6_BCL_DIR) +DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR:=$(DOTNET_BCL_DIR) endif # The sdk version band has the last two digits set to 0: https://github.com/dotnet/sdk/blob/22c4860dcb2cf6b123dd641cc4a87a50380759d5/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs#L52-L53 -DOTNET_MANIFEST_VERSION_BAND=$(shell echo $(DOTNET6_VERSION_BAND) | sed 's/..$$/00/') +DOTNET_MANIFEST_VERSION_BAND=$(shell echo $(DOTNET_VERSION_BAND) | sed 's/..$$/00/') # We must do the same for our version band: the last two digits must be set to 0. MANIFEST_VERSION_BAND=6.0.300 # The toolchain can either be hardcoded to something like 6.0.200, or set to MANIFEST_VERSION_BAND. @@ -583,10 +583,10 @@ MANIFEST_VERSION_BAND=6.0.300 TOOLCHAIN_MANIFEST_VERSION_BAND=6.0.200 # The location of csc changes depending on whether we're using a preview or a stable/service release :/ -DOTNET_CSC_PATH_PREVIEW=$(DOTNET6_DIR)/sdk/$(DOTNET6_VERSION)/Roslyn/bincore/csc.dll -DOTNET_CSC_PATH_STABLE=$(DOTNET6_DIR)/sdk/$(DOTNET6_VERSION_BAND)/Roslyn/bincore/csc.dll +DOTNET_CSC_PATH_PREVIEW=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION)/Roslyn/bincore/csc.dll +DOTNET_CSC_PATH_STABLE=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Roslyn/bincore/csc.dll -DOTNET6_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_PREVIEW) +DOTNET_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_PREVIEW) # How are our assemblies named? DOTNET_IOS_ASSEMBLY_NAME=Microsoft.iOS diff --git a/Makefile b/Makefile index 6f7e614c54..828c6b2dac 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ all-local:: global6.json global6.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index $(Q_GEN) \ printf "{\n" > $@; \ - printf "\t\"sdk\": { \"version\": \"$(DOTNET6_VERSION)\" }\n" >> $@; \ + printf "\t\"sdk\": { \"version\": \"$(DOTNET_VERSION)\" }\n" >> $@; \ printf "\n}\n" >> $@ install-hook:: diff --git a/builds/Makefile b/builds/Makefile index 44306fecf1..705602da4c 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -19,7 +19,7 @@ download-mono: \ downloads/$(basename $(MONO_IOS_FILENAME)): MONO_URL=$(MONO_IOS_URL) downloads/$(basename $(MONO_MAC_FILENAME)): MONO_URL=$(MONO_MAC_URL) downloads/$(basename $(MONO_MACCATALYST_FILENAME)): MONO_URL=$(MONO_MACCATALYST_URL) -downloads/$(DOTNET6_TARBALL_NAME): MONO_URL=$(DOTNET6_TARBALL) +downloads/$(DOTNET_TARBALL_NAME): MONO_URL=$(DOTNET_TARBALL) include $(TOP)/mk/colors.mk @@ -72,12 +72,12 @@ downloads/%: downloads/%.nupkg $(Q) mv $@.tmp $@ $(Q) echo "Unzipped $*." -downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))): dotnet-install.sh - $(Q) echo "Downloading and installing .NET $(DOTNET6_VERSION) into $@..." - $(Q) ./dotnet-install.sh --install-dir "$@.tmp" --version "$(DOTNET6_VERSION)" --architecture x64 --no-path $$DOTNET_INSTALL_EXTRA_ARGS +downloads/$(basename $(basename $(DOTNET_TARBALL_NAME))): dotnet-install.sh + $(Q) echo "Downloading and installing .NET $(DOTNET_VERSION) into $@..." + $(Q) ./dotnet-install.sh --install-dir "$@.tmp" --version "$(DOTNET_VERSION)" --architecture x64 --no-path $$DOTNET_INSTALL_EXTRA_ARGS $(Q) rm -Rf "$@" $(Q) mv "$@.tmp" "$@" - $(Q) echo "Downloaded and installed .NET $(DOTNET6_VERSION) into $@." + $(Q) echo "Downloaded and installed .NET $(DOTNET_VERSION) into $@." dotnet-install.sh: Makefile $(Q) curl --retry 20 --retry-delay 2 --connect-timeout 15 -S -L $(if $(V),-v,-s) https://dot.net/v1/dotnet-install.sh --output $@.tmp @@ -116,7 +116,7 @@ DOWNLOAD_DOTNET_VERSION=$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION) endif endif -.stamp-download-dotnet-packages: $(TOP)/Make.config downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))) package-download/global.json package-download/NuGet.config +.stamp-download-dotnet-packages: $(TOP)/Make.config downloads/$(basename $(basename $(DOTNET_TARBALL_NAME))) package-download/global.json package-download/NuGet.config $(Q_GEN) cd package-download && $(DOTNET) \ build \ download-packages.proj \ @@ -129,8 +129,8 @@ endif /p:ToolChainManifestVersionBand="$(TOOLCHAIN_MANIFEST_VERSION_BAND)" \ /bl \ $(DOTNET_BUILD_VERBOSITY) - $(Q) $(CP) ./downloads/microsoft.net.workload.mono.toolchain.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(DOWNLOAD_DOTNET_VERSION)/data/WorkloadManifest.* ./downloads/dotnet-sdk-$(DOTNET6_VERSION)-osx-x64/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain/ - $(Q) $(CP) ./downloads/microsoft.net.workload.emscripten.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(EMSCRIPTEN_MANIFEST_PACKAGE_VERSION)/data/WorkloadManifest.* ./downloads/dotnet-sdk-$(DOTNET6_VERSION)-osx-x64/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten/ + $(Q) $(CP) ./downloads/microsoft.net.workload.mono.toolchain.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(DOWNLOAD_DOTNET_VERSION)/data/WorkloadManifest.* ./downloads/dotnet-sdk-$(DOTNET_VERSION)-osx-x64/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain/ + $(Q) $(CP) ./downloads/microsoft.net.workload.emscripten.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(EMSCRIPTEN_MANIFEST_PACKAGE_VERSION)/data/WorkloadManifest.* ./downloads/dotnet-sdk-$(DOTNET_VERSION)-osx-x64/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten/ $(Q) touch $@ BundledNETCorePlatformsPackageVersion.txt: .stamp-download-dotnet-packages @@ -149,7 +149,7 @@ endif $(Q) mv $@.tmp $@ DOTNET_DOWNLOADS = \ - downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))) \ + downloads/$(basename $(basename $(DOTNET_TARBALL_NAME))) \ .stamp-download-dotnet-packages \ dotnet: $(DOTNET_DOWNLOADS) diff --git a/dotnet/Makefile b/dotnet/Makefile index d068117d00..33b93fdcb0 100644 --- a/dotnet/Makefile +++ b/dotnet/Makefile @@ -3,9 +3,9 @@ TOP = .. include $(TOP)/Make.config include $(TOP)/mk/rules.mk -DOTNET_MANIFESTS_PATH=$(DOTNET6_DIR)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND) -DOTNET_PACKS_PATH=$(DOTNET6_DIR)/packs -DOTNET_TEMPLATE_PACKS_PATH=$(DOTNET6_DIR)/template-packs +DOTNET_MANIFESTS_PATH=$(DOTNET_DIR)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND) +DOTNET_PACKS_PATH=$(DOTNET_DIR)/packs +DOTNET_TEMPLATE_PACKS_PATH=$(DOTNET_DIR)/template-packs TMP_PKG_DIR=_pkg DOTNET_PLATFORMS_UPPERCASE:=$(shell echo $(DOTNET_PLATFORMS) | tr a-z A-Z) @@ -181,12 +181,12 @@ nupkgs/$(1).$(2).nupkg: $(3) $(WORKLOAD_TARGETS) package/$(1)/package.csproj $(w endef # Create the NuGet packaging targets. It's amazing what make allows you to do... -$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Sdk,$($(platform)_NUGET_VERSION_NO_METADATA),$($(platform)_NUGET_TARGETS),,$(DOTNET6_VERSION_BAND)))) -$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call CreateWindowsNuGetTemplate,Microsoft.$(platform).Windows.Sdk,$(IOS_WINDOWS_NUGET_VERSION_NO_METADATA),$($(platform)_WINDOWS_NUGET_TARGETS),,$(DOTNET6_VERSION_BAND)))) -$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Ref,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET6_VERSION_BAND)))) -$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Templates,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET6_VERSION_BAND)))) +$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Sdk,$($(platform)_NUGET_VERSION_NO_METADATA),$($(platform)_NUGET_TARGETS),,$(DOTNET_VERSION_BAND)))) +$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call CreateWindowsNuGetTemplate,Microsoft.$(platform).Windows.Sdk,$(IOS_WINDOWS_NUGET_VERSION_NO_METADATA),$($(platform)_WINDOWS_NUGET_TARGETS),,$(DOTNET_VERSION_BAND)))) +$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Ref,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_VERSION_BAND)))) +$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Templates,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_VERSION_BAND)))) $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.NET.Sdk.$(platform),$($(platform)_NUGET_VERSION_NO_METADATA),,.Manifest-$(MANIFEST_VERSION_BAND),$(MANIFEST_VERSION_BAND)))) -$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Runtime.$(rid),$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET6_VERSION_BAND))))) +$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Runtime.$(rid),$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_VERSION_BAND))))) # Copy the nuget from the temporary directory into the final directory $(DOTNET_NUPKG_DIR)/%.nupkg: nupkgs/%.nupkg | $(DOTNET_NUPKG_DIR) @@ -218,12 +218,12 @@ TARGETS += $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLO define InstallWorkload # .NET comes with a workload for us, but we don't want that, we want our own. So delete the workload that comes with .NET. -.stamp-workload-replace-$1-$(DOTNET6_VERSION): - $(Q) echo "Removing existing workload shipped with .NET $(DOTNET6_VERSION): $(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$1" +.stamp-workload-replace-$1-$(DOTNET_VERSION): + $(Q) echo "Removing existing workload shipped with .NET $(DOTNET_VERSION): $(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$1" $(Q) rm -Rf $(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$3 $(Q) touch $$@ -$(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$3: .stamp-workload-replace-$1-$(DOTNET6_VERSION) | $(DOTNET_MANIFESTS_PATH) +$(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$3: .stamp-workload-replace-$1-$(DOTNET_VERSION) | $(DOTNET_MANIFESTS_PATH) $$(Q_LN) ln -Fhs $$(abspath Workloads/Microsoft.NET.Sdk.$1) $$(abspath $$@) $(DOTNET_PACKS_PATH)/Microsoft.$1.Sdk/$2: | $(DOTNET_PACKS_PATH)/Microsoft.$1.Sdk @@ -260,8 +260,8 @@ define CreatePackage $(TMP_PKG_DIR)/Microsoft.$1.Workload.$2.pkg: $($(1)_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile | $(TMP_PKG_DIR) $$(Q) rm -f $$@ $$(Q) rm -rf tmpdir/Microsoft.NET.Sdk.$1.$2/ - $$(Q) mkdir -p tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/ - $$(Q) $$(CP) -r Workloads/Microsoft.NET.Sdk.$1 tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/ + $$(Q) mkdir -p tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_VERSION_BAND)/ + $$(Q) $$(CP) -r Workloads/Microsoft.NET.Sdk.$1 tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_VERSION_BAND)/ $$(Q_GEN) pkgbuild --quiet --version '$2' --root tmpdir/Microsoft.NET.Sdk.$1.$2 --component-plist PackageInfo.plist --install-location / --identifier com.microsoft.net.$3.workload.pkg $$@.tmp $$(Q) mv $$@.tmp $$@ @@ -314,11 +314,11 @@ PACKAGE_TARGETS += $(DOTNET_PKG_DIR)/Microsoft.$1.Bundle.$2.pkg $(TMP_PKG_DIR)/Microsoft.$1.Bundle.$2.zip: $($(1)_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile $(REF_PACK_$(4)) $(SDK_PACK_$(4)) $(TEMPLATE_PACKS_$(4)) | $(TMP_PKG_DIR) $$(Q) rm -rf $$@ $$@.tmpdir $$@.tmp - $$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/ + $$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_VERSION_BAND)/ $$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk $$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref $$(Q) mkdir -p $$@.tmpdir/dotnet/template-packs - $$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/ + $$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_VERSION_BAND)/ $$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Sdk $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk/$2 $$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Ref $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref/$2 $$(Q) $(CP) $(TEMPLATE_PACKS_$(4)) $$@.tmpdir/dotnet/template-packs/$(subst +$(NUGET_BUILD_METADATA),,$(notdir $(TEMPLATE_PACKS_$(4)))) @@ -333,12 +333,12 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreatePackage,$(platform),$ define CreateWindowsBundle $(TMP_PKG_DIR)/Microsoft.$1.Windows.Bundle.$2.zip: $($(1)_NUGET_TARGETS) $($(1)_WINDOWS_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile $(REF_PACK_$(4)) $(SDK_PACK_$(4)) $(SDK_PACK_$(4)_WINDOWS) $(TEMPLATE_PACKS_$(4)) | $(TMP_PKG_DIR) $$(Q) rm -rf $$@ $$@.tmpdir $$@.tmp - $$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/ + $$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_VERSION_BAND)/ $$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk $$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Windows.Sdk $$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref $$(Q) mkdir -p $$@.tmpdir/dotnet/template-packs - $$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/ + $$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_VERSION_BAND)/ $$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Sdk $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk/$2 $$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Windows.Sdk $$@.tmpdir/dotnet/packs/Microsoft.$1.Windows.Sdk/$2 $$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Ref $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref/$2 diff --git a/src/Makefile b/src/Makefile index dc2dc56d6e..5429415251 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,43 +28,43 @@ MACCATALYST_DOTNET_BUILD_DIR=$(DOTNET_BUILD_DIR)/maccatalyst GENERATOR_FLAGS=-process-enums -core -nologo -nostdlib -noconfig -native-exception-marshalling --ns:ObjCRuntime DOTNET_REFERENCES = \ - /r:$(DOTNET6_BCL_DIR)/System.Buffers.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Collections.Concurrent.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Collections.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Collections.NonGeneric.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Console.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Diagnostics.Debug.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Diagnostics.Tools.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Drawing.Primitives.dll \ - /r:$(DOTNET6_BCL_DIR)/System.IO.Compression.dll \ - /r:$(DOTNET6_BCL_DIR)/System.IO.FileSystem.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Linq.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Memory.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Net.Http.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Net.NameResolution.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Net.Primitives.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Net.Requests.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Net.Security.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Net.ServicePoint.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Net.Sockets.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Numerics.Vectors.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Resources.ResourceManager.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Runtime.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Runtime.CompilerServices.Unsafe.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Runtime.Extensions.dll \ + /r:$(DOTNET_BCL_DIR)/System.Buffers.dll \ + /r:$(DOTNET_BCL_DIR)/System.Collections.Concurrent.dll \ + /r:$(DOTNET_BCL_DIR)/System.Collections.dll \ + /r:$(DOTNET_BCL_DIR)/System.Collections.NonGeneric.dll \ + /r:$(DOTNET_BCL_DIR)/System.Console.dll \ + /r:$(DOTNET_BCL_DIR)/System.Diagnostics.Debug.dll \ + /r:$(DOTNET_BCL_DIR)/System.Diagnostics.Tools.dll \ + /r:$(DOTNET_BCL_DIR)/System.Drawing.Primitives.dll \ + /r:$(DOTNET_BCL_DIR)/System.IO.Compression.dll \ + /r:$(DOTNET_BCL_DIR)/System.IO.FileSystem.dll \ + /r:$(DOTNET_BCL_DIR)/System.Linq.dll \ + /r:$(DOTNET_BCL_DIR)/System.Memory.dll \ + /r:$(DOTNET_BCL_DIR)/System.Net.Http.dll \ + /r:$(DOTNET_BCL_DIR)/System.Net.NameResolution.dll \ + /r:$(DOTNET_BCL_DIR)/System.Net.Primitives.dll \ + /r:$(DOTNET_BCL_DIR)/System.Net.Requests.dll \ + /r:$(DOTNET_BCL_DIR)/System.Net.Security.dll \ + /r:$(DOTNET_BCL_DIR)/System.Net.ServicePoint.dll \ + /r:$(DOTNET_BCL_DIR)/System.Net.Sockets.dll \ + /r:$(DOTNET_BCL_DIR)/System.Numerics.Vectors.dll \ + /r:$(DOTNET_BCL_DIR)/System.Resources.ResourceManager.dll \ + /r:$(DOTNET_BCL_DIR)/System.Runtime.dll \ + /r:$(DOTNET_BCL_DIR)/System.Runtime.CompilerServices.Unsafe.dll \ + /r:$(DOTNET_BCL_DIR)/System.Runtime.Extensions.dll \ /r:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Security.Cryptography.X509Certificates.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Text.RegularExpressions.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Threading.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Threading.Tasks.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Threading.Thread.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Xml.dll \ - /r:$(DOTNET6_BCL_DIR)/System.Xml.ReaderWriter.dll \ + /r:$(DOTNET_BCL_DIR)/System.Security.Cryptography.X509Certificates.dll \ + /r:$(DOTNET_BCL_DIR)/System.Text.RegularExpressions.dll \ + /r:$(DOTNET_BCL_DIR)/System.Threading.dll \ + /r:$(DOTNET_BCL_DIR)/System.Threading.Tasks.dll \ + /r:$(DOTNET_BCL_DIR)/System.Threading.Thread.dll \ + /r:$(DOTNET_BCL_DIR)/System.Xml.dll \ + /r:$(DOTNET_BCL_DIR)/System.Xml.ReaderWriter.dll \ DOTNET_FLAGS=/noconfig /nostdlib+ /deterministic /features:strict /nologo /target:library /debug /unsafe /define:NET /define:NET_TODO /define:XAMCORE_3_0 $(DOTNET_REFERENCES) DOTNET_COMPILER=$(DOTNET_BUILD_DIR)/compiler -DOTNET_GENERATOR_FLAGS=$(GENERATOR_FLAGS) -compiler=$(abspath $(DOTNET_COMPILER)) --lib=$(DOTNET6_BCL_DIR) -attributelib:$(DOTNET_BINDING_ATTRIBUTES) $(DOTNET_REFERENCES) +DOTNET_GENERATOR_FLAGS=$(GENERATOR_FLAGS) -compiler=$(abspath $(DOTNET_COMPILER)) --lib=$(DOTNET_BCL_DIR) -attributelib:$(DOTNET_BINDING_ATTRIBUTES) $(DOTNET_REFERENCES) DOTNET_GENERATOR=$(DOTNET_BUILD_DIR)/bgen/bgen DOTNET_BINDING_ATTRIBUTES=$(DOTNET_BUILD_DIR)/Xamarin.Apple.BindingAttributes.dll @@ -206,7 +206,7 @@ $(IOS_BUILD_DIR)/native/generated_sources: $(IOS_GENERATOR) $(IOS_APIS) $(IOS_BU $(IOS_DOTNET_BUILD_DIR)/core-ios.dll: $(IOS_DOTNET_CORE_SOURCES) frameworks.sources $(DOTNET_BUILD_DIR)/ios-defines-dotnet.rsp | $(IOS_DOTNET_BUILD_DIR) $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) \ + $(DOTNET_CSC) $(DOTNET_FLAGS) \ $(IOS_CORE_WARNINGS_TO_FIX) \ @$(DOTNET_BUILD_DIR)/ios-defines-dotnet.rsp \ $(IOS_CORE_DEFINES) \ @@ -262,7 +262,7 @@ $(IOS_BUILD_DIR)/native-$(1)%Xamarin.iOS.dll $(IOS_BUILD_DIR)/native-$(1)%Xamari $$(IOS_SOURCES) @$(IOS_BUILD_DIR)/native/generated_sources $(IOS_DOTNET_BUILD_DIR)/$(1)/Microsoft.iOS%dll $(IOS_DOTNET_BUILD_DIR)/$(1)/Microsoft.iOS%pdb $(2): $$(IOS_DOTNET_SOURCES) $$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources $$(IOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $$(IOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml $(PRODUCT_KEY_PATH) | $(IOS_DOTNET_BUILD_DIR)/$(1) $(IOS_DOTNET_BUILD_DIR)/ref - $$(call Q_PROF_CSC,dotnet/$(1)-bit) $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(IOS_DOTNET_BUILD_DIR)/$(1)/Microsoft.iOS.dll -unsafe -optimize \ + $$(call Q_PROF_CSC,dotnet/$(1)-bit) $(DOTNET_CSC) $(DOTNET_FLAGS) -out:$(IOS_DOTNET_BUILD_DIR)/$(1)/Microsoft.iOS.dll -unsafe -optimize \ $$(ARGS_$(1)) \ -publicsign -keyfile:$(PRODUCT_KEY_PATH) \ $(3) \ @@ -645,7 +645,7 @@ $(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Microsoft.macOS.dll: $(MACOS_DOT $(MACOS_DOTNET_BUILD_DIR)/core-macos.dll: $(MACOS_DOTNET_CORE_SOURCES) frameworks.sources $(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp | $(MACOS_DOTNET_BUILD_DIR) $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$@ \ + $(DOTNET_CSC) $(DOTNET_FLAGS) -out:$@ \ $(MAC_CORE_WARNINGS_TO_FIX) \ @$(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp \ $(MAC_CORE_DEFINES) \ @@ -670,7 +670,7 @@ $(MACOS_DOTNET_BUILD_DIR)/macos.rsp: Makefile Makefile.generator frameworks.sour $(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS%dll $(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS%pdb $(MACOS_DOTNET_BUILD_DIR)/ref/Microsoft.macOS%dll: $(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources $(MACOS_DOTNET_SOURCES) $(SN_KEY) $(MACOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACOS_DOTNET_BUILD_DIR)/64 $(MACOS_DOTNET_BUILD_DIR)/ref $(Q_DOTNET_BUILD) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS.dll -optimize \ + $(DOTNET_CSC) $(DOTNET_FLAGS) -out:$(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS.dll -optimize \ -publicsign -keyfile:$(SN_KEY) \ -refout:$(MACOS_DOTNET_BUILD_DIR)/ref/Microsoft.macOS.dll \ $(MAC_COMMON_DEFINES) \ @@ -899,7 +899,7 @@ $(BUILD_DIR)/watchos.rsp: Makefile Makefile.generator frameworks.sources $(WATCHOS_DOTNET_BUILD_DIR)/core-watchos.dll: $(WATCHOS_CORE_SOURCES) frameworks.sources $(DOTNET_BUILD_DIR)/watchos-defines-dotnet.rsp | $(WATCHOS_DOTNET_BUILD_DIR) $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) \ + $(DOTNET_CSC) $(DOTNET_FLAGS) \ $(WATCHOS_CORE_WARNINGS_TO_FIX) \ @$(DOTNET_BUILD_DIR)/watchos-defines-dotnet.rsp \ $(WATCHOS_CORE_DEFINES) \ @@ -924,7 +924,7 @@ $(WATCHOS_DOTNET_BUILD_DIR)/watchos.rsp: Makefile Makefile.generator frameworks. $(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS%dll $(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS%pdb: $(WATCHOS_DOTNET_BUILD_DIR)/watchos-generated-sources $(WATCHOS_SOURCES) $(PRODUCT_KEY_PATH) $(WATCHOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml | $(WATCHOS_DOTNET_BUILD_DIR)/32 $(WATCHOS_DOTNET_BUILD_DIR)/ref $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS.dll -optimize \ + $(DOTNET_CSC) $(DOTNET_FLAGS) -out:$(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS.dll -optimize \ -publicsign -keyfile:$(PRODUCT_KEY_PATH) \ $(WATCH_DEFINES) \ $(ARGS_32) \ @@ -938,7 +938,7 @@ $(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS%dll $(WATCHOS_DOTNET_BUILD_DIR)/3 $(WATCHOS_DOTNET_BUILD_DIR)/64/Xamarin.WatchOS%dll $(WATCHOS_DOTNET_BUILD_DIR)/64/Xamarin.WatchOS%pdb $(WATCHOS_DOTNET_BUILD_DIR)/ref/Xamarin.WatchOS%dll: $(WATCHOS_DOTNET_BUILD_DIR)/watchos-generated-sources $(WATCHOS_SOURCES) $(PRODUCT_KEY_PATH) $(WATCHOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml | $(WATCHOS_DOTNET_BUILD_DIR)/64 $(WATCHOS_DOTNET_BUILD_DIR)/ref $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(WATCHOS_DOTNET_BUILD_DIR)/64/Xamarin.WatchOS.dll -optimize \ + $(DOTNET_CSC) $(DOTNET_FLAGS) -out:$(WATCHOS_DOTNET_BUILD_DIR)/64/Xamarin.WatchOS.dll -optimize \ -publicsign -keyfile:$(PRODUCT_KEY_PATH) \ -refout:$(WATCHOS_DOTNET_BUILD_DIR)/ref/Xamarin.WatchOS.dll \ $(WATCH_DEFINES) \ @@ -1208,7 +1208,7 @@ $(BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.sources $(TVOS_DOTNET_BUILD_DIR)/core-tvos.dll: $(TVOS_DOTNET_CORE_SOURCES) frameworks.sources Makefile $(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp | $(TVOS_DOTNET_BUILD_DIR) $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) \ + $(DOTNET_CSC) $(DOTNET_FLAGS) \ $(TVOS_CORE_WARNINGS_TO_FIX) \ @$(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp \ $(TVOS_CORE_DEFINES) \ @@ -1233,7 +1233,7 @@ $(TVOS_DOTNET_BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.source $(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS%dll $(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS%pdb $(TVOS_DOTNET_BUILD_DIR)/ref/Microsoft.tvOS%dll: $(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources $(TVOS_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(TVOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(TVOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(TVOS_DOTNET_BUILD_DIR)/64 $(TVOS_DOTNET_BUILD_DIR)/ref $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS.dll -optimize \ + $(DOTNET_CSC) $(DOTNET_FLAGS) -out:$(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS.dll -optimize \ -publicsign -keyfile:$(PRODUCT_KEY_PATH) \ -refout:$(TVOS_DOTNET_BUILD_DIR)/ref/Microsoft.tvOS.dll \ $(TVOS_DEFINES) \ @@ -1393,7 +1393,7 @@ $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml: $(TOP)/src/ILLink.Subs $(MACCATALYST_DOTNET_BUILD_DIR)/core-maccatalyst.dll: $(MACCATALYST_DOTNET_CORE_SOURCES) frameworks.sources Makefile $(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp | $(MACCATALYST_DOTNET_BUILD_DIR) $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) \ + $(DOTNET_CSC) $(DOTNET_FLAGS) \ $(MACCATALYST_WARNINGS_TO_FIX) \ @$(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp \ $(MACCATALYST_CORE_DEFINES) \ @@ -1418,7 +1418,7 @@ $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst.rsp: Makefile Makefile.generator fra $(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst%dll $(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst%pdb $(MACCATALYST_DOTNET_BUILD_DIR)/ref/Microsoft.MacCatalyst%dll: $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst-generated-sources $(MACCATALYST_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACCATALYST_DOTNET_BUILD_DIR)/64 $(MACCATALYST_DOTNET_BUILD_DIR)/ref $(Q_DOTNET_GEN) \ - $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst.dll -optimize \ + $(DOTNET_CSC) $(DOTNET_FLAGS) -out:$(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst.dll -optimize \ -publicsign -keyfile:$(PRODUCT_KEY_PATH) \ -refout:$(MACCATALYST_DOTNET_BUILD_DIR)/ref/Microsoft.MacCatalyst.dll \ $(MACCATALYST_DEFINES) \ @@ -1547,7 +1547,7 @@ $(COMMON_TARGET_DIRS): $(DOTNET_COMPILER): Makefile $(TOP)/Make.config | $(DOTNET_BUILD_DIR) $(Q) echo "#!/bin/zsh -e" > $@ - $(Q) echo "exec $(DOTNET6_CSC) $(DOTNET_FLAGS) \"\$$@\"" >> $@ + $(Q) echo "exec $(DOTNET_CSC) $(DOTNET_FLAGS) \"\$$@\"" >> $@ $(Q) chmod +x $@ GENERATE_FRAMEWORKS_CONSTANTS=generate-frameworks-constants/bin/Debug/generate-frameworks-constants.exe diff --git a/system-dependencies.sh b/system-dependencies.sh index 1193f6d0fe..af3a23adb2 100755 --- a/system-dependencies.sh +++ b/system-dependencies.sh @@ -1021,7 +1021,7 @@ function check_dotnet () local CACHED_FILE local DOWNLOADED_FILE - DOTNET_VERSION=$(grep "^DOTNET_VERSION=" dotnet.config | sed 's/.*=//') + DOTNET_VERSION=$(grep "^SYSTEM_DOTNET_VERSION=" dotnet.config | sed 's/.*=//') URL=https://dotnetcli.azureedge.net/dotnet/Sdk/"$DOTNET_VERSION"/dotnet-sdk-"$DOTNET_VERSION"-osx-x64.pkg INSTALL_DIR=/usr/local/share/dotnet/sdk/"$DOTNET_VERSION" diff --git a/tests/Makefile b/tests/Makefile index 768dd29030..f01d0edea6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -74,10 +74,10 @@ test.config: Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/eng/Version.De @echo "TVOS_SDK_VERSION=$(TVOS_SDK_VERSION)" >> $@ @echo "WATCH_SDK_VERSION=$(WATCH_SDK_VERSION)" >> $@ @echo "MACOS_SDK_VERSION=$(MACOS_SDK_VERSION)" >> $@ - @echo "DOTNET6_BCL_DIR=$(DOTNET6_BCL_DIR)" >> $@ + @echo "DOTNET_BCL_DIR=$(DOTNET_BCL_DIR)" >> $@ @echo "ENABLE_DOTNET=$(ENABLE_DOTNET)" >> $@ @printf "$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),DOTNET_$(platform)_RUNTIME_IDENTIFIERS='$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS)'\\n)" | sed 's/^ //' >> $@ - @echo "DOTNET_CSC_COMMAND='$(DOTNET6_CSC)'" >> $@ + @echo "DOTNET_CSC_COMMAND='$(DOTNET_CSC)'" >> $@ test-system.config: Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/eng/Version.Details.xml @rm -f $@ diff --git a/tests/common/Configuration.cs b/tests/common/Configuration.cs index ad2cb141c8..a1acc09de2 100644 --- a/tests/common/Configuration.cs +++ b/tests/common/Configuration.cs @@ -21,7 +21,7 @@ namespace Xamarin.Tests static string mt_root; static string ios_destdir; static string mac_destdir; - public static string DotNet6BclDir; + public static string DotNetBclDir; public static string DotNetCscCommand; public static string DotNetExecutable; public static string mt_src_root; @@ -287,7 +287,7 @@ namespace Xamarin.Tests include_maccatalyst = !string.IsNullOrEmpty (GetVariable ("INCLUDE_MACCATALYST", "")); include_device = !string.IsNullOrEmpty (GetVariable ("INCLUDE_DEVICE", "")); include_dotnet = !string.IsNullOrEmpty (GetVariable ("ENABLE_DOTNET", "")); - DotNet6BclDir = GetVariable ("DOTNET6_BCL_DIR", null); + DotNetBclDir = GetVariable ("DOTNET_BCL_DIR", null); DotNetCscCommand = GetVariable ("DOTNET_CSC_COMMAND", null)?.Trim ('\''); DotNetExecutable = GetVariable ("DOTNET", null); @@ -509,7 +509,7 @@ namespace Xamarin.Tests public static string GetDotNetRoot () { if (IsVsts) { - return EvaluateVariable ("DOTNET6_DIR"); + return EvaluateVariable ("DOTNET_DIR"); } else { return Path.Combine (SourceRoot, "_build"); } diff --git a/tests/generator/BGenTool.cs b/tests/generator/BGenTool.cs index fedf48e7ca..17f65e22c7 100644 --- a/tests/generator/BGenTool.cs +++ b/tests/generator/BGenTool.cs @@ -175,7 +175,7 @@ namespace Xamarin.Tests if (tf == null) { // do nothing } else if (tf.Value.IsDotNet == true) { - References.AddRange (Directory.GetFiles (Configuration.DotNet6BclDir, "*.dll")); + References.AddRange (Directory.GetFiles (Configuration.DotNetBclDir, "*.dll")); } else { throw new NotImplementedException ("ReferenceBclByDefault"); } diff --git a/tests/generator/GeneratorTests.cs b/tests/generator/GeneratorTests.cs index a97d0bc66e..c0bdb09f35 100644 --- a/tests/generator/GeneratorTests.cs +++ b/tests/generator/GeneratorTests.cs @@ -28,7 +28,7 @@ namespace GeneratorTests var tf = TargetFramework.Parse (targetFramework); arguments.Add ($"--baselib={Configuration.GetBaseLibrary (tf)}"); arguments.Add ($"--attributelib={Configuration.GetBindingAttributePath (tf)}"); - arguments.AddRange (Directory.GetFiles (Configuration.DotNet6BclDir, "*.dll").Select (v => $"-r:{v}")); + arguments.AddRange (Directory.GetFiles (Configuration.DotNetBclDir, "*.dll").Select (v => $"-r:{v}")); #else var targetFramework = "Xamarin.iOS,v1.0"; #endif diff --git a/tests/test-libraries/custom-type-assembly/Makefile b/tests/test-libraries/custom-type-assembly/Makefile index 41ca76fa9f..08dae4a848 100644 --- a/tests/test-libraries/custom-type-assembly/Makefile +++ b/tests/test-libraries/custom-type-assembly/Makefile @@ -6,7 +6,7 @@ include $(TOP)/Make.config $(Q_CSC) $(MAC_mobile_CSC) $< -out:$@ -r:$(TOP)/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/mono/Xamarin.Mac/Xamarin.Mac.dll -target:library .libs/dotnet/macos/custom-type-assembly.dll: custom-type-assembly.cs Makefile | .libs/dotnet/macos - $(Q_CSC) $(DOTNET6_CSC) $< -out:$@ -r:$(TOP)/_build/Microsoft.macOS.Ref/ref/net6.0/Microsoft.macOS.dll -target:library -r:$(DOTNET6_BCL_DIR)/System.Runtime.dll /nologo + $(Q_CSC) $(DOTNET_CSC) $< -out:$@ -r:$(TOP)/_build/Microsoft.macOS.Ref/ref/net6.0/Microsoft.macOS.dll -target:library -r:$(DOTNET_BCL_DIR)/System.Runtime.dll /nologo .libs/macos .libs/dotnet/macos: $(Q) mkdir -p $@ diff --git a/tools/devops/Makefile b/tools/devops/Makefile index 7220dd57dc..225af969b7 100644 --- a/tools/devops/Makefile +++ b/tools/devops/Makefile @@ -8,7 +8,7 @@ device-tests-provisioning.csx: device-tests-provisioning.csx.in Makefile $(TOP)/ -e 's#@MONO_PACKAGE@#$(MIN_MONO_URL)#g' \ -e 's#@VS_PACKAGE@#$(MIN_VISUAL_STUDIO_URL)#g' \ -e 's#@MIN_SHARPIE_URL@#$(MIN_SHARPIE_URL)#g' \ - -e 's#@DOTNET_VERSION@#$(DOTNET_VERSION)#g' \ + -e 's#@SYSTEM_DOTNET_VERSION@#$(SYSTEM_DOTNET_VERSION)#g' \ $< > $@; build-provisioning.csx: build-provisioning.csx.in Makefile $(TOP)/Make.config @@ -17,7 +17,7 @@ build-provisioning.csx: build-provisioning.csx.in Makefile $(TOP)/Make.config -e 's#@MONO_PACKAGE@#$(MIN_MONO_URL)#g' \ -e 's#@VS_PACKAGE@#$(MIN_VISUAL_STUDIO_URL)#g' \ -e 's#@MIN_SHARPIE_URL@#$(MIN_SHARPIE_URL)#g' \ - -e 's#@DOTNET_VERSION@#$(DOTNET_VERSION)#g' \ + -e 's#@SYSTEM_DOTNET_VERSION@#$(SYSTEM_DOTNET_VERSION)#g' \ $< > $@; mac-tests-provisioning.csx: mac-tests-provisioning.csx.in Makefile $(TOP)/Make.config @@ -25,7 +25,7 @@ mac-tests-provisioning.csx: mac-tests-provisioning.csx.in Makefile $(TOP)/Make.c -e 's#@XM_PACKAGE@#$(XM_PACKAGE)#g' \ -e 's#@MONO_PACKAGE@#$(MIN_MONO_URL)#g' \ -e 's#@VS_PACKAGE@#$(MIN_VISUAL_STUDIO_URL)#g' \ - -e 's#@DOTNET_VERSION@#$(DOTNET_VERSION)#g' \ + -e 's#@SYSTEM_DOTNET_VERSION@#$(SYSTEM_DOTNET_VERSION)#g' \ $< > $@; provision-xcode.csx: provision-xcode.csx.in Makefile $(TOP)/Make.config diff --git a/tools/devops/automation/templates/tests/run-tests.yml b/tools/devops/automation/templates/tests/run-tests.yml index 93fbed6f79..18af947a83 100644 --- a/tools/devops/automation/templates/tests/run-tests.yml +++ b/tools/devops/automation/templates/tests/run-tests.yml @@ -143,9 +143,9 @@ steps: cp global6.json global.json $DOTNET workload install --from-rollback-file $ROLLBACK_PATH --source $DOTNET_NUPKG_DIR $SOURCES --verbosity diag $PLATFORMS - var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=DOTNET6_DIR) - DOTNET6_DIR=${var#*=} - ls -lR $DOTNET6_DIR + var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=DOTNET_DIR) + DOTNET_DIR=${var#*=} + ls -lR $DOTNET_DIR workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-macios displayName: 'Install dotnet workloads' diff --git a/tools/devops/build-provisioning.csx.in b/tools/devops/build-provisioning.csx.in index 767a435a88..1ca079d099 100644 --- a/tools/devops/build-provisioning.csx.in +++ b/tools/devops/build-provisioning.csx.in @@ -13,4 +13,4 @@ Xcode ("@XCODE_XIP_NAME@").XcodeSelect (allowUntrusted: true); Item ("@MONO_PACKAGE@"); Item ("@MIN_SHARPIE_URL@"); Item ("@VS_PACKAGE@"); -DotNetCoreSdk ("@DOTNET_VERSION@"); +DotNetCoreSdk ("@SYSTEM_DOTNET_VERSION@"); diff --git a/tools/devops/device-tests-provisioning.csx.in b/tools/devops/device-tests-provisioning.csx.in index f92192a618..8a04800fdf 100644 --- a/tools/devops/device-tests-provisioning.csx.in +++ b/tools/devops/device-tests-provisioning.csx.in @@ -14,6 +14,6 @@ Item ("@MONO_PACKAGE@"); Item ("@VS_PACKAGE@"); Item ("@XI_PACKAGE@"); Item ("@MIN_SHARPIE_URL@"); -DotNetCoreSdk ("@DOTNET_VERSION@"); +DotNetCoreSdk ("@SYSTEM_DOTNET_VERSION@"); BrewPackages ("p7zip"); diff --git a/tools/devops/mac-tests-provisioning.csx.in b/tools/devops/mac-tests-provisioning.csx.in index 822caeb7c5..65f7830a91 100644 --- a/tools/devops/mac-tests-provisioning.csx.in +++ b/tools/devops/mac-tests-provisioning.csx.in @@ -10,6 +10,6 @@ using static Xamarin.Provisioning.ProvisioningScript; Item ("@MONO_PACKAGE@"); Item ("@VS_PACKAGE@"); Item ("@XM_PACKAGE@"); -DotNetCoreSdk ("@DOTNET_VERSION@"); +DotNetCoreSdk ("@SYSTEM_DOTNET_VERSION@"); BrewPackages ("p7zip"); diff --git a/tools/dotnet-linker/Makefile b/tools/dotnet-linker/Makefile index 701c3d64bd..9ba57f5ac2 100644 --- a/tools/dotnet-linker/Makefile +++ b/tools/dotnet-linker/Makefile @@ -36,7 +36,7 @@ $(DOTNET_DIRECTORIES): global.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index $(Q_GEN) \ printf "{\n" > $@; \ - printf "\t\"sdk\": { \"version\": \"$(DOTNET6_VERSION)\" }\n" >> $@; \ + printf "\t\"sdk\": { \"version\": \"$(DOTNET_VERSION)\" }\n" >> $@; \ printf "}\n" >> $@ all-local:: $(DOTNET_TARGETS) diff --git a/tools/mmp/Makefile b/tools/mmp/Makefile index c257800303..083a54d0c9 100644 --- a/tools/mmp/Makefile +++ b/tools/mmp/Makefile @@ -80,11 +80,11 @@ Xamarin.Mac.registrar.mobile.arm64.m: $(TOP)/src/build/mac/mobile-64/Xamarin.Mac $(Q) touch Xamarin.Mac.registrar.mobile.arm64.m Xamarin.Mac.registrar.mobile.arm64.h Microsoft.macOS.registrar.x86_64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP) - $(GENERATE_PART_REGISTRAR) --arch=x86_64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll + $(GENERATE_PART_REGISTRAR) --arch=x86_64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll $(Q) touch $@ $(basename $@).h Microsoft.macOS.registrar.coreclr.x86_64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP) - $(GENERATE_PART_REGISTRAR) --arch=x86_64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll --xamarin-runtime CoreCLR + $(GENERATE_PART_REGISTRAR) --arch=x86_64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll --xamarin-runtime CoreCLR $(Q) touch $@ $(basename $@).h Xamarin.Mac.registrar.full.x86_64.m: $(TOP)/src/build/mac/full-64/Xamarin.Mac.dll $(LOCAL_MMP) @@ -92,11 +92,11 @@ Xamarin.Mac.registrar.full.x86_64.m: $(TOP)/src/build/mac/full-64/Xamarin.Mac. $(Q) touch Xamarin.Mac.registrar.full.x86_64.m Xamarin.Mac.registrar.full.x86_64.h Microsoft.macOS.registrar.arm64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP) - $(GENERATE_PART_REGISTRAR) --arch=arm64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll + $(GENERATE_PART_REGISTRAR) --arch=arm64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll $(Q) touch $@ $(basename $@).h Microsoft.macOS.registrar.coreclr.arm64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP) - $(GENERATE_PART_REGISTRAR) --arch=arm64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll --xamarin-runtime CoreCLR + $(GENERATE_PART_REGISTRAR) --arch=arm64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET_BCL_DIR)/System.Runtime.dll -a:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll --xamarin-runtime CoreCLR $(Q) touch $@ $(basename $@).h Xamarin.Mac.registrar.full.arm64.m: $(TOP)/src/build/mac/full-64/Xamarin.Mac.dll $(LOCAL_MMP) diff --git a/tools/mtouch/Makefile b/tools/mtouch/Makefile index 6f974eb206..b6293b062c 100644 --- a/tools/mtouch/Makefile +++ b/tools/mtouch/Makefile @@ -230,7 +230,7 @@ define RunRegistrar $$(Q) touch $$(basename $$@).m $$(basename $$@).h .libs/Microsoft.$(9).registrar.$(10)%m .libs/Microsoft.$(9).registrar.$(10)%h: $(TOP)/src/build/dotnet/$(1)/$(3)/Microsoft.$(9).dll $(LOCAL_MTOUCH) | .libs - $$(Q_GEN) $$(LOCAL_MTOUCH_COMMAND) --xamarin-framework-directory=$$(IOS_DESTDIR)/$$(MONOTOUCH_PREFIX) $$(MTOUCH_VERBOSITY) --runregistrar:$$(abspath $$(basename $$@).m) --sdkroot $$(XCODE_DEVELOPER_ROOT) --sdk $(4) $$< --registrar:static --target-framework .NETCoreApp,Version=6.0,Profile=$(1) --abi $(2) -r:$(DOTNET6_BCL_DIR)/System.Runtime.dll -r:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll --rid $(10) + $$(Q_GEN) $$(LOCAL_MTOUCH_COMMAND) --xamarin-framework-directory=$$(IOS_DESTDIR)/$$(MONOTOUCH_PREFIX) $$(MTOUCH_VERBOSITY) --runregistrar:$$(abspath $$(basename $$@).m) --sdkroot $$(XCODE_DEVELOPER_ROOT) --sdk $(4) $$< --registrar:static --target-framework .NETCoreApp,Version=6.0,Profile=$(1) --abi $(2) -r:$(DOTNET_BCL_DIR)/System.Runtime.dll -r:$(DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR)/System.Runtime.InteropServices.dll --rid $(10) $$(Q) touch $$(basename $$@).m $$(basename $$@).h %.registrar.$(1).$(2).a: %.registrar.$(1).$(2).m %.registrar.$(1).$(2).h From 0ddd7a6888077f27eeafee873a8afe6f34310e2a Mon Sep 17 00:00:00 2001 From: Mauro Agnoletti Date: Wed, 23 Mar 2022 04:12:50 -0400 Subject: [PATCH 3/5] Updated Xamarin.Messaging version (#14472) Updated to 1.5.8, including fixes for a hang in build cancellation during SayHello and also an improvement in the port forwarding logic when establishing the SSH connection --- msbuild/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msbuild/Directory.Build.props b/msbuild/Directory.Build.props index aa77a97671..32008440eb 100644 --- a/msbuild/Directory.Build.props +++ b/msbuild/Directory.Build.props @@ -1,6 +1,6 @@ - 1.5.5 + 1.5.8 1.0.90 From 9e9f28a1115b53653dee42b0bad45607c78430fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:31:28 +0100 Subject: [PATCH 4/5] [main] Update dependencies from dotnet/runtime (#14315) * Update dependencies from https://github.com/dotnet/runtime build 20220303.4 Microsoft.NETCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 * Update dependencies from https://github.com/dotnet/runtime build 20220308.10 Microsoft.NETCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 * Update dependencies from https://github.com/dotnet/runtime build 20220309.5 Microsoft.NETCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 * Add feed for the System.Runtime.InteropServices.NFlaot.Internal package. * Revert "Add feed for the System.Runtime.InteropServices.NFlaot.Internal package." This reverts commit a394c4848290292a5122981fd4e61eaa04a9f433. * Update dependencies from https://github.com/dotnet/runtime build 20220310.4 Microsoft.NETCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 * Update dependencies from https://github.com/dotnet/runtime build 20220310.4 Microsoft.NETCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 * Update dependencies from https://github.com/dotnet/runtime build 20220311.8 Microsoft.NETCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.2 -> To Version 6.0.4 (parent: Microsoft.NETCore.App.Ref Co-authored-by: dotnet-maestro[bot] Co-authored-by: Rolf Bjarne Kvinge Co-authored-by: Manuel de la Pena --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4ada33b606..0a082d6fe5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,12 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84d33ec6e4..3a90a90a17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,18 +8,18 @@ https://github.com/dotnet/linker e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf - + https://github.com/dotnet/runtime - 3ba4b3f4eb0b5e25d3901090f921c88055cac1b0 + 323bf2dd0ef1004687a8bafa10a0c66f63252dee https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 1dcf7acfacf0fe154adcc23270cb0da11ff44ace - + https://github.com/dotnet/emsdk - ee0a97a0009c0e048789126253fea7994db676ac + 572aeedcfa16bdb619fafcecf5924e5c6b65b07b diff --git a/eng/Versions.props b/eng/Versions.props index 37d60def7e..dfb935db7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 6.0.200-1.22124.2 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 6.0.3 - 6.0.2 + 6.0.4 + 6.0.4 7.0.100-alpha.1.21601.1 From 18fa252f1d595251a5bb88ab7abcbb1b4b696085 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 23 Mar 2022 16:49:06 +0100 Subject: [PATCH 5/5] [msbuild] Show a better error when a bundle identifier isn't provided. Fixes #14283. (#14402) Fixes https://github.com/xamarin/xamarin-macios/issues/14283. --- msbuild/Xamarin.Shared/Xamarin.Shared.targets | 6 +++++ tests/dotnet/UnitTests/TemplateProjectTest.cs | 25 +++++++++++++++++++ .../TargetTests/CollectAppManifestsTests.cs | 3 +++ 3 files changed, 34 insertions(+) diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets index d4975b30c1..fce53455de 100644 --- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets +++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets @@ -574,6 +574,12 @@ Copyright (C) 2018 Microsoft. All rights reserved. + + + diff --git a/tests/dotnet/UnitTests/TemplateProjectTest.cs b/tests/dotnet/UnitTests/TemplateProjectTest.cs index 2c3e26e4c0..7779d460e2 100644 --- a/tests/dotnet/UnitTests/TemplateProjectTest.cs +++ b/tests/dotnet/UnitTests/TemplateProjectTest.cs @@ -165,5 +165,30 @@ $@" DotNet.AssertBuild (csprojfn); ExecuteProjectWithMagicWordAndAssert (csprojfn, platform); } + + [TestCase (ApplePlatform.MacOSX)] + public void NoBundleIdentifierError (ApplePlatform platform) + { + Configuration.IgnoreIfIgnoredPlatform (platform); + var csproj = $@" + + + {platform.ToFramework ()} + Exe + +"; + + var tmpdir = Cache.CreateTemporaryDirectory (); + Configuration.CopyDotNetSupportingFiles (tmpdir); + var project_path = Path.Combine (tmpdir, "TestProject.csproj"); + File.WriteAllText (project_path, csproj); + File.WriteAllText (Path.Combine (tmpdir, "Main.cs"), EmptyMainFile); + + var properties = GetDefaultProperties (); + var result = DotNet.AssertBuildFailure (project_path, properties); + var errors = BinLog.GetBuildLogErrors (result.BinLogPath).ToArray (); + Assert.AreEqual (1, errors.Length, "Errors"); + Assert.AreEqual ("A bundle identifier is required. Either add an 'ApplicationId' property in the project file, or add a 'CFBundleIdentifier' entry in the project's Info.plist file.", errors [0].Message); + } } } diff --git a/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/CollectAppManifestsTests.cs b/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/CollectAppManifestsTests.cs index f2bbe22aec..5931ad812b 100644 --- a/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/CollectAppManifestsTests.cs +++ b/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/CollectAppManifestsTests.cs @@ -40,6 +40,8 @@ namespace Xamarin.MacDev.Tasks { CFBundleDisplayName PartialAppManifestDisplayName + CFBundleIdentifier + com.xamarin.partialappmanifest "; @@ -68,6 +70,7 @@ namespace Xamarin.MacDev.Tasks { var plist = PDictionary.FromFile (appManifestPath); Assert.AreEqual ("PartialAppManifestDisplayName", plist.GetCFBundleDisplayName (), "Bundle display name"); + Assert.AreEqual ("com.xamarin.partialappmanifest", plist.GetCFBundleIdentifier (), "Bundle identifier"); } } }