Skip to content

Commit e67a009

Browse files
author
Sheil Kumar
committed
Merge branch 'master' into user/sheilk/random-access-stream
2 parents 93590be + 0e4e66d commit e67a009

File tree

13 files changed

+158
-97
lines changed

13 files changed

+158
-97
lines changed

‎Samples/MNIST/UWP/cs/MNIST_Demo.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
</ItemGroup>
137137
<ItemGroup>
138138
<PackageReference Include="Microsoft.AI.MachineLearning">
139-
<Version>1.5.2</Version>
139+
<Version>1.9.1</Version>
140140
</PackageReference>
141141
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
142142
<Version>6.1.9</Version>

‎Samples/MNIST/UWP/cs/MNIST_Demo.sln‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Global
1616
Release_Inbox|ARM = Release_Inbox|ARM
1717
Release_Inbox|x64 = Release_Inbox|x64
1818
Release_Inbox|x86 = Release_Inbox|x86
19-
Release_Nuget|ARM = Release_Nuget|ARM
20-
Release_Nuget|x64 = Release_Nuget|x64
21-
Release_Nuget|x86 = Release_Nuget|x86
19+
Release_NuGet|ARM = Release_NuGet|ARM
20+
Release_NuGet|x64 = Release_NuGet|x64
21+
Release_NuGet|x86 = Release_NuGet|x86
2222
EndGlobalSection
2323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2424
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Debug_Inbox|ARM.ActiveCfg = Debug_Inbox|ARM
@@ -48,15 +48,15 @@ Global
4848
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Inbox|x86.ActiveCfg = Release_Inbox|Win32
4949
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Inbox|x86.Build.0 = Release_Inbox|Win32
5050
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Inbox|x86.Deploy.0 = Release_Inbox|Win32
51-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|ARM.ActiveCfg = Release|ARM
52-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|ARM.Build.0 = Release|ARM
53-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|ARM.Deploy.0 = Release|ARM
54-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|x64.ActiveCfg = Release|x64
55-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|x64.Build.0 = Release|x64
56-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|x64.Deploy.0 = Release|x64
57-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|x86.ActiveCfg = Release|x86
58-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|x86.Build.0 = Release|x86
59-
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_Nuget|x86.Deploy.0 = Release|x86
51+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|ARM.ActiveCfg = Release|ARM
52+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|ARM.Build.0 = Release|ARM
53+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|ARM.Deploy.0 = Release|ARM
54+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|x64.ActiveCfg = Release|x64
55+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|x64.Build.0 = Release|x64
56+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|x64.Deploy.0 = Release|x64
57+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|x86.ActiveCfg = Release|x86
58+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|x86.Build.0 = Release|x86
59+
{B9DB8CE5-0491-4C2D-BEF7-C25E01EF55E3}.Release_NuGet|x86.Deploy.0 = Release|x86
6060
EndGlobalSection
6161
GlobalSection(SolutionProperties) = preSolution
6262
HideSolutionNode = FALSE

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/WinMLSamplesGallery (Package).wapproj‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,7 @@
132132
</ItemGroup>
133133
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
134134
<ItemGroup>
135-
<PackageReference Include="Microsoft.AI.MachineLearning">
136-
<Version>1.9.1</Version>
137-
</PackageReference>
138-
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5">
139-
<IncludeAssets>build</IncludeAssets>
140-
</PackageReference>
141-
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0]">
142-
<IncludeAssets>build</IncludeAssets>
143-
</PackageReference>
135+
<PackageReference Include="Microsoft.AI.MachineLearning" Version="1.9.1" />
136+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-stable" />
144137
</ItemGroup>
145138
</Project>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Pages/SampleBasePage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</Grid>
7373
</Border>
7474
<TextBlock FontFamily="Segoe UI Light" FontSize="14" Margin="0,15,0,0" Text="{x:Bind sampleMetadata.Description}" TextWrapping="Wrap" />
75-
<Frame x:Name="SampleFrame" />
75+
<Frame x:Name="SampleFrame"/>
7676
</StackPanel>
7777
</ScrollViewer>
7878
</Page>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Pages/SamplesGrid.xaml.cs‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
using System;
2-
using System.Linq;
3-
using Microsoft.UI.Xaml.Controls;
1+
using System;
2+
using System.Linq;
3+
using Microsoft.UI.Xaml.Controls;
44
using Microsoft.UI.Xaml.Navigation;
55

