Merge pull request #855 from Microsoft/HotFixes_version1.2

Hot fixes version1.2
microsoft · Jul 21, 2017 · 5278ef4 · 5278ef4
2 parents d0c3796 + bfc529f
commit 5278ef4
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 10 deletions.
diff --git a/templates/Features/FirstUsePrompt/Services/ActivationService_postaction.cs b/templates/Features/FirstUsePrompt/Services/ActivationService_postaction.cs
@@ -11,8 +11,8 @@ internal class ActivationService
         private async Task StartupAsync()
         {
             //{[{
-            await FirstRunDisplayService.ShowIfAppropriate();
+            await FirstRunDisplayService.ShowIfAppropriateAsync();
             //}]}
         }
     }
-}
+}
diff --git a/templates/Features/FirstUsePrompt/Services/FirstRunDisplayService.cs b/templates/Features/FirstUsePrompt/Services/FirstRunDisplayService.cs
@@ -8,7 +8,7 @@ namespace Param_ItemNamespace.Services
 {
     public class FirstRunDisplayService
     {
-        internal static async Task ShowIfAppropriate()
+        internal static async Task ShowIfAppropriateAsync()
         {
             bool hasShownFirstRun = false;
             hasShownFirstRun = await Windows.Storage.ApplicationData.Current.LocalSettings.ReadAsync<bool>(nameof(hasShownFirstRun));

diff --git a/templates/Features/LiveTile/Services/LiveTileFeatureService.Samples.cs b/templates/Features/LiveTile/Services/LiveTileFeatureService.Samples.cs
@@ -80,7 +80,7 @@ public void SampleUpdate()
             UpdateTile(notification);
         }
 
-        public async Task SamplePinSecondary(string pageName)
+        public async Task SamplePinSecondaryAsync(string pageName)
         {
             // TODO WTS: Call this method to Pin a Secondary Tile from a page.
             // You also must implement the navigation to this specific page in the OnLaunched event handler on App.xaml.cs

diff --git a/templates/Features/WhatsNewPrompt/Services/ActivationService_postaction.cs b/templates/Features/WhatsNewPrompt/Services/ActivationService_postaction.cs
@@ -11,7 +11,7 @@ internal class ActivationService
         private async Task StartupAsync()
         {
             //{[{
-            await WhatsNewDisplayService.ShowIfAppropriate();
+            await WhatsNewDisplayService.ShowIfAppropriateAsync();
             //}]}
         }
     }

diff --git a/templates/Features/WhatsNewPrompt/Services/WhatsNewDisplayService.cs b/templates/Features/WhatsNewPrompt/Services/WhatsNewDisplayService.cs
@@ -9,7 +9,7 @@ namespace Param_ItemNamespace.Services
     // For instructions on testing this service see https://github.com/Microsoft/WindowsTemplateStudio/tree/master/docs/features/whats-new-prompt.md
     public class WhatsNewDisplayService
     {
-        internal static async Task ShowIfAppropriate()
+        internal static async Task ShowIfAppropriateAsync()
         {
             var currentVersion = PackageVersionToReadableString(Package.Current.Id.Version);
 

diff --git a/templates/Pages/Chart.CodeBehind/Views/ChartViewPage.xaml b/templates/Pages/Chart.CodeBehind/Views/ChartViewPage.xaml
@@ -23,10 +23,32 @@
         <Grid Grid.Row="1" Background="{ThemeResource SystemControlPageBackgroundChromeLowBrush}">
             <tc:RadCartesianChart>
                 <tc:RadCartesianChart.HorizontalAxis>
-                    <tc:CategoricalAxis />
+                    <tc:CategoricalAxis Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}">
+                        <tc:CategoricalAxis.LineStyle>
+                            <Style TargetType="Line">
+                                <Setter Property="Stroke" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:CategoricalAxis.LineStyle>
+                        <tc:CategoricalAxis.MajorTickStyle>
+                            <Style TargetType="Rectangle">
+                                <Setter Property="Fill" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:CategoricalAxis.MajorTickStyle>
+                    </tc:CategoricalAxis>
                 </tc:RadCartesianChart.HorizontalAxis>
                 <tc:RadCartesianChart.VerticalAxis>
-                    <tc:LinearAxis />
+                    <tc:LinearAxis Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}" >
+                        <tc:LinearAxis.LineStyle>
+                            <Style TargetType="Line">
+                                <Setter Property="Stroke" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:LinearAxis.LineStyle>
+                        <tc:LinearAxis.MajorTickStyle>
+                            <Style TargetType="Rectangle">
+                                <Setter Property="Fill" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:LinearAxis.MajorTickStyle>
+                    </tc:LinearAxis>
                 </tc:RadCartesianChart.VerticalAxis>
                 <tc:BarSeries ItemsSource="{x:Bind Source}" ShowLabels="True">
                     <tc:BarSeries.CategoryBinding>

diff --git a/templates/Pages/Chart/Views/ChartViewPage.xaml b/templates/Pages/Chart/Views/ChartViewPage.xaml
@@ -23,10 +23,32 @@
         <Grid Grid.Row="1" Background="{ThemeResource SystemControlPageBackgroundChromeLowBrush}">
             <tc:RadCartesianChart>
                 <tc:RadCartesianChart.HorizontalAxis>
-                    <tc:CategoricalAxis />
+                    <tc:CategoricalAxis Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}">
+                        <tc:CategoricalAxis.LineStyle>
+                            <Style TargetType="Line">
+                                <Setter Property="Stroke" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:CategoricalAxis.LineStyle>
+                        <tc:CategoricalAxis.MajorTickStyle>
+                            <Style TargetType="Rectangle">
+                                <Setter Property="Fill" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:CategoricalAxis.MajorTickStyle>
+                    </tc:CategoricalAxis>
                 </tc:RadCartesianChart.HorizontalAxis>
                 <tc:RadCartesianChart.VerticalAxis>
-                    <tc:LinearAxis />
+                    <tc:LinearAxis Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}" >
+                        <tc:LinearAxis.LineStyle>
+                            <Style TargetType="Line">
+                                <Setter Property="Stroke" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:LinearAxis.LineStyle>
+                        <tc:LinearAxis.MajorTickStyle>
+                            <Style TargetType="Rectangle">
+                                <Setter Property="Fill" Value="{ThemeResource SystemControlBackgroundBaseMediumBrush}"/>
+                            </Style>
+                        </tc:LinearAxis.MajorTickStyle>
+                    </tc:LinearAxis>
                 </tc:RadCartesianChart.VerticalAxis>
                 <tc:BarSeries ItemsSource="{x:Bind ViewModel.Source}" ShowLabels="True">
                     <tc:BarSeries.CategoryBinding>
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ internal class ActivationService @@
             private async Task StartupAsync()
             {
                 //{[{
-                await WhatsNewDisplayService.ShowIfAppropriate();
+                await WhatsNewDisplayService.ShowIfAppropriateAsync();
                 //}]}
             }
         }
@@ Expand Down @@