diff --git a/.nuget/directxtk_uwp.nuspec b/.nuget/directxtk_uwp.nuspec index 118a4df5..c26328e4 100644 --- a/.nuget/directxtk_uwp.nuspec +++ b/.nuget/directxtk_uwp.nuspec @@ -47,12 +47,6 @@ WICTextureLoader - WIC-based image file texture loader - - - - - - diff --git a/CMakePresets.json b/CMakePresets.json index 081ffd4f..f0483c62 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -29,15 +29,6 @@ "cacheVariables": { "DIRECTX_ARCH": "x86" }, "hidden": true }, - { - "name": "ARM", - "architecture": { - "value": "arm", - "strategy": "external" - }, - "cacheVariables": { "DIRECTX_ARCH": "arm" }, - "hidden": true - }, { "name": "ARM64", "architecture": { @@ -192,8 +183,6 @@ { "name": "x64-Release-UWP" , "description": "MSVC for x64 (Release) for UWP", "inherits": [ "base", "x64", "Release", "MSVC", "UWP" ] }, { "name": "x86-Debug-UWP" , "description": "MSVC for x86 (Debug) for UWP", "inherits": [ "base", "x86", "Debug", "MSVC", "UWP" ] }, { "name": "x86-Release-UWP" , "description": "MSVC for x86 (Release) for UWP", "inherits": [ "base", "x86", "Release", "MSVC", "UWP" ] }, - { "name": "arm-Debug-UWP" , "description": "MSVC for ARM (Debug) for UWP", "inherits": [ "base", "ARM", "Debug", "MSVC", "UWP" ] }, - { "name": "arm-Release-UWP" , "description": "MSVC for ARM (Release) for UWP", "inherits": [ "base", "ARM", "Release", "MSVC", "UWP" ] }, { "name": "arm64-Debug-UWP" , "description": "MSVC for ARM64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "MSVC", "UWP" ] }, { "name": "arm64-Release-UWP", "description": "MSVC for ARM64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "MSVC", "UWP" ] }, diff --git a/DirectXTK_Windows10_2019.sln b/DirectXTK_Windows10_2019.sln index 41fb2056..75c4fd61 100644 --- a/DirectXTK_Windows10_2019.sln +++ b/DirectXTK_Windows10_2019.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 15.0.27703.2000 +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 @@ -12,26 +12,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.ActiveCfg = Debug|ARM - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.Build.0 = Debug|ARM {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|ARM.ActiveCfg = Release|ARM - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM.Build.0 = Release|ARM {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 diff --git a/DirectXTK_Windows10_2019.vcxproj b/DirectXTK_Windows10_2019.vcxproj index 304d5eef..dc1384f9 100644 --- a/DirectXTK_Windows10_2019.vcxproj +++ b/DirectXTK_Windows10_2019.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -127,9 +119,7 @@ Create Create - Create Create - Create Create Create Create @@ -221,11 +211,6 @@ true v142 - - StaticLibrary - true - v142 - StaticLibrary true @@ -241,11 +226,6 @@ false v142 - - StaticLibrary - false - v142 - StaticLibrary false @@ -267,15 +247,9 @@ - - - - - - @@ -299,24 +273,12 @@ 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)\ @@ -381,29 +343,6 @@ 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 @@ -428,27 +367,6 @@ 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 - - - Console - false - false - - Use diff --git a/DirectXTK_Windows10_2022.sln b/DirectXTK_Windows10_2022.sln index def4d55d..38c1e9df 100644 --- a/DirectXTK_Windows10_2022.sln +++ b/DirectXTK_Windows10_2022.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 15.0.27703.2000 +VisualStudioVersion = 17.7.34009.444 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_Windows10_2022.vcxproj", "{F4776924-619C-42C7-88B2-82C947CCC9E7}" EndProject @@ -12,26 +11,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.ActiveCfg = Debug|ARM - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.Build.0 = Debug|ARM {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|ARM.ActiveCfg = Release|ARM - {F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM.Build.0 = Release|ARM {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 diff --git a/DirectXTK_Windows10_2022.vcxproj b/DirectXTK_Windows10_2022.vcxproj index 42b5523e..07d2178b 100644 --- a/DirectXTK_Windows10_2022.vcxproj +++ b/DirectXTK_Windows10_2022.vcxproj @@ -1,10 +1,6 @@ - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -127,9 +119,7 @@ Create Create - Create Create - Create Create Create Create @@ -221,11 +211,6 @@ true v143 - - StaticLibrary - true - v143 - StaticLibrary true @@ -241,11 +226,6 @@ false v143 - - StaticLibrary - false - v143 - StaticLibrary false @@ -267,15 +247,9 @@ - - - - - - @@ -299,24 +273,12 @@ DirectXTK false - - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - DirectXTK - false - Bin\Windows10_2022\$(Platform)\$(Configuration)\ Bin\Windows10_2022\$(Platform)\$(Configuration)\ DirectXTK false - - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - DirectXTK - false - Bin\Windows10_2022\$(Platform)\$(Configuration)\ Bin\Windows10_2022\$(Platform)\$(Configuration)\ @@ -381,29 +343,6 @@ 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 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Console - false - false - - Use @@ -428,27 +367,6 @@ 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 %(AdditionalOptions) - Level4 - - - Console - false - false - - Use diff --git a/build/DirectXTK-GitHub-CMake-Dev17.yml b/build/DirectXTK-GitHub-CMake-Dev17.yml index 21afe896..9ddbc388 100644 --- a/build/DirectXTK-GitHub-CMake-Dev17.yml +++ b/build/DirectXTK-GitHub-CMake-Dev17.yml @@ -94,16 +94,6 @@ jobs: inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --build out4 -v - - task: CMake@1 - displayName: 'CMake (UWP): Config ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM -B out5 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0' - - task: CMake@1 - displayName: 'CMake (UWP): Build ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v - task: CMake@1 displayName: 'CMake (ClangCl): Config x64' inputs: diff --git a/build/DirectXTK-GitHub-CMake.yml b/build/DirectXTK-GitHub-CMake.yml index fafebea6..8c8cfd86 100644 --- a/build/DirectXTK-GitHub-CMake.yml +++ b/build/DirectXTK-GitHub-CMake.yml @@ -106,16 +106,6 @@ jobs: inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --build out4 -v - - task: CMake@1 - displayName: 'CMake (UWP): Config ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM -B out5 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0' - - task: CMake@1 - displayName: 'CMake (UWP): Build ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v - task: CMake@1 displayName: 'CMake (ClangCl): Config x64' inputs: diff --git a/build/DirectXTK-GitHub-Dev17.yml b/build/DirectXTK-GitHub-Dev17.yml index 93938d29..54bb57fa 100644 --- a/build/DirectXTK-GitHub-Dev17.yml +++ b/build/DirectXTK-GitHub-Dev17.yml @@ -227,22 +227,6 @@ jobs: script: del *.pch /s workingDirectory: $(Build.SourcesDirectory) failOnStderr: false - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2022.sln armdbg - inputs: - solution: DirectXTK_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2022.sln armrel - inputs: - solution: DirectXTK_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - msbuildArchitecture: x64 - task: VSBuild@1 displayName: Build solution DirectXTK_Windows10_2022.sln arm64dbg inputs: diff --git a/build/DirectXTK-GitHub-SDK-prerelease.yml b/build/DirectXTK-GitHub-SDK-prerelease.yml index 2fb07e60..1092f6aa 100644 --- a/build/DirectXTK-GitHub-SDK-prerelease.yml +++ b/build/DirectXTK-GitHub-SDK-prerelease.yml @@ -307,11 +307,6 @@ jobs: $clearadd = $doc.configuration.packageSources.PrependChild($newelement) $doc.OuterXml | Set-Content $file - - task: NuGetCommand@2 - displayName: NuGet Install WSDK arm - inputs: - command: custom - arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK - task: NuGetCommand@2 displayName: NuGet Install WSDK arm64 inputs: @@ -323,20 +318,6 @@ jobs: SourceFolder: build Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln armdbg - inputs: - solution: DirectXTK_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln armrel - inputs: - solution: DirectXTK_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - task: VSBuild@1 displayName: Build solution DirectXTK_Windows10_2019.sln arm64dbg inputs: diff --git a/build/DirectXTK-GitHub-SDK-release.yml b/build/DirectXTK-GitHub-SDK-release.yml index bbf16312..9b08f538 100644 --- a/build/DirectXTK-GitHub-SDK-release.yml +++ b/build/DirectXTK-GitHub-SDK-release.yml @@ -307,11 +307,6 @@ jobs: $clearadd = $doc.configuration.packageSources.PrependChild($newelement) $doc.OuterXml | Set-Content $file - - task: NuGetCommand@2 - displayName: NuGet Install WSDK arm - inputs: - command: custom - arguments: install Microsoft.Windows.SDK.CPP.arm -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK - task: NuGetCommand@2 displayName: NuGet Install WSDK arm64 inputs: @@ -323,20 +318,6 @@ jobs: SourceFolder: build Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln armdbg - inputs: - solution: DirectXTK_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln armrel - inputs: - solution: DirectXTK_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - task: VSBuild@1 displayName: Build solution DirectXTK_Windows10_2019.sln arm64dbg inputs: diff --git a/build/DirectXTK-GitHub-Test.yml b/build/DirectXTK-GitHub-Test.yml index 14f8f33b..d4af0aaf 100644 --- a/build/DirectXTK-GitHub-Test.yml +++ b/build/DirectXTK-GitHub-Test.yml @@ -300,43 +300,6 @@ jobs: platform: x86 configuration: Release -- job: UWP_BUILD_ARM - displayName: 'Universal Windows Platform (UWP) for ARM' - timeoutInMinutes: 120 - steps: - - checkout: self - clean: true - fetchTags: false - - task: DeleteFiles@1 - displayName: Delete files from Tests - inputs: - SourceFolder: Tests - Contents: '**' - RemoveSourceFolder: true - RemoveDotFiles: true - - task: CmdLine@2 - displayName: Fetch Tests - inputs: - script: git clone --quiet https://%GITHUB_PAT%@github.com/walbourn/directxtktest.git Tests - workingDirectory: $(Build.SourcesDirectory) - failOnStderr: true - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Windows10.sln armdbg - inputs: - solution: Tests/DirectXTK_Tests_Windows10.sln - vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 /p:AppxBundle=Never - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Windows10.sln armrel - inputs: - solution: Tests/DirectXTK_Tests_Windows10.sln - vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 /p:AppxBundle=Never - platform: ARM - configuration: Release - - job: UWP_BUILD_ARM64 displayName: 'Universal Windows Platform (UWP) for ARM64' timeoutInMinutes: 120 diff --git a/build/DirectXTK-GitHub.yml b/build/DirectXTK-GitHub.yml index 3e86168b..0501d57a 100644 --- a/build/DirectXTK-GitHub.yml +++ b/build/DirectXTK-GitHub.yml @@ -227,20 +227,6 @@ jobs: script: del *.pch /s workingDirectory: $(Build.SourcesDirectory) failOnStderr: false - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln armdbg - inputs: - solution: DirectXTK_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2019.sln armrel - inputs: - solution: DirectXTK_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - task: VSBuild@1 displayName: Build solution DirectXTK_Windows10_2019.sln arm64dbg inputs: diff --git a/build/Directory.Build.props b/build/Directory.Build.props index 5e6141ce..56aa8aa6 100644 --- a/build/Directory.Build.props +++ b/build/Directory.Build.props @@ -23,9 +23,6 @@ - -