Merge branch 'main' into improvement/FixUIKitNullability

.gitignore

@@ -31,7 +31,7 @@ tests/bcl-test/Mac\ OS\ X\ BCL\ \tests*.csproj
 tests/bcl-test/mscorlib*.csproj
 tests/bcl-test/SystemCoreXunit*.csproj
 tests/bcl-test/SystemXunit.csproj
-global6.json
+global.json
 .idea
 device-tests-provisioning.csx
 build-provisioning.csx

Make.config

@@ -523,7 +523,7 @@ MAC_PACKAGE_DMG_DIRNAME="$(MAC_PACKAGE_TITLE)"
 MAC_PACKAGE_UTI=com.$(MAC_PACKAGE_NAME_LOWER).pkg
 MAC_PACKAGE_INSTALL_LOCATION=$(MAC_FRAMEWORK_VERSIONED_DIR)
 
-TT = $(SYSTEM_DOTNET) t4
+TT = $(DOTNET) t4
 
 PRODUCT_KEY_PATH?=$(TOP)/product.snk
 
@@ -578,22 +578,11 @@ 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": /SYSTEM_DOTNET_VERSION=/' -e 's/"//g' > [email protected]
 	$(Q) grep MicrosoftDotnetSdkInternalPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> [email protected]
 	$(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> [email protected]
 	$(Q) grep MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>//g' -e 's/[ \t]*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=/' >> [email protected]
 	$(Q) mv [email protected] $@
 
-ifneq ("$(wildcard /usr/local/share/dotnet/dotnet)","")
-SYSTEM_DOTNET=/usr/local/share/dotnet/dotnet
-else
-ifneq ("$(wildcard /usr/local/share/dotnet/x64/dotnet)","")
-SYSTEM_DOTNET=/usr/local/share/dotnet/x64/dotnet
-else
-SYSTEM_DOTNET=/must/install/dotnet
-endif
-endif
-
 DOTNET_DESTDIR ?= $(TOP)/_build
 DOTNET_NUPKG_DIR ?= $(DOTNET_DESTDIR)/nupkgs
 DOTNET_PKG_DIR ?= $(DOTNET_DESTDIR)/pkgs
@@ -619,12 +608,12 @@ DOTNET_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$(DOTNET_VERSI
 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))
+DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/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)
+DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR:=$(abspath $(TOP)/packages/system.runtime.interopservices.nfloat.internal/6.0.1/ref/net6.0)
 else
 DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR:=$(DOTNET_BCL_DIR)
 endif

Makefile

@@ -58,10 +58,10 @@ ifdef INCLUDE_IOS
 	@echo Validated file permissions for Xamarin.iOS.
 endif
 
-all-local:: global6.json
+all-local:: global.json
 
 # This tells NuGet to use the exact same dotnet version we've configured in Make.config
-global6.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index
+global.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index
 	$(Q_GEN) \
 		printf "{\n" > $@; \
 		printf "\t\"sdk\": { \"version\": \"$(DOTNET_VERSION)\" }\n" >> $@; \
@@ -149,6 +149,14 @@ fix-xcode-select:
 fix-xcode-first-run:
 	$(XCODE_DEVELOPER_ROOT)/usr/bin/xcodebuild -runFirstLaunch
 
+install-dotnet:
+	@echo "Figuring out package link..."
+	@export PKG=$$(make -C builds print-dotnet-pkg-urls); \
+	echo "Downloading $$(basename $$PKG)..."; \
+	curl -LO "$$PKG"; \
+	echo "Installing $$(basename $$PKG)..."; \
+	time sudo installer -pkg "$$(basename $$PKG)" -target / -verbose -dumplog
+
 git-clean-all:
 	@echo "$(COLOR_RED)Cleaning and resetting all dependencies. This is a destructive operation.$(COLOR_CLEAR)"
 	@echo "$(COLOR_RED)You have 5 seconds to cancel (Ctrl-C) if you wish.$(COLOR_CLEAR)"

NuGet.config

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <config>
+    <!-- use a local package folder because we produce nuget packages which may end up having to be cleaned,
+         and it's much easier to clean a local repository than the global nuget cache (in particular on bots) -->
     <add key="repositorypath" value="packages" />
+    <add key="globalPackagesFolder" value="packages" />
   </config>
   <packageSources>
     <clear />
