From 3962591430998785399463e683dcf7627c68fee5 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <michael.xfox@outlook.com>
Date: Sat, 14 Mar 2020 11:22:05 +0300
Subject: [PATCH] Fixed problems from RESharper report Updated validation.yml

---
 GUT.Schedule/GUTSchedule.UWP/App.xaml             | 1 +
 GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml | 2 +-
 GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml  | 6 +++---
 pipelines/validation.yml                          | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/GUT.Schedule/GUTSchedule.UWP/App.xaml b/GUT.Schedule/GUTSchedule.UWP/App.xaml
index 7c59486..c506ffc 100644
--- a/GUT.Schedule/GUTSchedule.UWP/App.xaml
+++ b/GUT.Schedule/GUTSchedule.UWP/App.xaml
@@ -20,5 +20,6 @@
 			<Setter Property="Margin" Value="2"/>
 		</Style>
 		<Color x:Key="SystemAccentColor">#ff8000</Color>
+		<SolidColorBrush x:Key="SystemAccentColorBrush" Color="#ff8000" />
 	</Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml b/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml
index 5cb776e..07d8d10 100644
--- a/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml
+++ b/GUT.Schedule/GUTSchedule.UWP/Pages/AboutPage.xaml
@@ -9,7 +9,7 @@
 	Loaded="Page_Loaded">
 
 	<Page.TopAppBar>
-		<CommandBar ClosedDisplayMode="Compact" Background="{StaticResource SystemAccentColor}" RequestedTheme="Dark">
+		<CommandBar ClosedDisplayMode="Compact" Background="{StaticResource SystemAccentColorBrush}" RequestedTheme="Dark">
 			<CommandBar.Content>
 				<Grid>
 					<Grid.ColumnDefinitions>
diff --git a/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml b/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml
index 8675b16..e486040 100644
--- a/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml
+++ b/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml
@@ -12,7 +12,7 @@
 	</Page.Background>
 
 	<Page.TopAppBar>
-		<CommandBar ClosedDisplayMode="Compact" Background="{StaticResource SystemAccentColor}" RequestedTheme="Dark">
+		<CommandBar ClosedDisplayMode="Compact" Background="{StaticResource SystemAccentColorBrush}" RequestedTheme="Dark">
 			<CommandBar.Content>
 				<TextBlock x:Uid="appName" Text="GUT.Schedule" Style="{StaticResource TitleTextBlockStyle}" Margin="10,6"/>
 			</CommandBar.Content>
@@ -115,7 +115,7 @@
 					<TextBlock x:Uid="titleNote" Style="{StaticResource CaptionTextBlockStyle}" Text="note"/>
 
 					<TextBlock Foreground="Red" Visibility="Collapsed" Text="Error" x:Name="errorPlaceholder"/>
-					<Button x:Uid="addScheduleButton" Content="Add schedule" Background="{StaticResource SystemAccentColor}" Foreground="White" FontWeight="Bold" Margin="0,10" Click="Export"/>
+					<Button x:Uid="addScheduleButton" Content="Add schedule" Background="{StaticResource SystemAccentColorBrush}" Foreground="White" FontWeight="Bold" Margin="0,10" Click="Export"/>
 
 					<TextBlock x:Uid="copyrights" Style="{StaticResource CaptionTextBlockStyle}" Text="©2020 Michael Gordeev, INS, ICT-907"/>
 					<TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="v$(Build.BuildNumber) (ci-id #$(Build.BuildId))" x:Name="version"/>
@@ -123,7 +123,7 @@
 			</Grid>
 		</ScrollViewer>
 
-		<Grid Background="{StaticResource SystemAccentColor}" x:Name="loading" Visibility="Collapsed">
+		<Grid Background="{StaticResource SystemAccentColorBrush}" x:Name="loading" Visibility="Collapsed">
 			<StackPanel VerticalAlignment="Center">
 				<ProgressRing Width="100" Height="100" Foreground="White" IsActive="True" HorizontalAlignment="Center"/>
 				<TextBlock Style="{StaticResource TitleTextBlockStyle}" x:Name="status" Text="Processing..." HorizontalAlignment="Center" Foreground="White" Margin="0,20"/>
diff --git a/pipelines/validation.yml b/pipelines/validation.yml
index c708f09..96431ef 100644
--- a/pipelines/validation.yml
+++ b/pipelines/validation.yml
@@ -40,7 +40,7 @@ steps:
 - task: VSBuild@1
   displayName: 'Build UWP'
   inputs:
-    platform: '$(buildPlatform)'
+    platform: 'x64'
     solution: '**/**.UWP.csproj'
     configuration: '$(buildConfiguration)'
     msbuildArgs: '/p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(outputDirectory)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload'
\ No newline at end of file