Skip to content

Commit 07b3d91

Browse files
lukeblevinslukeblevins
committed
Easily allow for eventual ARM and ARM64 builds
1 parent 490488f commit 07b3d91

File tree

7 files changed

+107
-31
lines changed

7 files changed

+107
-31
lines changed

‎ExecutableLauncher/ExecutableLauncher.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<RuntimeIdentifiers>win-x64;win-x86;win-arm;win-arm64</RuntimeIdentifiers>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<Reference Include="Windows">
11+
<HintPath>..\..\..\..\..\..\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
12+
<IsWinMDFile>true</IsWinMDFile>
13+
</Reference>
14+
</ItemGroup>
15+
16+
</Project>

‎ExecutableLauncher/Program.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using System;
2+
using System.Diagnostics;
3+
using Windows.Storage;
4+
5+
namespace ExecutableLauncher
6+
{
7+
internal class Program
8+
{
9+
private static void Main(string[] args)
10+
{
11+
try
12+
{
13+
var executable = (string)ApplicationData.Current.LocalSettings.Values["Application"];
14+
Process.Start(executable);
15+
}
16+
catch (Exception e)
17+
{
18+
Console.WriteLine(e.Message);
19+
Console.ReadLine();
20+
}
21+
}
22+
}
23+
}

‎Files UWP/App.xaml.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public App()
5353
else
5454
{
5555
localSettings.Values["theme"] = "Default";
56-
ProHome.RibbonTeachingTip.IsOpen = false;
5756
}
5857

5958
this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;

‎Files UWP/FilesUWP.csproj‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Files</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -248,17 +248,42 @@
248248
<None Include="Files_TemporaryKey.pfx" />
249249
</ItemGroup>
250250
<ItemGroup>
251-
<SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
251+
<SDKReference Include="WindowsDesktop, Version=10.0.18362.0">
252252
<Name>Windows Desktop Extensions for the UWP</Name>
253253
</SDKReference>
254254
</ItemGroup>
255-
<ItemGroup />
256255
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
257256
<VisualStudioVersion>14.0</VisualStudioVersion>
258257
</PropertyGroup>
259258
<PropertyGroup>
260259
<SignAssembly>true</SignAssembly>
261260
</PropertyGroup>
261+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
262+
<DebugSymbols>true</DebugSymbols>
263+
<OutputPath>bin\ARM64\Debug\</OutputPath>
264+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
265+
<NoWarn>;2008</NoWarn>
266+
<NoStdLib>true</NoStdLib>
267+
<DebugType>full</DebugType>
268+
<PlatformTarget>ARM64</PlatformTarget>
269+
<UseVSHostingProcess>false</UseVSHostingProcess>
270+
<ErrorReport>prompt</ErrorReport>
271+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
272+
<Prefer32Bit>true</Prefer32Bit>
273+
</PropertyGroup>
274+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
275+
<OutputPath>bin\ARM64\Release\</OutputPath>
276+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
277+
<Optimize>true</Optimize>
278+
<NoWarn>;2008</NoWarn>
279+
<NoStdLib>true</NoStdLib>
280+
<DebugType>pdbonly</DebugType>
281+
<PlatformTarget>ARM64</PlatformTarget>
282+
<UseVSHostingProcess>false</UseVSHostingProcess>
283+
<ErrorReport>prompt</ErrorReport>
284+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
285+
<Prefer32Bit>true</Prefer32Bit>
286+
</PropertyGroup>
262287
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
263288
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
264289
Other similar extension points exist, see Microsoft.Common.targets.