@@ -21,6 +24,7 @@
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="macios-dependencies" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/macios-dependencies/nuget/v3/index.json" />
     <add key="xamarin-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
+    <add key="local-tests-feed" value="tests/.nuget/packages" />
   </packageSources>
   <disabledPackageSources>
     <clear />

builds/.gitignore

@@ -28,3 +28,5 @@ mono-ios-sdk-destdir
 *.dylib
 *.o
 x86-64-slice*
+*.pkg
+

builds/Makefile

@@ -126,7 +126,7 @@ DOWNLOAD_DOTNET_VERSION=$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)
 endif
 endif
 
-.stamp-download-dotnet-packages: $(TOP)/Make.config downloads/$(basename $(basename $(DOTNET_TARBALL_NAME))) package-download/global.json package-download/NuGet.config
+.stamp-download-dotnet-packages: $(TOP)/Make.config downloads/$(basename $(basename $(DOTNET_TARBALL_NAME)))
 	$(Q_GEN) cd package-download && $(DOTNET) \
 		build \
 		download-packages.proj \
@@ -139,29 +139,16 @@ 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-$(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) $(CP) $(TOP)/packages/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) $(TOP)/packages/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 $@
 
-.stamp-install-t4: $(TOP)/.config/dotnet-tools.json
-	$(SYSTEM_DOTNET) tool restore
+.stamp-install-t4: $(TOP)/.config/dotnet-tools.json .stamp-download-dotnet-packages
+	$(DOTNET) tool restore
 	$(Q) touch $@
 
 BundledNETCorePlatformsPackageVersion.txt: .stamp-download-dotnet-packages
 
-package-download/global.json: $(TOP)/global6.json Makefile
-	$(Q) $(CP) $< $@
-
-# put any downloaded packages in our own directory, not in ~
-package-download/NuGet.config: $(TOP)/NuGet.config Makefile
-	$(Q) $(CP) $< $@
-	$(Q) $(CP) $< $@.tmp
-	$(Q) nuget config -Set globalPackagesFolder=$(abspath $(CURDIR)/downloads) -Config $@.tmp
-ifdef CUSTOM_DOTNET
-	$(Q) nuget sources add -Name dev-runtime-feed -Source $(abspath $(DOTNET_RUNTIME_PATH)/artifacts/packages/Release/Shipping) -ConfigFile [email protected]
-endif
-	$(Q) mv [email protected] $@
-
 DOTNET_DOWNLOADS = \
 	downloads/$(basename $(basename $(DOTNET_TARBALL_NAME))) \
 	.stamp-download-dotnet-packages \

dotnet/.gitignore

@@ -1,4 +1,3 @@
-global.json
 tmpdir
 Workloads/Microsoft.NET.Sdk.*/LICENSE
 WorkloadManifest.json

dotnet/Makefile

@@ -167,14 +167,14 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call NupkgDefinition,$(platform)
 
 # Create the nuget in a temporary directory (nupkgs/)
 define CreateNuGetTemplate
