WinGui: Adding a new project to allow us to easily generate AppX packages.

diff --git a/.gitignore b/.gitignore
index 4bbb01fa45da6ab1ef09877ca2012d598392ab93..da1f429c065af3872d05b0dd28acd0ad992a6600 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,10 @@ win/CS/**/*.Cache
 win/CS/**/*.user
 win/CS/packages/**/*
 win/CS/**/applicationhost.config
+win/CS/HandBrakeAppX/win32/**/*
+win/CS/HandBrakeAppX/bld/**/*
+win/CS/HandBrakeAppX/AppPackages/**/*
+win/CS/HandBrakeAppX/BundleArtifacts/**/*
 *.ide
 
 # Xcode user data

diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln
index 58ef6b724b2cb2d4a459916e8312120435d1bef6..0c3cc678f70290c3109223f0f6a74272d445862d 100644 (file)
--- a/win/CS/HandBrake.sln
+++ b/win/CS/HandBrake.sln
@@ -1,7 +1,7 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 14\r
-VisualStudioVersion = 14.0.25420.1\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26730.12\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"\r
 EndProject\r
@@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeTools", "HandBrakeTools\HandBrakeTools.csproj", "{3BAEBAC7-9042-4863-876F-C550ADCA66DC}"\r
 EndProject\r
+Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "HandBrakeAppX", "HandBrakeAppX\HandBrakeAppX.jsproj", "{6E855245-E402-4C0F-BB0B-EEB63082F6AC}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|x64 = Debug|x64\r
@@ -46,8 +48,19 @@ Global
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.Build.0 = Release|Any CPU\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x86.ActiveCfg = Release|Any CPU\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x86.Build.0 = Release|Any CPU\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.ActiveCfg = Debug|x64\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.Build.0 = Debug|x64\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.Deploy.0 = Debug|x64\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x86.ActiveCfg = Debug|x64\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.ActiveCfg = Release|x64\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.Build.0 = Release|x64\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.Deploy.0 = Release|x64\r
+               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x86.ActiveCfg = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
        EndGlobalSection\r
+       GlobalSection(ExtensibilityGlobals) = postSolution\r
+               SolutionGuid = {F2A9851D-E91D-41D4-9C3C-636A61503FCB}\r
+       EndGlobalSection\r
 EndGlobal\r

diff --git a/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj b/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj
new file mode 100644 (file)
index 0000000..4151999
--- /dev/null
+++ b/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+      <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>6e855245-e402-4c0f-bb0b-eeb63082f6ac</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0'">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
+  <PropertyGroup>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <PackageCertificateKeyFile>HandBrakeAppX_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <PackageCertificateThumbprint>8A8FE309838B56D97D543F30728F515F64B2291A</PackageCertificateThumbprint>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <Content Include="images\LargeTile.scale-100.png" />
+    <Content Include="images\LargeTile.scale-200.png" />
+    <Content Include="images\SmallTile.scale-100.png" />
+    <Content Include="images\SmallTile.scale-200.png" />
+    <Content Include="images\splashscreen.scale-100.png" />
+    <Content Include="images\splashscreen.scale-200.png" />
+    <Content Include="images\Square150x150Logo.scale-100.png" />
+    <Content Include="images\Square150x150Logo.scale-200.png" />
+    <Content Include="images\Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="images\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="images\Square44x44Logo.scale-100.png" />
+    <Content Include="images\Square44x44Logo.scale-200.png" />
+    <Content Include="images\Square44x44Logo.targetsize-16.png" />
+    <Content Include="images\Square44x44Logo.targetsize-48.png" />
+    <Content Include="images\storelogo.scale-100.png" />
+    <Content Include="images\storelogo.scale-200.png" />
+    <Content Include="images\Wide310x150Logo.scale-100.png" />
+    <Content Include="images\Wide310x150Logo.scale-200.png" />
+    <Content Include="win32\*.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="win32\*.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="win32\*.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="win32\Caliburn.Micro.Platform.Core.dll" />
+    <Content Include="win32\Caliburn.Micro.Platform.dll" />
+    <Content Include="win32\GongSolutions.Wpf.DragDrop.dll" />
+    <Content Include="win32\HandBrake.ApplicationServices.dll" />
+    <Content Include="win32\HandBrake.ApplicationServices.dll.config" />
+    <Content Include="win32\HandBrake.exe" />
+    <Content Include="win32\HandBrake.exe.config" />
+    <Content Include="win32\hb.dll" />
+    <Content Include="win32\Newtonsoft.Json.dll" />
+    <Content Include="win32\Ookii.Dialogs.Wpf.dll" />
+    <Content Include="win32\System.Windows.Interactivity.dll" />
+    <None Include="HandBrakeAppX_TemporaryKey.pfx" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
+  <!-- To modify your build process, add your task inside one of the targets below then uncomment
+       that target and the DisableFastUpToDateCheck PropertyGroup. 
+       Other similar extension points exist, see Microsoft.Common.targets. -->
+  <!--<Target Name="BeforeBuild">
+  </Target>
+    <Target Name="AfterBuild">
+  </Target>
+  <PropertyGroup>
+    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+  </PropertyGroup>
+  -->
+</Project>
\ No newline at end of file

