diff --git a/build/Uno.UI.proj b/build/Uno.UI.proj
index 3c2791dafb17..9eb528beef94 100644
--- a/build/Uno.UI.proj
+++ b/build/Uno.UI.proj
@@ -1,135 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4\PreEmptive.Dotfuscator.Targets" Condition="Exists('$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4\PreEmptive.Dotfuscator.Targets')"/>
+  <Import Project="$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4\PreEmptive.Dotfuscator.Targets" Condition="Exists('$(MSBuildExtensionsPath)\PreEmptive\Dotfuscator\4\PreEmptive.Dotfuscator.Targets')"/>
 
-	<PropertyGroup>
-		<AppVersion>$(GITVERSION_FullSemVer)</AppVersion>
-	
-		<NuGetBin>.\nuget\NuGet.exe</NuGetBin>
-		<OutputDir>$(BUILD_ARTIFACTSTAGINGDIRECTORY)</OutputDir>
-		<Configuration>$(CombinedConfiguration.Split('|')[0])</Configuration>
-		<Platform>$(CombinedConfiguration.Split('|')[1])</Platform>
-		<AppEnvironment Condition="'$(CombinedConfiguration)' != '' and $(CombinedConfiguration.Split('|').Length) > 2">$(CombinedConfiguration.Split('|')[2])</AppEnvironment>
-
-		<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
-	</PropertyGroup>
+  <PropertyGroup>
+	<AppVersion>$(GITVERSION_FullSemVer)</AppVersion>
+
+	<NuGetBin>.\nuget\NuGet.exe</NuGetBin>
+	<OutputDir>$(BUILD_ARTIFACTSTAGINGDIRECTORY)</OutputDir>
+	<Configuration>$(CombinedConfiguration.Split('|')[0])</Configuration>
+	<Platform>$(CombinedConfiguration.Split('|')[1])</Platform>
+	<AppEnvironment Condition="'$(CombinedConfiguration)' != '' and $(CombinedConfiguration.Split('|').Length) > 2">$(CombinedConfiguration.Split('|')[2])</AppEnvironment>
+
+	<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
+  </PropertyGroup>
 
   <Import Project=".\obj\Uno.UI.Build.csproj.nuget.g.props"/>
   <Import Project=".\obj\Uno.UI.Build.csproj.nuget.g.targets"/>
 
-  <Target Name="Build" DependsOnTargets="GetVersion;UpdateFileVersions">
-		<Message Text="Buidling for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_FullSemVer) Obfuscation:$(RunObfuscation)" />
+  <Target Name="Build" DependsOnTargets="GetVersion;UpdateFileVersions;UpdateTasksSHA">
+	<Message Text="Buidling for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_FullSemVer) Obfuscation:$(RunObfuscation)" />
 
-		<!-- 
+	<!-- 
     Use NuGet 4.3.0 or later for the restore 
     CI_Build environment is required for the restore to pickup the TargetFrameworksCI property in projects.
     -->
