From aa7ae9936609b329744f9becc2c6580199b78259 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 21 Oct 2025 16:12:57 -0700 Subject: [PATCH 1/2] Add October 2025 GDK new layout x64+Xbox projects --- .../pipelines/DirectXMesh-GitHub-Dev17.yml | 12 + .../DirectXMesh-GitHub-GDK-Dev17.yml | 73 ++- .../pipelines/DirectXMesh-GitHub-GDK.yml | 6 + .../DirectXMesh-GitHub-Test-Dev17.yml | 6 + .../pipelines/DirectXMesh-GitHub-Test.yml | 6 + .azuredevops/pipelines/DirectXMesh-GitHub.yml | 6 + .../templates/DirectXMesh-build-gdkx.yml | 72 +++ DirectXMesh/DirectXMesh_GDKX_2022.vcxproj | 516 ++++++++++++++++++ .../DirectXMesh_GDKX_2022.vcxproj.filters | 80 +++ DirectXMesh_GDKX_2022.sln | 46 ++ build/LogInfo.targets | 15 + 11 files changed, 837 insertions(+), 1 deletion(-) create mode 100644 .azuredevops/templates/DirectXMesh-build-gdkx.yml create mode 100644 DirectXMesh/DirectXMesh_GDKX_2022.vcxproj create mode 100644 DirectXMesh/DirectXMesh_GDKX_2022.vcxproj.filters create mode 100644 DirectXMesh_GDKX_2022.sln create mode 100644 build/LogInfo.targets diff --git a/.azuredevops/pipelines/DirectXMesh-GitHub-Dev17.yml b/.azuredevops/pipelines/DirectXMesh-GitHub-Dev17.yml index 9cc62bfe..85afda36 100644 --- a/.azuredevops/pipelines/DirectXMesh-GitHub-Dev17.yml +++ b/.azuredevops/pipelines/DirectXMesh-GitHub-Dev17.yml @@ -96,6 +96,12 @@ jobs: - checkout: self clean: true fetchTags: false + - task: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + platform: '$(BuildPlatform)' + configuration: '$(BuildConfiguration)' - task: VSBuild@1 displayName: Build solution DirectXMesh_Desktop_2022.sln inputs: @@ -143,6 +149,12 @@ jobs: - checkout: self clean: true fetchTags: false + - task: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + platform: '$(BuildPlatform)' + configuration: '$(BuildConfiguration)' - task: VSBuild@1 displayName: Build solution DirectXMesh_Windows10_2022.sln inputs: diff --git a/.azuredevops/pipelines/DirectXMesh-GitHub-GDK-Dev17.yml b/.azuredevops/pipelines/DirectXMesh-GitHub-GDK-Dev17.yml index 38fa06ae..c411410a 100644 --- a/.azuredevops/pipelines/DirectXMesh-GitHub-GDK-Dev17.yml +++ b/.azuredevops/pipelines/DirectXMesh-GitHub-GDK-Dev17.yml @@ -57,7 +57,7 @@ variables: jobs: - job: BUILD_GDK - displayName: 'Microsoft Game Development Kit (GDK)' + displayName: 'Microsoft Game Development Kit (GDK Gaming.Desktop.x64)' timeoutInMinutes: 120 cancelTimeoutInMinutes: 1 steps: @@ -110,11 +110,82 @@ jobs: solution: build/SetupBWOI.targets msbuildArchitecture: x64 msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) + - task: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + msbuildArchitecture: x64 + msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) - template: '/.azuredevops/templates/DirectXMesh-build-gdk.yml' parameters: msVersion: '17.0' vsYear: 2022 + - job: BUILD_GDKX + displayName: 'Microsoft Game Development Kit (GDK x64)' + timeoutInMinutes: 120 + cancelTimeoutInMinutes: 1 + steps: + - checkout: self + clean: true + fetchTags: false + - 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: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + msbuildArchitecture: x64 + msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) + - template: '/.azuredevops/templates/DirectXMesh-build-gdkx.yml' + parameters: + msVersion: '17.0' + vsYear: 2022 + - job: BUILD_GDK_CMAKE_SCAR displayName: 'Microsoft Game Development Kit (GDK) using CMake (Scarlett)' timeoutInMinutes: 120 diff --git a/.azuredevops/pipelines/DirectXMesh-GitHub-GDK.yml b/.azuredevops/pipelines/DirectXMesh-GitHub-GDK.yml index 66c73836..4d41bfc6 100644 --- a/.azuredevops/pipelines/DirectXMesh-GitHub-GDK.yml +++ b/.azuredevops/pipelines/DirectXMesh-GitHub-GDK.yml @@ -128,6 +128,12 @@ jobs: solution: build/SetupBWOI.targets msbuildArchitecture: x64 msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) + - task: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + msbuildArchitecture: x64 + msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) - template: '/.azuredevops/templates/DirectXMesh-build-gdk.yml' parameters: msVersion: '17.0' diff --git a/.azuredevops/pipelines/DirectXMesh-GitHub-Test-Dev17.yml b/.azuredevops/pipelines/DirectXMesh-GitHub-Test-Dev17.yml index 25c73109..e31e66cc 100644 --- a/.azuredevops/pipelines/DirectXMesh-GitHub-Test-Dev17.yml +++ b/.azuredevops/pipelines/DirectXMesh-GitHub-Test-Dev17.yml @@ -80,6 +80,12 @@ jobs: fetchTags: false fetchDepth: 1 path: 's/Tests' + - task: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + platform: '$(BuildPlatform)' + configuration: '$(BuildConfiguration)' - task: VSBuild@1 displayName: Build solution DirectXMesh_Tests_Desktop_2022.sln inputs: diff --git a/.azuredevops/pipelines/DirectXMesh-GitHub-Test.yml b/.azuredevops/pipelines/DirectXMesh-GitHub-Test.yml index c855ce2f..e8a16d4a 100644 --- a/.azuredevops/pipelines/DirectXMesh-GitHub-Test.yml +++ b/.azuredevops/pipelines/DirectXMesh-GitHub-Test.yml @@ -73,6 +73,12 @@ jobs: fetchTags: false fetchDepth: 1 path: 's/Tests' + - task: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + platform: '$(BuildPlatform)' + configuration: '$(BuildConfiguration)' - task: VSBuild@1 displayName: Build solution DirectXMesh_Tests_Desktop_2019.sln inputs: diff --git a/.azuredevops/pipelines/DirectXMesh-GitHub.yml b/.azuredevops/pipelines/DirectXMesh-GitHub.yml index 7d376b2e..933a06a2 100644 --- a/.azuredevops/pipelines/DirectXMesh-GitHub.yml +++ b/.azuredevops/pipelines/DirectXMesh-GitHub.yml @@ -65,6 +65,12 @@ jobs: - checkout: self clean: true fetchTags: false + - task: MSBuild@1 + displayName: Log Information + inputs: + solution: build/LogInfo.targets + platform: '$(BuildPlatform)' + configuration: '$(BuildConfiguration)' - task: VSBuild@1 displayName: Build solution DirectXMesh_Desktop_2019.sln inputs: diff --git a/.azuredevops/templates/DirectXMesh-build-gdkx.yml b/.azuredevops/templates/DirectXMesh-build-gdkx.yml new file mode 100644 index 00000000..17581f29 --- /dev/null +++ b/.azuredevops/templates/DirectXMesh-build-gdkx.yml @@ -0,0 +1,72 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# +# http://go.microsoft.com/fwlink/?LinkId=248926 + +# Template used by GitHub-GDK-* pipelines + +parameters: + - name: msVersion + type: string + values: + - '17.0' + - name: vsYear + type: number + values: + - 2022 + +steps: + - task: VSBuild@1 + displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} pcdbg + inputs: + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + vsVersion: ${{ parameters.msVersion }} + platform: x64 + configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + - task: VSBuild@1 + displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} pcrel + inputs: + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + vsVersion: ${{ parameters.msVersion }} + platform: x64 + configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + - task: VSBuild@1 + displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} xbdbg + inputs: + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + vsVersion: ${{ parameters.msVersion }} + platform: Gaming.Xbox.XboxOne.x64 + configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + - task: VSBuild@1 + displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} xbrel + inputs: + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + vsVersion: ${{ parameters.msVersion }} + platform: Gaming.Xbox.XboxOne.x64 + configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + - task: VSBuild@1 + displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} scardbg + inputs: + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + vsVersion: ${{ parameters.msVersion }} + platform: Gaming.Xbox.Scarlett.x64 + configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + - task: VSBuild@1 + displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} scarrel + inputs: + solution: DirectXMesh_GDKX_${{ parameters.vsYear }}.sln + vsVersion: ${{ parameters.msVersion }} + platform: Gaming.Xbox.Scarlett.x64 + configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) diff --git a/DirectXMesh/DirectXMesh_GDKX_2022.vcxproj b/DirectXMesh/DirectXMesh_GDKX_2022.vcxproj new file mode 100644 index 00000000..1d06b4a3 --- /dev/null +++ b/DirectXMesh/DirectXMesh_GDKX_2022.vcxproj @@ -0,0 +1,516 @@ + + + + + Debug + Gaming.Xbox.Scarlett.x64 + + + Debug + x64 + + + Profile + Gaming.Xbox.Scarlett.x64 + + + Profile + x64 + + + Release + Gaming.Xbox.Scarlett.x64 + + + Release + Gaming.Xbox.XboxOne.x64 + + + Profile + Gaming.Xbox.XboxOne.x64 + + + Debug + Gaming.Xbox.XboxOne.x64 + + + Release + x64 + + + + DirectXMesh + {2C69B4BD-1DE5-4E96-A674-13F186A5FE62} + en-US + Win32Proj + + 15.0 + Native + x64 + + + + + $(GRDKLatest) + $(GameDKCoreLatest) + $(GameDKXboxLatest) + true + false + + + $(GDKCrossPlatformPath)windows\include + $(GDKCrossPlatformPath)windows\lib\x64 + + + $(GDKPCEditionPath)GameKit\Include + $(GDKPCEditionPath)GameKit\lib\amd64 + + + StaticLibrary + v143 + false + Unicode + false + false + + + StaticLibrary + v143 + false + Unicode + + + StaticLibrary + v143 + false + Unicode + + + StaticLibrary + v143 + false + Unicode + false + false + + + StaticLibrary + v143 + false + Unicode + + + StaticLibrary + v143 + false + Unicode + + + StaticLibrary + v143 + true + Unicode + false + false + + + StaticLibrary + v143 + true + Unicode + + + StaticLibrary + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) + $(Console_SdkLibPath) + $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) + $(Console_SdkIncludeRoot) + $(Console_SdkRoot)bin;$(Console_SdkToolPath);$(ExecutablePath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(GameDK)bin;$(ExecutablePath) + $(GDKWindowsIncludePath);$(IncludePath); + $(GDKWindowsLibPath);$(LibraryPath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(Console_SdkLibPath);$(LibraryPath) + $(Console_SdkIncludeRoot);$(IncludePath) + $(Console_SdkRoot)bin;$(Console_SdkToolPath);$(ExecutablePath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) + $(Console_SdkLibPath) + $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) + $(Console_SdkIncludeRoot) + $(Console_SdkRoot)bin;$(Console_SdkToolPath);$(ExecutablePath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(GameDK)bin;$(ExecutablePath) + $(GDKWindowsIncludePath);$(IncludePath); + $(GDKWindowsLibPath);$(LibraryPath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(Console_SdkLibPath);$(LibraryPath) + $(Console_SdkIncludeRoot);$(IncludePath) + $(Console_SdkRoot)bin;$(Console_SdkToolPath);$(ExecutablePath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) + $(Console_SdkLibPath) + $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) + $(Console_SdkIncludeRoot) + $(Console_SdkRoot)bin;$(Console_SdkToolPath);$(ExecutablePath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(GameDK)bin;$(ExecutablePath) + $(GDKWindowsIncludePath);$(IncludePath); + $(GDKWindowsLibPath);$(LibraryPath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + $(Console_SdkLibPath);$(LibraryPath) + $(Console_SdkIncludeRoot);$(IncludePath) + $(Console_SdkRoot)bin;$(Console_SdkToolPath);$(ExecutablePath) + false + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + Bin\GDKX_2022\$(Platform)\$(Configuration)\ + DirectXMesh + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + true + Windows + true + true + + + Use + DirectXMeshP.h + MaxSpeed + NDEBUG;_LIB;%(PreprocessorDefinitions) + EnableAllWarnings + true + true + true + Level4 + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + true + Windows + true + true + + + Use + DirectXMeshP.h + MaxSpeed + _WIN32_WINNT=0x0A00;NDEBUG;_GAMING_DESKTOP;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WIN32;_WINDOWS;_LIB;%(PreprocessorDefinitions) + EnableAllWarnings + true + true + true + Level4 + true + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + true + Windows + true + true + + + Use + DirectXMeshP.h + MaxSpeed + NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) + EnableAllWarnings + true + true + true + Level4 + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + true + Windows + true + true + + + Use + DirectXMeshP.h + MaxSpeed + NDEBUG;_LIB;PROFILE;%(PreprocessorDefinitions) + EnableAllWarnings + true + true + true + Level4 + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + true + Windows + true + true + + + Use + DirectXMeshP.h + MaxSpeed + _WIN32_WINNT=0x0A00;PROFILE;NDEBUG;_GAMING_DESKTOP;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WIN32;_WINDOWS;_LIB;%(PreprocessorDefinitions) + EnableAllWarnings + true + true + true + Level4 + true + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + true + Windows + true + true + + + Use + DirectXMeshP.h + MaxSpeed + NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions) + EnableAllWarnings + true + true + true + Level4 + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + Windows + true + + + DirectXMeshP.h + Use + false + EnableAllWarnings + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + Level4 + ProgramDatabase + false + /Zc:__cplusplus %(AdditionalOptions) + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + Windows + true + + + DirectXMeshP.h + Use + false + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_DEBUG;_GAMING_DESKTOP;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WIN32;_WINDOWS;_LIB;%(PreprocessorDefinitions) + true + Level4 + ProgramDatabase + false + /Zc:__cplusplus %(AdditionalOptions) + + + 6.0 + + + + + $(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + Windows + true + + + DirectXMeshP.h + Use + false + EnableAllWarnings + Disabled + _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) + true + Level4 + ProgramDatabase + false + /Zc:__cplusplus %(AdditionalOptions) + + + 6.0 + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + DirectXMeshP.h + + + + + + + + + + + + + + + + + + + + + + + + + + This project requires the Microsoft GDK with Xbox Extensions 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}. + + + + \ No newline at end of file diff --git a/DirectXMesh/DirectXMesh_GDKX_2022.vcxproj.filters b/DirectXMesh/DirectXMesh_GDKX_2022.vcxproj.filters new file mode 100644 index 00000000..6b595130 --- /dev/null +++ b/DirectXMesh/DirectXMesh_GDKX_2022.vcxproj.filters @@ -0,0 +1,80 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Header Files + + + Source Files + + + Header 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 + + + \ No newline at end of file diff --git a/DirectXMesh_GDKX_2022.sln b/DirectXMesh_GDKX_2022.sln new file mode 100644 index 00000000..7799b9c3 --- /dev/null +++ b/DirectXMesh_GDKX_2022.sln @@ -0,0 +1,46 @@ + +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/build/LogInfo.targets b/build/LogInfo.targets new file mode 100644 index 00000000..80e73a70 --- /dev/null +++ b/build/LogInfo.targets @@ -0,0 +1,15 @@ + + + + + + + + + + + + From 152893874852f8dce2b4c26ab0d2f84f70bc351c Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 21 Oct 2025 16:38:13 -0700 Subject: [PATCH 2/2] Code review feedabck --- .azuredevops/templates/DirectXMesh-build-gdkx.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.azuredevops/templates/DirectXMesh-build-gdkx.yml b/.azuredevops/templates/DirectXMesh-build-gdkx.yml index 17581f29..9ae66c17 100644 --- a/.azuredevops/templates/DirectXMesh-build-gdkx.yml +++ b/.azuredevops/templates/DirectXMesh-build-gdkx.yml @@ -24,7 +24,7 @@ steps: platform: x64 configuration: Debug msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} pcrel inputs: @@ -33,7 +33,7 @@ steps: platform: x64 configuration: Release msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} xbdbg inputs: @@ -42,7 +42,7 @@ steps: platform: Gaming.Xbox.XboxOne.x64 configuration: Debug msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} xbrel inputs: @@ -51,7 +51,7 @@ steps: platform: Gaming.Xbox.XboxOne.x64 configuration: Release msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} scardbg inputs: @@ -60,7 +60,7 @@ steps: platform: Gaming.Xbox.Scarlett.x64 configuration: Debug msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXMesh_GDKX_${{ parameters.vsYear }} scarrel inputs: @@ -69,4 +69,4 @@ steps: platform: Gaming.Xbox.Scarlett.x64 configuration: Release msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDKX_EDITION) + msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)