Merge main into xcode14. (#15803)

Make.config

@@ -204,6 +204,8 @@ export MD_APPLE_SDK_ROOT=$(abspath $(XCODE_DEVELOPER_ROOT)/../..)
 
 # We don't need to be told there are workload updates
 export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=true
+# We don't need to be told we're using preview packages (we pretty much always are).
+export SuppressNETCoreSdkPreviewMessage=true
 
 # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk
 include $(TOP)/mk/mono.mk

dotnet/Workloads/Microsoft.NET.Sdk.MacCatalyst/WorkloadManifest.targets

@@ -1,5 +1,5 @@
 <Project>
-	<Import Project="Sdk.props" Sdk="Microsoft.MacCatalyst.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst'" />
+	<Import Project="Sdk.props" Sdk="Microsoft.MacCatalyst.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst'" />
 
 	<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
 		<SdkSupportedTargetPlatformIdentifier Include="maccatalyst" DisplayName="Mac Catalyst" />

dotnet/Workloads/Microsoft.NET.Sdk.iOS/WorkloadManifest.targets

@@ -1,6 +1,6 @@
 <Project>
-	<Import Project="Sdk.props" Sdk="Microsoft.iOS.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'iOS'" />
-	<Import Project="Sdk.props" Sdk="Microsoft.iOS.Windows.Sdk.Aliased" Condition=" '$(TargetPlatformIdentifier)' == 'iOS' and $([MSBuild]::IsOSPlatform('windows'))" />
+	<Import Project="Sdk.props" Sdk="Microsoft.iOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'iOS'" />
+	<Import Project="Sdk.props" Sdk="Microsoft.iOS.Windows.Sdk.Aliased.net6" Condition=" '$(TargetPlatformIdentifier)' == 'iOS' and $([MSBuild]::IsOSPlatform('windows'))" />
 
 	<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
 		<SdkSupportedTargetPlatformIdentifier Include="ios" DisplayName="iOS" />

dotnet/Workloads/Microsoft.NET.Sdk.macOS/WorkloadManifest.targets

@@ -1,5 +1,5 @@
 <Project>
-	<Import Project="Sdk.props" Sdk="Microsoft.macOS.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'macOS'" />
+	<Import Project="Sdk.props" Sdk="Microsoft.macOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'macOS'" />
 
 	<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
 		<SdkSupportedTargetPlatformIdentifier Include="macos" DisplayName="macOS" />

dotnet/Workloads/Microsoft.NET.Sdk.tvOS/WorkloadManifest.targets

@@ -1,5 +1,5 @@
 <Project>
-	<Import Project="Sdk.props" Sdk="Microsoft.tvOS.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'tvOS'" />
+	<Import Project="Sdk.props" Sdk="Microsoft.tvOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'tvOS'" />
 
 	<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
 		<SdkSupportedTargetPlatformIdentifier Include="tvos" DisplayName="tvOS" />

dotnet/Workloads/vs-workload.template.props

@@ -29,5 +29,10 @@
     <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.MacCatalyst.Manifest*.nupkg" Version="@MACCATALYST_WORKLOAD_VERSION@" />
     <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.macOS.Manifest*.nupkg" Version="@MACOS_WORKLOAD_VERSION@" />
     <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.tvOS.Manifest*.nupkg" Version="@TVOS_WORKLOAD_VERSION@" />
+    <MultiTargetPackNames Include="Microsoft.iOS.Sdk" />
+    <MultiTargetPackNames Include="Microsoft.iOS.Windows.Sdk" />
+    <MultiTargetPackNames Include="Microsoft.MacCatalyst.Sdk" />
+    <MultiTargetPackNames Include="Microsoft.macOS.Sdk" />
+    <MultiTargetPackNames Include="Microsoft.tvOS.Sdk" />
   </ItemGroup>
 </Project>

dotnet/targets/WorkloadManifest.MacCatalyst.template.json

@@ -4,7 +4,7 @@
 		"@PLATFORM_LOWERCASE@": {
 			"description": ".NET SDK Workload for building macOS applications with @PLATFORM@.",
 			"packs": [
-				"Microsoft.@PLATFORM@.Sdk",
+				"Microsoft.@PLATFORM@.Sdk.net6",
 				"Microsoft.@PLATFORM@.Ref",
 				"Microsoft.@PLATFORM@.Runtime.maccatalyst-arm64",
 				"Microsoft.@PLATFORM@.Runtime.maccatalyst-x64",
@@ -16,9 +16,12 @@
 		}
 	},
 	"packs": {
-		"Microsoft.@PLATFORM@.Sdk": {
+		"Microsoft.@PLATFORM@.Sdk.net6": {
 			"kind": "sdk",
-			"version": "@VERSION@"
+			"version": "@VERSION@",
+			"alias-to": {
+				"any": "Microsoft.@PLATFORM@.Sdk"
+			}
 		},
 		"Microsoft.@PLATFORM@.Ref": {
 			"kind": "framework",

dotnet/targets/WorkloadManifest.iOS.template.json

@@ -4,8 +4,8 @@
 		"@PLATFORM_LOWERCASE@": {
 			"description": ".NET SDK Workload for building @PLATFORM@ applications.",
 			"packs": [
-				"Microsoft.@PLATFORM@.Sdk",
-				"Microsoft.@PLATFORM@.Windows.Sdk.Aliased",
+				"Microsoft.@PLATFORM@.Sdk.net6",
+				"Microsoft.@PLATFORM@.Windows.Sdk.Aliased.net6",
 				"Microsoft.@PLATFORM@.Ref",
 				"Microsoft.@PLATFORM@.Runtime.ios-arm",
 				"Microsoft.@PLATFORM@.Runtime.ios-arm64",
@@ -20,9 +20,12 @@
 		}
 	},
 	"packs": {
-		"Microsoft.@PLATFORM@.Sdk": {
+		"Microsoft.@PLATFORM@.Sdk.net6": {
 			"kind": "sdk",
-			"version": "@VERSION@"
+			"version": "@VERSION@",
+			"alias-to": {
+				"any": "Microsoft.@PLATFORM@.Sdk"
+			}
 		},
 		"Microsoft.@PLATFORM@.Windows.Sdk.Aliased": {
 			"kind": "sdk",

dotnet/targets/WorkloadManifest.macOS.template.json

@@ -4,7 +4,7 @@
 		"@PLATFORM_LOWERCASE@": {
 			"description": ".NET SDK Workload for building @PLATFORM@ applications.",
 			"packs": [
-				"Microsoft.@PLATFORM@.Sdk",
+				"Microsoft.@PLATFORM@.Sdk.net6",
 				"Microsoft.@PLATFORM@.Ref",
 				"Microsoft.@PLATFORM@.Runtime.osx-arm64",
 				"Microsoft.@PLATFORM@.Runtime.osx-x64",
@@ -16,9 +16,12 @@
 		}
 	},
 	"packs": {
-		"Microsoft.@PLATFORM@.Sdk": {
+		"Microsoft.@PLATFORM@.Sdk.net6": {
 			"kind": "sdk",
-			"version": "@VERSION@"
+			"version": "@VERSION@",
+			"alias-to": {
+				"any": "Microsoft.@PLATFORM@.Sdk"
+			}
 		},
 		"Microsoft.@PLATFORM@.Ref": {
 			"kind": "framework",

dotnet/targets/WorkloadManifest.tvOS.template.json

@@ -4,7 +4,7 @@
 		"@PLATFORM_LOWERCASE@": {
 			"description": ".NET SDK Workload for building @PLATFORM@ applications.",
 			"packs": [
-				"Microsoft.@PLATFORM@.Sdk",
+				"Microsoft.@PLATFORM@.Sdk.net6",
 				"Microsoft.@PLATFORM@.Ref",
 				"Microsoft.@PLATFORM@.Runtime.tvos-arm64",
 				"Microsoft.@PLATFORM@.Runtime.tvossimulator-x64",
@@ -17,9 +17,12 @@
 		}
 	},
 	"packs": {
-		"Microsoft.@PLATFORM@.Sdk": {
+		"Microsoft.@PLATFORM@.Sdk.net6": {
 			"kind": "sdk",
-			"version": "@VERSION@"
+			"version": "@VERSION@",
+			"alias-to": {
+				"any": "Microsoft.@PLATFORM@.Sdk"
+			}
 		},
 		"Microsoft.@PLATFORM@.Ref": {
 			"kind": "framework",

dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets

@@ -16,10 +16,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Exclude api definitions from files included by default -->
+    <!-- Exclude api definitions and core sources from the compilation file list, but let them without build action so they're not hidden in the IDE. We'll re-add them later (this way we make sure they only show up once in the Compile item group) -->
     <Compile Remove="@(ObjcBindingApiDefinition)" />
-    <!-- Exclude core sources as well, we re-add them later (this way we make sure they only show up once in the Compile item group) -->
+	<None Include="@(ObjcBindingApiDefinition)" />
     <Compile Remove="@(ObjcBindingCoreSource)" />
+    <None Include="@(ObjcBindingCoreSource)" />
   </ItemGroup>
 
   <!-- Architecture -->

msbuild/ILMerge.targets

@@ -26,9 +26,7 @@
     <!-- The assemblies are in a very different place when building for netstandard2.0, which means we need different logic to find them too -->
     <ItemGroup Condition="$(TargetFramework.StartsWith ('netstandard'))">
       <!-- I don't like to have a hard-coded list of assemblies to merge, but I couldn't find a way to calculate it -->
-      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Xamarin.MacDev.Tasks.Core'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Xamarin.MacDev.Tasks'" />
-      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == '$(AssemblyName).Core'" /> <!-- Use AssemblyName so that the exact same logic works for both Xamarin.iOS.Tasks.dll and Xamarin.Mac.Tasks.dll -->
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Xamarin.MacDev'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'DotNetZip'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'ILLink.Tasks'" />

msbuild/Makefile

@@ -50,9 +50,9 @@ WINDOWSRUNTIMEIDENTIFIER = win
 ## 
 
 IOS_TARGETS =                                                      \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.MonoTouch.*.targets) \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.iOS.*.props)         \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.iOS.*.targets)       \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.MonoTouch.*.targets) \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.iOS.*.props)         \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.iOS.*.targets)       \
 	$(wildcard Xamarin.Shared/Xamarin.*.props)       \
 	$(wildcard Xamarin.Shared/Xamarin.*.targets)       \
 
@@ -116,8 +116,8 @@ endif
 ##
 
 MACCATALYST_TARGETS =                                                \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.*.props)   \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.*.targets) \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.MacCatalyst.*.props)   \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.MacCatalyst.*.targets) \
 
 MACCATALYST_DIRECTORIES = \
 	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.MacCatalyst/RedistList                                       \
@@ -148,9 +148,9 @@ endif
 ##
 
 WATCH_TARGETS =                                                  \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.*.props)   \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.*.targets) \
-	Xamarin.iOS.Tasks.Core/NoCode.cs                             \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.WatchOS.*.props)   \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.WatchOS.*.targets) \
+	Xamarin.iOS.Tasks/NoCode.cs                             \
 
 WATCH_DIRECTORIES =                                                                                             \
 	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/RedistList                                       \