-		<Exec Command="set NUGET_RESTORE_MSBUILD_ARGS=/p:CI_Build=true &amp; nuget\nuget.exe restore ..\src\Uno.UI.sln" Condition="'$(AppEnvironment)'=='' " />
-
-		<CallTarget Targets="BuildCI" Condition="'$(Configuration)'=='Release'" />
-    
-		<CallTarget Targets="BuildNuGetPackage" Condition="'$(Configuration)'=='Release'" />
-		<CallTarget Targets="PublishVisx" Condition="'$(Configuration)'=='Release'" />
-		<CallTarget Targets="GenerateAPIDiff" Condition="'$(Configuration)'=='Release'" />
-	</Target>
-  
-	<Target Name="UpdateFileVersions">
-		
-		<XmlUpdate
-			XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate.VISX\source.extension.vsixmanifest"
-			XPath="/x:PackageManifest/x:Metadata/x:Identity/@Version"
-			Value="$(GITVERSION_MajorMinorPatch)"
-			Namespace="http://schemas.microsoft.com/developer/vsx-schema/2011"
-			Prefix="x"/>
-
-	  <XmlUpdate
-		  XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\UnoQuickStart.Droid\UnoQuickStart.Droid.csproj"
-		  XPath="//x:PackageReference[@Include='Uno.UI']/@Version"
-		  Value="$(GitVersion_FullSemVer)"
-		  Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
-		  Prefix="x"/>
-
-	  <XmlUpdate
-		  XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\UnoQuickStart.iOS\UnoQuickStart.iOS.csproj"
-		  XPath="//x:PackageReference[@Include='Uno.UI']/@Version"
-		  Value="$(GitVersion_FullSemVer)"
-		  Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
-		  Prefix="x"/>
-
-	  <XmlUpdate
-		  XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\UnoQuickStart.Wasm\UnoQuickStart.Wasm.csproj"
-		  XPath="//PackageReference[@Include='Uno.UI']/@Version"
-		  Value="$(GitVersion_FullSemVer)" />
-
-	  <XmlUpdate
-		  XmlFileName="..\src\SolutionTemplate\UnoLibraryTemplate\CrossTargetedLibrary.csproj"
-		  XPath="//PackageReference[@Include='Uno.UI']/@Version"
-		  Value="$(GitVersion_FullSemVer)" />
-
-	</Target>
-
-	<Target Name="BuildCI">
-
-		<MSBuild Properties="Configuration=Release;VisualStudioVersion=15.0;CopyDSYM=False;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true"
-						 Projects="..\src\Uno.UI.sln"
-						 Targets="Build"
-						 RebaseOutputs="false"
-						 BuildInParallel="true" />
-
-	</Target>
-
-	<Target Name="GenerateDoc">
-		<Exec Command="$(NuGetPackageRoot)\docfx.console\2.36.0\tools\docfx.exe ..\doc\docfx.json -o $(OutputDir)\doc" />
-	</Target>
-
-	<Target Name="GenerateAPIDiff">
-		<PropertyGroup>
-			<WindowsDefinition>C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\2.0.0.0\Windows.Foundation.UniversalApiContract.winmd</WindowsDefinition>
-			<iOS_UnoUIDefinition>..\src\Uno.UI\bin\release\xamarinios10\Uno.UI.dll</iOS_UnoUIDefinition>
-			<Android_UnoUIDefinition>..\src\Uno.UI\bin\release\Monoandroid80\Uno.UI.dll</Android_UnoUIDefinition>
-			<Wasm_UnoUIDefinition>..\src\Uno.UI\bin\release\netstandard2.0\Uno.UI.dll</Wasm_UnoUIDefinition>
-		</PropertyGroup>
-
-		<Exec Command="..\src\Uno.UI.AssemblyComparer\Bin\Release\Uno.UI.AssemblyComparer.exe &quot;$(iOS_UnoUIDefinition)&quot; &quot;$(WindowsDefinition)&quot; &quot;output.txt&quot;" />
-		<Exec Command="copy .\output.txt &quot;$(OutputDir)\iOS_API_Diff.txt&quot;" />
-
-		<Exec Command="..\src\Uno.UI.AssemblyComparer\Bin\Release\Uno.UI.AssemblyComparer.exe &quot;$(Android_UnoUIDefinition)&quot; &quot;$(WindowsDefinition)&quot; &quot;output.txt&quot;" />
-		<Exec Command="copy .\output.txt &quot;$(OutputDir)\Android_API_Diff.txt&quot;" />
-
-		<Exec Command="..\src\Uno.UI.AssemblyComparer\Bin\Release\Uno.UI.AssemblyComparer.exe &quot;$(Wasm_UnoUIDefinition)&quot; &quot;$(WindowsDefinition)&quot; &quot;output.txt&quot;" />
-		<Exec Command="copy .\output.txt &quot;$(OutputDir)\Wasm_API_Diff.txt&quot;" />
-	</Target>
+	<Exec Command="set NUGET_RESTORE_MSBUILD_ARGS=/p:CI_Build=true &amp; nuget\nuget.exe restore ..\src\Uno.UI.sln" Condition="'$(AppEnvironment)'=='' " />
+
+	<CallTarget Targets="BuildCI" Condition="'$(Configuration)'=='Release'" />
+
+	<CallTarget Targets="BuildNuGetPackage" Condition="'$(Configuration)'=='Release'" />
+	<CallTarget Targets="PublishVisx" Condition="'$(Configuration)'=='Release'" />
+	<CallTarget Targets="GenerateAPIDiff" Condition="'$(Configuration)'=='Release'" />
+  </Target>
+
+  <Target Name="UpdateFileVersions">
+
+	<XmlUpdate
+		XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate.VISX\source.extension.vsixmanifest"
+		XPath="/x:PackageManifest/x:Metadata/x:Identity/@Version"
+		Value="$(GITVERSION_MajorMinorPatch)"
+		Namespace="http://schemas.microsoft.com/developer/vsx-schema/2011"
+		Prefix="x"/>
+
+	<XmlUpdate
+		XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\UnoQuickStart.Droid\UnoQuickStart.Droid.csproj"
+		XPath="//x:PackageReference[@Include='Uno.UI']/@Version"
+		Value="$(GitVersion_FullSemVer)"
+		Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
+		Prefix="x"/>
+
+	<XmlUpdate
+		XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\UnoQuickStart.iOS\UnoQuickStart.iOS.csproj"
+		XPath="//x:PackageReference[@Include='Uno.UI']/@Version"
+		Value="$(GitVersion_FullSemVer)"
+		Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
+		Prefix="x"/>
+
+	<XmlUpdate
+		XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\UnoQuickStart.Wasm\UnoQuickStart.Wasm.csproj"
+		XPath="//PackageReference[@Include='Uno.UI']/@Version"
+		Value="$(GitVersion_FullSemVer)" />
+
+	<XmlUpdate
+		XmlFileName="..\src\SolutionTemplate\UnoLibraryTemplate\CrossTargetedLibrary.csproj"
+		XPath="//PackageReference[@Include='Uno.UI']/@Version"
+		Value="$(GitVersion_FullSemVer)" />
+
+  </Target>
+
+  <Target Name="UpdateTasksSHA">
+
+	<ItemGroup>
+	  <_Sha1Replace Include="..\src\SourceGenerators\Uno.UI.Tasks\Uno.UI.Tasks.csproj" />
+	  <_Sha1Replace Include="..\src\SourceGenerators\Uno.UI.Tasks\Assets\RetargetAssets.cs" />
+	  <_Sha1Replace Include="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" />
+	  <_Sha1Replace Include="..\src\SourceGenerators\Uno.UI.Tasks\ResourcesGenerator\ResourcesGenerationTask.cs" />
+	</ItemGroup>
+
+	<FileUpdate Files="@(_Sha1Replace)"
+		   Regex="v0"
+		   ReplacementText="v$(GitVersion_Sha)" />
+
+  </Target>
+
+  <Target Name="BuildCI">
+
+	<MSBuild Properties="Configuration=Release;VisualStudioVersion=15.0;CopyDSYM=False;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true"
+					 Projects="..\src\Uno.UI.sln"
+					 Targets="Build"
+					 RebaseOutputs="false"
+					 BuildInParallel="true" />
+
+  </Target>
+
+  <Target Name="GenerateDoc">
+	<Exec Command="$(NuGetPackageRoot)\docfx.console\2.36.0\tools\docfx.exe ..\doc\docfx.json -o $(OutputDir)\doc" />
+  </Target>
+
+  <Target Name="GenerateAPIDiff">
+	<PropertyGroup>
+	  <WindowsDefinition>C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\2.0.0.0\Windows.Foundation.UniversalApiContract.winmd</WindowsDefinition>
+	  <iOS_UnoUIDefinition>..\src\Uno.UI\bin\release\xamarinios10\Uno.UI.dll</iOS_UnoUIDefinition>
+	  <Android_UnoUIDefinition>..\src\Uno.UI\bin\release\Monoandroid80\Uno.UI.dll</Android_UnoUIDefinition>
+	  <Wasm_UnoUIDefinition>..\src\Uno.UI\bin\release\netstandard2.0\Uno.UI.dll</Wasm_UnoUIDefinition>
+	</PropertyGroup>
+
+	<Exec Command="..\src\Uno.UI.AssemblyComparer\Bin\Release\Uno.UI.AssemblyComparer.exe &quot;$(iOS_UnoUIDefinition)&quot; &quot;$(WindowsDefinition)&quot; &quot;output.txt&quot;" />
+	<Exec Command="copy .\output.txt &quot;$(OutputDir)\iOS_API_Diff.txt&quot;" />
+
+	<Exec Command="..\src\Uno.UI.AssemblyComparer\Bin\Release\Uno.UI.AssemblyComparer.exe &quot;$(Android_UnoUIDefinition)&quot; &quot;$(WindowsDefinition)&quot; &quot;output.txt&quot;" />
+	<Exec Command="copy .\output.txt &quot;$(OutputDir)\Android_API_Diff.txt&quot;" />
+
+	<Exec Command="..\src\Uno.UI.AssemblyComparer\Bin\Release\Uno.UI.AssemblyComparer.exe &quot;$(Wasm_UnoUIDefinition)&quot; &quot;$(WindowsDefinition)&quot; &quot;output.txt&quot;" />
+	<Exec Command="copy .\output.txt &quot;$(OutputDir)\Wasm_API_Diff.txt&quot;" />
+  </Target>
 
   <Target Name="PublishVisx">
