Merge pull request #907 from Microsoft/dev

1.3.1

Author: deltakosh

Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs

@@ -103,39 +103,46 @@ public async Task<string> GetJavaScriptSourceAsync()
 
         public async Task<string> GetDocumentationAsync()
         {
-            using (var request = new HttpHelperRequest(new Uri(DocumentationUrl), HttpMethod.Get))
+            try
             {
-                using (var response = await HttpHelper.Instance.SendRequestAsync(request).ConfigureAwait(false))
+                using (var request = new HttpHelperRequest(new Uri(DocumentationUrl), HttpMethod.Get))
                 {
-                    if (response.Success)
+                    using (var response = await HttpHelper.Instance.SendRequestAsync(request).ConfigureAwait(false))
                     {
-                        var result = await response.Content.ReadAsStringAsync();
+                        if (response.Success)
+                        {
+                            var result = await response.Content.ReadAsStringAsync();
 
-                        // Need to do some cleaning
-                        // Rework code tags
-                        var regex = new Regex("```(xaml|xml|csharp)(?<code>.+?)```", RegexOptions.Singleline);
+                            // Need to do some cleaning
+                            // Rework code tags
+                            var regex = new Regex("```(xaml|xml|csharp)(?<code>.+?)```", RegexOptions.Singleline);
 
-                        foreach (Match match in regex.Matches(result))
-                        {
-                            var code = match.Groups["code"].Value;
-                            var lines = code.Split('\n');
-                            var newCode = new StringBuilder();
-                            foreach (var line in lines)
+                            foreach (Match match in regex.Matches(result))
                             {
-                                newCode.AppendLine("    " + line);
+                                var code = match.Groups["code"].Value;
+                                var lines = code.Split('\n');
+                                var newCode = new StringBuilder();
+                                foreach (var line in lines)
+                                {
+                                    newCode.AppendLine("    " + line);
+                                }
+
+                                result = result.Replace(match.Value, newCode.ToString());
                             }
 
-                            result = result.Replace(match.Value, newCode.ToString());
-                        }
-
-                        // Images
-                        regex = new Regex("## Example Image.+?##", RegexOptions.Singleline);
-                        result = regex.Replace(result, "##");
+                            // Images
+                            regex = new Regex("## Example Image.+?##", RegexOptions.Singleline);
+                            result = regex.Replace(result, "##");
 
-                        return result;
+                            return result;
+                        }
                     }
                 }
             }
+            catch (Exception ex)
+            {
+                return ex.Message;
+            }
 
             return string.Empty;
         }

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml

@@ -18,6 +18,14 @@
                    Text="Light effects are not available on your version of Windows 10"
                    TextWrapping="Wrap"
                    Visibility="Collapsed" />
+        <TextBlock x:Name="NoCreatorUpdateWarningText"
+                   Margin="0,20"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Top"
+                   Foreground="{ThemeResource TextSelectionHighlightColorThemeBrush}"
+                   Text="Warning: This effect has issues on low end devices if you are not on Creator Update or upper"
+                   TextWrapping="Wrap"
+                   Visibility="Collapsed" />
 
         <Image x:Name="ToolkitLogo"
                Width="100"

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Light/LightBehaviorPage.xaml.cs

@@ -43,6 +43,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             {
                 WarningText.Visibility = Visibility.Visible;
             }
+            else
+            {
+                NoCreatorUpdateWarningText.Visibility = Visibility.Visible;
+            }
         }
     }
 }

Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs

@@ -441,16 +441,14 @@ private async Task<bool> LoadImageBrush(Uri uri)
                 if (strategy == UIStrategy.Composition)
                 {
                     var compositor = _containerVisual.Compositor;
+                    var surfaceFactory = SurfaceFactory.GetSharedSurfaceFactoryForCompositor(compositor);
 
-                    using (var surfaceFactory = SurfaceFactory.GetSharedSurfaceFactoryForCompositor(compositor))
-                    {
-                        var surfaceUri = await surfaceFactory.CreateUriSurfaceAsync(uri);
+                    var surfaceUri = await surfaceFactory.CreateUriSurfaceAsync(uri);
 
-                        _uriSurface = surfaceUri;
-                        _brushVisual = compositor.CreateSurfaceBrush(surfaceUri.Surface);
+                    _uriSurface = surfaceUri;
+                    _brushVisual = compositor.CreateSurfaceBrush(surfaceUri.Surface);
 
-                        _imageSize = surfaceUri.Size;
-                    }
+                    _imageSize = surfaceUri.Size;
                 }
                 else
                 {

Microsoft.Toolkit.Uwp.UI.Controls/project.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
-    "Robmikh.CompositionSurfaceFactory": "0.7.0-alpha",
+    "Robmikh.CompositionSurfaceFactory": "0.7.1",
     "StyleCop.Analyzers": "1.0.0"
   },
   "frameworks": {

build/Microsoft.Toolkit.Uwp.UI.Controls.nuspec

@@ -18,7 +18,7 @@
       <dependency id="Microsoft.Toolkit.Uwp" version="$version$" />
       <dependency id="Microsoft.Toolkit.Uwp.UI" version="$version$" />
 	    <dependency id="Microsoft.Toolkit.Uwp.UI.Animations" version="$version$" />
-	    <dependency id="Robmikh.CompositionSurfaceFactory" version="0.7.0-alpha" />
+	    <dependency id="Robmikh.CompositionSurfaceFactory" version="0.7.1" />
     </dependencies>
   </metadata>
   <files>