6-
namespace WinMLSamplesGallery
7-
{
8-
public sealed partial class SamplesGrid : Page
9-
{
10-
public SamplesGrid()
11-
{
12-
this.InitializeComponent();
13-
}
14-
15-
protected override async void OnNavigatedTo(NavigationEventArgs e)
6+
namespace WinMLSamplesGallery
7+
{
8+
public sealed partial class SamplesGrid : Page
9+
{
10+
public SamplesGrid()
1611
{
17-
var allSamples = await SampleMetadata.GetAllSampleMetadata();
12+
this.InitializeComponent();
13+
}
14+
15+
protected override async void OnNavigatedTo(NavigationEventArgs e)
16+
{
17+
var allSamples = await SampleMetadata.GetAllSampleMetadata();
1818
if (e.Parameter == typeof(HomePage))
19-
{
20-
var recentlyAddedSamples = allSamples.Where(metadata => metadata.IsRecentlyAdded).Reverse();
19+
{
20+
var recentlyAddedSamples = allSamples.Where(metadata => metadata.IsRecentlyAdded).Reverse();
2121
StyledGrid.ItemsSource = recentlyAddedSamples;
2222
}
23-
else
24-
{
25-
allSamples.Sort((left, right) => left.Title.CompareTo(right.Title));
26-
StyledGrid.ItemsSource = allSamples;
27-
}
23+
else
24+
{
25+
allSamples.Sort((left, right) => left.Title.CompareTo(right.Title));
26+
StyledGrid.ItemsSource = allSamples;
27+
}
28+
}
29+
30+
private void NavigateToSample(object sender, SelectionChangedEventArgs e)
31+
{
32+
GridView gridView = sender as GridView;
33+
SampleMetadata sample = gridView.SelectedItem as SampleMetadata;
34+
35+
// Only navigate if the selected page isn't currently loaded.
36+
if (!Type.Equals(MainWindow.mainFrame.CurrentSourcePageType, typeof(SampleBasePage)))
37+
{
38+
MainWindow.mainFrame.Navigate(typeof(SampleBasePage), sample);
39+
}
2840
}
2941

30-
private void NavigateToSample(object sender, SelectionChangedEventArgs e)
31-
{
32-
GridView gridView = sender as GridView;
33-
SampleMetadata sample = gridView.SelectedItem as SampleMetadata;
34-
35-
// Only navigate if the selected page isn't currently loaded.
36-
if (!Type.Equals(MainWindow.mainFrame.CurrentSourcePageType, typeof(SampleBasePage)))
37-
{
38-
MainWindow.mainFrame.Navigate(typeof(SampleBasePage), sample);
39-
}
40-
}
41-
42-
43-
}
44-
}
45-
42+
43+
}
44+
}
45+

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/EncryptedModel/EncryptedModel.xaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:local_controls="using:WinMLSamplesGallery.Controls"
88
xmlns:local_samples="using:WinMLSamplesGallery.Samples"
9-
mc:Ignorable="d"
10-
11-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
9+
mc:Ignorable="d">
1210

1311
<Page.Resources>
1412
<DataTemplate x:Name="InferenceResultsTemplate" x:DataType="local_controls:Prediction">
@@ -93,7 +91,7 @@
9391
</ItemsPanelTemplate>
9492
</ListView.ItemsPanel>
9593
</ListView>
96-
</StackPanel>
94+
</StackPanel>
9795
</StackPanel>
9896
</Grid>
9997
</Page>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageClassifier/ImageClassifier.xaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:local_controls="using:WinMLSamplesGallery.Controls"
88
xmlns:local_samples="using:WinMLSamplesGallery.Samples"
9-
mc:Ignorable="d"
10-
11-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
9+
mc:Ignorable="d">
1210

1311
<Page.Resources>
1412
<DataTemplate x:Key="ImageTemplate" x:DataType="local_controls:Thumbnail">
15-
<Image Stretch="UniformToFill" Source="{x:Bind ImageUri}" Width="200" Height="150" />
13+
<Image Stretch="UniformToFill" Source="{x:Bind ImageUri}" Width="200" Height="145" />
1614
</DataTemplate>
1715

1816
<DataTemplate x:Name="InferenceResultsTemplate" x:DataType="local_controls:Prediction">
@@ -70,9 +68,15 @@
7068
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="0,10,0,0">
7169
<StackPanel Orientation="Vertical">
7270
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
73-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
71+
<Button Background="{ThemeResource ButtonBackgroundThemeBrush}"
72+
FontFamily="Segoe MDL2 Assets"
73+
Content="&#xE1A5;"
74+
Width="55"
75+
Height="50"
76+
HorizontalAlignment="Left"
77+
Click="OpenButton_Clicked" />
7478
<Grid Padding="5,0,0,0">
75-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
79+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="{ThemeResource ButtonBackgroundThemeBrush}" PlaceholderText="Device" Height="50" Width="139"
7680
SelectionChanged="DeviceComboBox_SelectionChanged">
7781
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
7882
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageEffects/ImageEffects.xaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
xmlns:local_samples="using:WinMLSamplesGallery.Samples"
88
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10-
mc:Ignorable="d"
11-
12-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
10+
mc:Ignorable="d">
1311

1412
<Page.Resources>
1513
<DataTemplate x:Key="ImageTemplate" x:DataType="local_controls:Thumbnail">
@@ -122,9 +120,13 @@
122120
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="0,10,0,0">
123121
<StackPanel Orientation="Vertical">
124122
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
125-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
123+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;"
124+
Background="{ThemeResource ButtonBackgroundThemeBrush}"
125+
Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
126126
<Grid Padding="5,0,0,0">
127-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
127+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0"
128+
Background="{ThemeResource ButtonBackgroundThemeBrush}"
129+
PlaceholderText="Device" Height="50" Width="139"
128130
SelectionChanged="DeviceComboBox_SelectionChanged">
129131
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
130132
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ImageSharpInterop/ImageSharpInterop.xaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:local_controls="using:WinMLSamplesGallery.Controls"
88
xmlns:local_samples="using:WinMLSamplesGallery.Samples"
9-
mc:Ignorable="d"
10-
11-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
9+
mc:Ignorable="d">
1210

1311
<Page.Resources>
1412
<DataTemplate x:Key="ImageTemplate" x:DataType="local_controls:Thumbnail">
@@ -72,9 +70,13 @@
7270
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="0,10,0,0">
7371
<StackPanel Orientation="Vertical">
7472
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
75-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
73+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;"
74+
Background="{ThemeResource ButtonBackgroundThemeBrush}"
75+
Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
7676
<Grid Padding="5,0,0,0">
77-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
77+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0"
78+
Background="{ThemeResource ButtonBackgroundThemeBrush}"
79+
PlaceholderText="Device" Height="50" Width="139"
7880
SelectionChanged="DeviceComboBox_SelectionChanged">
7981
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
8082
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/ObjectDetector/ObjectDetector.xaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
xmlns:local_samples="using:WinMLSamplesGallery.Samples"
88
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10-
mc:Ignorable="d"
11-
12-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
10+
mc:Ignorable="d">
1311

1412
<Page.Resources>
1513
<DataTemplate x:Key="ImageTemplate" x:DataType="local_controls:Thumbnail">
@@ -127,9 +125,13 @@
127125
<StackPanel Grid.Row="0" Orientation="Horizontal" Padding="5,10,0,0">
128126
<StackPanel Orientation="Vertical">
129127
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
130-
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;" Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
128+
<Button FontFamily="Segoe MDL2 Assets" Content="&#xE1A5;"
129+
Background="{ThemeResource ButtonBackgroundThemeBrush}"
130+
Width="55" Height="50" HorizontalAlignment="Left" Click="OpenButton_Clicked" />
131131
<Grid Padding="5,0,0,0">
132-
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0" Background="LightGray" PlaceholderText="Device" Height="50" Width="139"
132+
<ComboBox x:Name="DeviceComboBox" SelectedIndex="0"
133+
Background="{ThemeResource ButtonBackgroundThemeBrush}"
134+
PlaceholderText="Device" Height="50" Width="139"
133135
SelectionChanged="DeviceComboBox_SelectionChanged">
134136
<TextBlock Text="CPU" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>
135137
<TextBlock Text="DirectML" FontSize="18" Typography.Capitals="AllSmallCaps" Typography.StylisticSet4="True"/>

0 commit comments

Comments
 (0)