Add switches to build Control Gallery using the nuget produced by the…

… build (xamarin#8937) * Build Control Gallery with nugets * - sync pipelines * - add team project check * - fix output dir to match for ui tests * - preserve dual screen
fabulous-dev · Mar 11, 2020 · 1532d46 · 1532d46
1 parent 112a203
commit 1532d46
Show file tree

Hide file tree

Showing 34 changed files with 329 additions and 156 deletions.
diff --git a/DevopsNuget.config b/DevopsNuget.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear/>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="nightly" value="https://aka.ms/xf-ci/index.json" />
+    <add key="nuget" value="../s/Nuget" />
+  </packageSources>
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+</configuration>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,4 +21,4 @@
   <Target Name="GitVersion" />
 
   <Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="Environment.Build.props" />
-</Project>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -3,6 +3,5 @@
     <PackageReference Include="GitInfo" Version="2.0.20" PrivateAssets="All" />
     <PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
 	</ItemGroup>
-
   <Import Project="Version.targets" />
  </Project>
diff --git a/Environment.Build.props b/Environment.Build.props
@@ -5,6 +5,7 @@
 
 
 
+
   <PropertyGroup Condition="'$(CI)' == ''">
     <CI>false</CI>
     <CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
@@ -19,6 +20,18 @@
     -->
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(CI)' == 'true'">
+    <_XamarinFormsVersion>$(BUILD_BUILDNUMBER.Split(`+`)[0])</_XamarinFormsVersion>
+    <XamarinFormsVersion Condition="Exists('$(BUILD_SOURCESDIRECTORY)/Nuget/Xamarin.Forms.$(_XamarinFormsVersion).nupkg')" >$(_XamarinFormsVersion)</XamarinFormsVersion>
+  </PropertyGroup>
+
+  <!-- Build from source or nugets-->
+  <PropertyGroup>
+    <XamarinFormsVersion Condition="'$(XamarinFormsVersion)' == ''"></XamarinFormsVersion>
+    <FromSource Condition="'$(XamarinFormsVersion)' != ''">false</FromSource>
+    <FromSource Condition="'$(FromSource)' == ''">true</FromSource>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
     <Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
@@ -30,4 +43,4 @@
     <AndroidTargetFrameworks Condition="'$(Use2017)' == 'true'">MonoAndroid90;</AndroidTargetFrameworks>
     <AndroidTargetFrameworks Condition="'$(Use2017)' == 'false'">MonoAndroid90;MonoAndroid10.0;</AndroidTargetFrameworks>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/Nuget.targets b/Nuget.targets
@@ -0,0 +1,16 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms.Maps" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms.DualScreen" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition=" $(TargetFrameworkIdentifier.StartsWith('MonoAndroid')) ">
+    <PackageReference Include="Xamarin.Forms.AppLinks" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/Nuget/.gitignore b/Nuget/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}</ProjectGuid>

diff --git a/Xamarin.Forms.ControlGallery.Android/Android10.Build.targets b/Xamarin.Forms.ControlGallery.Android/Android10.Build.targets
@@ -1,12 +1,12 @@
 <Project>
   <ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
-    <PackageReference Include="Xamarin.AndroidX.Migration">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
-    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
-    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
-    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
+  <PackageReference Include="Xamarin.AndroidX.Migration">
+    <Version>1.0.0</Version>
+  </PackageReference>
+  <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
+  <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
+  <PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
+  <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
+  <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
@@ -1,3 +1,6 @@
 <Project>
   <Import Project="Android10.Build.targets" Condition="'$(TargetFrameworkVersion)' == 'v10.0'" />
-</Project>
+  <Import Condition="'$(Use2017)' == 'true'" Project="Nuget2017.Build.targets" />
+  <Import Condition="'$(Use2017)' != 'true'" Project="Nuget2019.Build.targets" />
+  <Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
+</Project>
diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+    <ItemGroup>
+        <PackageReference Include="Xamarin.Build.Download">
+            <Version>0.4.11</Version>
+        </PackageReference>
+    </ItemGroup>
+</Project>
diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets
@@ -0,0 +1,17 @@
+<Project>
+    <ItemGroup>
+        <PackageReference Include="Xamarin.Build.Download">
+            <Version>0.7.1</Version>
+        </PackageReference>
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
+        <PackageReference Include="Xamarin.AndroidX.Migration">
+            <Version>1.0.0</Version>
+        </PackageReference>
+        <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
+        <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
+        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
+        <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
+        <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
+    </ItemGroup>
+</Project>
diff --git a/Xamarin.Forms.ControlGallery.Android/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms.ControlGallery.Android/PlatformSpecificCoreGalleryFactory.cs
@@ -3,11 +3,13 @@
 using Xamarin.Forms;
 using Xamarin.Forms.ControlGallery.Android;
 using Xamarin.Forms.Controls;
