From 2045b7ccb91de3fac311b61a0584ad492117f99a Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Mon, 22 May 2023 14:24:12 -0500
Subject: [PATCH] More stable path for SNK file

Should be consistent for the current solution and any other solutions that may include UIX as a subfolder/submodule.
---
 Directory.Build.props | 28 ++++++++++++++--------------
 MicrosoftIris.sln     |  5 +++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index eeb594e..cea6fbd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,27 +3,27 @@
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-		<ApplicationVersion>5.0.0.0</ApplicationVersion>
-		<AssemblyVersion>$(ApplicationVersion)</AssemblyVersion>
-		<FileVersion>$(ApplicationVersion)</FileVersion>
+        <ApplicationVersion>5.0.0.0</ApplicationVersion>
+        <AssemblyVersion>$(ApplicationVersion)</AssemblyVersion>
+        <FileVersion>$(ApplicationVersion)</FileVersion>
         <LangVersion>latest</LangVersion>
 
-		<DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
-		
+        <DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
+        
         <TargetFrameworks>net461;net6.0;net6.0-windows10.0.22000</TargetFrameworks>
         <Platforms>AnyCPU;x64;x86</Platforms>
 
         <SignAssembly>True</SignAssembly>
-        <AssemblyOriginatorKeyFile>..\36MSApp1024.snk</AssemblyOriginatorKeyFile>
+        <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\36MSApp1024.snk</AssemblyOriginatorKeyFile>
         <DelaySign>True</DelaySign>
     </PropertyGroup>
 
-	<Choose>
-		<When Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
-			<PropertyGroup>
-				<DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">$(DefineConstants);WINDOWS10</DefineConstants>
-				<DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows8'))">$(DefineConstants);WINDOWS8</DefineConstants>
-			</PropertyGroup>
-		</When>
-	</Choose>
+    <Choose>
+        <When Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
+            <PropertyGroup>
+                <DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">$(DefineConstants);WINDOWS10</DefineConstants>
+                <DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows8'))">$(DefineConstants);WINDOWS8</DefineConstants>
+            </PropertyGroup>
+        </When>
+    </Choose>
 </Project>
\ No newline at end of file
diff --git a/MicrosoftIris.sln b/MicrosoftIris.sln
index e8f5d05..4c99b51 100644
--- a/MicrosoftIris.sln
+++ b/MicrosoftIris.sln
@@ -13,6 +13,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleDebugClient", "Tests\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleIrisApp", "Tests\SimpleIrisApp\SimpleIrisApp.csproj", "{96FB9772-5619-47AD-93FC-F26319EC6BB1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49D932ED-87EE-46FA-B374-9C30B26DF06C}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU