diff --git a/.azuredevops/templates/DirectXMesh-build-gdk.yml b/.azuredevops/templates/DirectXMesh-build-gdk.yml index 17d9ae55..3459dfcc 100644 --- a/.azuredevops/templates/DirectXMesh-build-gdk.yml +++ b/.azuredevops/templates/DirectXMesh-build-gdk.yml @@ -9,19 +9,19 @@ parameters: - name: msVersion type: string values: - - '16.0' - '17.0' + - '18.0' - name: vsYear type: number values: - - 2019 - 2022 + - 2026 steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDK_${{ parameters.vsYear }} pcdbg inputs: - solution: DirectXMesh_GDK_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDK_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Desktop.x64 configuration: Debug @@ -30,7 +30,7 @@ steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDK_${{ parameters.vsYear }} pcrel inputs: - solution: DirectXMesh_GDK_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDK_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Desktop.x64 configuration: Release @@ -39,7 +39,7 @@ steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDK_${{ parameters.vsYear }} xbdbg inputs: - solution: DirectXMesh_GDK_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDK_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.XboxOne.x64 configuration: Debug @@ -48,7 +48,7 @@ steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDK_${{ parameters.vsYear }} xbrel inputs: - solution: DirectXMesh_GDK_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDK_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.XboxOne.x64 configuration: Release @@ -57,7 +57,7 @@ steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDK_${{ parameters.vsYear }} scardbg inputs: - solution: DirectXMesh_GDK_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDK_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.Scarlett.x64 configuration: Debug @@ -66,7 +66,7 @@ steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDK_${{ parameters.vsYear }} scarrel inputs: - solution: DirectXMesh_GDK_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDK_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.Scarlett.x64 configuration: Release diff --git a/.azuredevops/templates/DirectXMesh-build-gdkx.yml b/.azuredevops/templates/DirectXMesh-build-gdkx.yml index 924419c2..7a99ff8d 100644 --- a/.azuredevops/templates/DirectXMesh-build-gdkx.yml +++ b/.azuredevops/templates/DirectXMesh-build-gdkx.yml @@ -25,7 +25,7 @@ steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} pcdbg inputs: - solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: x64 configuration: Debug @@ -34,7 +34,7 @@ steps: - task: VSBuild@1 displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} pcrel inputs: - solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: x64 configuration: Release @@ -44,7 +44,7 @@ steps: displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} xbdbg condition: eq(${{ parameters.xboxone }}, true) inputs: - solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.XboxOne.x64 configuration: Debug @@ -54,7 +54,7 @@ steps: displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} xbrel condition: eq(${{ parameters.xboxone }}, true) inputs: - solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.XboxOne.x64 configuration: Release @@ -64,7 +64,7 @@ steps: displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} scardbg condition: eq(${{ parameters.scarlett }}, true) inputs: - solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.Scarlett.x64 configuration: Debug @@ -74,7 +74,7 @@ steps: displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} scarrel condition: eq(${{ parameters.scarlett }}, true) inputs: - solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.slnx vsVersion: ${{ parameters.msVersion }} platform: Gaming.Xbox.Scarlett.x64 configuration: Release diff --git a/.azuredevops/templates/DirectXMesh-build-uwp.yml b/.azuredevops/templates/DirectXMesh-build-uwp.yml index cd91d575..710aae3d 100644 --- a/.azuredevops/templates/DirectXMesh-build-uwp.yml +++ b/.azuredevops/templates/DirectXMesh-build-uwp.yml @@ -7,47 +7,47 @@ steps: - task: VSBuild@1 - displayName: Build solution DirectXMesh_Windows10_2022.sln 32dbg + displayName: Build solution DirectXMesh_Windows10_2022 32dbg inputs: - solution: DirectXMesh_Windows10_2022.sln + solution: DirectXMesh_Windows10_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Windows10_2022.sln 32rel + displayName: Build solution DirectXMesh_Windows10_2022 32rel inputs: - solution: DirectXMesh_Windows10_2022.sln + solution: DirectXMesh_Windows10_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXMesh_Windows10_2022.sln 64dbg + displayName: Build solution DirectXMesh_Windows10_2022 64dbg inputs: - solution: DirectXMesh_Windows10_2022.sln + solution: DirectXMesh_Windows10_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Windows10_2022.sln 64rel + displayName: Build solution DirectXMesh_Windows10_2022 64rel inputs: - solution: DirectXMesh_Windows10_2022.sln + solution: DirectXMesh_Windows10_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release # Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64 - task: VSBuild@1 - displayName: Build solution DirectXMesh_Windows10_2022.sln arm64dbg + displayName: Build solution DirectXMesh_Windows10_2022 arm64dbg timeoutInMinutes: 30 inputs: - solution: DirectXMesh_Windows10_2022.sln + solution: DirectXMesh_Windows10_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Windows10_2022.sln arm64rel + displayName: Build solution DirectXMesh_Windows10_2022 arm64rel timeoutInMinutes: 30 inputs: - solution: DirectXMesh_Windows10_2022.sln + solution: DirectXMesh_Windows10_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release diff --git a/.azuredevops/templates/DirectXMesh-build-win32.yml b/.azuredevops/templates/DirectXMesh-build-win32.yml index e20cce53..49962efb 100644 --- a/.azuredevops/templates/DirectXMesh-build-win32.yml +++ b/.azuredevops/templates/DirectXMesh-build-win32.yml @@ -7,72 +7,72 @@ steps: - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022.sln 32dbg + displayName: Build solution DirectXMesh_Desktop_2022 32dbg inputs: - solution: DirectXMesh_Desktop_2022.sln + solution: DirectXMesh_Desktop_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022.sln 32rel + displayName: Build solution DirectXMesh_Desktop_2022 32rel inputs: - solution: DirectXMesh_Desktop_2022.sln + solution: DirectXMesh_Desktop_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022.sln 64dbg + displayName: Build solution DirectXMesh_Desktop_2022 64dbg inputs: - solution: DirectXMesh_Desktop_2022.sln + solution: DirectXMesh_Desktop_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022.sln 64rel + displayName: Build solution DirectXMesh_Desktop_2022 64rel inputs: - solution: DirectXMesh_Desktop_2022.sln + solution: DirectXMesh_Desktop_2022.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 32dbg + displayName: Build solution DirectXMesh_Desktop_2022_Win10 32dbg inputs: - solution: DirectXMesh_Desktop_2022_Win10.sln + solution: DirectXMesh_Desktop_2022_Win10.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 32rel + displayName: Build solution DirectXMesh_Desktop_2022_Win10 32rel inputs: - solution: DirectXMesh_Desktop_2022_Win10.sln + solution: DirectXMesh_Desktop_2022_Win10.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 64dbg + displayName: Build solution DirectXMesh_Desktop_2022_Win10 64dbg inputs: - solution: DirectXMesh_Desktop_2022_Win10.sln + solution: DirectXMesh_Desktop_2022_Win10.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 64rel + displayName: Build solution DirectXMesh_Desktop_2022_Win10 64rel inputs: - solution: DirectXMesh_Desktop_2022_Win10.sln + solution: DirectXMesh_Desktop_2022_Win10.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln arm64dbg + displayName: Build solution DirectXMesh_Desktop_2022_Win10 arm64dbg inputs: - solution: DirectXMesh_Desktop_2022_Win10.sln + solution: DirectXMesh_Desktop_2022_Win10.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug - task: VSBuild@1 - displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln arm64rel + displayName: Build solution DirectXMesh_Desktop_2022_Win10 arm64rel inputs: - solution: DirectXMesh_Desktop_2022_Win10.sln + solution: DirectXMesh_Desktop_2022_Win10.slnx msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index cee2bec8..1496a5d2 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -40,7 +40,7 @@ jobs: platform: [x86, x64, ARM64] steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 @@ -52,19 +52,19 @@ jobs: working-directory: ${{ github.workspace }} run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} - DirectXMesh_Desktop_2022.sln + DirectXMesh_Desktop_2022.slnx - name: 'Build (Windows 10)' working-directory: ${{ github.workspace }} run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} - DirectXMesh_Desktop_2022_Win10.sln + DirectXMesh_Desktop_2022_Win10.slnx - name: 'Build (UWP)' working-directory: ${{ github.workspace }} run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} - DirectXMesh_Windows10_2022.sln + DirectXMesh_Windows10_2022.slnx - if: matrix.platform != 'ARM64' name: 'Build (Spectre)' @@ -72,7 +72,7 @@ jobs: run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} /p:SpectreMitigation=Spectre - DirectXMesh_Desktop_2022.sln + DirectXMesh_Desktop_2022.slnx - if: matrix.platform != 'ARM64' name: 'Build (Spectre Windows 10)' @@ -80,7 +80,7 @@ jobs: run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} /p:SpectreMitigation=Spectre - DirectXMesh_Desktop_2022_Win10.sln + DirectXMesh_Desktop_2022_Win10.slnx build2026: runs-on: windows-2025-vs2026 @@ -93,7 +93,7 @@ jobs: platform: [x86, x64, ARM64] steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 @@ -116,7 +116,7 @@ jobs: build_type: [Debug, Release] steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 @@ -127,10 +127,10 @@ jobs: working-directory: ${{ github.workspace }} run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64 - DirectXMesh_Desktop_2022_Win10.sln + DirectXMesh_Desktop_2022_Win10.slnx - name: 'Build (UWP)' working-directory: ${{ github.workspace }} run: > msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64 - DirectXMesh_Windows10_2022.sln + DirectXMesh_Windows10_2022.slnx diff --git a/DirectXMesh_Desktop_2022.sln b/DirectXMesh_Desktop_2022.sln deleted file mode 100644 index d3c9db3f..00000000 --- a/DirectXMesh_Desktop_2022.sln +++ /dev/null @@ -1,55 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 16.0.28621.142 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh", "DirectXMesh\DirectXMesh_Desktop_2022.vcxproj", "{6857F086-F6FE-4150-9ED7-7446F1C1C220}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshconvert", "Meshconvert\Meshconvert_Desktop_2022.vcxproj", "{6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D7B83B71-AA03-4455-8959-C90D06581953}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Debug|x64 = Debug|x64 - Profile|x86 = Profile|x86 - Profile|x64 = Profile|x64 - Release|x86 = Release|x86 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.ActiveCfg = Debug|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.Build.0 = Debug|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.ActiveCfg = Debug|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.Build.0 = Debug|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.ActiveCfg = Profile|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.Build.0 = Profile|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.ActiveCfg = Profile|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.Build.0 = Profile|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.ActiveCfg = Release|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.Build.0 = Release|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.ActiveCfg = Release|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.Build.0 = Release|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x86.ActiveCfg = Debug|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x86.Build.0 = Debug|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x64.ActiveCfg = Debug|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x64.Build.0 = Debug|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x86.ActiveCfg = Profile|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x86.Build.0 = Profile|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x64.ActiveCfg = Profile|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x64.Build.0 = Profile|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x86.ActiveCfg = Release|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x86.Build.0 = Release|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x64.ActiveCfg = Release|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {5C389688-21F3-4661-9802-2A73B2AD857F} - EndGlobalSection -EndGlobal diff --git a/DirectXMesh_Desktop_2022.slnx b/DirectXMesh_Desktop_2022.slnx new file mode 100644 index 00000000..960f2660 --- /dev/null +++ b/DirectXMesh_Desktop_2022.slnx @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/DirectXMesh_Desktop_2022_Win10.sln b/DirectXMesh_Desktop_2022_Win10.sln deleted file mode 100644 index 29d70fb1..00000000 --- a/DirectXMesh_Desktop_2022_Win10.sln +++ /dev/null @@ -1,70 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.33516.290 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh", "DirectXMesh\DirectXMesh_Desktop_2022_Win10.vcxproj", "{6857F086-F6FE-4150-9ED7-7446F1C1C220}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C688B690-29CD-47AA-BF43-EF1BA44BC5AC}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshconvert", "Meshconvert\Meshconvert_Desktop_2022_Win10.vcxproj", "{6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Profile|ARM64 = Profile|ARM64 - Profile|x64 = Profile|x64 - Profile|x86 = Profile|x86 - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|ARM64.Build.0 = Debug|ARM64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.ActiveCfg = Debug|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.Build.0 = Debug|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.ActiveCfg = Debug|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.Build.0 = Debug|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|ARM64.ActiveCfg = Profile|ARM64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|ARM64.Build.0 = Profile|ARM64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.ActiveCfg = Profile|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.Build.0 = Profile|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.ActiveCfg = Profile|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.Build.0 = Profile|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|ARM64.ActiveCfg = Release|ARM64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|ARM64.Build.0 = Release|ARM64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.ActiveCfg = Release|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.Build.0 = Release|x64 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.ActiveCfg = Release|Win32 - {6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.Build.0 = Release|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|ARM64.Build.0 = Debug|ARM64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x64.ActiveCfg = Debug|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x64.Build.0 = Debug|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x86.ActiveCfg = Debug|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Debug|x86.Build.0 = Debug|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|ARM64.ActiveCfg = Profile|ARM64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|ARM64.Build.0 = Profile|ARM64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x64.ActiveCfg = Profile|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x64.Build.0 = Profile|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x86.ActiveCfg = Profile|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Profile|x86.Build.0 = Profile|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|ARM64.ActiveCfg = Release|ARM64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|ARM64.Build.0 = Release|ARM64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x64.ActiveCfg = Release|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x64.Build.0 = Release|x64 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x86.ActiveCfg = Release|Win32 - {6D4CFD0E-8772-462A-9AC1-7DBAD9C16880}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D04D9571-DDE4-4F6F-A7E1-0EBB08CFC482} - EndGlobalSection -EndGlobal diff --git a/DirectXMesh_Desktop_2022_Win10.slnx b/DirectXMesh_Desktop_2022_Win10.slnx new file mode 100644 index 00000000..5f9381db --- /dev/null +++ b/DirectXMesh_Desktop_2022_Win10.slnx @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/DirectXMesh_Desktop_2026.slnx b/DirectXMesh_Desktop_2026.slnx index 6948dd31..8786a025 100644 --- a/DirectXMesh_Desktop_2026.slnx +++ b/DirectXMesh_Desktop_2026.slnx @@ -10,6 +10,6 @@ - - + + diff --git a/DirectXMesh_GDKX_2022.sln b/DirectXMesh_GDKX_2022.sln deleted file mode 100644 index 7799b9c3..00000000 --- a/DirectXMesh_GDKX_2022.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.14.36603.0 d17.14 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh_GDKX_2022", "DirectXMesh\DirectXMesh_GDKX_2022.vcxproj", "{2C69B4BD-1DE5-4E96-A674-13F186A5FE62}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Gaming.Xbox.Scarlett.x64 = Debug|Gaming.Xbox.Scarlett.x64 - Debug|Gaming.Xbox.XboxOne.x64 = Debug|Gaming.Xbox.XboxOne.x64 - Debug|x64 = Debug|x64 - Profile|Gaming.Xbox.Scarlett.x64 = Profile|Gaming.Xbox.Scarlett.x64 - Profile|Gaming.Xbox.XboxOne.x64 = Profile|Gaming.Xbox.XboxOne.x64 - Profile|x64 = Profile|x64 - Release|Gaming.Xbox.Scarlett.x64 = Release|Gaming.Xbox.Scarlett.x64 - Release|Gaming.Xbox.XboxOne.x64 = Release|Gaming.Xbox.XboxOne.x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Debug|Gaming.Xbox.Scarlett.x64.ActiveCfg = Debug|Gaming.Xbox.Scarlett.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Debug|Gaming.Xbox.Scarlett.x64.Build.0 = Debug|Gaming.Xbox.Scarlett.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Debug|Gaming.Xbox.XboxOne.x64.ActiveCfg = Debug|Gaming.Xbox.XboxOne.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Debug|Gaming.Xbox.XboxOne.x64.Build.0 = Debug|Gaming.Xbox.XboxOne.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Debug|x64.ActiveCfg = Debug|x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Debug|x64.Build.0 = Debug|x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Profile|Gaming.Xbox.Scarlett.x64.ActiveCfg = Profile|Gaming.Xbox.Scarlett.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Profile|Gaming.Xbox.Scarlett.x64.Build.0 = Profile|Gaming.Xbox.Scarlett.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Profile|Gaming.Xbox.XboxOne.x64.ActiveCfg = Profile|Gaming.Xbox.XboxOne.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Profile|Gaming.Xbox.XboxOne.x64.Build.0 = Profile|Gaming.Xbox.XboxOne.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Profile|x64.ActiveCfg = Profile|x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Profile|x64.Build.0 = Profile|x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Release|Gaming.Xbox.Scarlett.x64.ActiveCfg = Release|Gaming.Xbox.Scarlett.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Release|Gaming.Xbox.Scarlett.x64.Build.0 = Release|Gaming.Xbox.Scarlett.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Release|Gaming.Xbox.XboxOne.x64.ActiveCfg = Release|Gaming.Xbox.XboxOne.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Release|Gaming.Xbox.XboxOne.x64.Build.0 = Release|Gaming.Xbox.XboxOne.x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Release|x64.ActiveCfg = Release|x64 - {2C69B4BD-1DE5-4E96-A674-13F186A5FE62}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {771F4C0B-7F28-44AF-B07C-764F47F55C41} - EndGlobalSection -EndGlobal diff --git a/DirectXMesh_GDKX_2022.slnx b/DirectXMesh_GDKX_2022.slnx new file mode 100644 index 00000000..8f46fd9b --- /dev/null +++ b/DirectXMesh_GDKX_2022.slnx @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/DirectXMesh_GDK_2022.sln b/DirectXMesh_GDK_2022.sln deleted file mode 100644 index 2806175c..00000000 --- a/DirectXMesh_GDK_2022.sln +++ /dev/null @@ -1,51 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 16.0.30404.54 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh_GDK_2022", "DirectXMesh\DirectXMesh_GDK_2022.vcxproj", "{0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DBC86AB6-3D3C-4879-8DD7-3CFC505ABAC4}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Gaming.Desktop.x64 = Debug|Gaming.Desktop.x64 - Debug|Gaming.Xbox.Scarlett.x64 = Debug|Gaming.Xbox.Scarlett.x64 - Debug|Gaming.Xbox.XboxOne.x64 = Debug|Gaming.Xbox.XboxOne.x64 - Profile|Gaming.Desktop.x64 = Profile|Gaming.Desktop.x64 - Profile|Gaming.Xbox.Scarlett.x64 = Profile|Gaming.Xbox.Scarlett.x64 - Profile|Gaming.Xbox.XboxOne.x64 = Profile|Gaming.Xbox.XboxOne.x64 - Release|Gaming.Desktop.x64 = Release|Gaming.Desktop.x64 - Release|Gaming.Xbox.Scarlett.x64 = Release|Gaming.Xbox.Scarlett.x64 - Release|Gaming.Xbox.XboxOne.x64 = Release|Gaming.Xbox.XboxOne.x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Debug|Gaming.Xbox.Scarlett.x64.ActiveCfg = Debug|Gaming.Xbox.Scarlett.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Debug|Gaming.Xbox.Scarlett.x64.Build.0 = Debug|Gaming.Xbox.Scarlett.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Debug|Gaming.Xbox.XboxOne.x64.ActiveCfg = Debug|Gaming.Xbox.XboxOne.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Debug|Gaming.Xbox.XboxOne.x64.Build.0 = Debug|Gaming.Xbox.XboxOne.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Profile|Gaming.Desktop.x64.ActiveCfg = Profile|Gaming.Desktop.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Profile|Gaming.Desktop.x64.Build.0 = Profile|Gaming.Desktop.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Profile|Gaming.Xbox.Scarlett.x64.ActiveCfg = Profile|Gaming.Xbox.Scarlett.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Profile|Gaming.Xbox.Scarlett.x64.Build.0 = Profile|Gaming.Xbox.Scarlett.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Profile|Gaming.Xbox.XboxOne.x64.ActiveCfg = Profile|Gaming.Xbox.XboxOne.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Profile|Gaming.Xbox.XboxOne.x64.Build.0 = Profile|Gaming.Xbox.XboxOne.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Release|Gaming.Xbox.Scarlett.x64.ActiveCfg = Release|Gaming.Xbox.Scarlett.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Release|Gaming.Xbox.Scarlett.x64.Build.0 = Release|Gaming.Xbox.Scarlett.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Release|Gaming.Xbox.XboxOne.x64.ActiveCfg = Release|Gaming.Xbox.XboxOne.x64 - {0B019AFB-D02B-430A-9331-B2A9D6D9C0C3}.Release|Gaming.Xbox.XboxOne.x64.Build.0 = Release|Gaming.Xbox.XboxOne.x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7C261958-9DC2-41CC-A677-D8507C24FCDF} - EndGlobalSection -EndGlobal diff --git a/DirectXMesh_GDK_2022.slnx b/DirectXMesh_GDK_2022.slnx new file mode 100644 index 00000000..05f14436 --- /dev/null +++ b/DirectXMesh_GDK_2022.slnx @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/DirectXMesh_Windows10_2022.sln b/DirectXMesh_Windows10_2022.sln deleted file mode 100644 index 2627ed1c..00000000 --- a/DirectXMesh_Windows10_2022.sln +++ /dev/null @@ -1,41 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.7.34009.444 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh", "DirectXMesh\DirectXMesh_Windows10_2022.vcxproj", "{107A408E-C148-4594-B469-075FE0ADB7A5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2562D7DA-2CF1-432C-9CC8-DAF8C477CF14}" - 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 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Debug|ARM64.Build.0 = Debug|ARM64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Debug|x64.ActiveCfg = Debug|x64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Debug|x64.Build.0 = Debug|x64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Debug|x86.ActiveCfg = Debug|Win32 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Debug|x86.Build.0 = Debug|Win32 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Release|ARM64.ActiveCfg = Release|ARM64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Release|ARM64.Build.0 = Release|ARM64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Release|x64.ActiveCfg = Release|x64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Release|x64.Build.0 = Release|x64 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Release|x86.ActiveCfg = Release|Win32 - {107A408E-C148-4594-B469-075FE0ADB7A5}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {FDDF6E4C-931A-428D-B05C-23AE1228CFF6} - EndGlobalSection -EndGlobal diff --git a/DirectXMesh_Windows10_2022.slnx b/DirectXMesh_Windows10_2022.slnx new file mode 100644 index 00000000..4c664c46 --- /dev/null +++ b/DirectXMesh_Windows10_2022.slnx @@ -0,0 +1,11 @@ + + + + + + + + + + +