Skip to content

Commit 9afa290

Browse files
committed
Minor fixes
1 parent b38ff05 commit 9afa290

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

Scanner/Scanner.csproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<UseVSHostingProcess>false</UseVSHostingProcess>
4040
<ErrorReport>prompt</ErrorReport>
4141
<Prefer32Bit>true</Prefer32Bit>
42+
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
4243
</PropertyGroup>
4344
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
4445
<OutputPath>bin\x86\Release\</OutputPath>
@@ -62,6 +63,7 @@
6263
<UseVSHostingProcess>false</UseVSHostingProcess>
6364
<ErrorReport>prompt</ErrorReport>
6465
<Prefer32Bit>true</Prefer32Bit>
66+
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
6567
</PropertyGroup>
6668
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
6769
<OutputPath>bin\ARM\Release\</OutputPath>
@@ -85,7 +87,7 @@
8587
<UseVSHostingProcess>false</UseVSHostingProcess>
8688
<ErrorReport>prompt</ErrorReport>
8789
<Prefer32Bit>true</Prefer32Bit>
88-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
90+
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
8991
</PropertyGroup>
9092
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
9193
<OutputPath>bin\ARM64\Release\</OutputPath>
@@ -109,6 +111,7 @@
109111
<UseVSHostingProcess>false</UseVSHostingProcess>
110112
<ErrorReport>prompt</ErrorReport>
111113
<Prefer32Bit>true</Prefer32Bit>
114+
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
112115
</PropertyGroup>
113116
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
114117
<OutputPath>bin\x64\Release\</OutputPath>
@@ -618,6 +621,12 @@
618621
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
619622
<VisualStudioVersion>14.0</VisualStudioVersion>
620623
</PropertyGroup>
624+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'">
625+
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
626+
</PropertyGroup>
627+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
628+
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
629+
</PropertyGroup>
621630
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
622631
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
623632
Other similar extension points exist, see Microsoft.Common.targets.

Scanner/Scanner.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ Global
111111
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|ARM64.Build.0 = Debug|ARM64
112112
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|ARM64.Deploy.0 = Debug|ARM64
113113
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|x64.ActiveCfg = Debug|x64
114-
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|x64.Build.0 = Debug|x64
115-
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|x64.Deploy.0 = Debug|x64
116114
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|x86.ActiveCfg = Debug|x86
117115
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|x86.Build.0 = Debug|x86
118116
{13C75332-B638-4D4B-96DA-7C29366FD657}.Debug|x86.Deploy.0 = Debug|x86

Scanner/Views/Dialogs/OtherAppsDialogView.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
4444
<ContentDialog.Title>
4545
<StackPanel Orientation="Vertical" Spacing="4" Margin="0,0,0,12">
46-
<TextBlock x:Uid="HeadingDialogOtherApps"/>
46+
<TextBlock x:Uid="HeadingDialogOtherApps" AutomationProperties.HeadingLevel="Level1"/>
4747
<TextBlock x:Uid="SubheadingDialogOtherApps" Style="{StaticResource BodyTextBlockStyle}"/>
4848
</StackPanel>
4949
</ContentDialog.Title>
@@ -61,7 +61,7 @@
6161

6262
<Image Grid.Column="1" Source="/Assets/ClipShelf/Hero Image Alt Close-Up.jpg" HorizontalAlignment="Center" VerticalAlignment="Stretch" Stretch="UniformToFill" />
6363

64-
<Grid Grid.Column="0" RowSpacing="24" ColumnSpacing="16" Padding="20" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}">
64+
<Grid Grid.Column="0" RowSpacing="24" ColumnSpacing="12" Padding="20" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}">
6565
<Grid.RowDefinitions>
6666
<RowDefinition Height="Auto" />
6767
<RowDefinition Height="Auto" />
@@ -73,8 +73,8 @@
7373
<ColumnDefinition Width="1*" />
7474
</Grid.ColumnDefinitions>
7575

76-
<Image Grid.Row="0" Grid.Column="0" Source="/Assets/ClipShelf/Logo.svg" MaxWidth="24" MaxHeight="24" />
77-
<TextBlock Grid.Row="0" Grid.Column="1" Text="ClipShelf" FontSize="24" Style="{StaticResource BaseTextBlockStyle}" />
76+
<Image Grid.Row="0" Grid.Column="0" Source="/Assets/ClipShelf/Logo.svg" MaxWidth="28" MaxHeight="28" VerticalAlignment="Center" />
77+
<TextBlock Grid.Row="0" Grid.Column="1" Text="ClipShelf" FontSize="24" Style="{StaticResource BaseTextBlockStyle}" AutomationProperties.HeadingLevel="Level2" />
7878
<TextBlock x:Uid="TextDialogOtherAppsClipShelf" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Foreground="{ThemeResource TextFillColorSecondaryBrush}" Style="{StaticResource BodyTextBlockStyle}" />
7979
<Button x:Name="ButtonGetClipShelf" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" MinWidth="120" VerticalAlignment="Bottom" Style="{StaticResource AccentButtonStyle}" Click="ButtonGetClipShelf_Click">
8080
<StackPanel Orientation="Horizontal" Spacing="8">

Scanner/Views/Dialogs/OtherAppsDialogView.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public OtherAppsDialogView()
1616

1717
private async void ButtonGetClipShelf_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
1818
{
19-
await Launcher.LaunchUriAsync(new Uri("ms-windows-store://pdp/?productid=9NV7F7JGLRPL"));
19+
await Launcher.LaunchUriAsync(new Uri("ms-windows-store://pdp/?productid=9NV7F7JGLRPL&cid=scanner"));
2020
}
2121
}
2222
}

0 commit comments

Comments
 (0)