diff --git a/.nuget/directxtk_uwp.nuspec b/.nuget/directxtk_uwp.nuspec index c1ce8f3..c1290c0 100644 --- a/.nuget/directxtk_uwp.nuspec +++ b/.nuget/directxtk_uwp.nuspec @@ -7,7 +7,7 @@ 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 Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2019 (16.11) or Visual Studio 2022. + This version is for Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2022. Features: Audio - low-level audio API using XAudio2 @@ -47,23 +47,23 @@ WICTextureLoader - WIC-based image file texture loader - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/DirectXTK_Windows10_2019.sln b/DirectXTK_Windows10_2019.sln deleted file mode 100644 index 75c4fd6..0000000 --- a/DirectXTK_Windows10_2019.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.33927.289 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_Windows10_2019.vcxproj", "{F4776924-619C-42C7-88B2-82C947CCC9E7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{88140C29-E1F8-41E0-9126-6912B6A713BA}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.Build.0 = Debug|ARM64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.ActiveCfg = Debug|x64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.Build.0 = Debug|x64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.ActiveCfg = Debug|Win32 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.Build.0 = Debug|Win32 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.ActiveCfg = Release|ARM64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.Build.0 = Release|ARM64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x64.ActiveCfg = Release|x64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x64.Build.0 = Release|x64 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x86.ActiveCfg = Release|Win32 - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {FFD89A12-8620-47B9-A00E-6FD1824BFAC5} - EndGlobalSection -EndGlobal diff --git a/DirectXTK_Windows10_2019.vcxproj b/DirectXTK_Windows10_2019.vcxproj deleted file mode 100644 index 483dcf8..0000000 --- a/DirectXTK_Windows10_2019.vcxproj +++ /dev/null @@ -1,460 +0,0 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - - - Document - - - - - Document - - - - - Document - - - - - Document - - - - - Document - - - - {f4776924-619c-42c7-88b2-82c947ccc9e7} - StaticLibrary - DirectXTK - DirectXTK - en-US - 14.0 - true - Windows Store - 10.0 - 10.0.14393.0 - 10.0 - x64 - - - - StaticLibrary - true - v142 - - - StaticLibrary - true - v142 - - - StaticLibrary - true - v142 - - - StaticLibrary - false - v142 - - - StaticLibrary - false - v142 - - - StaticLibrary - false - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTK - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTK - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTK - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTK - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTK - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTK - false - - - - Use - - false - true - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - EnableAllWarnings - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Console - false - false - - - - - Use - - false - true - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - EnableAllWarnings - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - - - Console - false - false - - - - - Use - - - false - true - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Console - false - false - - - - - Use - - - false - true - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - Console - false - false - - - - - Use - - false - true - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Console - false - false - - - - - Use - - false - true - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - Console - false - false - - - - - - - - <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) - <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) - <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - - - - <_ATGFXCPath /> - - - - - <_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_Windows10_2019.vcxproj.filters b/DirectXTK_Windows10_2019.vcxproj.filters deleted file mode 100644 index 1a30b58..0000000 --- a/DirectXTK_Windows10_2019.vcxproj.filters +++ /dev/null @@ -1,360 +0,0 @@ - - - - - {a77af43b-f2ab-4dcc-b84e-70909b198d8a} - - - {4a81ebd8-dd1a-46fb-ad14-8b57d8e92774} - - - {a872f54e-e97f-4e14-a946-da034ce61f99} - - - {e536bb5b-5908-4d5a-b629-6a73cf2fc9ca} - - - {68d47991-3b63-4a17-a705-680374a426f2} - - - {b5728d91-918a-4481-8e6f-8e793da9ee2c} - - - {020af8ad-d3a0-41bc-bc05-b1d0a5d2a85f} - - - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Inc - - - Src - - - Src - - - Audio - - - Audio - - - Audio - - - Audio - - - Inc - - - 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 - - - Src\Shared - - - Inc - - - Inc - - - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Inc\Shared - - - Src\Shared - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders\Shared - - - Src\Shaders\Shared - - - Src\Shaders - - - Src\Shaders - - - Src\Shaders\Shared - - - - Src\Shaders\Shared - - - - - 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 - - - Src - - - Audio - - - Src - - - Src - - - \ No newline at end of file diff --git a/build/DirectXTK-GitHub-SDK-prerelease.yml b/build/DirectXTK-GitHub-SDK-prerelease.yml index 1092f6a..9d77718 100644 --- a/build/DirectXTK-GitHub-SDK-prerelease.yml +++ b/build/DirectXTK-GitHub-SDK-prerelease.yml @@ -30,7 +30,7 @@ variables: URL_FEED: $(ADOFeedURL) pool: - vmImage: windows-2019 + vmImage: windows-2022 jobs: - job: DESKTOP_BUILD @@ -253,30 +253,30 @@ jobs: Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 32dbg + displayName: Build solution DirectXTK_Windows10_2022.sln 32dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 32rel + displayName: Build solution DirectXTK_Windows10_2022.sln 32rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 64dbg + displayName: Build solution DirectXTK_Windows10_2022.sln 64dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 64rel + displayName: Build solution DirectXTK_Windows10_2022.sln 64rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release @@ -319,16 +319,16 @@ jobs: Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln arm64dbg + displayName: Build solution DirectXTK_Windows10_2022.sln arm64dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln arm64rel + displayName: Build solution DirectXTK_Windows10_2022.sln arm64rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release diff --git a/build/DirectXTK-GitHub-SDK-release.yml b/build/DirectXTK-GitHub-SDK-release.yml index 9b08f53..902a7c7 100644 --- a/build/DirectXTK-GitHub-SDK-release.yml +++ b/build/DirectXTK-GitHub-SDK-release.yml @@ -30,7 +30,7 @@ variables: URL_FEED: $(ADOFeedURL) pool: - vmImage: windows-2019 + vmImage: windows-2022 jobs: - job: DESKTOP_BUILD @@ -253,30 +253,30 @@ jobs: Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 32dbg + displayName: Build solution DirectXTK_Windows10_2022.sln 32dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 32rel + displayName: Build solution DirectXTK_Windows10_2022.sln 32rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 64dbg + displayName: Build solution DirectXTK_Windows10_2022.sln 64dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 64rel + displayName: Build solution DirectXTK_Windows10_2022.sln 64rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release @@ -319,16 +319,16 @@ jobs: Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln arm64dbg + displayName: Build solution DirectXTK_Windows10_2022.sln arm64dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln arm64rel + displayName: Build solution DirectXTK_Windows10_2022.sln arm64rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release diff --git a/build/DirectXTK-GitHub.yml b/build/DirectXTK-GitHub.yml index 0501d57..2875e25 100644 --- a/build/DirectXTK-GitHub.yml +++ b/build/DirectXTK-GitHub.yml @@ -47,7 +47,7 @@ variables: Codeql.Enabled: true pool: - vmImage: windows-2019 + vmImage: windows-2022 jobs: - job: DESKTOP_BUILD @@ -194,30 +194,30 @@ jobs: clean: true fetchTags: false - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 32dbg + displayName: Build solution DirectXTK_Windows10_2022.sln 32dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 32rel + displayName: Build solution DirectXTK_Windows10_2022.sln 32rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 64dbg + displayName: Build solution DirectXTK_Windows10_2022.sln 64dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln 64rel + displayName: Build solution DirectXTK_Windows10_2022.sln 64rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release @@ -228,16 +228,16 @@ jobs: workingDirectory: $(Build.SourcesDirectory) failOnStderr: false - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln arm64dbg + displayName: Build solution DirectXTK_Windows10_2022.sln arm64dbg inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln arm64rel + displayName: Build solution DirectXTK_Windows10_2022.sln arm64rel inputs: - solution: DirectXTK_Windows10_2019.sln + solution: DirectXTK_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release