‎Files.sln‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,82 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27703.2000
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28803.156
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launcher.csproj", "{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}"
7-
EndProject
86
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "FilesUwp.Package", "FilesUwp.Package\FilesUwp.Package.wapproj", "{3B15596C-3DB9-4B58-B4C8-442D06A8C130}"
97
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilesUWP", "Files UWP\FilesUWP.csproj", "{64C30C4E-A69A-411C-9F78-776E7AAD583C}"
119
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExecutableLauncher", "ExecutableLauncher\ExecutableLauncher.csproj", "{4A643C29-0E4C-4CEE-941D-6485280B5F0A}"
11+
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14-
Debug|Any CPU = Debug|Any CPU
1514
Debug|ARM = Debug|ARM
15+
Debug|ARM64 = Debug|ARM64
1616
Debug|x64 = Debug|x64
1717
Debug|x86 = Debug|x86
18-
Release|Any CPU = Release|Any CPU
1918
Release|ARM = Release|ARM
19+
Release|ARM64 = Release|ARM64
2020
Release|x64 = Release|x64
2121
Release|x86 = Release|x86
2222
EndGlobalSection
2323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|ARM.ActiveCfg = Debug|Any CPU
27-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x64.ActiveCfg = Debug|x64
28-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x64.Build.0 = Debug|x64
29-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x86.ActiveCfg = Debug|x86
30-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x86.Build.0 = Debug|x86
31-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|ARM.ActiveCfg = Release|Any CPU
34-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x64.ActiveCfg = Release|x64
35-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x64.Build.0 = Release|x64
36-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x86.ActiveCfg = Release|x86
37-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x86.Build.0 = Release|x86
38-
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|Any CPU.ActiveCfg = Debug|x86
3924
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.ActiveCfg = Debug|ARM
4025
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.Build.0 = Debug|ARM
4126
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.Deploy.0 = Debug|ARM
27+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM64.ActiveCfg = Debug|x86
28+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM64.Build.0 = Debug|x86
29+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM64.Deploy.0 = Debug|x86
4230
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x64.ActiveCfg = Debug|x64
4331
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x64.Build.0 = Debug|x64
4432
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x64.Deploy.0 = Debug|x64
4533
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x86.ActiveCfg = Debug|x86
4634
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x86.Build.0 = Debug|x86
4735
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x86.Deploy.0 = Debug|x86
48-
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|Any CPU.ActiveCfg = Release|x86
4936
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM.ActiveCfg = Release|ARM
5037
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM.Build.0 = Release|ARM
5138
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM.Deploy.0 = Release|ARM
39+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM64.ActiveCfg = Release|x86
40+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM64.Build.0 = Release|x86
41+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM64.Deploy.0 = Release|x86
5242
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x64.ActiveCfg = Release|x64
5343
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x64.Build.0 = Release|x64
5444
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x64.Deploy.0 = Release|x64
5545
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x86.ActiveCfg = Release|x86
5646
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x86.Build.0 = Release|x86
5747
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x86.Deploy.0 = Release|x86
58-
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|Any CPU.ActiveCfg = Debug|x86
5948
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM.ActiveCfg = Debug|ARM
6049
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM.Build.0 = Debug|ARM
50+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM64.ActiveCfg = Debug|ARM64
51+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM64.Build.0 = Debug|ARM64
6152
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x64.ActiveCfg = Debug|x64
6253
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x64.Build.0 = Debug|x64
6354
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x86.ActiveCfg = Debug|x86
6455
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x86.Build.0 = Debug|x86
65-
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|Any CPU.ActiveCfg = Release|x86
6656
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM.ActiveCfg = Release|ARM
6757
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM.Build.0 = Release|ARM
58+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM64.ActiveCfg = Release|ARM64
59+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM64.Build.0 = Release|ARM64
6860
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x64.ActiveCfg = Release|x64
6961
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x64.Build.0 = Release|x64
7062
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x86.ActiveCfg = Release|x86
7163
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x86.Build.0 = Release|x86
64+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|ARM.ActiveCfg = Debug|Any CPU
65+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|ARM.Build.0 = Debug|Any CPU
66+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
67+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|ARM64.Build.0 = Debug|Any CPU
68+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|x64.ActiveCfg = Debug|Any CPU
69+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|x64.Build.0 = Debug|Any CPU
70+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|x86.ActiveCfg = Debug|Any CPU
71+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Debug|x86.Build.0 = Debug|Any CPU
72+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|ARM.ActiveCfg = Release|Any CPU
73+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|ARM.Build.0 = Release|Any CPU
74+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|ARM64.ActiveCfg = Release|Any CPU
75+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|ARM64.Build.0 = Release|Any CPU
76+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|x64.ActiveCfg = Release|Any CPU
77+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|x64.Build.0 = Release|Any CPU
78+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|x86.ActiveCfg = Release|Any CPU
79+
{4A643C29-0E4C-4CEE-941D-6485280B5F0A}.Release|x86.Build.0 = Release|Any CPU
7280
EndGlobalSection
7381
GlobalSection(SolutionProperties) = preSolution
7482
HideSolutionNode = FALSE

‎FilesUwp.Package/FilesUwp.Package.wapproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
3636
<PropertyGroup>
3737
<ProjectGuid>3b15596c-3db9-4b58-b4c8-442d06a8c130</ProjectGuid>
38-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
38+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
3939
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
4040
<DefaultLanguage>en-US</DefaultLanguage>
4141
<PackageCertificateKeyFile>FilesUwp.Package_TemporaryKey.pfx</PackageCertificateKeyFile>
@@ -75,8 +75,13 @@
7575
<None Include="Files_TemporaryKey.pfx" />
7676
</ItemGroup>
7777
<ItemGroup>
78+
<ProjectReference Include="..\ExecutableLauncher\ExecutableLauncher.csproj">
79+
<DesktopBridgeSelfContained>True</DesktopBridgeSelfContained>
80+
<DesktopBridgeIdentifier>$(DesktopBridgeRuntimeIdentifier)</DesktopBridgeIdentifier>
81+
<Properties>SelfContained=%(DesktopBridgeSelfContained);RuntimeIdentifier=%(DesktopBridgeIdentifier)</Properties>
82+
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
83+
</ProjectReference>
7884
<ProjectReference Include="..\Files UWP\FilesUWP.csproj" />
79-
<ProjectReference Include="..\Launcher\Launcher.csproj" />
8085
</ItemGroup>
8186
<ItemGroup>
8287
<Content Include="Assets\LargeTile.scale-100.png" />

‎FilesUwp.Package/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<uap:SplashScreen Image="Assets\SplashScreen.png" />
2222
</uap:VisualElements>
2323
<Extensions>
24-
<desktop:Extension Category="windows.fullTrustProcess" Executable="Launcher/Launcher.exe" />
24+
<desktop:Extension Category="windows.fullTrustProcess" Executable="ExecutableLauncher/ExecutableLauncher.exe" />
2525
</Extensions>
2626
</Application>
2727
</Applications>

0 commit comments

Comments
 (0)