-nupkgs/$(1)$(4).$(2).nupkg: $(TEMPLATED_FILES) $(WORKLOAD_TARGETS) $(3) package/$(1)/package.csproj $(wildcard package/*.csproj) $(wildcard $(DOTNET_DESTDIR)/$(1)/* $(DOTNET_DESTDIR)/$(1)/*/* $(DOTNET_DESTDIR)/$(1)/*/*/* $(DOTNET_DESTDIR)/$(1)/*/*/*/*) global.json .stamp-workaround-for-maccore-issue-2427
+nupkgs/$(1)$(4).$(2).nupkg: $(TEMPLATED_FILES) $(WORKLOAD_TARGETS) $(3) package/$(1)/package.csproj $(wildcard package/*.csproj) $(wildcard $(DOTNET_DESTDIR)/$(1)/* $(DOTNET_DESTDIR)/$(1)/*/* $(DOTNET_DESTDIR)/$(1)/*/*/* $(DOTNET_DESTDIR)/$(1)/*/*/*/*) .stamp-workaround-for-maccore-issue-2427
 	@# Delete any versions of the nuget we're building
 	$$(Q) rm -f nupkgs/$(1).*.nupkg
 	$$(Q_PACK) $(DOTNET) pack package/$(1)/package.csproj -p:VersionBand=$(5) --output "$$(dir $$@)" $(DOTNET_PACK_VERBOSITY) "/bl:$$@.binlog"
 endef
 
 define CreateWindowsNuGetTemplate
-nupkgs/$(1).$(2).nupkg: $(3) $(WORKLOAD_TARGETS) package/$(1)/package.csproj $(wildcard package/*.csproj) $(wildcard $(DOTNET_DESTDIR)/$(1)/* $(DOTNET_DESTDIR)/$(1)/*/* $(DOTNET_DESTDIR)/$(1)/*/*/* $(DOTNET_DESTDIR)/$(1)/*/*/*/*) global.json .stamp-workaround-for-maccore-issue-2427
+nupkgs/$(1).$(2).nupkg: $(3) $(WORKLOAD_TARGETS) package/$(1)/package.csproj $(wildcard package/*.csproj) $(wildcard $(DOTNET_DESTDIR)/$(1)/* $(DOTNET_DESTDIR)/$(1)/*/* $(DOTNET_DESTDIR)/$(1)/*/*/* $(DOTNET_DESTDIR)/$(1)/*/*/*/*) .stamp-workaround-for-maccore-issue-2427
 	@# Delete any versions of the nuget we're building
 	$$(Q) rm -f nupkgs/$(1).*.nupkg
 	$$(Q_PACK) $(DOTNET) pack package/$(1)/package.csproj --output "$$(dir $$@)" $(DOTNET_PACK_VERBOSITY) "/bl:$$@.binlog"
@@ -394,18 +394,11 @@ ifdef ENABLE_DOTNET
 all-local:: $(TARGETS)
 endif
 
-# This tells NuGet to use the exact same dotnet version we've configured in Make.config
-global.json: $(TOP)/global6.json
-	$(CP) $< $@
-
-$(TOP)/tests/dotnet/NuGet.config:
-	$(Q) $(MAKE) -C $(TOP)/tests/dotnet NuGet.config
-
 clean-local::
 	$(Q) rm -Rf $(DOTNET_NUPKG_DIR)
 	$(Q) git clean -xfdq
 
-.stamp-workaround-for-maccore-issue-2427: global.json $(TOP)/eng/Versions.props $(LOCAL_WORKLOAD_TARGETS)
+.stamp-workaround-for-maccore-issue-2427: $(TOP)/eng/Versions.props $(LOCAL_WORKLOAD_TARGETS)
 	$(Q) $(DOTNET) restore package/workaround-for-maccore-issue-2427/restore.csproj /bl:package/workaround-for-maccore-issue-2427/restore.binlog $(MSBUILD_VERBOSITY)
 	$(Q) touch $@
 

dotnet/targets/Microsoft.Sdk.DefaultItems.template.props

@@ -17,70 +17,53 @@
 
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<!-- Default plist file inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0'))">
+		<!-- Default plist file inclusion -->
 		<None Include="*.plist">
 			<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
 		</None>
-	</ItemGroup>
 
-	<!-- Default SceneKit assets inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+		<!-- Default SceneKit assets inclusion -->
 		<SceneKitAsset Include="**\*.scnassets\*" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" >
 			<IsDefaultItem>true</IsDefaultItem>
 		</SceneKitAsset>
-	</ItemGroup>
 
-	<!-- Default Asset Catalog file inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+		<!-- Default Asset Catalog file inclusion -->
 		<ImageAsset Include="**\*.xcassets\**\*.*" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);**\*.xcassets\**\*.DS_Store">
 			<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
 			<Visible>false</Visible>
 			<IsDefaultItem>true</IsDefaultItem>
 		</ImageAsset>
-	</ItemGroup>
 
-	<!-- Default Storyboard file inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+		<!-- Default Storyboard file inclusion -->
 		<InterfaceDefinition Include="**\*.storyboard;**\*.xib" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" >
 			<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
 			<IsDefaultItem>true</IsDefaultItem>
 		</InterfaceDefinition>
-	</ItemGroup>
 
-	<!-- Default Atlas Texture file inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+		<!-- Default Atlas Texture file inclusion -->
 		<AtlasTexture Include="**\*.atlas\*.png" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" >
 			<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
 			<IsDefaultItem>true</IsDefaultItem>
 		</AtlasTexture>
-	</ItemGroup>
 
-	<!-- Default CoreMLModel inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+		<!-- Default CoreMLModel inclusion -->
 		<CoreMLModel Include="**\*.mlmodel" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" >
 			<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
 			<IsDefaultItem>true</IsDefaultItem>
 		</CoreMLModel>
-	</ItemGroup>
 
-	<!-- Default Metal inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+		<!-- Default Metal inclusion -->
 		<Metal Include="**\*.metal" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" >
 			<Link>$([MSBuild]::MakeRelative ('$(MSBuildProjectDirectory)', '%(Identity)'))</Link>
 			<IsDefaultItem>true</IsDefaultItem>
 		</Metal>
-	</ItemGroup>
 
-	<!-- Default SceneKit assets inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
+		<!-- Default SceneKit assets inclusion -->
 		<SceneKitAsset Include="**\*.scnassets\*" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" >
 			<IsDefaultItem>true</IsDefaultItem>
 		</SceneKitAsset>
-	</ItemGroup>
 
-	<!-- Default font files inclusion -->
-	<ItemGroup Condition="'$(EnableDefault@PLATFORM@Items)' == 'true'">
 		<!-- Include everything in the project's Resources folder (as represented by the _ResourcePrefix property, which is set from the IPhoneResourcePrefix/XamMacResourcePrefix properties),
 		     except for files that are already in any of the other resource type item groups -->
 		<BundleResource Include="$(_ResourcePrefix)\**\*" Exclude="

msbuild/Xamarin.HotRestart.PreBuilt/.gitignore

@@ -1,4 +1 @@
 *.zip
-NuGet.config
-global.json
-

msbuild/Xamarin.HotRestart.PreBuilt/Makefile

@@ -9,18 +9,10 @@ Xamarin.PreBuilt.iOS.app.zip: .build-stamp
 	$(Q) rm -rf $@
 	$(Q_GEN) cd $(APP_DIR) && zip -9r $(abspath $@) .
 
-NuGet.config: $(TOP)/tests/dotnet/NuGet.config $(TOP)/NuGet.config
-	$(Q) $(MAKE) $@ -C $(dir $<)
-	$(Q) $(CP) $< $@
-
-global.json: $(TOP)/tests/dotnet/global.json $(TOP)/global6.json
-	$(Q) $(MAKE) $@ -C $(dir $<)
-	$(Q) $(CP) $< $@
-
 $(TOP)/tests/dotnet/%:
 	$(Q) $(MAKE) -C $(dir $@) $*
 
-.build-stamp: $(wildcard Xamarin.PreBuilt.iOS/*) Makefile NuGet.config global.json
+.build-stamp: $(wildcard Xamarin.PreBuilt.iOS/*) Makefile
 	$(Q_GEN) $(DOTNET) build Xamarin.PreBuilt.iOS/Xamarin.PreBuilt.iOS.csproj "/bl:$(abspath ./msbuild.binlog)" $(MSBUILD_VERBOSITY)
 	$(Q) touch $@
 

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileSceneKitAssetsTaskBase.cs

@@ -164,7 +164,6 @@ public override bool Execute ()
 			var bundleResources = new List<ITaskItem> ();
 			var modified = new HashSet<string> ();
 			var items = new List<ITaskItem> ();
-			string metadata;
 
 			foreach (var asset in SceneKitAssets) {
 				if (!File.Exists (asset.ItemSpec))
@@ -178,9 +177,7 @@ public override bool Execute ()
 				if (scnassets.Length == 0)
 					continue;
 
-				metadata = asset.GetMetadata ("LogicalName");
-				if (!string.IsNullOrEmpty (metadata))
-					asset.SetMetadata ("LogicalName", string.Empty);
+				asset.RemoveMetadata ("LogicalName");
 
 				var bundleName = BundleResource.GetLogicalName (ProjectDir, prefixes, asset, !string.IsNullOrEmpty(SessionId));
 				var output = new TaskItem (Path.Combine (intermediate, bundleName));
@@ -195,6 +192,17 @@ public override bool Execute ()
 					// .. and remove the @OriginalItemSpec which is for @asset
 					scnassetsItem.RemoveMetadata ("OriginalItemSpec");
 
+					// The Link metadata is for the asset, but 'scnassetsItem' is the containing *.scnasset directory,
+					// so we need to update the Link metadata accordingly (if it exists).
+					var link = scnassetsItem.GetMetadata ("Link");
+					if (!string.IsNullOrEmpty (link)) {
+						var newLinkLength = link.Length - (asset.ItemSpec.Length - scnassets.Length);
+						if (newLinkLength > 0 && newLinkLength < link.Length) {
+							link = link.Substring (0, newLinkLength);
+							scnassetsItem.SetMetadata ("Link", link);
+						}
+					}
+
 					var assetMetadata = asset.GetMetadata ("DefiningProjectFullPath");
 					if (assetMetadata != scnassetsItem.GetMetadata ("DefiningProjectFullPath")) {
 						// xbuild doesn't set this, so we'll do it

runtime/Makefile

@@ -664,7 +664,7 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIM
 
 define DotNetLibXamarinTemplate
 
-DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime$(7).$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native
+DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/packages/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))

src/.gitignore

@@ -1,4 +1,3 @@
-global.json
 build
 MonoTouch.NUnitLite.csproj
 MonoTouch.NUnitLite.tvos.csproj

src/Makefile

@@ -1545,7 +1545,7 @@ $(SHARED_PATH)/Delegates.generated.cs: $(SHARED_PATH)/Delegates.cs.t4 $(SHARED_P
 	$(Q) $(MAKE) -C $(SHARED_PATH) Delegates.generated.cs
 
 $(BUILD_DIR)/common/NativeTypes/%.cs: $(TOP)/src/NativeTypes/%.tt | $(BUILD_DIR)/common/NativeTypes
-	$(Q_GEN) cd $(TOP) && $(TT) $(abspath $<) -o $(abspath $@) 1>/dev/null
+	$(Q_GEN) $(TT) $(abspath $<) -o $(abspath $@) 1>/dev/null
 
 $(COMMON_TARGET_DIRS):
 	$(Q) mkdir -p $@
@@ -1576,10 +1576,6 @@ $(DOTNET_BUILD_DIR)/Constants.%.generated.cs: Makefile $(DOTNET_GENERATE_FRAMEWO
 	$(Q) mono --debug $(DOTNET_GENERATE_FRAMEWORKS_CONSTANTS) "$*" "$@.tmp"
 	$(Q) mv "$@.tmp" "$@"
 
-# This tells NuGet to use the exact same dotnet version we've configured in Make.config
-global.json: $(TOP)/global6.json
-	$(Q) $(CP) $< $@
-
 install-local:: $(INSTALL_TARGETS)
 all-local:: $(ALL_TARGETS)
 

src/Makefile.generator

@@ -13,7 +13,7 @@ $(BUILD_DIR)/generator.csproj: generator.csproj | $(BUILD_DIR)
 $(BUILD_DIR)/common/bgen.exe: $(generator_dependencies) Makefile.generator $(BUILD_DIR)/generator-frameworks.g.cs
 	$(Q_GEN) $(SYSTEM_MSBUILD) "/bl:[email protected]" $(XBUILD_VERBOSITY) /p:Configuration=Debug generator.csproj /p:IntermediateOutputPath=$(BUILD_DIR)/IDE/obj/common/ /p:OutputPath=$(BUILD_DIR)/common /restore
 
-$(DOTNET_BUILD_DIR)/bgen/bgen:  $(generator_dependencies) Makefile.generator $(BUILD_DIR)/generator-frameworks.g.cs global.json | $(DOTNET_BUILD_DIR)/bgen
+$(DOTNET_BUILD_DIR)/bgen/bgen:  $(generator_dependencies) Makefile.generator $(BUILD_DIR)/generator-frameworks.g.cs | $(DOTNET_BUILD_DIR)/bgen
 	$(Q_DOTNET_BUILD) $(DOTNET) publish bgen/bgen.csproj $(DOTNET_BUILD_VERBOSITY) /p:Configuration=Debug /p:IntermediateOutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/obj/common/bgen)/ /p:OutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/bin/common/bgen/)/
 	$(Q) $(CP) $(DOTNET_BUILD_DIR)/IDE/bin/common/bgen/publish/* $(dir $@)
 	$(Q) printf 'exec $(DOTNET) "$$(dirname "$$0")"/bgen.dll $$@\n' > $@