From 9fd4d9f6b699870b8b23175e833283d96b3c721e Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <walbourn@users.noreply.github.com>
Date: Tue, 13 Dec 2022 22:26:09 -0800
Subject: [PATCH] Add Spectre-mitigated libraries to the NuGet (#295)

---
 .nuget/directxtex_desktop_2019.nuspec          | 12 ++++++++++++
 .nuget/directxtex_desktop_2019.targets         |  4 +++-
 .nuget/directxtex_desktop_win10.nuspec         | 18 ++++++++++++++++++
 .nuget/directxtex_desktop_win10.targets        |  8 +++++++-
 DirectXTex/DirectXTex_Desktop_2019.vcxproj     |  5 +++++
 .../DirectXTex_Desktop_2019_Win10.vcxproj      |  5 +++++
 DirectXTex/DirectXTex_Desktop_2022.vcxproj     |  5 +++++
 .../DirectXTex_Desktop_2022_Win10.vcxproj      |  5 +++++
 8 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/.nuget/directxtex_desktop_2019.nuspec b/.nuget/directxtex_desktop_2019.nuspec
index 749e73d..3f790c7 100644
--- a/.nuget/directxtex_desktop_2019.nuspec
+++ b/.nuget/directxtex_desktop_2019.nuspec
@@ -31,15 +31,27 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019\Win32\Debug\*.lib" />
         <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019\Win32\Debug\*.pdb" />
 
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019\Win32\DebugSpectre\*.lib" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019\Win32\DebugSpectre\*.pdb" />
+
         <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019\Win32\Release\*.lib" />
         <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019\Win32\Release\*.pdb" />
 
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019\Win32\ReleaseSpectre\*.lib" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019\Win32\ReleaseSpectre\*.pdb" />
+
         <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019\x64\Debug\*.lib" />
         <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019\x64\Debug\*.pdb" />
 
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019\x64\DebugSpectre\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019\x64\DebugSpectre\*.pdb" />
+
         <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019\x64\Release\*.lib" />
         <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019\x64\Release\*.pdb" />
 
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019\x64\ReleaseSpectre\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019\x64\ReleaseSpectre\*.pdb" />
+
         <file src=".nuget/directxtex_desktop_2019.targets" target="build\native" />
 
         <file src=".nuget/icon.jpg" target="images\" />
diff --git a/.nuget/directxtex_desktop_2019.targets b/.nuget/directxtex_desktop_2019.targets
index 0613a3a..d188792 100644
--- a/.nuget/directxtex_desktop_2019.targets
+++ b/.nuget/directxtex_desktop_2019.targets
@@ -16,12 +16,14 @@
 
   <PropertyGroup>
     <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration)</directxtex-LibPath>
+    <directxtex-LibName Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">DirectXTex_Spectre</directxtex-LibName>
+    <directxtex-LibName Condition="'$(directxtex-LibName)'==''">DirectXTex</directxtex-LibName>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
     <Link>
       <AdditionalLibraryDirectories>$(directxtex-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>DirectXTex.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(directxtex-LibName).lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
diff --git a/.nuget/directxtex_desktop_win10.nuspec b/.nuget/directxtex_desktop_win10.nuspec
index 37e5316..abcef64 100644
--- a/.nuget/directxtex_desktop_win10.nuspec
+++ b/.nuget/directxtex_desktop_win10.nuspec
@@ -31,21 +31,39 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Debug\*.lib" />
         <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Debug\*.pdb" />
 
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\DebugSpectre\*.lib" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\DebugSpectre\*.pdb" />
+
         <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Release\*.lib" />
         <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Release\*.pdb" />
 
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\ReleaseSpectre\*.lib" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\ReleaseSpectre\*.pdb" />
+
         <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Debug\*.lib" />
         <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Debug\*.pdb" />
 
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\DebugSpectre\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\DebugSpectre\*.pdb" />
+
         <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Release\*.lib" />
         <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Release\*.pdb" />
 
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\ReleaseSpectre\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\ReleaseSpectre\*.pdb" />
+
         <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Debug\*.lib" />
         <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Debug\*.pdb" />
 
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\DebugSpectre\*.lib" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\DebugSpectre\*.pdb" />
+
         <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Release\*.lib" />
         <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Release\*.pdb" />
 
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\ReleaseSpectre\*.lib" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\ReleaseSpectre\*.pdb" />
+
         <file src=".nuget/directxtex_desktop_win10.targets" target="build\native" />
 
         <file src=".nuget/icon.jpg" target="images\" />
diff --git a/.nuget/directxtex_desktop_win10.targets b/.nuget/directxtex_desktop_win10.targets
index 0613a3a..5d2b6c6 100644
--- a/.nuget/directxtex_desktop_win10.targets
+++ b/.nuget/directxtex_desktop_win10.targets
@@ -14,6 +14,12 @@
     <NuGetConfiguration>Release</NuGetConfiguration>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration)</directxtex-LibPath>