+using Xamarin.Forms.Internals;
 
 [assembly: Dependency(typeof(PlatformSpecificCoreGalleryFactory))]
 
 namespace Xamarin.Forms.ControlGallery.Android
 {
+	[Preserve(AllMembers = true)]
 	public class PlatformSpecificCoreGalleryFactory : IPlatformSpecificCoreGalleryFactory
 	{
 		public string Title => "Android Core Gallery";

diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
@@ -28,7 +28,6 @@
     <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
-
   <PropertyGroup>
     <!-- default locally to using fast renderers but if we're running on CI don't set a value for ANDROID_RENDERERS.
       This will let the old and new yaml configurations coexist -->
@@ -37,7 +36,6 @@
     <DefineConstants Condition="'$(ANDROID_RENDERERS)' == 'PREAPPCOMPAT'">$(DefineConstants);FORMS_APPLICATION_ACTIVITY</DefineConstants>
     <DefineConstants Condition="'$(ANDROID_RENDERERS)' == 'LEGACY'">$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DefineConstants>$(DefineConstants);HAVE_OPENTK</DefineConstants>
     <AndroidKeyStore>True</AndroidKeyStore>
@@ -194,11 +192,7 @@
     <AndroidResource Include="Resources\drawable\Icon.png" />
     <AndroidResource Include="Resources\drawable\cover1.jpg" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj">
-      <Project>{6e53feb1-1100-46ae-8013-17bba35cc197}</Project>
-      <Name>Xamarin.Forms.Platform.Android (Forwarders)</Name>
-    </ProjectReference>
+  <ItemGroup>  
     <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
       <Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
       <Name>Xamarin.Forms.Controls</Name>
@@ -207,6 +201,15 @@
       <Project>{4dcd0420-1168-4b77-86db-6196ee4bd491}</Project>
       <Name>Xamarin.Forms.CustomAttributes</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="$(FromSource) == 'true'">
+    <ProguardConfiguration Include="..\.nuspec\proguard.cfg">
+      <Link>proguard.cfg</Link>
+    </ProguardConfiguration>
+    <ProjectReference Include="..\Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj">
+      <Project>{6e53feb1-1100-46ae-8013-17bba35cc197}</Project>
+      <Name>Xamarin.Forms.Platform.Android (Forwarders)</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
       <Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
       <Name>Xamarin.Forms.DualScreen</Name>
@@ -358,9 +361,6 @@
     <PackageReference Include="Xam.Plugin.DeviceInfo">
       <Version>3.0.2</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Build.Download">
-      <Version>0.7.1</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="28.0.0.3" />
@@ -394,11 +394,6 @@
     <AndroidResource Include="Resources\drawable\GifOne.gif" />
     <AndroidEnvironment Include="Environment.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProguardConfiguration Include="..\.nuspec\proguard.cfg">
-      <Link>proguard.cfg</Link>
-    </ProguardConfiguration>
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\GifTwo.gif" />
   </ItemGroup>
@@ -424,11 +419,11 @@
     </AndroidResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="$(FromSource) == 'true' AND Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="BeforeBuild">
     <CreateItem Include="Properties\MapsKey.cs.blank">
       <Output TaskParameter="Include" ItemName="MapsKey" />
     </CreateItem>
     <Copy SourceFiles="@(MapsKey)" DestinationFiles="Properties\MapsKey.cs" Condition="!Exists('Properties\MapsKey.cs')" />
   </Target>
-</Project>
+</Project>
diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Directory.Build.targets b/Xamarin.Forms.ControlGallery.WindowsUniversal/Directory.Build.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\Nuget.targets" Condition="$(FromSource) == 'false'" />
+</Project>
diff --git a/...orms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj b/...orms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
@@ -101,6 +101,14 @@
       <Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
       <Name>Xamarin.Forms.Controls</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="$(FromSource) == 'false'">
+    <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj">
+      <Project>{4dcd0420-1168-4b77-86db-6196ee4bd491}</Project>
+      <Name>Xamarin.Forms.CustomAttributes</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="$(FromSource) == 'true'">
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
       <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
       <Name>Xamarin.Forms.Core</Name>

diff --git a/Xamarin.Forms.ControlGallery.iOS/Directory.Build.targets b/Xamarin.Forms.ControlGallery.iOS/Directory.Build.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\Nuget.targets" Condition="$(FromSource) == 'false'" />
+</Project>
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="..\Environment.Build.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' And '$(BuildIpa)' == 'True' ">iPhone</Platform>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
     <ProjectGuid>{C7131F14-274F-4B55-ACA9-E81731AD012F}</ProjectGuid>
     <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -159,6 +161,14 @@
       <Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
       <Name>Xamarin.Forms.Controls</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="$(FromSource) == 'false'">
+    <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj">
+      <Project>{4dcd0420-1168-4b77-86db-6196ee4bd491}</Project>
+      <Name>Xamarin.Forms.CustomAttributes</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="$(FromSource) == 'true'">
     <ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
       <Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
       <Name>Xamarin.Forms.DualScreen</Name>
@@ -439,4 +449,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Xamarin.Forms.Controls/Directory.Build.props b/Xamarin.Forms.Controls/Directory.Build.props
@@ -1,4 +1,4 @@
 <Project>
-  <Import Project="..\.nuspec\Xamarin.Forms.props" />
   <Import Project="..\Directory.Build.props" />
+  <Import Project="..\.nuspec\Xamarin.Forms.props" Condition="$(FromSource) == 'true'" />
 </Project> 
diff --git a/Xamarin.Forms.Controls/Directory.Build.targets b/Xamarin.Forms.Controls/Directory.Build.targets
@@ -1,4 +1,5 @@
 <Project>
-  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
-  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
+  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="$(FromSource) == 'true' AND '$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
+  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="$(FromSource) == 'true' AND '$(BuildingInsideVisualStudio)' != 'true'" />
+  <Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
 </Project>
diff --git a/Xamarin.Forms.Controls/Nuget.Build.targets b/Xamarin.Forms.Controls/Nuget.Build.targets
@@ -0,0 +1,11 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms.Maps" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="$(XamarinFormsVersion)">
+    </PackageReference>
+    <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Xamarin.Forms.Controls/Source.Build.targets b/Xamarin.Forms.Controls/Source.Build.targets
@@ -0,0 +1,11 @@
+<Project>
+  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
+  <Import Project="..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
+  <ItemGroup>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj" />
+    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
@@ -27,14 +27,17 @@
     <None Remove="Fonts\fa-regular-400.ttf" />
     <None Remove="Fonts\PTM55FT.ttf" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup  Condition="$(FromSource) == 'true'">
     <!-- A reference to the entire .NET Framework is automatically included -->
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
     <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj" />
     <ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj" />
     <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj" />
     <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
   </ItemGroup>
+  <ItemGroup Condition="$(FromSource) == 'false'">
+    <ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="BuildNumber.txt" />
     <EmbeddedResource Include="GalleryPages\crimson.jpg" />
@@ -91,4 +94,4 @@
 
   <Import Project="..\Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems" Label="Shared" />
 
-</Project>
+</Project>
diff --git a/Xamarin.Forms.DualScreen/DualScreenService.android.cs b/Xamarin.Forms.DualScreen/DualScreenService.android.cs
@@ -14,6 +14,12 @@ namespace Xamarin.Forms.DualScreen
 {
 	public class DualScreenService
 	{
+		[Internals.Preserve(Conditional = true)]
+		public DualScreenService()
+		{
+
+		}
+
 		public static void Init(Activity activity)
 		{
 			DependencyService.Register<DualScreenServiceImpl>();
@@ -34,6 +40,7 @@ internal class DualScreenServiceImpl : IDualScreenService, Platform.Android.Dual
 			object _hingeAngleLock = new object();
 			TaskCompletionSource<int> _gettingHingeAngle;
 
+			[Internals.Preserve(Conditional = true)]
 			public DualScreenServiceImpl()
 			{
 				_HingeService = this;

diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
@@ -37,4 +37,4 @@
   <ItemGroup>
     <PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
   </ItemGroup>
-</Project>
+</Project>