Merge branch 'main' into darc-main-7d6cfed6-6e3b-49ea-b941-87e0d82e36e0

xamarin · Nov 17, 2022 · 870dccc · 870dccc · vs-mobiletools-engineering-service2 · Nov 17, 2022
2 parents 99395ac + d6f9aa7
commit 870dccc
Show file tree

Hide file tree

Showing 208 changed files with 3,518 additions and 3,062 deletions.
diff --git a/dotnet/Makefile b/dotnet/Makefile
@@ -74,6 +74,7 @@ DIRECTORIES += \
 	$(TMP_PKG_DIR) \
 	$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(DOTNET_DESTDIR)/Microsoft.$(platform).Windows.Sdk/Sdk) \
 	$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(DOTNET_DESTDIR)/Microsoft.$(platform).Windows.Sdk/targets) \
+	$(foreach platform,$(DOTNET_PLATFORMS),Workloads/Microsoft.NET.Sdk.$(platform)) \
 
 $(DIRECTORIES):
 	$(Q) mkdir -p $@
@@ -167,13 +168,12 @@ endef
 $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call SharedAfterTargetsTemplate,$(platform),$(NET6_$(platform)_NUGET_VERSION_NO_METADATA))))
 
 define WorkloadTargets
-Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.json: Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index Makefile generate-workloadmanifest-json.csharp
-	$$(Q) mkdir -p Workloads/Microsoft.NET.Sdk.$(1)/
+Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.json: Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index Makefile generate-workloadmanifest-json.csharp | Workloads/Microsoft.NET.Sdk.$(1)
 	$$(Q) rm -f $$@.tmp
 	$$(Q_GEN) ./generate-workloadmanifest-json.csharp "$(1)" "$(3)" "$(4)" "$$(DOTNET_$(5)_RUNTIME_IDENTIFIERS)" "$$@.tmp" "$$(DOTNET_WINDOWS_PLATFORMS)"
 	$$(Q) mv $$@.tmp $$@
 
-Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.targets: Workloads/WorkloadManifest.$(1).template.targets Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index
+Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.targets: Workloads/WorkloadManifest.$(1).template.targets Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index | Workloads/Microsoft.NET.Sdk.$(1)
 	$$(Q_GEN) sed \
 		-e "s/@NUGET_VERSION_NO_METADATA@/$3/g" \
 		$$< > $$@.tmp

diff --git a/msbuild/Xamarin.iOS.Tasks/Tasks/ValidateAppBundleTaskBase.cs b/msbuild/Xamarin.iOS.Tasks/Tasks/ValidateAppBundleTaskBase.cs
@@ -120,6 +120,7 @@ void ValidateWatchApp (string path, string mainBundleIdentifier, string mainShor
 		{
 			var name = Path.GetFileNameWithoutExtension (path);
 			var info = Path.Combine (path, "Info.plist");
+			var isSingleProject = false;
 			if (!File.Exists (info)) {
 				Log.LogError (7014, path, MSBStrings.E7014, name);
 				return;
@@ -162,26 +163,32 @@ void ValidateWatchApp (string path, string mainBundleIdentifier, string mainShor
 				Log.LogError (7019, info, MSBStrings.E7019, name, wkCompanionAppBundleIdentifier, mainBundleIdentifier);
 
 			PBoolean watchKitApp;
-			if (!plist.TryGetValue ("WKWatchKitApp", out watchKitApp) || !watchKitApp.Value)
-				Log.LogError (7020, info, MSBStrings.E7020, name);
+			if (plist.TryGetValue ("WKWatchKitApp", out watchKitApp)) {
+				if (!watchKitApp.Value)
+					Log.LogError (7020, info, MSBStrings.E7020, name);
+			} else {
+				isSingleProject = true;
+			}
 
 			if (plist.ContainsKey ("LSRequiresIPhoneOS"))
 				Log.LogError (7021, info, MSBStrings.E7021, name);
 
 			var pluginsDir = Path.Combine (path, "PlugIns");
-			if (!Directory.Exists (pluginsDir)) {
+			if (!Directory.Exists (pluginsDir) && !isSingleProject) {
 				Log.LogError (7022, path, MSBStrings.E7022, name);
 				return;
 			}
 
-			int count = 0;
-			foreach (var plugin in Directory.EnumerateDirectories (pluginsDir, "*.appex")) {
-				ValidateWatchExtension (plugin, bundleIdentifier, shortVersionString, version);
-				count++;
-			}
+			if (!isSingleProject) {
+				int count = 0;
+				foreach (var plugin in Directory.EnumerateDirectories (pluginsDir, "*.appex")) {
+					ValidateWatchExtension (plugin, bundleIdentifier, shortVersionString, version);
+					count++;
+				}
 
-			if (count == 0)
-				Log.LogError (7022, pluginsDir, MSBStrings.E7022_A, name);
+				if (count == 0)
+					Log.LogError (7022, pluginsDir, MSBStrings.E7022_A, name);
+			}
 		}
 
 		void ValidateWatchExtension (string path, string watchAppBundleIdentifier, string mainShortVersionString, string mainVersion)

diff --git a/runtime/exports.t4 b/runtime/exports.t4
@@ -255,6 +255,7 @@
 			"MonoProfileThreadFunc", "end"
 		) {
 			XamarinRuntime = RuntimeMode.MonoVM,
+			Mode = DotNetMode.OnlyLegacy,
 		},
 
 		new Export ("void", "mono_profiler_install_gc",

diff --git a/runtime/monovm-bridge.m b/runtime/monovm-bridge.m
@@ -235,6 +235,7 @@
  * and create a pool that spans the thread's entire lifetime.
  */
 
+#if !DOTNET
 static CFMutableDictionaryRef xamarin_thread_hash = NULL;
 static pthread_mutex_t thread_hash_lock = PTHREAD_MUTEX_INITIALIZER;
 
@@ -296,14 +297,18 @@
 	// COOP: no managed memory access: any mode.
 	xamarin_thread_finish (NULL);
 }
+#endif // !DOTNET
 
 void
 xamarin_install_nsautoreleasepool_hooks ()
 {
+	// No need to do anything here for CoreCLR.
+#if !DOTNET
 	// COOP: executed at startup (and no managed memory access): any mode.
 	xamarin_thread_hash = CFDictionaryCreateMutable (kCFAllocatorDefault, 0, NULL, NULL);
 
 	mono_profiler_install_thread (thread_start, thread_end);
+#endif // !DOTNET
 }
 
 void

diff --git a/src/CoreFoundation/CFDataBuffer.cs b/src/CoreFoundation/CFDataBuffer.cs
@@ -51,9 +51,14 @@ public unsafe CFDataBuffer (byte [] buffer)
 				data = CFData.FromData ((IntPtr) ptr, buffer.Length);
 		}
 
-		public CFDataBuffer (IntPtr ptr)
+		public CFDataBuffer (IntPtr ptr) : this (ptr, false)
 		{
-			data = new CFData (ptr, false);
+		}
+
+
+		public CFDataBuffer (IntPtr ptr, bool owns)
+		{
+			data = new CFData (ptr, owns);
 			buffer = data.GetBuffer ();
 		}