@@ -185,8 +185,8 @@ endif
 ##
 
 TVOS_TARGETS =                                                \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.TVOS.*.props)   \
-	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.TVOS.*.targets) \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.TVOS.*.props)   \
+	$(wildcard Xamarin.iOS.Tasks/Xamarin.TVOS.*.targets) \
 
 TVOS_DIRECTORIES =                                                                                           \
 	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/RedistList                                       \
@@ -289,7 +289,7 @@ $(IOS_2_1_SYMLINKS): | $(IOS_DIRECTORIES)
 
 # The actual content goes into /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/FrameworkList.xml: Xamarin.iOS.Tasks.Core/Xamarin.iOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/FrameworkList.xml: Xamarin.iOS.Tasks/Xamarin.iOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
 	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.iOS@' $< > $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/RedistList/FrameworkList.xml: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/FrameworkList.xml | $(IOS_DIRECTORIES)
@@ -298,7 +298,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/RedistList/FrameworkList.
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.ObjcBinding.Tasks/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
 	$(Q) install -m 644 $< $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.iOS.Tasks.Core/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.iOS.Tasks/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
 	$(Q) install -m 644 $< $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.Shared/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
@@ -320,13 +320,13 @@ $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xama
 $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/MacCatalyst: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
 	$(Q) ln -Fhs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/MacCatalyst $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml: Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml: Xamarin.iOS.Tasks/Xamarin.MacCatalyst-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
 	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.MacCatalyst@' $< > $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.MacCatalyst/RedistList/FrameworkList.xml: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml | $(MACCATALYST_DIRECTORIES)
 	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/MacCatalyst/$(notdir $@) $@ 
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/%: Xamarin.iOS.Tasks.Core/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/%: Xamarin.iOS.Tasks/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
 	$(Q) install -m 644 $< $@
 
 ##
