From fc5002aa939ef98d817dc1d86b821c5dfcd8b8e7 Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Tue, 1 Sep 2020 05:51:37 -0500 Subject: [PATCH] Bump UWP to 19041 (#11940) * Remove uwp build packages from nuspec * 19041 * - bump 19041 * - remove spanning rects * - fix features installs for 19041 * - fix comma * - add android platforms --- .../DualScreen.UWP/DualScreen.UWP.csproj | 2 +- UWP.Build.props | 15 +++++---------- UWP.Build.targets | 9 ++------- ...rms.ControlGallery.WindowsUniversal.csproj | 2 +- .../DualScreenService.uwp.cs | 5 +++-- ...amarin.Forms.Platform.UAP.UnitTests.csproj | 2 +- Xamarin.Forms.Platform.UAP/Forms.cs | 2 +- Xamarin.Forms.Platform.UAP/Platform.cs | 2 +- .../WindowsIsolatedStorage.cs | 2 +- build.cake | 19 +++++++++++-------- 10 files changed, 27 insertions(+), 33 deletions(-) diff --git a/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj b/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj index 78281b05f80..09fe2645edc 100644 --- a/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj +++ b/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj @@ -11,7 +11,7 @@ DualScreen.UWP en-US UAP - 10.0.18362.0 + 10.0.19041.0 10.0.16299.0 14 true diff --git a/UWP.Build.props b/UWP.Build.props index a96966cf411..5b931005fea 100644 --- a/UWP.Build.props +++ b/UWP.Build.props @@ -4,24 +4,19 @@ uap10.0.14393;uap10.0.16299 - netstandard2.0 - 10.0.16299.0 - 10.0.18362.0 - 10.0.19559.0 + 10.0.19041.0 + 10.0.19041.0 $(DefineConstants);UWP - + $(DefineConstants);UWP_14393 - - $(DefineConstants);UWP_18362 - - - $(DefineConstants);UWP_18362;UWP_19000 + + $(DefineConstants);UWP_18362;UWP_19041;UWP_14393;UWP_16299 diff --git a/UWP.Build.targets b/UWP.Build.targets index 56dd56c3296..df0181c2d5c 100644 --- a/UWP.Build.targets +++ b/UWP.Build.targets @@ -2,13 +2,8 @@ - - - Windows Mobile Extensions for the UWP - - - - + + Windows Mobile Extensions for the UWP diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj index 100ee0c945f..a5e5991391c 100644 --- a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj +++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj @@ -13,7 +13,7 @@ Xamarin.Forms.ControlGallery.WindowsUniversal en-US UAP - 10.0.18362.0 + 10.0.19041.0 10.0.16299.0 true 14 diff --git a/Xamarin.Forms.DualScreen/DualScreenService.uwp.cs b/Xamarin.Forms.DualScreen/DualScreenService.uwp.cs index 2c6d2431544..3fe93b5c59d 100644 --- a/Xamarin.Forms.DualScreen/DualScreenService.uwp.cs +++ b/Xamarin.Forms.DualScreen/DualScreenService.uwp.cs @@ -137,8 +137,9 @@ public Rectangle GetHinge() var applicationView = ApplicationView.GetForCurrentView(); List spanningRects = null; -#if UWP_19000 - spanningRects = applicationView.GetSpanningRects().ToList(); +#if UWP_19041 + // This will make a come back with winui2.5 + //spanningRects = applicationView.GetSpanningRects().ToList(); #endif if (spanningRects?.Count == 2) diff --git a/Xamarin.Forms.Platform.UAP.UnitTests/Xamarin.Forms.Platform.UAP.UnitTests.csproj b/Xamarin.Forms.Platform.UAP.UnitTests/Xamarin.Forms.Platform.UAP.UnitTests.csproj index 6d8baf5e5b7..ba318b2645a 100644 --- a/Xamarin.Forms.Platform.UAP.UnitTests/Xamarin.Forms.Platform.UAP.UnitTests.csproj +++ b/Xamarin.Forms.Platform.UAP.UnitTests/Xamarin.Forms.Platform.UAP.UnitTests.csproj @@ -11,7 +11,7 @@ Xamarin.Forms.Platform.UAP.UnitTests en-US UAP - 10.0.18362.0 + 10.0.19041.0 10.0.16299.0 14 512 diff --git a/Xamarin.Forms.Platform.UAP/Forms.cs b/Xamarin.Forms.Platform.UAP/Forms.cs index 308d3fd1a47..c970c34601d 100644 --- a/Xamarin.Forms.Platform.UAP/Forms.cs +++ b/Xamarin.Forms.Platform.UAP/Forms.cs @@ -28,7 +28,7 @@ public static void Init(IActivatedEventArgs launchActivatedEventArgs, IEnumerabl var accent = (WSolidColorBrush)Windows.UI.Xaml.Application.Current.Resources["SystemColorControlAccentBrush"]; Color.SetAccent(accent.ToFormsColor()); -#if UWP_14393 +#if !UWP_16299 Log.Listeners.Add(new DelegateLogListener((c, m) => Debug.WriteLine(LogFormat, c, m))); #else Log.Listeners.Add(new DelegateLogListener((c, m) => Trace.WriteLine(m, c))); diff --git a/Xamarin.Forms.Platform.UAP/Platform.cs b/Xamarin.Forms.Platform.UAP/Platform.cs index 2045af858b3..6af7c4bfc01 100644 --- a/Xamarin.Forms.Platform.UAP/Platform.cs +++ b/Xamarin.Forms.Platform.UAP/Platform.cs @@ -72,7 +72,7 @@ internal Platform(Windows.UI.Xaml.Controls.Page page) Windows.UI.Xaml.Application.Current.Resources.MergedDictionaries.Add(Forms.GetTabletResources()); } -#if !UWP_14393 +#if UWP_16299 if (!current.Resources.ContainsKey(ShellRenderer.ShellStyle)) { var myResourceDictionary = new Windows.UI.Xaml.ResourceDictionary(); diff --git a/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs b/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs index e88af24bcb9..4642bf773c9 100644 --- a/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs +++ b/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs @@ -5,7 +5,7 @@ using Windows.Storage.FileProperties; using Windows.Storage.Streams; -#if UWP_14393 +#if !UWP_16299 using FileMode = Xamarin.Forms.Internals.FileMode; using FileAccess = Xamarin.Forms.Internals.FileAccess; using FileShare = Xamarin.Forms.Internals.FileShare; diff --git a/build.cake b/build.cake index 67ade591d26..76ce713756d 100644 --- a/build.cake +++ b/build.cake @@ -117,7 +117,7 @@ else Information("MSBuildArguments: {0}", MSBuildArguments); -string androidSdks = EnvironmentVariable("ANDROID_API_SDKS", "platforms;android-28,platforms;android-29,build-tools;29.0.3"); +string androidSdks = EnvironmentVariable("ANDROID_API_SDKS", "platform-tools,platforms;android-28,platforms;android-29,build-tools;29.0.3,platforms;android-30"); if(buildForVS2017) androidSdks = "platforms;android-28,platforms;android-29,build-tools;29.0.3"; @@ -125,12 +125,12 @@ if(buildForVS2017) Information("ANDROID_API_SDKS: {0}", androidSdks); string[] androidSdkManagerInstalls = androidSdks.Split(','); -(string name, string location)[] windowsSdksInstalls = new (string name, string location)[] +(string name, string location, string featureList)[] windowsSdksInstalls = new (string name, string location, string featureList)[] { - ("10.0.19041.0", "https://go.microsoft.com/fwlink/p/?linkid=2120843"), - ("10.0.18362.0", "https://go.microsoft.com/fwlink/?linkid=2083338"), - ("10.0.16299.0", "https://go.microsoft.com/fwlink/p/?linkid=864422"), - ("10.0.14393.0", "https://go.microsoft.com/fwlink/p/?LinkId=838916") + ("10.0.19041.0", "https://go.microsoft.com/fwlink/p/?linkid=2120843", "OptionId.WindowsPerformanceToolkit OptionId.WindowsDesktopDebuggers OptionId.AvrfExternal OptionId.WindowsSoftwareLogoToolkit OptionId.MSIInstallTools OptionId.SigningTools OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm OptionId.DesktopCPParm64"), + ("10.0.18362.0", "https://go.microsoft.com/fwlink/?linkid=2083338", "+"), + ("10.0.16299.0", "https://go.microsoft.com/fwlink/p/?linkid=864422", "+"), + ("10.0.14393.0", "https://go.microsoft.com/fwlink/p/?LinkId=838916", "+") }; string[] netFrameworkSdksLocalInstall = new string[] @@ -138,7 +138,8 @@ string[] netFrameworkSdksLocalInstall = new string[] "https://go.microsoft.com/fwlink/?linkid=2099470", //NET461 SDK "https://go.microsoft.com/fwlink/?linkid=874338", //NET472 SDK "https://go.microsoft.com/fwlink/?linkid=2099465", //NET47 - "https://download.microsoft.com/download/A/1/D/A1D07600-6915-4CB8-A931-9A980EF47BB7/NDP47-DevPack-KB3186612-ENU.exe" //net47 targeting pack + "https://download.microsoft.com/download/A/1/D/A1D07600-6915-4CB8-A931-9A980EF47BB7/NDP47-DevPack-KB3186612-ENU.exe", //net47 targeting pack + "https://go.microsoft.com/fwlink/?linkid=2088517", //NET48 SDK }; // these don't run on CI @@ -401,7 +402,9 @@ Task("provision-windowssdk") var result = StartProcess(installerPath, new ProcessSettings { Arguments = new ProcessArgumentBuilder() - .Append(@"/features + /q") + .Append(@"/features ") + .Append(windowsSdk.featureList) + .Append(@" /q") } );