[Tasks] multitarget the build tasks

- fixes #2690 - closes #2706
xamarin · Sep 26, 2018 · f60ec50 · f60ec50
1 parent e875e9f
commit f60ec50
Show file tree

Hide file tree

Showing 53 changed files with 32 additions and 24 deletions.
diff --git a/.nuspec/Xamarin.Forms.Debug.targets b/.nuspec/Xamarin.Forms.Debug.targets
@@ -1,12 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.DebugXamlCTask" AssemblyFile="Xamarin.Forms.Build.Tasks.dll"/>
-
 	<PropertyGroup>
 		<XFKeepXamlResources>True</XFKeepXamlResources>
 	</PropertyGroup>
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Forms.targets" />
-
+	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.DebugXamlCTask" AssemblyFile="$(_XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll" />
+
 	<PropertyGroup>
 		<CompileDependsOn>
 			$(CompileDependsOn);

diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
@@ -112,18 +112,26 @@
     <file src="..\Xamarin.Forms.Platform\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Platform.*mdb" target="lib\netstandard2.0" />
 
     <!--Xamlc stuff-->
-    <file src="Xamarin.Forms.targets" target="build\netstandard2.0\Xamarin.Forms.targets" />
-    <file src="Xamarin.Forms.props" target="build\netstandard2.0\Xamarin.Forms.props" />
-    <file src="Xamarin.Forms.DefaultItems.targets" target="build\netstandard2.0" />
-    <file src="Xamarin.Forms.DefaultItems.props" target="build\netstandard2.0" />
+    <file src="Xamarin.Forms.targets" target="build" />
+    <file src="Xamarin.Forms.props" target="build" />
+    <file src="Xamarin.Forms.DefaultItems.targets" target="build" />
+    <file src="Xamarin.Forms.DefaultItems.props" target="build" />
     <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Build.Tasks.dll" target="build\netstandard2.0" />
     <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="build\netstandard2.0" />
     <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="build\netstandard2.0" />
     <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.dll" target="build\netstandard2.0" />
     <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.Mdb.dll" target="build\netstandard2.0" />
     <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.Pdb.dll" target="build\netstandard2.0" />
     <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\Mono.Cecil.Rocks.dll" target="build\netstandard2.0" />
-    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\System.CodeDom.dll" target="build\netstandard2.0" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\netstandard2.0\System.CodeDom.dll" target="build\netstandard2.0" />   
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\Xamarin.Forms.Build.Tasks.dll" target="build\net461" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\Xamarin.Forms.Core.dll" target="build\net461" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\Xamarin.Forms.Xaml.dll" target="build\net461" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\Mono.Cecil.dll" target="build\net461" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\Mono.Cecil.Mdb.dll" target="build\net461" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\Mono.Cecil.Pdb.dll" target="build\net461" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\Mono.Cecil.Rocks.dll" target="build\net461" />
+    <file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\net461\System.CodeDom.dll" target="build\net461" />
 
     <!-- Xaml Design-time Stuff -->
     <file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\netstandard2.0\Design" />

diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets
@@ -1,8 +1,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlGTask" AssemblyFile="$(MSBuildThisFileDirectory)Xamarin.Forms.Build.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.CssGTask" AssemblyFile="$(MSBuildThisFileDirectory)Xamarin.Forms.Build.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlCTask" AssemblyFile="$(MSBuildThisFileDirectory)Xamarin.Forms.Build.Tasks.dll" />
+	<PropertyGroup>
+		<_XFBuildTasksLocation Condition="'$(_XFBuildTasksLocation)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)netstandard2.0\</_XFBuildTasksLocation>
+		<_XFBuildTasksLocation Condition="'$(_XFBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory)net461\</_XFBuildTasksLocation>
+	</PropertyGroup>
+
+	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlGTask" AssemblyFile="$(_XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll" />
+	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.CssGTask" AssemblyFile="$(_XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll" />
+	<UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlCTask" AssemblyFile="$(_XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll" />
 
 	<PropertyGroup>
 		<SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
@@ -27,26 +32,22 @@
 	</PropertyGroup>
 
 	<Target Name="_ValidateXFTasks" BeforeTargets="_CheckForInvalidConfigurationAndPlatform" Condition="'$(XFDisableTargetsValidation)' != 'True'">
-		<Error
+		<Error Code="XF001"
 			Text="Xamarin.Forms targets have been imported multiple times. Please check your project file and remove the duplicate import(s)."
-			Code="XF001"
 			Condition="'$(_XFTargetsImportedAgain)' == 'True'" />
 	</Target>
 
 	<Target Name="_ValidateMSBuild" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
-		<Error
+		<Error Code="XF003"
 			Text="Xamarin.Forms require msbuild. xbuild is no longer supported."
-			Code="XF003"
 			Condition="'$(IsXBuild)' == 'true'" />
 	</Target>
 
 	<Target Name="_ValidateNETFrameworkVersion"
 			BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
-			Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '4.7' AND '$(XFDisableFrameworkVersionValidation)' != 'True'">
-		<Error
-			Text="XF requires .NETFramework >= v4.7. You have '$(TargetFrameworkVersion)'"
-			Code="XF004"
-			 />
+			Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '4.6.1' AND '$(XFDisableFrameworkVersionValidation)' != 'True'">
+		<Error Code="XF004"
+			Text="XF requires .NETFramework >= v4.6.1. You have '$(TargetFrameworkVersion)'" />
 	</Target>
 
 	<!-- XamlG -->

diff --git a/XFCorePostProcessor.Tasks/XFCorePostProcessor.Tasks.csproj b/XFCorePostProcessor.Tasks/XFCorePostProcessor.Tasks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Framework.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Framework.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Tasks.Core.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Tasks.Core.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Utilities.Core.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Utilities.Core.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.dll
diff --git a/...stProcessor.Tasks/bin/Debug/net461/Microsoft.VisualStudio.Setup.Configuration.Interop.dll b/...stProcessor.Tasks/bin/Debug/net461/Microsoft.VisualStudio.Setup.Configuration.Interop.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Mdb.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Mdb.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Pdb.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Pdb.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Rocks.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Rocks.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.dll
diff --git a/...ndard2.0/System.Collections.Immutable.dll → ...g/net461/System.Collections.Immutable.dll b/...ndard2.0/System.Collections.Immutable.dll → ...g/net461/System.Collections.Immutable.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.IO.Compression.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/System.IO.Compression.dll
diff --git a/...ostProcessor.Tasks/bin/Debug/net461/System.Runtime.InteropServices.RuntimeInformation.dll b/...ostProcessor.Tasks/bin/Debug/net461/System.Runtime.InteropServices.RuntimeInformation.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Threading.Tasks.Dataflow.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Threading.Tasks.Dataflow.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.pdb b/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.pdb
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.Framework.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.Framework.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.Tasks.Core.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.Tasks.Core.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.Utilities.Core.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.Utilities.Core.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Microsoft.Build.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.Mdb.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.Mdb.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.Pdb.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.Pdb.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.Rocks.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.Rocks.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/Mono.Cecil.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Buffers.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Buffers.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Collections.Concurrent.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Collections.Concurrent.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Dynamic.Runtime.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Dynamic.Runtime.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.IO.FileSystem.Primitives.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.IO.FileSystem.Primitives.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Linq.Expressions.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Linq.Expressions.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Linq.Parallel.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Linq.Parallel.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Linq.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Linq.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.ObjectModel.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.ObjectModel.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Emit.ILGeneration.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Emit.ILGeneration.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Emit.Lightweight.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Emit.Lightweight.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Emit.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Emit.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Metadata.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.Metadata.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.TypeExtensions.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Reflection.TypeExtensions.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Resources.Writer.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Resources.Writer.dll
diff --git a/...ssor.Tasks/bin/Debug/netstandard2.0/System.Runtime.InteropServices.RuntimeInformation.dll b/...ssor.Tasks/bin/Debug/netstandard2.0/System.Runtime.InteropServices.RuntimeInformation.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Runtime.Loader.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Runtime.Loader.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Runtime.Numerics.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Runtime.Numerics.dll
diff --git a/...ePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Runtime.Serialization.Primitives.dll b/...ePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Runtime.Serialization.Primitives.dll
diff --git a/...ePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Security.Cryptography.Primitives.dll b/...ePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Security.Cryptography.Primitives.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Text.Encoding.CodePages.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Text.Encoding.CodePages.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Threading.Tasks.Dataflow.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Threading.Tasks.Dataflow.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Threading.Thread.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Threading.Thread.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Threading.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/System.Threading.dll
diff --git a/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/XFCorePostProcessor.Tasks.dll b/XFCorePostProcessor.Tasks/bin/Debug/netstandard2.0/XFCorePostProcessor.Tasks.dll
diff --git a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
@@ -8,7 +8,7 @@
 	<PropertyGroup>
 	    <_DisableStrongNamer Condition=" '$(_DisableStrongNamer)' != 'True' ">False</_DisableStrongNamer>
 	    <AssemblyName>Xamarin.Forms.Build.Tasks</AssemblyName>
-	    <TargetFramework>netstandard2.0</TargetFramework>
+	    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
 	    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 	    <SignAssembly Condition=" '$(_DisableStrongNamer)' != 'True' ">True</SignAssembly>
@@ -64,6 +64,6 @@
     <ItemGroup>
       <_CopyItems Include="$(TargetDir)*.dll" />
     </ItemGroup>
-    <Copy SourceFiles="@(_CopyItems)" DestinationFolder="..\.nuspec\" ContinueOnError="true" Retries="0" />
+    <Copy SourceFiles="@(_CopyItems)" DestinationFolder="..\.nuspec\$(TargetFramework)\" ContinueOnError="true" Retries="0" />
   </Target>
 </Project>
diff --git a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
@@ -20,7 +20,7 @@
 		<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
 	</ItemGroup>
 	<Import Project="..\Xamarin.Flex\Xamarin.Flex.projitems" Label="Shared" Condition="Exists('..\Xamarin.Flex\Xamarin.Flex.projitems')" />
-	<UsingTask TaskName="XFCorePostProcessor.Tasks.FixXFCoreAssembly" AssemblyFile="..\XFCorePostProcessor.Tasks\bin\Debug\netstandard2.0\XFCorePostProcessor.Tasks.dll" />
+	<UsingTask TaskName="XFCorePostProcessor.Tasks.FixXFCoreAssembly" AssemblyFile="..\XFCorePostProcessor.Tasks\bin\Debug\net461\XFCorePostProcessor.Tasks.dll" />
 	<Target Condition="$(DesignTimeBuild) != true AND $(BuildingProject) == true" AfterTargets="AfterCompile" Name="ShameHat">
 		<FixXFCoreAssembly Assembly="$(IntermediateOutputPath)$(TargetFileName)" ReferencePath="@(ReferencePath)" />
 	</Target>