diff --git a/.nuget/directxtex_uwp.nuspec b/.nuget/directxtex_uwp.nuspec index a19b8e7..0c1010c 100644 --- a/.nuget/directxtex_uwp.nuspec +++ b/.nuget/directxtex_uwp.nuspec @@ -7,7 +7,7 @@ Microsoft microsoft,directxtk DirectXTex texture processing library - 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. DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. Matches the February 21, 2024 release on GitHub. @@ -28,23 +28,23 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/DirectXTex/DirectXTex_Windows10_2019.vcxproj b/DirectXTex/DirectXTex_Windows10_2019.vcxproj deleted file mode 100644 index dd6f5c2..0000000 --- a/DirectXTex/DirectXTex_Windows10_2019.vcxproj +++ /dev/null @@ -1,359 +0,0 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - Document - - - Document - - - - {fb3f52b5-bfe8-43fd-836f-363735dab738} - StaticLibrary - DirectXTex - DirectXTex - 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)\ - DirectXTex - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTex - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTex - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTex - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTex - false - - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTex - false - - - - Use - - false - true - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - ProgramDatabase - false - Level4 - - - Console - false - false - - - - - Use - - false - true - Fast - StreamingSIMDExtensions2 - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - Level4 - - - Console - false - false - - - - - Use - - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - ProgramDatabase - false - Level4 - - - Console - false - false - - - - - Use - - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - Level4 - true - - - Console - false - false - - - - - Use - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - ProgramDatabase - false - Level4 - - - Console - false - false - - - - - Use - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - 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)Shaders/Compiled/*.inc" /> - <_ATGShaderSymbols Include="$(ProjectDir)Shaders/Compiled/*.pdb" /> - - - - - \ No newline at end of file diff --git a/DirectXTex/DirectXTex_Windows10_2019.vcxproj.filters b/DirectXTex/DirectXTex_Windows10_2019.vcxproj.filters deleted file mode 100644 index caccf47..0000000 --- a/DirectXTex/DirectXTex_Windows10_2019.vcxproj.filters +++ /dev/null @@ -1,136 +0,0 @@ - - - - - {f4d68f4f-adbe-40a1-b052-f2e4cae3b5ae} - - - {b42472b0-7a63-47b0-b77f-4ffe492471a0} - - - {1838e3e6-1f80-4713-9a98-41ea7e654d12} - - - - - {f4d68f4f-adbe-40a1-b052-f2e4cae3b5ae} - - - {b42472b0-7a63-47b0-b77f-4ffe492471a0} - - - {1838e3e6-1f80-4713-9a98-41ea7e654d12} - - - {7c13ba68-1ec8-4710-a8dd-cd973621b725} - - - {fbc9373c-d511-4fd1-a7b8-d55df1b27d2e} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Source Files\Shaders - - - Source Files\Shaders - - - Source Files\Shaders - - - \ No newline at end of file diff --git a/DirectXTex_Windows10_2019.sln b/DirectXTex_Windows10_2019.sln deleted file mode 100644 index 62ac35f..0000000 --- a/DirectXTex_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}") = "DirectXTex", "DirectXTex\DirectXTex_Windows10_2019.vcxproj", "{FB3F52B5-BFE8-43FD-836F-363735DAB738}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8D3EE191-AC2D-4DA6-97EB-058D8A28B933}" - 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 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.Build.0 = Debug|ARM64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.ActiveCfg = Debug|x64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.Build.0 = Debug|x64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.ActiveCfg = Debug|Win32 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.Build.0 = Debug|Win32 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.ActiveCfg = Release|ARM64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.Build.0 = Release|ARM64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x64.ActiveCfg = Release|x64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x64.Build.0 = Release|x64 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x86.ActiveCfg = Release|Win32 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E507EBC0-EBB7-4519-A886-15B7E0917E2F} - EndGlobalSection -EndGlobal diff --git a/build/DirectXTex-GitHub-SDK-prerelease.yml b/build/DirectXTex-GitHub-SDK-prerelease.yml index 6475f59..13e8c56 100644 --- a/build/DirectXTex-GitHub-SDK-prerelease.yml +++ b/build/DirectXTex-GitHub-SDK-prerelease.yml @@ -30,7 +30,7 @@ variables: URL_FEED: $(ADOFeedURL) pool: - vmImage: windows-2019 + vmImage: windows-2022 jobs: - job: DESKTOP_BUILD @@ -204,44 +204,44 @@ jobs: Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 32dbg + displayName: Build solution DirectXTex_Windows10_2022.sln 32dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 32rel + displayName: Build solution DirectXTex_Windows10_2022.sln 32rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 64dbg + displayName: Build solution DirectXTex_Windows10_2022.sln 64dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 64rel + displayName: Build solution DirectXTex_Windows10_2022.sln 64rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln arm64dbg + displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln arm64rel + displayName: Build solution DirectXTex_Windows10_2022.sln arm64rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release diff --git a/build/DirectXTex-GitHub-SDK-release.yml b/build/DirectXTex-GitHub-SDK-release.yml index 1272921..7451cdb 100644 --- a/build/DirectXTex-GitHub-SDK-release.yml +++ b/build/DirectXTex-GitHub-SDK-release.yml @@ -30,7 +30,7 @@ variables: URL_FEED: $(ADOFeedURL) pool: - vmImage: windows-2019 + vmImage: windows-2022 jobs: - job: DESKTOP_BUILD @@ -204,44 +204,44 @@ jobs: Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 32dbg + displayName: Build solution DirectXTex_Windows10_2022.sln 32dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 32rel + displayName: Build solution DirectXTex_Windows10_2022.sln 32rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 64dbg + displayName: Build solution DirectXTex_Windows10_2022.sln 64dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 64rel + displayName: Build solution DirectXTex_Windows10_2022.sln 64rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln arm64dbg + displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln arm64rel + displayName: Build solution DirectXTex_Windows10_2022.sln arm64rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release diff --git a/build/DirectXTex-GitHub.yml b/build/DirectXTex-GitHub.yml index 6f57d23..ba04e98 100644 --- a/build/DirectXTex-GitHub.yml +++ b/build/DirectXTex-GitHub.yml @@ -46,7 +46,7 @@ variables: Codeql.Enabled: true pool: - vmImage: windows-2019 + vmImage: windows-2022 jobs: - job: DESKTOP_BUILD @@ -216,44 +216,44 @@ jobs: clean: true fetchTags: false - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 32dbg + displayName: Build solution DirectXTex_Windows10_2022.sln 32dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 32rel + displayName: Build solution DirectXTex_Windows10_2022.sln 32rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 64dbg + displayName: Build solution DirectXTex_Windows10_2022.sln 64dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln 64rel + displayName: Build solution DirectXTex_Windows10_2022.sln 64rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln arm64dbg + displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln arm64rel + displayName: Build solution DirectXTex_Windows10_2022.sln arm64rel inputs: - solution: DirectXTex_Windows10_2019.sln + solution: DirectXTex_Windows10_2022.sln msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release