Merge branch 'xcode14' into ImageKit-xcode14

Makefile

@@ -105,6 +105,9 @@ package:
  $(CP) $(MACCORE_PATH)/release/*.zip ../package
  $(CP) $(MACCORE_PATH)/release/*updateinfo ../package
 
+dotnet-install-system:
+ $(Q) $(MAKE) -C dotnet install-system
+
 install-system: install-system-ios install-system-mac
  @# Clean up some old files
  $(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS

NuGet.config

@@ -14,7 +14,7 @@
  <!-- Begin: Package sources from dotnet-aspnetcore -->
  <!-- End: Package sources from dotnet-aspnetcore -->
  <!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-pub-dotnet-runtime-4d6a40a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4d6a40ac/nuget/v3/index.json" />
+ <add key="darc-pub-dotnet-runtime-f8bf0fc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-f8bf0fcc/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-runtime -->
  <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />

dotnet/Makefile

@@ -213,12 +213,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),,$(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.$(platform).Sdk,$($(platform)_NUGET_VERSION_NO_METADATA),$($(platform)_NUGET_TARGETS),,$(DOTNET_MANIFEST_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_MANIFEST_VERSION_BAND))))
+$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Ref,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_MANIFEST_VERSION_BAND))))
+$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Templates,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_MANIFEST_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),,,$(DOTNET_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_MANIFEST_VERSION_BAND)))))
 
 # Copy the nuget from the temporary directory into the final directory
 $(DOTNET_NUPKG_DIR)/%.nupkg: nupkgs/%.nupkg | $(DOTNET_NUPKG_DIR)
@@ -292,8 +292,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/$(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) mkdir -p tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/
+ $$(Q) $$(CP) -r Workloads/Microsoft.NET.Sdk.$1 tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_MANIFEST_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 $$@
 
@@ -346,11 +346,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/$(DOTNET_VERSION_BAND)/
+ $$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_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/$(DOTNET_VERSION_BAND)/
+ $$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_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))))
@@ -359,18 +359,27 @@ $(TMP_PKG_DIR)/Microsoft.$1.Bundle.$2.zip: $($(1)_NUGET_TARGETS) $(WORKLOAD_TARG
  $$(Q) echo Created $$@
 
 PACKAGE_TARGETS += $(DOTNET_PKG_DIR)/Microsoft.$1.Bundle.$2.zip
+
+install-system-$(3): $(DOTNET_PKG_DIR)/Microsoft.$1.Bundle.$2.pkg
+ $(Q) echo "Installing $$<..."
+ $(Q) sudo installer -pkg "$$<" -target / $$(INSTALLER_VERBOSITY)
+ $(Q) echo "Installed $$<"
+ $(Q) echo "Execute this in the project directory to be built for NuGet to find the runtime packs:"
+ $(Q) echo " nuget sources add -Name local-macios-packages -ConfigFile NuGet.config -Source file://$(abspath $(DOTNET_NUPKG_DIR))"
+
+INSTALL_SYSTEM_PACKAGE_TARGETS += install-system-$(3)
 endef
 $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreatePackage,$(platform),$($(platform)_NUGET_VERSION_NO_METADATA),$(shell echo $(platform) | tr A-Z a-z),$(shell echo $(platform) | tr a-z A-Z))))
 
 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/$(DOTNET_VERSION_BAND)/
+ $$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_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/$(DOTNET_VERSION_BAND)/
+ $$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_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
@@ -422,6 +431,12 @@ TARGETS += $(WORKLOAD_TARGETS) $(WINDOWS_PACKAGE_TARGETS)
 msi: $(MSI_TARGETS)
 package: $(PACKAGE_TARGETS) $(MSI_TARGETS) $(WINDOWS_PACKAGE_TARGETS)
 
+install-system:
+ @# We don't want to execute these in parallel
+ @for target in $(INSTALL_SYSTEM_PACKAGE_TARGETS); do \
+ $(MAKE) $$target; \
+ done
+
 ifdef ENABLE_DOTNET
 all-local:: $(TARGETS)
 endif

eng/Version.Details.xml

@@ -10,7 +10,7 @@
  </Dependency>
  <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.8">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>4d6a40ac22fc008d5fe22f1e776f58ecc7e5fdc3</Sha>
+ <Sha>f8bf0fcc30d2e1f606266db1b644266c7bdbf063</Sha>
  </Dependency>
  <!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
  <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">

mk/mono.mk

@@ -1,4 +1,4 @@
-NEEDED_MONO_VERSION := dffa5ab92245f2419238a35b7c2052e9a24036b4
+NEEDED_MONO_VERSION := 2a19f878dab8d2e62123e0bf29453de553f5402a
 NEEDED_MONO_BRANCH := 2020-02
 
 MONO_DIRECTORY := mono

mk/quiet.mk

@@ -73,6 +73,7 @@ MTOUCH_VERBOSITY=-q
 DOTNET_PACK_VERBOSITY=--verbosity:quiet --nologo
 DOTNET_BUILD_VERBOSITY=--verbosity quiet --nologo -consoleLoggerParameters:NoSummary
 NUGET_VERBOSITY=-verbosity quiet
+INSTALLER_VERBOSITY=
 else
 # CI build
 XBUILD_VERBOSITY=/nologo /verbosity:normal
@@ -82,6 +83,7 @@ MTOUCH_VERBOSITY=-vvvv
 DOTNET_PACK_VERBOSITY=
 DOTNET_BUILD_VERBOSITY=
 NUGET_VERBOSITY=
+INSTALLER_VERBOSITY=
 endif
 else
 # verbose build
@@ -92,6 +94,7 @@ MTOUCH_VERBOSITY=-vvvv
 DOTNET_PACK_VERBOSITY=--verbosity:detailed
 DOTNET_BUILD_VERBOSITY=--verbosity detailed
 NUGET_VERBOSITY=-verbosity detailed
+INSTALLER_VERBOSITY=-verbose -dumplog
 endif
 MSBUILD_VERBOSITY=$(XBUILD_VERBOSITY)
 MSBUILD_VERBOSITY_QUIET=$(XBUILD_VERBOSITY_QUIET)

msbuild/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
- <MessagingVersion>1.6.24</MessagingVersion>
+ <MessagingVersion>1.6.60</MessagingVersion>
  <HotRestartVersion>1.0.93</HotRestartVersion>
  </PropertyGroup>
 </Project>

msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs

@@ -21,7 +21,7 @@ internal TaskRunner (ITaskSerializer serializer)
  var dotnetPath = Path.Combine (sdkRootPath, "dotnet", "dotnet");
 
  if (File.Exists (dotnetPath)) {
- Environment.SetEnvironmentVariable ("HOME", Path.Combine (sdkRootPath, ".home"));
+ Environment.SetEnvironmentVariable ("DOTNET_CUSTOM_HOME", Path.Combine (sdkRootPath, ".home"));
  } else {
  //In case the XMA dotnet has not been installed yet
  dotnetPath = "/usr/local/share/dotnet/dotnet";
@@ -34,7 +34,7 @@ internal TaskRunner (ITaskSerializer serializer)
 
  internal void LoadTasks (Assembly assembly) => tasks.AddRange (assembly.GetTypes ());
 
- internal void LoadXamarinTasks () => LoadTasks (typeof (iOS.Tasks.CompileAppManifest).Assembly);
+ internal void LoadXamarinTasks () => LoadTasks (typeof (iOS.Tasks.MTouch).Assembly);
 
  public ExecuteTaskResult Execute (string taskName, string inputs)
  {

msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj

@@ -12,7 +12,7 @@
  <ItemGroup>
  <PackageReference Include="System.IO.Abstractions" Version="6.0.27" />
  <PackageReference Include="Mono.Cecil" Version="0.11.4" />
- <PackageReference Include="GitInfo" Version="2.1.2" />
+ <PackageReference Include="GitInfo" Version="2.2.0" />
  <!-- We only include build assets to get targets related to agent generation, the assemblies come from Xamarin.iOS.Tasks -->
  <PackageReference Include="Xamarin.Messaging.Core" Version="$(MessagingVersion)" IncludeAssets="build" />
  </ItemGroup>

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

@@ -268,7 +268,13 @@ public override bool Execute ()
  BTouchToolPath = PathUtils.ConvertToMacPath (BTouchToolPath);
  DotNetCscCompiler = PathUtils.ConvertToMacPath (DotNetCscCompiler);
 
- if (!IsDotNet) {
+ if (IsDotNet) {
+ var customHome = Environment.GetEnvironmentVariable ("DOTNET_CUSTOM_HOME");
+
+ if(!string.IsNullOrEmpty(customHome)) {
+ EnvironmentVariables = EnvironmentVariables.CopyAndAdd ($"HOME={customHome}");
+ }
+ } else {
  ToolExe = BTouchToolExe;
  ToolPath = BTouchToolPath;
  }