-		<Copy SourceFiles="..\src\SolutionTemplate\UnoSolutionTemplate.VISX\bin\Release\UnoSolutionTemplate.vsix"
-					DestinationFiles="$(OutputDir)\UnoPlatform-$(GITVERSION_FullSemVer).vsix" />
-	</Target>
-
-	<Target Name="BuildNuGetPackage" DependsOnTargets="_FillMsBuildVersion">
-
-		<PropertyGroup>
-			<NugetNamespace>http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd</NugetNamespace>
-		</PropertyGroup>
-
-		<XmlUpdate
-			XmlFileName=".\Uno.UI.nuspec"
-			XPath="/x:package/x:metadata/x:version"
-			Value="$(GITVERSION_FullSemVer)"
-			Namespace="$(NugetNamespace)"
-			Prefix="x"/>
-
-		<XmlUpdate
-			XmlFileName=".\Uno.UI.nuspec"
-			XPath="/x:package/x:metadata/x:dependencies/x:dependency/@version"
-			Value="$(GITVERSION_FullSemVer)"
-			Namespace="$(NugetNamespace)"
-			Prefix="x"/>
-
-		<!-- Create the packages -->
-	  <Exec Command="$(NuGetBin) pack Uno.UI.nuspec -Verbosity Detailed" />
-	</Target>
-
-	<Import Project="GetMsBuildVersion.targets" />
+	<Copy SourceFiles="..\src\SolutionTemplate\UnoSolutionTemplate.VISX\bin\Release\UnoSolutionTemplate.vsix"
+				DestinationFiles="$(OutputDir)\UnoPlatform-$(GITVERSION_FullSemVer).vsix" />
+  </Target>
+
+  <Target Name="BuildNuGetPackage" DependsOnTargets="_FillMsBuildVersion">
+
+	<PropertyGroup>
+	  <NugetNamespace>http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd</NugetNamespace>
+	</PropertyGroup>
+
+	<XmlUpdate
+		XmlFileName=".\Uno.UI.nuspec"
+		XPath="/x:package/x:metadata/x:version"
+		Value="$(GITVERSION_FullSemVer)"
+		Namespace="$(NugetNamespace)"
+		Prefix="x"/>
+
+	<XmlUpdate
+		XmlFileName=".\Uno.UI.nuspec"
+		XPath="/x:package/x:metadata/x:dependencies/x:dependency/@version"
+		Value="$(GITVERSION_FullSemVer)"
+		Namespace="$(NugetNamespace)"
+		Prefix="x"/>
+
+	<!-- Create the packages -->
+	<Exec Command="$(NuGetBin) pack Uno.UI.nuspec -Verbosity Detailed" />
+  </Target>
+
+  <Import Project="GetMsBuildVersion.targets" />
 
 </Project>
