Build for a Windows 8.1 minimum (#517)

microsoft · Dec 12, 2024 · 013ce38 · 013ce38
1 parent f6018cc
commit 013ce38
Show file tree

Hide file tree

Showing 45 changed files with 219 additions and 1,900 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -38,31 +38,21 @@ jobs:
       uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
 
     - if: matrix.platform != 'ARM64'
-      name: Build
+      name: Build (Windows 8.1)
       working-directory: ${{ github.workspace }}
       run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}.sln
 
     - name: 'Build (Windows 10)'
       working-directory: ${{ github.workspace }}
       run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}_Win10.sln
 
-    - if: matrix.platform != 'ARM64'
-      name: Restore NuGet packages
-      working-directory: ${{ github.workspace }}
-      run: nuget restore ./DirectXTK_Desktop_${{ matrix.vs }}_Win7.sln
-
-    - if: matrix.platform != 'ARM64'
-      name: 'Build (Windows 7)'
-      working-directory: ${{ github.workspace }}
-      run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}_Win7.sln
-
     - if: matrix.vs == '2022'
       name: 'Build (UWP)'
       working-directory: ${{ github.workspace }}
       run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Windows10_2022.sln
 
     - if: matrix.platform != 'ARM64'
-      name: 'Build (Spectre)'
+      name: 'Build (Windows 8.1 w/ Spectre)'
       working-directory: ${{ github.workspace }}
       run: msbuild /m /p:SpectreMitigation=Spectre /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}.sln
 

diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml
@@ -36,6 +36,12 @@ jobs:
           - os: windows-2022
             build_type: x86-Debug-VCPKG
             arch: amd64_x86
+          - os: windows-2022
+            build_type: x64-Debug-Redist
+            arch: amd64
+          - os: windows-2022
+            build_type: x64-Release-Redist
+            arch: amd64
           - os: windows-2022
             build_type: arm64-Debug-VCPKG
             arch: amd64_arm64
@@ -102,7 +108,7 @@ jobs:
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}
       run: >
-        cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF -DBUILD_XAUDIO_WIN10=OFF -DBUILD_XAUDIO_WIN8=OFF -DBUILD_XAUDIO_WIN7=ON
+        cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF -DBUILD_XAUDIO_WIN10=OFF -DBUILD_XAUDIO_WIN8=OFF -DBUILD_XAUDIO_REDIST=ON
         -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
         -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
 

diff --git a/.nuget/directxtk_desktop_2019.nuspec b/.nuget/directxtk_desktop_2019.nuspec
@@ -32,7 +32,7 @@ VertexTypes - structures for commonly used vertex data formats
 WICTextureLoader - WIC-based image file texture loader</description>
         <releaseNotes>Matches the October 28, 2024 release on GitHub.
 
-DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to support Windows 7 or later.</releaseNotes>
+DirectX Tool Kit for Audio in this package uses XAudio 2.8 to support Windows 8.1.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
         <repository type="git" url="https://github.com/microsoft/DirectXTK.git" />
         <icon>images\icon.jpg</icon>
@@ -41,9 +41,6 @@ DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to s
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
         <tags>DirectX DirectXTK native nativepackage</tags>
-        <dependencies>
-            <dependency id="Microsoft.XAudio2.Redist" version="1.2.11" />
-        </dependencies>
     </metadata>
 
     <files>
@@ -54,23 +51,15 @@ DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to s
 
         <file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\Debug\*.lib" />
         <file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\Debug\*.pdb" />
-        <file target="native\lib\x86\Debug" src="Audio\Bin\Desktop_2019_Win7\Win32\Debug\*.lib" />
-        <file target="native\lib\x86\Debug" src="Audio\Bin\Desktop_2019_Win7\Win32\Debug\*.pdb" />
 
         <file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\Release\*.lib" />
         <file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\Release\*.pdb" />
-        <file target="native\lib\x86\Release" src="Audio\Bin\Desktop_2019_Win7\Win32\Release\*.lib" />
-        <file target="native\lib\x86\Release" src="Audio\Bin\Desktop_2019_Win7\Win32\Release\*.pdb" />
 
         <file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\Debug\*.lib" />
         <file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\Debug\*.pdb" />
-        <file target="native\lib\x64\Debug" src="Audio\Bin\Desktop_2019_Win7\x64\Debug\*.lib" />
-        <file target="native\lib\x64\Debug" src="Audio\Bin\Desktop_2019_Win7\x64\Debug\*.pdb" />
 
         <file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\Release\*.lib" />
         <file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\Release\*.pdb" />
-        <file target="native\lib\x64\Release" src="Audio\Bin\Desktop_2019_Win7\x64\Release\*.lib" />
-        <file target="native\lib\x64\Release" src="Audio\Bin\Desktop_2019_Win7\x64\Release\*.pdb" />
 
         <file src=".nuget/directxtk_desktop_2019.targets" target="build\native" />
 

diff --git a/.nuget/directxtk_desktop_2019.targets b/.nuget/directxtk_desktop_2019.targets
@@ -21,13 +21,13 @@
   <ItemDefinitionGroup>
     <Link>
       <AdditionalLibraryDirectories>$(directxtk-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>DirectXTK.lib;DirectXTKAudioWin7.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>DirectXTK.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>HAS_DIRECTXTK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAS_DIRECTXTK;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>

diff --git a/.nuget/directxtk_desktop_win10.targets b/.nuget/directxtk_desktop_win10.targets
@@ -27,7 +27,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>HAS_DIRECTXTK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAS_DIRECTXTK;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>

diff --git a/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj b/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj