From 472361c839328d865bd059f825bb19232137cb34 Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Tue, 20 Dec 2022 01:54:59 -0600
Subject: [PATCH] Split common props into file

---
 Directory.Build.props              | 51 ++++++++++++++++++++++++++++++
 UIX.Debug/UIX.Debug.csproj         | 15 +--------
 UIX.RenderApi/UIX.RenderApi.csproj |  5 ---
 UIX/UIX.csproj                     | 19 +----------
 4 files changed, 53 insertions(+), 37 deletions(-)
 create mode 100644 Directory.Build.props

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..d731b1d
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+        <ApplicationVersion>4.9.0.0</ApplicationVersion>
+		<AssemblyVersion>$(ApplicationVersion)</AssemblyVersion>
+		<FileVersion>$(ApplicationVersion)</FileVersion>
+        <LangVersion>latest</LangVersion>
+
+        <TargetFrameworks>net35;net40;net6.0;net6.0-windows10.0.22000</TargetFrameworks>
+        <Platforms>AnyCPU;x64;x86</Platforms>
+
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\36MSApp1024.snk</AssemblyOriginatorKeyFile>
+        <DelaySign>True</DelaySign>
+
+        <UseOpenZune>False</UseOpenZune>
+    </PropertyGroup>
+
+	<Choose>
+		<When Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
+			<PropertyGroup>
+				<UseOpenZune>True</UseOpenZune>
+
+				<DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">$(DefineConstants);WINDOWS10</DefineConstants>
+				<DefineConstants Condition="$(TargetFramework.StartsWith('net6.0-windows8'))">$(DefineConstants);WINDOWS8</DefineConstants>
+			</PropertyGroup>
+		</When>
+
+		<When Condition=" $(TargetFramework.StartsWith('net6.0')) ">
+			<PropertyGroup>
+				<UseOpenZune>True</UseOpenZune>
+			</PropertyGroup>
+		</When>
+
+		<!--
+            .NET Core 3.1 is only used to target Windows 8/8.1
+        -->
+		<When Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">
+			<PropertyGroup>
+				<UseOpenZune>True</UseOpenZune>
+			</PropertyGroup>
+		</When>
+	</Choose>
+
+	<PropertyGroup Condition="$(UseOpenZune)">
+		<ApplicationVersion>5.0.0.0</ApplicationVersion>
+		<DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
+	</PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/UIX.Debug/UIX.Debug.csproj b/UIX.Debug/UIX.Debug.csproj
index 52567b0..c2d42f3 100644
--- a/UIX.Debug/UIX.Debug.csproj
+++ b/UIX.Debug/UIX.Debug.csproj
@@ -1,25 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net35;net40;net6.0;netstandard2.0</TargetFrameworks>
         <RootNamespace>Microsoft.Iris.Debug</RootNamespace>
-        <LangVersion>latest</LangVersion>
-
-        <UseOpenZune>false</UseOpenZune>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.0' ">
-        <UseOpenZune>true</UseOpenZune>
-    </PropertyGroup>
-
-    <ItemGroup Condition=" '$(UseOpenZune)' == 'true' ">
+    <ItemGroup Condition="$(UseOpenZune)">
         <PackageReference Include="OwlCore" Version="0.0.71" />
         <PackageReference Include="Cauldron.BasicInterceptors" Version="3.2.3" />
     </ItemGroup>
 
-    <PropertyGroup Condition=" '$(UseOpenZune)' == 'true' ">
-        <ApplicationVersion>5.0.0.0</ApplicationVersion>
-        <DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
-    </PropertyGroup>
-
 </Project>
diff --git a/UIX.RenderApi/UIX.RenderApi.csproj b/UIX.RenderApi/UIX.RenderApi.csproj
index 34427e5..10a8d7f 100644
--- a/UIX.RenderApi/UIX.RenderApi.csproj
+++ b/UIX.RenderApi/UIX.RenderApi.csproj
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net35;net40;net6.0</TargetFrameworks>
         <ProjectGuid>{CB2B7609-C7B8-4E2A-82D8-DD631B70B621}</ProjectGuid>
         <OutputType>Library</OutputType>
         <AssemblyName>UIX.RenderApi</AssemblyName>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <LangVersion>9</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <SignAssembly>True</SignAssembly>
-        <AssemblyOriginatorKeyFile>..\36MSApp1024.snk</AssemblyOriginatorKeyFile>
-        <Platforms>AnyCPU;x64;x86</Platforms>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/UIX/UIX.csproj b/UIX/UIX.csproj
index 3ebe1c4..bd630e7 100644
--- a/UIX/UIX.csproj
+++ b/UIX/UIX.csproj
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net35;net40;net6.0</TargetFrameworks>
         <ProjectGuid>{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9}</ProjectGuid>
-        <ApplicationVersion>4.8.0.0</ApplicationVersion>
         <OutputType>Library</OutputType>
         <AssemblyName>UIX</AssemblyName>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <LangVersion>9</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <SignAssembly>True</SignAssembly>
-        <AssemblyOriginatorKeyFile>..\36MSApp1024.snk</AssemblyOriginatorKeyFile>
-        <Platforms>AnyCPU;x64;x86</Platforms>
-
-        <UseOpenZune>false</UseOpenZune>
     </PropertyGroup>
 
     <ItemGroup>
@@ -21,10 +13,6 @@
         <ProjectReference Include="..\UIX.RenderApi\UIX.RenderApi.csproj" />
     </ItemGroup>
 
-    <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-        <UseOpenZune>true</UseOpenZune>
-    </PropertyGroup>
-
     <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
         <Reference Include="Accessibility" />
         <Reference Include="System" />
@@ -41,14 +29,9 @@
         <None Include="packages.config" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
         <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
         <PackageReference Include="Vanara.PInvoke.Accessibility" Version="3.4.2" />
         <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
     </ItemGroup>
-
-    <PropertyGroup Condition=" '$(UseOpenZune)' == 'true' ">
-        <ApplicationVersion>5.0.0.0</ApplicationVersion>
-        <DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
-    </PropertyGroup>
 </Project>
\ No newline at end of file