@@ -339,13 +339,13 @@ $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xama
 $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/WatchOS: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
 	$(Q) ln -Fhs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/WatchOS $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS/FrameworkList.xml: Xamarin.iOS.Tasks.Core/Xamarin.WatchOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS/FrameworkList.xml: Xamarin.iOS.Tasks/Xamarin.WatchOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS
 	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.WatchOS@' $< > $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/RedistList/FrameworkList.xml: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS/FrameworkList.xml | $(WATCH_DIRECTORIES)
 	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/WatchOS/$(notdir $@) $@ 
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS/%: Xamarin.iOS.Tasks.Core/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS/%: Xamarin.iOS.Tasks/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/WatchOS
 	$(Q) install -m 644 $< $@
 
 ##
@@ -358,13 +358,13 @@ $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xama
 $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/TVOS: $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
 	$(Q) ln -Fhs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/TVOS $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/FrameworkList.xml: Xamarin.iOS.Tasks.Core/Xamarin.TVOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/FrameworkList.xml: Xamarin.iOS.Tasks/Xamarin.TVOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS
 	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.TVOS@' $< > $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/RedistList/FrameworkList.xml: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/FrameworkList.xml | $(TVOS_DIRECTORIES)
 	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/TVOS/$(notdir $@) $@ 
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/%: Xamarin.iOS.Tasks.Core/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/%: Xamarin.iOS.Tasks/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS
 	$(Q) install -m 644 $< $@
 
 ##
