Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #448 from jadeiceman/iotcoredefaultapp-arm64
Browse files Browse the repository at this point in the history
Add ARM64 configuration to IoTCoreDefaultApp
  • Loading branch information
saraclay authored Sep 23, 2019
2 parents 6a58dc6 + 7536ffe commit 2553e33
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 11 deletions.
20 changes: 20 additions & 0 deletions Samples/IoTCoreDefaultApp/CS/IoTCoreDefaultApp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,21 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|ARM.ActiveCfg = Debug|ARM
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|ARM.Build.0 = Debug|ARM
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|ARM.Deploy.0 = Debug|ARM
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|ARM64.ActiveCfg = Debug|ARM64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|ARM64.Build.0 = Debug|ARM64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|ARM64.Deploy.0 = Debug|ARM64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|x64.ActiveCfg = Debug|x64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|x64.Build.0 = Debug|x64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Debug|x64.Deploy.0 = Debug|x64
Expand All @@ -36,6 +41,9 @@ Global
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|ARM.ActiveCfg = Release|ARM
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|ARM.Build.0 = Release|ARM
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|ARM.Deploy.0 = Release|ARM
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|ARM64.ActiveCfg = Release|ARM64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|ARM64.Build.0 = Release|ARM64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|ARM64.Deploy.0 = Release|ARM64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|x64.ActiveCfg = Release|x64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|x64.Build.0 = Release|x64
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|x64.Deploy.0 = Release|x64
Expand All @@ -44,36 +52,48 @@ Global
{A417FAF4-1000-4D83-9B35-D2AB6066E76E}.Release|x86.Deploy.0 = Release|x86
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|ARM.ActiveCfg = Debug|ARM
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|ARM.Build.0 = Debug|ARM
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|ARM64.Build.0 = Debug|ARM64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|x64.ActiveCfg = Debug|x64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|x64.Build.0 = Debug|x64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|x86.ActiveCfg = Debug|x86
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Debug|x86.Build.0 = Debug|x86
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|ARM.ActiveCfg = Release|ARM
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|ARM.Build.0 = Release|ARM
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|ARM64.ActiveCfg = Release|ARM64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|ARM64.Build.0 = Release|ARM64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|x64.ActiveCfg = Release|x64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|x64.Build.0 = Release|x64
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|x86.ActiveCfg = Release|x86
{8DA90BDA-CE14-46A1-BC52-AD5A40AE0BCA}.Release|x86.Build.0 = Release|x86
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|ARM.ActiveCfg = Debug|ARM
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|ARM.Build.0 = Debug|ARM
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|ARM64.Build.0 = Debug|ARM64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|x64.ActiveCfg = Debug|x64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|x64.Build.0 = Debug|x64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|x86.ActiveCfg = Debug|x86
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Debug|x86.Build.0 = Debug|x86
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|ARM.ActiveCfg = Release|ARM
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|ARM.Build.0 = Release|ARM
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|ARM64.ActiveCfg = Release|ARM64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|ARM64.Build.0 = Release|ARM64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|x64.ActiveCfg = Release|x64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|x64.Build.0 = Release|x64
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|x86.ActiveCfg = Release|x86
{9A45F2F2-0F2B-452A-887D-C39A22A3C3C2}.Release|x86.Build.0 = Release|x86
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|ARM.ActiveCfg = Debug|ARM
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|ARM.Build.0 = Debug|ARM
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|ARM64.ActiveCfg = Debug|ARM64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|ARM64.Build.0 = Debug|ARM64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|x64.ActiveCfg = Debug|x64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|x64.Build.0 = Debug|x64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|x86.ActiveCfg = Debug|x86
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Debug|x86.Build.0 = Debug|x86
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Release|ARM.ActiveCfg = Release|ARM
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Release|ARM.Build.0 = Release|ARM
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Release|ARM64.ActiveCfg = Release|ARM64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Release|ARM64.Build.0 = Release|ARM64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Release|x64.ActiveCfg = Release|x64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Release|x64.Build.0 = Release|x64
{4FE09537-3CF8-4012-87DB-D1F72CAB62B0}.Release|x86.ActiveCfg = Release|x86
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<Version>1.0.31</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.1.9</Version>
<Version>6.2.9</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand All @@ -149,6 +149,30 @@
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>full</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
<OutputPath>bin\ARM64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.1.9</Version>
<Version>6.2.9</Version>
</PackageReference>
<PackageReference Include="System.Composition">
<Version>1.2.0</Version>
Expand Down Expand Up @@ -152,6 +152,30 @@
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>full</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
<OutputPath>bin\ARM64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

