Merge branch '4.8.0' into 5.0.0

# Conflicts: # build.cake
fabulous-dev · Nov 16, 2020 · 899ffc1 · 899ffc1
2 parents 1c41635 + db8ab0c
commit 899ffc1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/UWP.Build.props b/UWP.Build.props
@@ -3,8 +3,7 @@
     <TargetFrameworks>$(UwpMinTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(UwpMinTargetFrameworks)' == '' ">
-    <TargetFrameworks Condition=" '$(BuildingInsideVisualStudio)' == 'true' AND '$(OS)' == 'Windows_NT' ">uap10.0.16299</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(BuildingInsideVisualStudio)' != 'true' AND '$(OS)' == 'Windows_NT' ">uap10.0.14393;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.16299</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/build.cake b/build.cake
@@ -798,14 +798,36 @@ Task("BuildForNuget")
                             .WithRestore()
                             .WithTarget("rebuild"));
 
-            msbuildSettings = GetMSBuildSettings();
-            msbuildSettings.BinaryLogger = binaryLogger;
-            binaryLogger.FileName = $"{artifactStagingDirectory}/win-{configuration}-csproj.binlog";
-            MSBuild("./Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj",
-                        msbuildSettings
-                            .WithTarget("rebuild")
-                            .WithProperty("DisableEmbeddedXbf", "false")
-                            .WithProperty("EnableTypeInfoReflection", "false"));
+
+	        msbuildSettings = GetMSBuildSettings();
+	        msbuildSettings.BinaryLogger = binaryLogger;
+	        binaryLogger.FileName = $"{artifactStagingDirectory}/win-maps-{configuration}-csproj.binlog";
+	        MSBuild("./Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj",
+	                    msbuildSettings
+	                        .WithProperty("UwpMinTargetFrameworks", "uap10.0.14393")
+	                        .WithRestore());
+
+	        msbuildSettings = GetMSBuildSettings();
+	        msbuildSettings.BinaryLogger = binaryLogger;
+	        binaryLogger.FileName = $"{artifactStagingDirectory}/win-16299-{configuration}-csproj.binlog";
+	        MSBuild("./Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj",
+	                    msbuildSettings
+	                        .WithRestore()
+	                        .WithTarget("rebuild")
+	                        .WithProperty("DisableEmbeddedXbf", "false")
+	                        .WithProperty("EnableTypeInfoReflection", "false")
+	                        .WithProperty("UwpMinTargetFrameworks", "uap10.0.16299"));
+
+	        msbuildSettings = GetMSBuildSettings();
+	        msbuildSettings.BinaryLogger = binaryLogger;
+	        binaryLogger.FileName = $"{artifactStagingDirectory}/win-14393-{configuration}-csproj.binlog";
+	        MSBuild("./Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj",
+	                    msbuildSettings
+	                        .WithRestore()
+	                        .WithTarget("rebuild")
+	                        .WithProperty("DisableEmbeddedXbf", "false")
+	                        .WithProperty("EnableTypeInfoReflection", "false")
+	                        .WithProperty("UwpMinTargetFrameworks", "uap10.0.14393"));
 
             msbuildSettings = GetMSBuildSettings();
             msbuildSettings.BinaryLogger = binaryLogger;