@@ -532,7 +532,7 @@ endif
 all-local:: $(MSBUILD_PRODUCTS) .stamp-test-xml
 
 .build-stamp: $(ALL_SOURCES)
-	$(Q) $(SYSTEM_MONO) /Library/Frameworks/Mono.framework/Versions/Current/lib/mono/nuget/NuGet.exe restore
+	$(Q) $(SYSTEM_MONO) /Library/Frameworks/Mono.framework/Versions/Current/lib/mono/nuget/NuGet.exe restore $(NUGET_VERBOSITY)
 	$(Q) $(SYSTEM_MSBUILD) "/bl:$@.binlog" $(XBUILD_VERBOSITY)
 	$(Q) touch $@
 

msbuild/Xamarin.Mac.Tasks.Core/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xamarin.Mac.Tasks.Core")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.Mac.Tasks.Core")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("af1ac7c3-f6dd-4e46-b897-9dbb90b158ec")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <LangVersion>latest</LangVersion>
-    <WarningsAsErrors>Nullable</WarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- Compile against Microsoft.Build* NuGet refs, but do not copy to OutputDir. -->
-    <PackageReference Include="Microsoft.Build" Version="15.9.20" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.8.0" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="compile" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj" />
-    <ProjectReference Include="..\Xamarin.MacDev.Tasks.Core\Xamarin.MacDev.Tasks.Core.csproj" />
-    <ProjectReference Include="..\Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj" />
-  </ItemGroup>
-</Project>

msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj

@@ -14,9 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj" />
-    <ProjectReference Include="..\Xamarin.MacDev.Tasks.Core\Xamarin.MacDev.Tasks.Core.csproj" />
     <ProjectReference Include="..\Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj" />
-    <ProjectReference Include="..\Xamarin.Mac.Tasks.Core\Xamarin.Mac.Tasks.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="*.targets">

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/CopyBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class CopyBase : Copy
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/DeleteBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class DeleteBase : Delete
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/ExecBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class ExecBase : Exec
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/MakeDirBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class MakeDirBase : MakeDir
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/MoveTaskBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class MoveTaskBase : Move
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/RemoveDirBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class RemoveDirBase : RemoveDir
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/TouchBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class TouchBase : Touch
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/WriteLinesToFileBase.cs