diff --git a/src/SourceGenerators/Uno.UI.Tasks/Assets/RetargetAssets.cs b/src/SourceGenerators/Uno.UI.Tasks/Assets/RetargetAssets.cs
index e6ec66b486b4..34847113b88b 100644
--- a/src/SourceGenerators/Uno.UI.Tasks/Assets/RetargetAssets.cs
+++ b/src/SourceGenerators/Uno.UI.Tasks/Assets/RetargetAssets.cs
@@ -18,7 +18,7 @@ namespace Uno.UI.Tasks.Assets
 	/// <remarks>
 	/// Currently supports .png, .jpg, .jpeg and .gif.
 	/// </remarks>
-	public class RetargetAssets : Task
+	public class RetargetAssets_v0 : Task
 	{
 		private const int HighDPIThresholdScale = 150;
 
@@ -56,7 +56,8 @@ public override bool Execute()
 					resourceToTargetPath = resource => AndroidResourceConverter.Convert(resource, DefaultLanguage);
 					break;
 				default:
-					throw new NotSupportedException($"{nameof(TargetPlatform)} must be either 'ios' or 'android'.");
+					this.Log().Info($"Skipping unknown platform {TargetPlatform}");
+					return true;
 			}
 
 			Assets = ContentItems.Where(content => IsAsset(content.ItemSpec)).ToArray();