using SmartDisplay.Controls;
using SmartDisplay.ViewModels;
using System;
using Windows.Foundation;
using Windows.Media;
using Windows.UI;
Expand Down Expand Up @@ -54,7 +55,14 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)

private async void InkPresenter_StrokesCollected(InkPresenter sender, InkStrokesCollectedEventArgs args)
{
InputReady?.Invoke(this, await MnistHelper.GetHandWrittenImageAsync(inkGrid));
try
{
InputReady?.Invoke(this, await MnistHelper.GetHandWrittenImageAsync(inkGrid));
}
catch (Exception ex)
{
PageService?.ShowNotification(ex.Message);
}
}

public void Reset()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<Version>1.1.2-preview0008</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.1.9</Version>
<Version>6.2.9</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand All @@ -136,6 +136,30 @@
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>full</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
<OutputPath>bin\ARM64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
30 changes: 28 additions & 2 deletions Samples/IoTCoreDefaultApp/CS/SmartDisplay/SmartDisplay.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,37 @@
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm64-aot</RuntimeIdentifiers>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM64\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;_M_ARM64</DefineConstants>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>full</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
<OutputPath>bin\ARM64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;_M_ARM64</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<NoStdLib>true</NoStdLib>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<Import Project="App.Overrides.props" Condition="Exists('App.Overrides.props')" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -590,7 +616,7 @@
<Version>1.11.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.1.9</Version>
<Version>6.2.9</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.

#if !_M_ARM64
using Microsoft.Graphics.Canvas.Effects;
#endif
using Windows.UI;
using Windows.UI.Composition;
using Windows.UI.Xaml;
Expand Down Expand Up @@ -60,6 +62,7 @@ protected override void OnConnected()
// Delay creating composition resources until they're required.
if (CompositionBrush == null)
{
#if !_M_ARM64
var backdrop = Window.Current.Compositor.CreateBackdropBrush();

// Use a Win2D blur affect applied to a CompositionBackdropBrush.
Expand All @@ -83,16 +86,19 @@ protected override void OnConnected()
Mode = BlendEffectMode.Overlay
};

var effectFactory = Window.Current.Compositor.CreateEffectFactory(blendEffect, new[]
var effectFactory = Window.Current.Compositor.CreateEffectFactory(blendEffect, new[]
{
"Blur.BlurAmount",
"Tint.Color"
});
"Blur.BlurAmount",
"Tint.Color"
});
var effectBrush = effectFactory.CreateBrush();

effectBrush.SetSourceParameter("backdrop", backdrop);

CompositionBrush = effectBrush;
#else
CompositionBrush = Window.Current.Compositor.CreateColorBrush(Colors.Black);
#endif
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<ToggleSwitch x:Uid="AutoScalingToggle" IsOn="{x:Bind ViewModel.AppAutoScaling, Mode=TwoWay}" />
</StackPanel>

<StackPanel>
<StackPanel x:Name="ColorPickerPanel" x:Load="{x:Bind ViewModel.LoadColorPicker}">
<TextBlock x:Uid="ColorPickerTextBlock" Margin="0,0,0,10" />
<ColorPicker
HorizontalAlignment="Left"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ namespace SmartDisplay.Controls
public class TileSettingsControlVM : SmartDisplaySettingsBaseViewModel
{
private string InvalidNumericalValueErrorText { get; } = Common.GetLocalizedText("InvalidNumericalValueErrorText");

#if _M_ARM64
// Color picker throws exception on ARM64
public bool LoadColorPicker = false;
#else
public bool LoadColorPicker = true;
#endif

public Color TileColor
{
Expand Down

0 comments on commit 2553e33

Please sign in to comment.