Use the packaging project in the Systray demo

.gitattributes

@@ -1,39 +1,39 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-* text=auto
-
-# Declare files that will always have CRLF line endings on checkout.
-*.appxmanifest text eol=crlf
-*.c            text eol=crlf
-*.cpp          text eol=crlf
-*.cs           text eol=crlf
-*.csproj       text eol=crlf
-*.css          text eol=crlf
-*.def          text eol=crlf
-*.filters      text eol=crlf
-*.h            text eol=crlf
-*.htm          text eol=crlf
-*.html         text eol=crlf
-*.idl          text eol=crlf
-*.inf          text eol=crlf
-*.inx          text eol=crlf
-*.js           text eol=crlf
-*.json         text eol=crlf
-*.jsproj       text eol=crlf
-*.rc           text eol=crlf
-*.resjson      text eol=crlf
-*.rgs          text eol=crlf
-*.sln          text eol=crlf
-*.vcxproj      text eol=crlf
-*.xaml         text eol=crlf
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-*.cs     diff=csharp
-
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+#* text=auto
+
+# Declare files that will always have CRLF line endings on checkout.
+*.appxmanifest text eol=crlf
+*.c            text eol=crlf
+*.cpp          text eol=crlf
+*.cs           text eol=crlf
+*.csproj       text eol=crlf
+*.css          text eol=crlf
+*.def          text eol=crlf
+*.filters      text eol=crlf
+*.h            text eol=crlf
+*.htm          text eol=crlf
+*.html         text eol=crlf
+*.idl          text eol=crlf
+*.inf          text eol=crlf
+*.inx          text eol=crlf
+*.js           text eol=crlf
+*.json         text eol=crlf
+*.jsproj       text eol=crlf
+*.rc           text eol=crlf
+*.resjson      text eol=crlf
+*.rgs          text eol=crlf
+*.sln          text eol=crlf
+*.vcxproj      text eol=crlf
+*.xaml         text eol=crlf
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+*.cs     diff=csharp
+

Samples/UWP Office Interop/.gitattributes

@@ -1,7 +1,7 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-* text=auto
+#* text=auto
 
 ###############################################################################
 # Set default behavior for command prompt diff.

Samples/UWP Systray/SystrayComponent/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
+</configuration>

Samples/UWP Systray/SystrayComponent/SystrayComponent.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -8,9 +8,10 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>SystrayComponent</RootNamespace>
     <AssemblyName>SystrayComponent</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,7 +49,7 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Windows">
-      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.15063.0\Windows.winmd</HintPath>
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -89,6 +90,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy /y "$(TargetPath)" "$(SolutionDir)SystrayExtension\Win32\"</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

Samples/UWP Systray/SystrayExtension.sln

@@ -10,6 +10,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystrayExtension", "Systray
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystrayComponent", "SystrayComponent\SystrayComponent.csproj", "{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}"
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "SystrayExtensionDemo", "SystrayExtensionDemo\SystrayExtensionDemo.wapproj", "{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,7 +27,6 @@ Global
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Debug|ARM.ActiveCfg = Debug|ARM
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Debug|ARM.Build.0 = Debug|ARM
-		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Debug|ARM.Deploy.0 = Debug|ARM
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Debug|x64.ActiveCfg = Debug|x64
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Debug|x64.Build.0 = Debug|x64
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Debug|x64.Deploy.0 = Debug|x64
@@ -35,7 +36,6 @@ Global
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Release|Any CPU.ActiveCfg = Release|x86
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Release|ARM.ActiveCfg = Release|ARM
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Release|ARM.Build.0 = Release|ARM
-		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Release|ARM.Deploy.0 = Release|ARM
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Release|x64.ActiveCfg = Release|x64
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Release|x64.Build.0 = Release|x64
 		{82EB7D3F-8948-4EED-9C98-F2FC2428A4F5}.Release|x64.Deploy.0 = Release|x64
@@ -53,13 +53,39 @@ Global
 		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|ARM.Build.0 = Release|Any CPU
 		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|x64.ActiveCfg = Release|Any CPU
 		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|x64.Build.0 = Release|Any CPU
 		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|x86.ActiveCfg = Release|Any CPU
 		{7EB81B54-E3D6-4945-B1DE-F75663CC3A7D}.Release|x86.Build.0 = Release|Any CPU
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|ARM.ActiveCfg = Debug|ARM
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|ARM.Build.0 = Debug|ARM
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|ARM.Deploy.0 = Debug|ARM
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|x64.ActiveCfg = Debug|x64
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|x64.Build.0 = Debug|x64
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|x64.Deploy.0 = Debug|x64
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|x86.ActiveCfg = Debug|x86
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|x86.Build.0 = Debug|x86
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Debug|x86.Deploy.0 = Debug|x86
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|ARM.ActiveCfg = Release|ARM
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|ARM.Build.0 = Release|ARM
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|ARM.Deploy.0 = Release|ARM
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|x64.ActiveCfg = Release|x64
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|x64.Build.0 = Release|x64
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|x64.Deploy.0 = Release|x64
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|x86.ActiveCfg = Release|x86
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|x86.Build.0 = Release|x86
+		{8C8C6C40-5272-4F4C-AE0C-225BDB57B7DE}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7497612B-9043-49C3-9993-B00E123FE65A}
+	EndGlobalSection
 EndGlobal

Samples/UWP Systray/SystrayExtension/SystrayExtension.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>SystrayExtension</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.15063.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17133.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -136,7 +136,6 @@
     <Content Include="Assets\StoreLogo.scale-200.png" />
     <Content Include="Assets\Wide310x150Logo.scale-100.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-    <Content Include="Win32\SystrayComponent.exe" />
     <None Include="Package.StoreAssociation.xml" />
     <Content Include="Properties\Default.rd.xml" />
   </ItemGroup>
@@ -160,7 +159,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsDesktop, Version=10.0.15063.0">
+    <SDKReference Include="WindowsDesktop, Version=10.0.17133.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>

Samples/UWP Systray/SystrayExtensionDemo/Package.appxmanifest

@@ -0,0 +1,35 @@
+<?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" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap mp desktop rescap">
+  <Identity Name="e3a1c211-ae48-4c37-b467-b208b4a35528" Publisher="CN=rmpablos" Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>SystrayExtensionDemo</DisplayName>
+    <PublisherDisplayName>rmpablos</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+      <uap:VisualElements DisplayName="SystrayExtensionDemo" Description="SystrayExtensionDemo" BackgroundColor="transparent" Square150x150Logo="Images\Square150x150Logo.png" Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png">
+        </uap:DefaultTile>
+      </uap:VisualElements>
+      <Extensions>
+        <desktop:Extension Category="windows.fullTrustProcess" Executable="SystrayComponent\SystrayComponent.exe" />
+        <uap:Extension Category="windows.appService">
+          <uap:AppService Name="SystrayExtensionService" />
+        </uap:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+    <rescap:Capability Name="confirmAppClose" />
+  </Capabilities>
+</Package>