@@ -106,4 +107,4 @@ private static bool IsAsset(string path)
 				|| extension == ".gif";
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets
index 88d2edd3044c..ef498783df14 100644
--- a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets
+++ b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+	<UnoUIMSBuildTasksPath Condition="'$(UnoUIMSBuildTasksPath)'==''">..\Uno.UI.Tasks\Uno.UI.Tasks.v0.dll</UnoUIMSBuildTasksPath>
+	<UmbrellaMSBuildTasksImported>true</UmbrellaMSBuildTasksImported>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<UnoSourceGeneratorBeforeTarget Condition="'$(XamarinProjectType)'=='android'" Include="UpdateAndroidAssets" />
+  </ItemGroup>
+
+  <UsingTask AssemblyFile="$(UnoUIMSBuildTasksPath)" TaskName="Uno.UI.Tasks.ResourcesGenerator.ResourcesGenerationTask_v0" />
+  <UsingTask AssemblyFile="$(UnoUIMSBuildTasksPath)" TaskName="Uno.UI.Tasks.Assets.RetargetAssets_v0" />
+
+  <Target Name="ResourcesGeneration"
+				  BeforeTargets="PrepareForBuild;_CheckForContent"
+				  DependsOnTargets="AssignLinkMetadata"
+				  Condition="'$(BuildingInsideUnoSourceGenerator)' == '' and '$(XamarinProjectType)'!=''">
+	<!-- String resources -->
 	<PropertyGroup>
-		<UnoUIMSBuildTasksPath Condition="'$(UnoUIMSBuildTasksPath)'==''">..\Uno.UI.Tasks\Uno.UI.Tasks.dll</UnoUIMSBuildTasksPath>
-		<UmbrellaMSBuildTasksImported>true</UmbrellaMSBuildTasksImported>
+	  <!-- LEGACY: Old projects define DefaultApplicationLanguage instead of DefaultLanguage -->
+	  <DefaultLanguage Condition="'$(DefaultLanguage)'=='' and '$(DefaultApplicationLanguage)'!=''">$(DefaultApplicationLanguage)</DefaultLanguage>
+	  <!-- Default to English if DefaultLanguage isn't set -->
+	  <DefaultLanguage Condition="'$(DefaultLanguage)'==''">en</DefaultLanguage>
 	</PropertyGroup>
-
+	<ResourcesGenerationTask_v0 Resources="@(PRIResource)"
+							   TargetProjectDirectory="$(ProjectDir)"
+							   TargetPlatform="$(XamarinProjectType)"
+							   IntermediateOutputPath="$(IntermediateOutputPath)"
+							   DefaultLanguage="$(DefaultLanguage)">
+	  <Output TaskParameter="GeneratedFiles"
+					  ItemName="GeneratedFiles" />
+	</ResourcesGenerationTask_v0>
 	<ItemGroup>
-		<UnoSourceGeneratorBeforeTarget Condition="'$(XamarinProjectType)'=='android'" Include="UpdateAndroidAssets" />
+	  <BundleResource Condition="'$(XamarinProjectType)'=='ios'" Include="@(GeneratedFiles)" />
+	  <AndroidResource Condition="'$(XamarinProjectType)'=='android'" Include="@(GeneratedFiles)" />
 	</ItemGroup>