@@ -1,7 +0,0 @@
-namespace Microsoft.Build.Tasks
-{
-	public abstract class WriteLinesToFileBase : WriteLinesToFile
-	{
-		public string SessionId { get; set; }
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/Properties/AssemblyInfo.cs

@@ -1,54 +0,0 @@
-//
-// AssemblyInfo.cs
-//
-// Author: Jeffrey Stedfast <jeff@xamarin.com>
-//
-// Copyright (c) 2014 Xamarin Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Xamarin.MacDev.Tasks")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Xamarin Inc.")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("Xamarin Inc.")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
-[assembly: InternalsVisibleTo ("Xamarin.MacDev.Tasks.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
-

msbuild/Xamarin.MacDev.Tasks.Core/Xamarin.MacDev.Tasks.Core.csproj

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>latest</LangVersion>
-    <WarningsAsErrors>Nullable</WarningsAsErrors>
-    <DefineConstants>$(DefineConstants);MSBUILD_TASKS</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="4.7.0" />
-    <!-- Compile against Microsoft.Build* NuGet refs, but do not copy to OutputDir. -->
-    <PackageReference Include="Microsoft.Build" Version="15.9.20" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.8.0" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="compile" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj" />
-    <ProjectReference Include="..\Xamarin.Localization.MSBuild\Xamarin.Localization.MSBuild.csproj">
-      <ReferenceSourceTarget>ProjectReference</ReferenceSourceTarget>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\tools\common\ApplePlatform.cs">
-      <Link>ApplePlatform.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\StringUtils.cs">
-      <Link>StringUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\FileCopier.cs">
-        <Link>FileCopier.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\mtouch\errors.Designer.cs">
-      <Link>errors.Designer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\TargetFramework.cs">
-      <Link>TargetFramework.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\Execution.cs">
-      <Link>Execution.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\PathUtils.cs">
-      <Link>PathUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\PListExtensions.cs">
-      <Link>PListExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\MachO.cs">
-      <Link>MachO.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\error.cs">
-      <Link>error.cs</Link>
-    </Compile>
-    <Compile Include="..\..\src\ObjCRuntime\ErrorHelper.cs">
-      <Link>ErrorHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\src\ObjCRuntime\RuntimeException.cs">
-      <Link>external\RuntimeException.cs</Link>
-    </Compile>
-    <Compile Include="..\..\tools\common\FileUtils.cs">
-      <Link>external\FileUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\Versions.dotnet.g.cs">
-      <Link>Versions.dotnet.g.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="../../tools/mtouch/Errors.resx">
-      <Type>Resx</Type>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>../../tools/mtouch/Errors.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>Xamarin.Bundler</CustomToolNamespace>
-      <ManifestResourceName>Xamarin.Bundler.Errors</ManifestResourceName>
-      <StronglyTypedFileName>../../tools/mtouch/Errors.Designer.cs</StronglyTypedFileName>
-      <StronglyTypedLanguage>CSharp</StronglyTypedLanguage>
-      <StronglyTypedNamespace>Xamarin.Bundler</StronglyTypedNamespace>
-      <StronglyTypedClassName>Errors</StronglyTypedClassName>
-      <GenerateResource>true</GenerateResource>
-      <PublicClass>true</PublicClass>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.cs.resx">
-      <Link>Errors.cs.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.cs</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.de.resx">
-      <Link>Errors.de.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.de</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.es.resx">
-      <Link>Errors.es.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.es</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.fr.resx">
-      <Link>Errors.fr.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.fr</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.it.resx">
-      <Link>Errors.it.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.it</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.ja.resx">
-      <Link>Errors.ja.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.ja</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.ko.resx">
-      <Link>Errors.ko.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.ko</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.pl.resx">
-      <Link>Errors.pl.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.pl</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.pt-BR.resx">
-      <Link>Errors.pt-BR.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.pt-BR</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.ru.resx">
-      <Link>Errors.ru.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.ru</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.tr.resx">
-      <Link>Errors.tr.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.tr</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.zh-Hans.resx">
-      <Link>Errors.zh-Hans.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.zh-Hans</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.zh-Hant.resx">
-      <Link>Errors.zh-Hant.resx</Link>
-      <ManifestResourceName>Xamarin.Bundler.Errors.zh-Hant</ManifestResourceName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>

msbuild/Xamarin.MacDev.Tasks.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.iOS.Tasks.Core", "Xamarin.iOS.Tasks.Core\Xamarin.iOS.Tasks.Core.csproj", "{93E12FA0-089C-4BC8-840F-43CFBC7927C7}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.MacDev", "..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj", "{CC3D9353-20C4-467A-8522-A9DED6F0C753}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.MacDev.Tasks", "Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj", "{534D7C5A-0E1C-4C58-9E48-21B1A98919EB}"
@@ -13,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Mac.Tasks", "Xamari
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.iOS.Tasks", "Xamarin.iOS.Tasks\Xamarin.iOS.Tasks.csproj", "{44605724-8002-48E1-895F-7CB068099B6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.MacDev.Tasks.Core", "Xamarin.MacDev.Tasks.Core\Xamarin.MacDev.Tasks.Core.csproj", "{7B095849-6FDB-4BD2-9B59-569D81A1A809}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Mac.Tasks.Core", "Xamarin.Mac.Tasks.Core\Xamarin.Mac.Tasks.Core.csproj", "{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Localization.MSBuild", "Xamarin.Localization.MSBuild\Xamarin.Localization.MSBuild.csproj", "{947E3C4C-8891-49D7-B665-23F785489D3F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D669990B-EE95-4282-AAC4-17CA05AE0575}"
@@ -39,14 +33,6 @@ Global
 		Debug-netstandard2.0|Any CPU = Debug-netstandard2.0|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Debug-net461|Any CPU.ActiveCfg = Debug|Any CPU
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Debug-net461|Any CPU.Build.0 = Debug|Any CPU
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
-		{93E12FA0-089C-4BC8-840F-43CFBC7927C7}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
 		{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,22 +65,6 @@ Global
 		{44605724-8002-48E1-895F-7CB068099B6A}.Debug-net461|Any CPU.Build.0 = Debug|Any CPU
 		{44605724-8002-48E1-895F-7CB068099B6A}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
 		{44605724-8002-48E1-895F-7CB068099B6A}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Debug-net461|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Debug-net461|Any CPU.Build.0 = Debug|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B095849-6FDB-4BD2-9B59-569D81A1A809}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Debug-net461|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Debug-net461|Any CPU.Build.0 = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF1AC7C3-F6DD-4E46-B897-9DBB90B158EC}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
 		{947E3C4C-8891-49D7-B665-23F785489D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{947E3C4C-8891-49D7-B665-23F785489D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{947E3C4C-8891-49D7-B665-23F785489D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/CopyBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class CopyBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.Copy
+	{
+		public string SessionId { get; set; }
+	}
+}

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/DeleteBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class DeleteBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.Delete
+	{
+		public string SessionId { get; set; }
+	}
+}

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/ExecBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class ExecBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.Exec
+	{
+		public string SessionId { get; set; }
+	}
+}

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/MakeDirBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class MakeDirBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.MakeDir
+	{
+		public string SessionId { get; set; }
+	}
+}

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/MoveTaskBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class MoveTaskBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.Move
+	{
+		public string SessionId { get; set; }
+	}
+}

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/RemoveDirBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class RemoveDirBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.RemoveDir
+	{
+		public string SessionId { get; set; }
+	}
+}

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/TouchBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class TouchBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.Touch
+	{
+		public string SessionId { get; set; }
+	}
+}

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/WriteLinesToFileBase.cs

@@ -0,0 +1,9 @@
+extern alias Microsoft_Build_Tasks_Core;
+
+namespace Microsoft.Build.Tasks
+{
+	public abstract class WriteLinesToFileBase : Microsoft_Build_Tasks_Core::Microsoft.Build.Tasks.WriteLinesToFile
+	{
+		public string SessionId { get; set; }
+	}
+}