From b5872b2cfb8dbaef09195adefc1deb620a455093 Mon Sep 17 00:00:00 2001
From: Alexander Kozlenko <alexander.kozlenko@live.com>
Date: Tue, 22 Dec 2015 00:15:49 +0200
Subject: [PATCH] Fix projects build order and unit tests project certificate

---
 .../BehaviorsSDKManaged.sln                   |  8 ++++-
 .../ManagedUnitTests/ManagedUnitTests.csproj  |  1 +
 .../ManagedUnitTests/Package.appxmanifest     | 33 +++++--------------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln
index 5b5ade9..4e50ee2 100644
--- a/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln
+++ b/src/BehaviorsSDKManaged/BehaviorsSDKManaged.sln
@@ -1,15 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24710.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactivity", "Microsoft.Xaml.Interactivity\Microsoft.Xaml.Interactivity.csproj", "{7FFC1385-C3E1-487C-9A81-DE48DD63ECB9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactions", "Microsoft.Xaml.Interactions\Microsoft.Xaml.Interactions.csproj", "{A338A7F2-9010-477B-8A6E-6C2B2495C33C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactivity.Design", "Microsoft.Xaml.Interactivity.Design\Microsoft.Xaml.Interactivity.Design.csproj", "{76BF4E75-B1E7-4BFA-AE67-BAF6800DAC78}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7FFC1385-C3E1-487C-9A81-DE48DD63ECB9} = {7FFC1385-C3E1-487C-9A81-DE48DD63ECB9}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Xaml.Interactions.Design", "Microsoft.Xaml.Interactions.Design\Microsoft.Xaml.Interactions.Design.csproj", "{A3161818-5AA8-4A7C-A6CD-B19EDA5F3AE1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A338A7F2-9010-477B-8A6E-6C2B2495C33C} = {A338A7F2-9010-477B-8A6E-6C2B2495C33C}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedUnitTests", "ManagedUnitTests\ManagedUnitTests.csproj", "{9A26166B-1E98-4723-9B42-FB64BDC231E6}"
 EndProject
diff --git a/src/BehaviorsSDKManaged/ManagedUnitTests/ManagedUnitTests.csproj b/src/BehaviorsSDKManaged/ManagedUnitTests/ManagedUnitTests.csproj
index eb89d05..3df79ca 100644
--- a/src/BehaviorsSDKManaged/ManagedUnitTests/ManagedUnitTests.csproj
+++ b/src/BehaviorsSDKManaged/ManagedUnitTests/ManagedUnitTests.csproj
@@ -18,6 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>ManagedUnitTests_TemporaryKey.pfx</PackageCertificateKeyFile>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">14.0</UnitTestPlatformVersion>
+    <PackageCertificateThumbprint>0157B79A805098A51F87327E1B8A93904DA1F5C8</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/BehaviorsSDKManaged/ManagedUnitTests/Package.appxmanifest b/src/BehaviorsSDKManaged/ManagedUnitTests/Package.appxmanifest
index 834c93b..03ea245 100644
--- a/src/BehaviorsSDKManaged/ManagedUnitTests/Package.appxmanifest
+++ b/src/BehaviorsSDKManaged/ManagedUnitTests/Package.appxmanifest
@@ -1,45 +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"
-  IgnorableNamespaces="uap mp">
-
-  <Identity Name="25012dc2-4bd7-4ff2-8c5f-6ad0b90f3df4"
-            Publisher="CN=drewgil"
-            Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="25012dc2-4bd7-4ff2-8c5f-6ad0b90f3df4" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
+<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" IgnorableNamespaces="uap mp">
+  <Identity Name="25012dc2-4bd7-4ff2-8c5f-6ad0b90f3df4" Publisher="CN=ManagedUnitTests" Version="1.0.0.0" />
+  <mp:PhoneIdentity PhoneProductId="25012dc2-4bd7-4ff2-8c5f-6ad0b90f3df4" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ManagedUnitTests</DisplayName>
     <PublisherDisplayName>drewgil</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
-  
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
   </Dependencies>
-
   <Resources>
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="vstest.executionengine.universal.App" 
-        Executable="$targetnametoken$.exe"
-        EntryPoint="ManagedUnitTests.App">
-      <uap:VisualElements
-        DisplayName="ManagedUnitTests"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="ManagedUnitTests"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+    <Application Id="vstest.executionengine.universal.App" Executable="$targetnametoken$.exe" EntryPoint="ManagedUnitTests.App">
+      <uap:VisualElements DisplayName="ManagedUnitTests" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="ManagedUnitTests" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
+        </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
-  </Capabilities> 
+  </Capabilities>
 </Package>
\ No newline at end of file