-
-	<UsingTask AssemblyFile="$(UnoUIMSBuildTasksPath)" TaskName="Uno.UI.Tasks.ResourcesGenerator.ResourcesGenerationTask" />
-	<UsingTask AssemblyFile="$(UnoUIMSBuildTasksPath)" TaskName="Uno.UI.Tasks.Assets.RetargetAssets" />
-
-	<Target Name="ResourcesGeneration"
-					BeforeTargets="PrepareForBuild;_CheckForContent"
-					DependsOnTargets="AssignLinkMetadata"
-					Condition="'$(BuildingInsideUnoSourceGenerator)' == '' and '$(XamarinProjectType)'!=''">
-		<!-- String resources -->
-		<PropertyGroup>
-			<!-- LEGACY: Old projects define DefaultApplicationLanguage instead of DefaultLanguage -->
-			<DefaultLanguage Condition="'$(DefaultLanguage)'=='' and '$(DefaultApplicationLanguage)'!=''">$(DefaultApplicationLanguage)</DefaultLanguage>
-			<!-- Default to English if DefaultLanguage isn't set -->
-			<DefaultLanguage Condition="'$(DefaultLanguage)'==''">en</DefaultLanguage>			
-		</PropertyGroup>
-		<ResourcesGenerationTask Resources="@(PRIResource)"
-														 TargetProjectDirectory="$(ProjectDir)"
-														 TargetPlatform="$(XamarinProjectType)"
-														 IntermediateOutputPath="$(IntermediateOutputPath)"
-														 DefaultLanguage="$(DefaultLanguage)">
-			<Output TaskParameter="GeneratedFiles"
-							ItemName="GeneratedFiles" />
-		</ResourcesGenerationTask>
-		<ItemGroup>
-			<BundleResource Condition="'$(XamarinProjectType)'=='ios'" Include="@(GeneratedFiles)" />
-			<AndroidResource Condition="'$(XamarinProjectType)'=='android'" Include="@(GeneratedFiles)" />
-		</ItemGroup>		
-		<!-- Assets -->
-		<PropertyGroup>			
-			<UseHighDPIResources Condition="'$(UseHighDPIResources)'==''">True</UseHighDPIResources>
-		</PropertyGroup>
-		<RetargetAssets UseHighDPIResources="$(UseHighDPIResources)"
-										TargetPlatform="$(XamarinProjectType)"
-										DefaultLanguage="$(DefaultLanguage)"
-										ContentItems="@(Content)">
-			<Output TaskParameter="Assets"
-							ItemName="Assets" />			
-			<Output TaskParameter="RetargetedAssets"
-							ItemName="RetargetedAssets" />
-		</RetargetAssets>
-		<ItemGroup>
-			<Content Remove="@(Assets)" />
-			<BundleResource Condition="'$(XamarinProjectType)'=='ios'" Include="@(RetargetedAssets)" />
-			<AndroidResource Condition="'$(XamarinProjectType)'=='android'" Include="@(RetargetedAssets)" />
-		</ItemGroup>
-	</Target>
+	<!-- Assets -->
+	<PropertyGroup>
+	  <UseHighDPIResources Condition="'$(UseHighDPIResources)'==''">True</UseHighDPIResources>
+	</PropertyGroup>
+	<RetargetAssets_v0 UseHighDPIResources="$(UseHighDPIResources)"
+									  TargetPlatform="$(XamarinProjectType)"
+									  DefaultLanguage="$(DefaultLanguage)"
+									  ContentItems="@(Content)">
+	  <Output TaskParameter="Assets"
+					  ItemName="Assets" />
+	  <Output TaskParameter="RetargetedAssets"
+					  ItemName="RetargetedAssets" />
+	</RetargetAssets_v0>
+	<ItemGroup>
+	  <Content Remove="@(Assets)" />
+	  <BundleResource Condition="'$(XamarinProjectType)'=='ios'" Include="@(RetargetedAssets)" />
+	  <AndroidResource Condition="'$(XamarinProjectType)'=='android'" Include="@(RetargetedAssets)" />
+	</ItemGroup>
+  </Target>
 </Project>
diff --git a/src/SourceGenerators/Uno.UI.Tasks/ResourcesGenerator/ResourcesGenerationTask.cs b/src/SourceGenerators/Uno.UI.Tasks/ResourcesGenerator/ResourcesGenerationTask.cs
index c8036cf5c59b..911505dec2a1 100644
--- a/src/SourceGenerators/Uno.UI.Tasks/ResourcesGenerator/ResourcesGenerationTask.cs
+++ b/src/SourceGenerators/Uno.UI.Tasks/ResourcesGenerator/ResourcesGenerationTask.cs
@@ -14,7 +14,7 @@ namespace Uno.UI.Tasks.ResourcesGenerator
 	/// <summary>
 	/// Parse Resources.resw files and generate the corresponding Localizable.strings (iOS) and Strings.xml (Android) files.
 	/// </summary>
-	public class ResourcesGenerationTask : Task
+	public class ResourcesGenerationTask_v0 : Task
 	{
 		private const string CommentPattern = @"
 	WARNING : THIS FILE HAS BEEN GENERATED BY A TOOL DO NOT UPDATE MANUALLY
diff --git a/src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj b/src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj
index 5d277237f87d..22baba9a7745 100644
--- a/src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj
+++ b/src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Uno.UI.Tasks</RootNamespace>
-    <AssemblyName>Uno.UI.Tasks</AssemblyName>
+    <AssemblyName>Uno.UI.Tasks.v0</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>