diff --git a/win/CS/HandBrakeAppX/HandBrakeAppX_TemporaryKey.pfx b/win/CS/HandBrakeAppX/HandBrakeAppX_TemporaryKey.pfx
new file mode 100644 (file)
index 0000000..0c54aa2
Binary files /dev/null and b/win/CS/HandBrakeAppX/HandBrakeAppX_TemporaryKey.pfx differ

diff --git a/win/CS/HandBrakeAppX/images/LargeTile.scale-100.png b/win/CS/HandBrakeAppX/images/LargeTile.scale-100.png
new file mode 100644 (file)
index 0000000..8a3d525
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/LargeTile.scale-100.png differ

diff --git a/win/CS/HandBrakeAppX/images/LargeTile.scale-200.png b/win/CS/HandBrakeAppX/images/LargeTile.scale-200.png
new file mode 100644 (file)
index 0000000..d1e4624
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/LargeTile.scale-200.png differ

diff --git a/win/CS/HandBrakeAppX/images/SmallTile.scale-100.png b/win/CS/HandBrakeAppX/images/SmallTile.scale-100.png
new file mode 100644 (file)
index 0000000..4023950
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/SmallTile.scale-100.png differ

diff --git a/win/CS/HandBrakeAppX/images/SmallTile.scale-200.png b/win/CS/HandBrakeAppX/images/SmallTile.scale-200.png
new file mode 100644 (file)
index 0000000..a572f3a
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/SmallTile.scale-200.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-100.png b/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-100.png
new file mode 100644 (file)
index 0000000..308f42b
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-100.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-200.png b/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-200.png
new file mode 100644 (file)
index 0000000..15082f0
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-200.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-16.png b/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-16.png
new file mode 100644 (file)
index 0000000..524273c
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-16.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-48.png b/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-48.png
new file mode 100644 (file)
index 0000000..8f52e09
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-48.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-100.png b/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-100.png
new file mode 100644 (file)
index 0000000..db26116
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-100.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-200.png b/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-200.png
new file mode 100644 (file)
index 0000000..b611254
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-200.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-16.png b/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-16.png
new file mode 100644 (file)
index 0000000..524273c
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-16.png differ

diff --git a/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-48.png b/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-48.png
new file mode 100644 (file)
index 0000000..8f52e09
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-48.png differ

diff --git a/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-100.png b/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-100.png
new file mode 100644 (file)
index 0000000..70ba2b5
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-100.png differ

diff --git a/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-200.png b/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-200.png
new file mode 100644 (file)
index 0000000..bf28028
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-200.png differ

diff --git a/win/CS/HandBrakeAppX/images/splashscreen.scale-100.png b/win/CS/HandBrakeAppX/images/splashscreen.scale-100.png
new file mode 100644 (file)
index 0000000..bf28028
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/splashscreen.scale-100.png differ

diff --git a/win/CS/HandBrakeAppX/images/splashscreen.scale-200.png b/win/CS/HandBrakeAppX/images/splashscreen.scale-200.png
new file mode 100644 (file)
index 0000000..2c6a1ce
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/splashscreen.scale-200.png differ

diff --git a/win/CS/HandBrakeAppX/images/storelogo.scale-100.png b/win/CS/HandBrakeAppX/images/storelogo.scale-100.png
new file mode 100644 (file)
index 0000000..e26789a
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/storelogo.scale-100.png differ

diff --git a/win/CS/HandBrakeAppX/images/storelogo.scale-200.png b/win/CS/HandBrakeAppX/images/storelogo.scale-200.png
new file mode 100644 (file)
index 0000000..3c6a9b8
Binary files /dev/null and b/win/CS/HandBrakeAppX/images/storelogo.scale-200.png differ

diff --git a/win/CS/HandBrakeAppX/package.appxmanifest b/win/CS/HandBrakeAppX/package.appxmanifest
new file mode 100644 (file)
index 0000000..5de5e4f
--- /dev/null
+++ b/win/CS/HandBrakeAppX/package.appxmanifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
+  <Identity Name="06bcfa84-a650-442c-9ecd-e64641a14f24" Version="1.1.7.0" Publisher="CN=HandBrake Unofficial" />
+  <mp:PhoneIdentity PhoneProductId="06bcfa84-a650-442c-9ecd-e64641a14f24" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Properties>
+    <DisplayName>HandBrake</DisplayName>
+    <PublisherDisplayName>HandBrake Team</PublisherDisplayName>
+    <Logo>images\storelogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.10586.0" MaxVersionTested="10.0.15063.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="win32\HandBrake.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements DisplayName="HandBrake" Description="HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs." BackgroundColor="transparent" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="HandBrake" Square71x71Logo="images\SmallTile.png" Square310x310Logo="images\LargeTile.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="images\splashscreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
\ No newline at end of file