From cd23c184b34bbff0f1b2731529a341e62b6086f9 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 30 Mar 2026 23:35:10 -0700 Subject: [PATCH] Remove 2019 projects --- .../pipelines/DirectXTK-GitHub-GDK.yml | 238 ----------- .../templates/DirectXTK-build-win32.yml | 41 +- .github/workflows/msbuild.yml | 23 +- .nuget/directxtk_desktop_2019.nuspec | 81 ---- .nuget/directxtk_desktop_2019.targets | 37 -- DirectXTK_Desktop_2019.sln | 70 ---- DirectXTK_Desktop_2019.vcxproj | 372 ------------------ DirectXTK_Desktop_2019.vcxproj.filters | 363 ----------------- DirectXTK_Desktop_2019_Win10.sln | 70 ---- DirectXTK_Desktop_2019_Win10.vcxproj | 372 ------------------ DirectXTK_Desktop_2019_Win10.vcxproj.filters | 363 ----------------- DirectXTK_GDK_2019.sln | 33 -- DirectXTK_GDK_2019.vcxproj | 325 --------------- DirectXTK_GDK_2019.vcxproj.filters | 365 ----------------- README.md | 8 +- XWBTool/xwbtool_Desktop_2019.vcxproj | 193 --------- XWBTool/xwbtool_Desktop_2019.vcxproj.filters | 26 -- build/Directory.Build.props | 12 - build/SetupBWOI.targets | 4 +- build/promotenuget.ps1 | 2 +- 20 files changed, 34 insertions(+), 2964 deletions(-) delete mode 100644 .azuredevops/pipelines/DirectXTK-GitHub-GDK.yml delete mode 100644 .nuget/directxtk_desktop_2019.nuspec delete mode 100644 .nuget/directxtk_desktop_2019.targets delete mode 100644 DirectXTK_Desktop_2019.sln delete mode 100644 DirectXTK_Desktop_2019.vcxproj delete mode 100644 DirectXTK_Desktop_2019.vcxproj.filters delete mode 100644 DirectXTK_Desktop_2019_Win10.sln delete mode 100644 DirectXTK_Desktop_2019_Win10.vcxproj delete mode 100644 DirectXTK_Desktop_2019_Win10.vcxproj.filters delete mode 100644 DirectXTK_GDK_2019.sln delete mode 100644 DirectXTK_GDK_2019.vcxproj delete mode 100644 DirectXTK_GDK_2019.vcxproj.filters delete mode 100644 XWBTool/xwbtool_Desktop_2019.vcxproj delete mode 100644 XWBTool/xwbtool_Desktop_2019.vcxproj.filters diff --git a/.azuredevops/pipelines/DirectXTK-GitHub-GDK.yml b/.azuredevops/pipelines/DirectXTK-GitHub-GDK.yml deleted file mode 100644 index 15229513b..000000000 --- a/.azuredevops/pipelines/DirectXTK-GitHub-GDK.yml +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# https://go.microsoft.com/fwlink/?LinkId=248929 - -# Builds the library and test suite using the Microsoft GDK. - -# NOTE: We use x64 MSBuild for the GDK as the NuGets don't include 32-bit support to avoid cross-arch dependencies. - -schedules: - - cron: "30 5 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -trigger: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - CMake* - - '.github/**' - - '.nuget/*' - - build/*.cmake - - build/*.cmd - - build/*.in - - build/*.json - - build/*.ps1 - -pr: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - CMake* - - '.github/**' - - '.nuget/*' - - build/*.cmake - - build/*.cmd - - build/*.in - - build/*.json - - build/*.ps1 - drafts: false - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - - repository: testRepo - name: walbourn/directxtktest - type: github - endpoint: microsoft - ref: refs/heads/main - -name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) - -pool: - vmImage: windows-2022 - -variables: - - group: dxtk-shared-variables - - name: Codeql.Enabled - value: false - - name: EXTRACTED_FOLDER - value: '$(ExtractedFolder)' - - name: GDK_EDITION - value: $(GDKEditionNumber) - - name: GDKEnableBWOI - value: true - - name: URL_FEED - value: $(ADOFeedURL) - - name: skipNugetSecurityAnalysis - value: true # We explicitly call this task so we don't need it to be auto-injected - -jobs: - - job: BUILD_GDK - displayName: 'Microsoft Game Development Kit (GDK)' - workspace: - clean: all - timeoutInMinutes: 120 - cancelTimeoutInMinutes: 1 - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - - task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - - task: PowerShell@2 - displayName: 'Create nuget.config with single source' - inputs: - targetType: inline - script: | - $xml = @' - - - - - - - '@ - $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" - - - task: NuGetCommand@2 - # We have to use a nuget.config to provide the feed for the 'nuget install' option. - displayName: 'NuGet set package source to ADO feed' - inputs: - command: custom - arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: nuget-security-analysis@0 - displayName: 'Secure Supply Chain Analysis' - - task: NuGetAuthenticate@1 - displayName: 'NuGet Auth' - - task: PowerShell@2 - displayName: 'NuGet Install GDK' - inputs: - targetType: filePath - filePath: ./build/RestoreGDK.ps1 - arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER) - failOnStderr: true - - task: CopyFiles@2 - displayName: Set up Directory.Build.props - inputs: - SourceFolder: build - Contents: 'Directory.Build.props' - TargetFolder: $(Build.SourcesDirectory) - - task: MSBuild@1 - displayName: Setup BWOI VCTargets - inputs: - solution: build/SetupBWOI.targets - msbuildArchitecture: x64 - msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) - - task: VSBuild@1 - displayName: Build solution DirectXTK_GDK_2019 pcdbg - continueOnError: true - inputs: - solution: DirectXTK_GDK_2019.sln - platform: Gaming.Desktop.x64 - configuration: Debug - msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - - task: VSBuild@1 - displayName: Build solution DirectXTK_GDK_2019 pcrel - continueOnError: true - inputs: - solution: DirectXTK_GDK_2019.sln - platform: Gaming.Desktop.x64 - configuration: Release - msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - - - job: BUILD_TESTS_GDK - displayName: 'Test Suite for Microsoft Game Development Kit (GDK)' - workspace: - clean: all - timeoutInMinutes: 120 - cancelTimeoutInMinutes: 1 - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - - task: PowerShell@2 - displayName: 'Create nuget.config with single source' - inputs: - targetType: inline - script: | - $xml = @' - - - - - - - '@ - $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config" - - - task: NuGetCommand@2 - displayName: 'NuGet set package source to ADO feed' - inputs: - command: custom - arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config - - task: nuget-security-analysis@0 - displayName: 'Secure Supply Chain Analysis' - - task: NuGetAuthenticate@1 - displayName: 'NuGet Auth' - - task: PowerShell@2 - displayName: 'NuGet Install GDK' - inputs: - targetType: filePath - filePath: ./build/RestoreGDK.ps1 - arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER) - failOnStderr: true - - task: CopyFiles@2 - displayName: Set up Directory.Build.props - inputs: - SourceFolder: build - Contents: 'Directory.Build.props' - TargetFolder: $(Build.SourcesDirectory) - - task: MSBuild@1 - displayName: Setup BWOI VCTargets - inputs: - solution: build/SetupBWOI.targets - msbuildArchitecture: x64 - msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) - - task: VSBuild@1 - displayName: Build Tests pcdbg - inputs: - solution: '**\*GDK_2019*.sln' - platform: Gaming.Desktop.x64 - configuration: Debug - msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - - task: VSBuild@1 - displayName: Build Tests pcrel - inputs: - solution: '**\*GDK_2019*.sln' - platform: Gaming.Desktop.x64 - configuration: Release - msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) diff --git a/.azuredevops/templates/DirectXTK-build-win32.yml b/.azuredevops/templates/DirectXTK-build-win32.yml index 414639e36..89b31d65e 100644 --- a/.azuredevops/templates/DirectXTK-build-win32.yml +++ b/.azuredevops/templates/DirectXTK-build-win32.yml @@ -7,30 +7,30 @@ steps: - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln 32dbg + displayName: Build solution DirectXTK_Desktop_2022.sln 32dbg inputs: - solution: DirectXTK_Desktop_2019.sln + solution: DirectXTK_Desktop_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln 32rel + displayName: Build solution DirectXTK_Desktop_2022.sln 32rel inputs: - solution: DirectXTK_Desktop_2019.sln + solution: DirectXTK_Desktop_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln 64dbg + displayName: Build solution DirectXTK_Desktop_2022.sln 64dbg inputs: - solution: DirectXTK_Desktop_2019.sln + solution: DirectXTK_Desktop_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln 64rel + displayName: Build solution DirectXTK_Desktop_2022.sln 64rel inputs: - solution: DirectXTK_Desktop_2019.sln + solution: DirectXTK_Desktop_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release @@ -41,48 +41,47 @@ steps: workingDirectory: $(Build.SourcesDirectory) failOnStderr: false - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln managed dbg + displayName: Build solution DirectXTK_Desktop_2022.sln managed dbg inputs: - solution: DirectXTK_Desktop_2019.sln + solution: DirectXTK_Desktop_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: Mixed Platforms configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln managed rel + displayName: Build solution DirectXTK_Desktop_2022.sln managed rel inputs: - solution: DirectXTK_Desktop_2019.sln + solution: DirectXTK_Desktop_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: Mixed Platforms configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win10.sln 32dbg + displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 32dbg inputs: - solution: DirectXTK_Desktop_2019_Win10.sln + solution: DirectXTK_Desktop_2022_Win10.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win10.sln 32rel + displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 32rel inputs: - solution: DirectXTK_Desktop_2019_Win10.sln + solution: DirectXTK_Desktop_2022_Win10.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win10.sln 64dbg + displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 64dbg inputs: - solution: DirectXTK_Desktop_2019_Win10.sln + solution: DirectXTK_Desktop_2022_Win10.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win10.sln 64rel + displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 64rel inputs: - solution: DirectXTK_Desktop_2019_Win10.sln + solution: DirectXTK_Desktop_2022_Win10.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - # VS 2019 for Win32 on ARM64 is out of support. - task: VSBuild@1 displayName: Build solution DirectXTK_Desktop_2022_Win10.sln arm64dbg inputs: diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 4d739b166..717038134 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -34,54 +34,49 @@ jobs: fail-fast: false matrix: - vs: [2019, 2022] build_type: [Debug, Release] platform: [x86, x64, ARM64] - exclude: - - vs: 2019 - platform: ARM64 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 + uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 - if: matrix.platform != 'ARM64' 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 + DirectXTK_Desktop_2022.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 + DirectXTK_Desktop_2022_Win10.sln - - if: matrix.vs == '2022' - name: 'Build (UWP)' + - 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' && matrix.vs != '2019' + - if: matrix.platform != 'ARM64' name: 'Build (Windows 8.1 w/ Spectre)' working-directory: ${{ github.workspace }} run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} /p:SpectreMitigation=Spectre - DirectXTK_Desktop_${{ matrix.vs }}.sln + DirectXTK_Desktop_2022.sln - - if: matrix.platform != 'ARM64' && matrix.vs != '2019' + - if: matrix.platform != 'ARM64' name: 'Build (Spectre Windows 10)' working-directory: ${{ github.workspace }} run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} /p:SpectreMitigation=Spectre - DirectXTK_Desktop_${{ matrix.vs }}_Win10.sln + DirectXTK_Desktop_2022_Win10.sln build2026: runs-on: windows-2025-vs2026 @@ -97,7 +92,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 + uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 - name: 'Build' working-directory: ${{ github.workspace }} diff --git a/.nuget/directxtk_desktop_2019.nuspec b/.nuget/directxtk_desktop_2019.nuspec deleted file mode 100644 index 5f3913e28..000000000 --- a/.nuget/directxtk_desktop_2019.nuspec +++ /dev/null @@ -1,81 +0,0 @@ - - - - directxtk_desktop_2019 - 0.0.0-SpecifyVersionOnCommandline - DirectX Tool Kit for DirectX 11 (VS 2019/2022 Win32) - Microsoft - microsoft,directxtk - The DirectX Tool Kit (aka DirectXTK) is a collection of helper classes for writing Direct3D 11.x code in C++. - This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 on Windows 8.1 or later. - -Features: -Audio - low-level audio API using XAudio2 -BufferHelpers - C++ helpers for creating D3D resources from CPU data -CommonStates - factory providing commonly used D3D state objects -DirectXHelpers - misc C++ helpers for D3D programming -DDSTextureLoader - light-weight DDS file texture loader -Effects - set of built-in shaders for common rendering tasks -GamePad - gamepad controller helper using XInput -GeometricPrimitive - draws basic shapes such as cubes and spheres -GraphicsMemory - helper for managing dynamic graphics memory allocation -Keyboard - keyboard state tracking helper -Model - draws meshes loaded from .CMO, .SDKMESH, or .VBO files -Mouse - mouse helper -PostProcess - set of built-in shaders for common post-processing operations -PrimitiveBatch - simple and efficient way to draw user primitives -ScreenGrab - light-weight screen shot saver -SimpleMath - simplified C++ wrapper for DirectXMath -SpriteBatch - simple & efficient 2D sprite rendering -SpriteFont - bitmap based text rendering -VertexTypes - structures for commonly used vertex data formats -WICTextureLoader - WIC-based image file texture loader - Matches the October 27, 2025 release on GitHub. - -DirectX Tool Kit for Audio in this package uses XAudio 2.8 to support Windows 8.1. - http://go.microsoft.com/fwlink/?LinkId=248929 - - images\icon.jpg - docs\README.md - MIT - false - © Microsoft Corporation. All rights reserved. - DirectX DirectXTK native nativepackage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.nuget/directxtk_desktop_2019.targets b/.nuget/directxtk_desktop_2019.targets deleted file mode 100644 index 0520e030d..000000000 --- a/.nuget/directxtk_desktop_2019.targets +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Debug - - - Release - - - Release - - - Release - - - - $(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration) - DirectXTK_Spectre - DirectXTK - - - - - $(directxtk-LibPath);%(AdditionalLibraryDirectories) - $(directxtk-LibName).lib;%(AdditionalDependencies) - - - - - - HAS_DIRECTXTK;USING_XINPUT;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) - $(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories) - - - - diff --git a/DirectXTK_Desktop_2019.sln b/DirectXTK_Desktop_2019.sln deleted file mode 100644 index 9595cdc28..000000000 --- a/DirectXTK_Desktop_2019.sln +++ /dev/null @@ -1,70 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 15.0.27703.2000 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2019", "DirectXTK_Desktop_2019.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeSpriteFont", "MakeSpriteFont\MakeSpriteFont.csproj", "{7329B02D-C504-482A-A156-181D48CE493C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XWBTool_Desktop_2019", "XWBTool\XWBTool_Desktop_2019.vcxproj", "{C7AB4186-54B2-4244-A533-77494763EA1D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0317D9F7-1BFB-4422-8B2F-670E7956F12D}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Mixed Platforms = Release|Mixed Platforms - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.ActiveCfg = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.Build.0 = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.Build.0 = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.ActiveCfg = Debug|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.Build.0 = Debug|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.ActiveCfg = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.Build.0 = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A26A07B7-AF41-47A4-B21F-8C772153EAA4} - EndGlobalSection -EndGlobal diff --git a/DirectXTK_Desktop_2019.vcxproj b/DirectXTK_Desktop_2019.vcxproj deleted file mode 100644 index c9318e2a6..000000000 --- a/DirectXTK_Desktop_2019.vcxproj +++ /dev/null @@ -1,372 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - - - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - - - Document - - - - - Document - - - Document - - - - - Document - - - - - Document - - - - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E} - Win32Proj - DirectXTK - 10.0 - x64 - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - Unicode - - - StaticLibrary - false - v142 - Unicode - - - - - - - - - - - - - - - - - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\ - Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\ - DirectXTK_Spectre - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0603;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Windows - true - - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0603;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Windows - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0603;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - Windows - true - true - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0603;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - - - Windows - true - true - true - - - - - - - - <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) - <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) - <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) - <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ - - - - <_ATGFXCPath /> - <_ATGFXCVer /> - - - - - <_ATGShaderHeaders Include="$(ProjectDir)src/Shaders/Compiled/*.inc" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.inc" /> - <_ATGShaderSymbols Include="$(ProjectDir)src/Shaders/Compiled/*.pdb" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.pdb" /> - - - - - \ No newline at end of file diff --git a/DirectXTK_Desktop_2019.vcxproj.filters b/DirectXTK_Desktop_2019.vcxproj.filters deleted file mode 100644 index ce325aab0..000000000 --- a/DirectXTK_Desktop_2019.vcxproj.filters +++ /dev/null @@ -1,363 +0,0 @@ - - - - - {771f5f80-d173-49c3-8afb-790e8f7cb0ce} - - - {c52e19b6-8703-49a1-9b36-101a05b4745d} - - - {e07ba3bc-b69f-4ded-9ffa-3b47427e9fef} - - - {28e934ed-a6d7-4c30-b064-c72c50c99626} - - - {28d5fa16-99e2-471c-8cd8-2020e81f0024} - - - {34676173-31f5-4435-b90d-a0ad4f7d163c} - - - {76f588c5-2d94-47db-ad9a-e9b00d5ba8d8} - - - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Src - - - Inc - - - Src - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Inc - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Inc - - - Inc - - - Src\Shared - - - Audio - - - Audio - - - Audio - - - Audio - - - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shared - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders\Shared - - - - Src\Shaders\Shared - - - \ No newline at end of file diff --git a/DirectXTK_Desktop_2019_Win10.sln b/DirectXTK_Desktop_2019_Win10.sln deleted file mode 100644 index d0e1fe1a2..000000000 --- a/DirectXTK_Desktop_2019_Win10.sln +++ /dev/null @@ -1,70 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29609.76 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2019_Win10", "DirectXTK_Desktop_2019_Win10.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeSpriteFont", "MakeSpriteFont\MakeSpriteFont.csproj", "{7329B02D-C504-482A-A156-181D48CE493C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XWBTool_Desktop_2019", "XWBTool\XWBTool_Desktop_2019.vcxproj", "{C7AB4186-54B2-4244-A533-77494763EA1D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BD5A62C9-FE7B-4491-82C2-BD46EA64D1C8}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Mixed Platforms = Release|Mixed Platforms - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.ActiveCfg = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.Build.0 = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.Build.0 = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.ActiveCfg = Debug|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.Build.0 = Debug|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.ActiveCfg = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.Build.0 = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0F7A0290-0AF9-47AB-A91D-1346B9433995} - EndGlobalSection -EndGlobal diff --git a/DirectXTK_Desktop_2019_Win10.vcxproj b/DirectXTK_Desktop_2019_Win10.vcxproj deleted file mode 100644 index 269761480..000000000 --- a/DirectXTK_Desktop_2019_Win10.vcxproj +++ /dev/null @@ -1,372 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - - - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - - - Document - - - - - Document - - - Document - - - - - Document - - - - - Document - - - - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E} - Win32Proj - DirectXTK - 10.0 - x64 - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - Unicode - - - StaticLibrary - false - v142 - Unicode - - - - - - - - - - - - - - - - - - - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - DirectXTK - - - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\ - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\ - DirectXTK_Spectre - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0A00;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Windows - true - - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0A00;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Windows - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0A00;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - Windows - true - true - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0A00;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - - - Windows - true - true - true - - - - - - - - <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) - <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) - <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) - <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ - - - - <_ATGFXCPath /> - <_ATGFXCVer /> - - - - - <_ATGShaderHeaders Include="$(ProjectDir)src/Shaders/Compiled/*.inc" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.inc" /> - <_ATGShaderSymbols Include="$(ProjectDir)src/Shaders/Compiled/*.pdb" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.pdb" /> - - - - - \ No newline at end of file diff --git a/DirectXTK_Desktop_2019_Win10.vcxproj.filters b/DirectXTK_Desktop_2019_Win10.vcxproj.filters deleted file mode 100644 index 3eead7e89..000000000 --- a/DirectXTK_Desktop_2019_Win10.vcxproj.filters +++ /dev/null @@ -1,363 +0,0 @@ - - - - - {771f5f80-d173-49c3-8afb-790e8f7cb0ce} - - - {c52e19b6-8703-49a1-9b36-101a05b4745d} - - - {e07ba3bc-b69f-4ded-9ffa-3b47427e9fef} - - - {28e934ed-a6d7-4c30-b064-c72c50c99626} - - - {28d5fa16-99e2-471c-8cd8-2020e81f0024} - - - {34676173-31f5-4435-b90d-a0ad4f7d163c} - - - {5d47b946-09b9-4477-934f-ca45fba9845d} - - - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Src - - - Src - - - Inc - - - Src - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Audio - - - Audio - - - Audio - - - Audio - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Inc - - - Inc - - - Src\Shared - - - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Src - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Audio - - - Src - - - Src - - - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shared - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders\Shared - - - - Src\Shaders\Shared - - - \ No newline at end of file diff --git a/DirectXTK_GDK_2019.sln b/DirectXTK_GDK_2019.sln deleted file mode 100644 index f3069f8db..000000000 --- a/DirectXTK_GDK_2019.sln +++ /dev/null @@ -1,33 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.32228.343 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_GDK_2019.vcxproj", "{26BE66BD-6E77-43BA-B363-725F9FC827C1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CF6C2CB0-3CB2-42D3-AF77-EBEADDD4BEBF}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Gaming.Desktop.x64 = Debug|Gaming.Desktop.x64 - Profile|Gaming.Desktop.x64 = Profile|Gaming.Desktop.x64 - Release|Gaming.Desktop.x64 = Release|Gaming.Desktop.x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64 - {26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64 - {26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|Gaming.Desktop.x64.ActiveCfg = Profile|Gaming.Desktop.x64 - {26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|Gaming.Desktop.x64.Build.0 = Profile|Gaming.Desktop.x64 - {26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64 - {26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {61313088-A570-4AE2-A5E4-1169FE8F2562} - EndGlobalSection -EndGlobal diff --git a/DirectXTK_GDK_2019.vcxproj b/DirectXTK_GDK_2019.vcxproj deleted file mode 100644 index c6d1105ab..000000000 --- a/DirectXTK_GDK_2019.vcxproj +++ /dev/null @@ -1,325 +0,0 @@ - - - - - Release - Gaming.Desktop.x64 - - - Profile - Gaming.Desktop.x64 - - - Debug - Gaming.Desktop.x64 - - - - DirectXTK - DirectXTK - {26be66bd-6e77-43ba-b363-725f9fc827c1} - en-US - Win32Proj - - 15.0 - Native - x64 - - - - StaticLibrary - v142 - false - true - Unicode - - - StaticLibrary - v142 - false - true - Unicode - - - StaticLibrary - v142 - true - Unicode - - - - - - - - - - - - - - - - $(Console_SdkLibPath);$(LibraryPath) - $(Console_SdkIncludeRoot);$(IncludePath) - false - Bin\GDK_2019\$(Platform)\$(Configuration)\ - Bin\GDK_2019\$(Platform)\$(Configuration)\ - DirectXTK - - - $(Console_SdkLibPath);$(LibraryPath) - $(Console_SdkIncludeRoot);$(IncludePath) - false - Bin\GDK_2019\$(Platform)\$(Configuration)\ - Bin\GDK_2019\$(Platform)\$(Configuration)\ - DirectXTK - - - $(Console_SdkLibPath);$(LibraryPath) - $(Console_SdkIncludeRoot);$(IncludePath) - false - Bin\GDK_2019\$(Platform)\$(Configuration)\ - Bin\GDK_2019\$(Platform)\$(Configuration)\ - DirectXTK - - - - true - Windows - true - true - - - Use - pch.h - MaxSpeed - _WIN32_WINNT=0x0A00;NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) - EnableAllWarnings - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - true - true - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - 6.0 - true - /Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions) - - - - - true - Windows - true - true - - - Use - pch.h - MaxSpeed - _WIN32_WINNT=0x0A00;NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions) - EnableAllWarnings - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - true - true - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - 6.0 - true - /Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions) - - - - - Windows - true - - - pch.h - Use - false - EnableAllWarnings - Disabled - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - _WIN32_WINNT=0x0A00;_DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) - Fast - $(IntDir)$(TargetName).pdb - true - true - Level4 - ProgramDatabase - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - false - - - 6.0 - true - /Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project requires the Microsoft GDK to be installed. If you have already installed the GDK, then run Repair to ensure proper integration with Visual Studio. The missing platform is {0}. - - - - - - <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) - <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) - <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) - <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ - - - - <_ATGFXCPath /> - <_ATGFXCVer /> - - - - - <_ATGShaderHeaders Include="$(ProjectDir)src/Shaders/Compiled/*.inc" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.inc" /> - <_ATGShaderSymbols Include="$(ProjectDir)src/Shaders/Compiled/*.pdb" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.pdb" /> - - - - - \ No newline at end of file diff --git a/DirectXTK_GDK_2019.vcxproj.filters b/DirectXTK_GDK_2019.vcxproj.filters deleted file mode 100644 index f3b9fda7f..000000000 --- a/DirectXTK_GDK_2019.vcxproj.filters +++ /dev/null @@ -1,365 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {bfe08c7b-04ad-4694-97b7-1053f276b6d6} - - - {bb887e9d-4a05-42f1-928a-6e0aea0b39b6} - - - {ba729d67-3bf4-4323-8387-443d75ffabb3} - - - {d6b153c5-132e-4c53-8fba-476a4f2fd140} - - - {2c00e8fa-322f-4f28-bcbf-14d82c3b3a58} - - - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Src - - - Inc - - - Src - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Audio - - - Audio - - - Audio - - - Audio - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Inc\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Inc - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Inc - - - Inc - - - Src\Shared - - - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Src\Shared - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Audio - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Audio - - - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shared - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders\Shared - - - - Src\Shaders\Shared - - - \ No newline at end of file diff --git a/README.md b/README.md index bcbf0ec62..b25e3b806 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Copyright (c) Microsoft Corporation. This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 11 C++ code for Win32 desktop applications for Windows 8.1 or later, Xbox One, and Universal Windows Platform (UWP) apps for Windows 10 and Windows 11. -This code is designed to build with Visual Studio 2019 (16.11), Visual Studio 2022, clang for Windows v12 or later, or MinGW 12.2. Use of the Windows 10 May 2020 Update SDK ([19041](https://walbourn.github.io/windows-10-may-2020-update-sdk/)) or later is required for Visual Studio. +This code is designed to build with Visual Studio 2022, Visual Studio 2026, clang for Windows v12 or later, or MinGW 12.2. Use of the Windows 10 May 2020 Update SDK ([19041](https://walbourn.github.io/windows-10-may-2020-update-sdk/)) or later is required for Visual Studio. These components are designed to work without requiring any content from the legacy DirectX SDK. For details, see [Where is the DirectX SDK?](https://aka.ms/dxsdk). @@ -78,14 +78,12 @@ FOR SECURITY ADVISORIES, see [GitHub](https://github.com/microsoft/DirectXTK/sec For a full change history, see [CHANGELOG.md](https://github.com/microsoft/DirectXTK/blob/main/CHANGELOG.md). -* The CMake projects require 3.21 or later. VS 2019 users will need to install a standalone version of CMake 3.21 or later and add it to their PATH. +* The CMake projects require 3.21 or later. * Starting with the March 2025 release, Windows 7 and Windows 8.0 support has been retired. For _DirectX ToolKit for Audio_ this means that `DirectXTKAudio_Desktop_*_Win7` has been removed, and `DirectXTKAudio_Desktop_*_Win8` has been integrated into the `DirectXTK_Desktop_*` vcxproj which uses XAudio 2.8 for Windows 8.1 compatibility. * Remove any References to or use of `DirectXTKAudio_Desktop_*_Win8.vcxproj` or `DirectXTKAudio_Desktop_*_Win7`. If using `DirectXTK_Desktop_*.vcxproj` you will be using XAudio 2.8 as before. Client code will need to build with `_WIN32_WINNT=0x0603`. - * With the `directxtk_desktop_2019` NuGet package, you will be using XAudio 2.8 and no longer use the XAudio2Redist NuGet package. Client code will build with `_WIN32_WINNT=0x0603`. - * If you want to use XAudio2Redist with Windows 8.1, the CMake project supports this with the build option `BUILD_XAUDIO_REDIST`. The CMake build option `BUILD_XAUDIO_WIN7` was renamed. * When using XAudio 2.8 for Windows 8.1, there is no xWMA format support. This is available when using XAudio 2.9 or XAudio2Redist. @@ -106,8 +104,6 @@ For a full change history, see [CHANGELOG.md](https://github.com/microsoft/Direc * The UWP projects and the Win10 classic desktop project include configurations for the ARM64 platform. Building these requires installing the ARM64 toolset. -* For ARM64/AArch64 development, the VS 2022 compiler is strongly recommended over the VS 2019 toolset. The Windows SDK (26100 or later) is not compatible with VS 2019 for Win32 on ARM64 development. _Note that the ARM32/AArch32 platform is [deprecated](https://learn.microsoft.com/windows/arm/arm32-to-arm64)_. - * When using clang/LLVM for the ARM64/AArch64 platform, the Windows 11 SDK ([22000](https://walbourn.github.io/windows-sdk-for-windows-11/)) or later is required. * The ``CompileShaders.cmd`` script must have Windows-style (CRLF) line-endings. If it is changed to Linux-style (LF) line-endings, it can fail to build all the required shaders. diff --git a/XWBTool/xwbtool_Desktop_2019.vcxproj b/XWBTool/xwbtool_Desktop_2019.vcxproj deleted file mode 100644 index 692de5db5..000000000 --- a/XWBTool/xwbtool_Desktop_2019.vcxproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C7AB4186-54B2-4244-A533-77494763EA1D} - Win32Proj - XWBTool - 10.0 - - - - Application - true - v142 - Unicode - false - - - Application - true - v142 - Unicode - false - - - Application - false - v142 - Unicode - - - Application - false - v142 - Unicode - - - - - - - - - - - - - - - - - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - XWBTool - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - XWBTool - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - XWBTool - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - XWBTool - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) - ..\Audio;..\Src;%(AdditionalIncludeDirectories) - true - false - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - 26812 - ProgramDatabase - stdcpp17 - - - Console - true - true - kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) - /CETCOMPAT %(AdditionalOptions) - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) - ..\Audio;..\Src;%(AdditionalIncludeDirectories) - true - false - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - 26812 - ProgramDatabase - stdcpp17 - - - Console - true - kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) - /CETCOMPAT %(AdditionalOptions) - - - - - Level4 - MaxSpeed - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) - ..\Audio;..\Src;%(AdditionalIncludeDirectories) - Guard - true - false - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - 26812 - stdcpp17 - - - Console - true - true - true - true - kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) - /CETCOMPAT %(AdditionalOptions) - - - - - Level4 - MaxSpeed - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) - ..\Audio;..\Src;%(AdditionalIncludeDirectories) - Guard - true - false - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - 26812 - stdcpp17 - - - Console - true - true - true - kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) - /CETCOMPAT %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/XWBTool/xwbtool_Desktop_2019.vcxproj.filters b/XWBTool/xwbtool_Desktop_2019.vcxproj.filters deleted file mode 100644 index 409a0f554..000000000 --- a/XWBTool/xwbtool_Desktop_2019.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - {a82dd41b-2b9b-4027-8047-cc6f092c2213} - - - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/build/Directory.Build.props b/build/Directory.Build.props index f356ccf1a..abbd0c67c 100644 --- a/build/Directory.Build.props +++ b/build/Directory.Build.props @@ -47,18 +47,6 @@ - - - $(_AlternativeVCTargetsPath160) - true - $(_AlternativeVCTargetsPath150) - $(_AlternativeVCTargetsPath160) - - diff --git a/build/promotenuget.ps1 b/build/promotenuget.ps1 index fb24b20d9..d9e609cb0 100644 --- a/build/promotenuget.ps1 +++ b/build/promotenuget.ps1 @@ -64,7 +64,7 @@ $bodyRelease = @{ } } | ConvertTo-Json -$packages = @('directxtk_desktop_2019', 'directxtk_desktop_win10', 'directxtk_uwp') +$packages = @('directxtk_desktop_win10', 'directxtk_uwp') # Check if all packages exist $allPackagesSucceeded = $true