UWP build fixes for 4.5.

davidbritch · davidbritch · commit 29ef268c8b0f · 2020-02-27T13:15:48.000Z
diff --git a/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs b/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs
@@ -3,8 +3,8 @@
 using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
+using WinControls = Windows.UI.Xaml.Controls;
+using WinMedia = Windows.UI.Xaml.Media;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.UWP;
 using DIContainerDemo;
@@ -13,7 +13,7 @@
                           typeof(FormsVideoLibrary.UWP.VideoPlayerRenderer))]
 namespace FormsVideoLibrary.UWP
 {
-    public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>
+    public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>
     {
         ILogger _logger;
 
@@ -32,7 +32,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar
             {
                 if (Control == null)
                 {
-                    MediaElement mediaElement = new MediaElement();
+                    WinControls.MediaElement mediaElement = new WinControls.MediaElement();
                     SetNativeControl(mediaElement);
 
                     mediaElement.MediaOpened += OnMediaElementMediaOpened;
@@ -86,12 +86,12 @@ void OnMediaElementCurrentStateChanged(object sender, RoutedEventArgs args)
 
             switch (Control.CurrentState)
             {
-                case MediaElementState.Playing:
+                case WinMedia.MediaElementState.Playing:
                     videoStatus = VideoStatus.Playing;
                     break;
 
-                case MediaElementState.Paused:
-                case MediaElementState.Stopped:
+                case WinMedia.MediaElementState.Paused:
+                case WinMedia.MediaElementState.Stopped:
                     videoStatus = VideoStatus.Paused;
                     break;
             }
diff --git a/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs b/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs
@@ -3,8 +3,8 @@
 using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
+using WinControls = Windows.UI.Xaml.Controls;
+using WinMedia = Windows.UI.Xaml.Media;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.UWP;
 using FactoriesDemo;
@@ -13,7 +13,7 @@
                           typeof(FormsVideoLibrary.UWP.VideoPlayerRenderer))]
 namespace FormsVideoLibrary.UWP
 {
-    public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>
+    public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>
     {
         ILogger _logger;
 
@@ -32,7 +32,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar
             {
                 if (Control == null)
                 {
-                    MediaElement mediaElement = new MediaElement();
+                    WinControls.MediaElement mediaElement = new WinControls.MediaElement();
                     SetNativeControl(mediaElement);
 
                     mediaElement.MediaOpened += OnMediaElementMediaOpened;
@@ -86,12 +86,12 @@ void OnMediaElementCurrentStateChanged(object sender, RoutedEventArgs args)
 
             switch (Control.CurrentState)
             {
-                case MediaElementState.Playing:
+                case WinMedia.MediaElementState.Playing:
                     videoStatus = VideoStatus.Playing;
                     break;
 
-                case MediaElementState.Paused:
-                case MediaElementState.Stopped:
+                case WinMedia.MediaElementState.Paused:
+                case WinMedia.MediaElementState.Stopped:
                     videoStatus = VideoStatus.Paused;
                     break;
             }
diff --git a/CustomRenderers/VideoPlayerDemos/VideoPlayerDemos/VideoPlayerDemos.UWP/FormsVideoLibrary/VideoPlayerRenderer.cs b/CustomRenderers/VideoPlayerDemos/VideoPlayerDemos/VideoPlayerDemos.UWP/FormsVideoLibrary/VideoPlayerRenderer.cs
@@ -4,8 +4,8 @@
 using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
+using WinControls = Windows.UI.Xaml.Controls;
+using WinMedia = Windows.UI.Xaml.Media;
 
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.UWP;
@@ -15,7 +15,7 @@
 
 namespace FormsVideoLibrary.UWP
 {
-    public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>
+    public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>
     {
         protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> args)
         {
@@ -25,7 +25,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar
             {
                 if (Control == null)
                 {
-                    MediaElement mediaElement = new MediaElement();
+                    WinControls.MediaElement mediaElement = new WinControls.MediaElement();
                     SetNativeControl(mediaElement);
 
                     mediaElement.MediaOpened += OnMediaElementMediaOpened;
@@ -73,12 +73,12 @@ void OnMediaElementCurrentStateChanged(object sender, RoutedEventArgs args)
 
             switch (Control.CurrentState)
             {
-                case MediaElementState.Playing:
+                case WinMedia.MediaElementState.Playing:
                     videoStatus = VideoStatus.Playing;
                     break;
 
-                case MediaElementState.Paused:
-                case MediaElementState.Stopped:
+                case WinMedia.MediaElementState.Paused:
+                case WinMedia.MediaElementState.Stopped:
                     videoStatus = VideoStatus.Paused;
                     break;
             }
diff --git a/TodoLocalizedRTL/TodoLocalized.UWP/Speech.cs b/TodoLocalizedRTL/TodoLocalized.UWP/Speech.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using TodoLocalized.UWP;
 using Windows.Media.SpeechSynthesis;
-using Windows.UI.Xaml.Controls;
 using Xamarin.Forms;
 
 [assembly: Dependency(typeof(Speech))]
@@ -14,7 +13,7 @@ public async void Speak(string text)
             using (var speech = new SpeechSynthesizer())
             {
                 var stream = await speech.SynthesizeTextToStreamAsync(text);
-                var mediaElement = new MediaElement();
+                var mediaElement = new Windows.UI.Xaml.Controls.MediaElement();
                 mediaElement.SetSource(stream, stream.ContentType);
                 mediaElement.Play();
             }

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`using Windows.Storage;`
`5`	`5`	`using Windows.Storage.Streams;`
`6`	`6`	`using Windows.UI.Xaml;`
`7`		`-using Windows.UI.Xaml.Controls;`
`8`		`-using Windows.UI.Xaml.Media;`
	`7`	`+using WinControls = Windows.UI.Xaml.Controls;`
	`8`	`+using WinMedia = Windows.UI.Xaml.Media;`
`9`	`9`
`10`	`10`	`using Xamarin.Forms;`
`11`	`11`	`using Xamarin.Forms.Platform.UWP;`
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`namespace FormsVideoLibrary.UWP`
`17`	`17`	`{`
`18`		`- public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>`
	`18`	`+ public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>`
`19`	`19`	`{`
`20`	`20`	`protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> args)`
`21`	`21`	`{`
`@@ -25,7 +25,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar`
`25`	`25`	`{`
`26`	`26`	`if (Control == null)`
`27`	`27`	`{`
`28`		`- MediaElement mediaElement = new MediaElement();`
	`28`	`+ WinControls.MediaElement mediaElement = new WinControls.MediaElement();`
`29`	`29`	`SetNativeControl(mediaElement);`
`30`	`30`
`31`	`31`	`mediaElement.MediaOpened += OnMediaElementMediaOpened;`
`@@ -73,12 +73,12 @@ void OnMediaElementCurrentStateChanged(object sender, RoutedEventArgs args)`
`73`	`73`
`74`	`74`	`switch (Control.CurrentState)`
`75`	`75`	`{`
`76`		`- case MediaElementState.Playing:`
	`76`	`+ case WinMedia.MediaElementState.Playing:`
`77`	`77`	`videoStatus = VideoStatus.Playing;`
`78`	`78`	`break;`
`79`	`79`
`80`		`- case MediaElementState.Paused:`
`81`		`- case MediaElementState.Stopped:`
	`80`	`+ case WinMedia.MediaElementState.Paused:`
	`81`	`+ case WinMedia.MediaElementState.Stopped:`
`82`	`82`	`videoStatus = VideoStatus.Paused;`
`83`	`83`	`break;`
`84`	`84`	`}`