+    <directxtex-LibName Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">DirectXTex_Spectre</directxtex-LibName>
+    <directxtex-LibName Condition="'$(directxtex-LibName)'==''">DirectXTex</directxtex-LibName>
+  </PropertyGroup>
+
   <PropertyGroup>
     <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration)</directxtex-LibPath>
   </PropertyGroup>
@@ -21,7 +27,7 @@
   <ItemDefinitionGroup>
     <Link>
       <AdditionalLibraryDirectories>$(directxtex-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>DirectXTex.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(directxtex-LibName).lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
diff --git a/DirectXTex/DirectXTex_Desktop_2019.vcxproj b/DirectXTex/DirectXTex_Desktop_2019.vcxproj
index 1ea7c70..1a1dc01 100644
--- a/DirectXTex/DirectXTex_Desktop_2019.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2019.vcxproj
@@ -124,6 +124,11 @@
     <TargetName>DirectXTex</TargetName>
     <GenerateManifest>true</GenerateManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
+    <OutDir>Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\</OutDir>
+    <IntDir>Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\</IntDir>
+    <TargetName>DirectXTex_Spectre</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>EnableAllWarnings</WarningLevel>
diff --git a/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj b/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj
index de71431..39c39e9 100644
--- a/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj
@@ -179,6 +179,11 @@
     <TargetName>DirectXTex</TargetName>
     <GenerateManifest>true</GenerateManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
+    <OutDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</OutDir>
+    <IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</IntDir>
+    <TargetName>DirectXTex_Spectre</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>EnableAllWarnings</WarningLevel>
diff --git a/DirectXTex/DirectXTex_Desktop_2022.vcxproj b/DirectXTex/DirectXTex_Desktop_2022.vcxproj
index b3385cc..dd7a72c 100644
--- a/DirectXTex/DirectXTex_Desktop_2022.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2022.vcxproj
@@ -124,6 +124,11 @@
     <TargetName>DirectXTex</TargetName>
     <GenerateManifest>true</GenerateManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
+    <OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)Spectre\</OutDir>
+    <IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)Spectre\</IntDir>
+    <TargetName>DirectXTex_Spectre</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>EnableAllWarnings</WarningLevel>
diff --git a/DirectXTex/DirectXTex_Desktop_2022_Win10.vcxproj b/DirectXTex/DirectXTex_Desktop_2022_Win10.vcxproj
index 6547424..fcfb26e 100644
--- a/DirectXTex/DirectXTex_Desktop_2022_Win10.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2022_Win10.vcxproj
@@ -179,6 +179,11 @@
     <TargetName>DirectXTex</TargetName>
     <GenerateManifest>true</GenerateManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
+    <OutDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)Spectre\</OutDir>
+    <IntDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)Spectre\</IntDir>
+    <TargetName>DirectXTex_Spectre</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>EnableAllWarnings</WarningLevel>