From aad06fd8a52d5c0e00f0f3bcf337d87a6bcf3f16 Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Wed, 4 Feb 2026 03:06:49 +0530 Subject: [PATCH 1/9] Reverting D3D Compiler Pinning --- .gitignore | 1 + eng/WpfArcadeSdk/Sdk/Sdk.props | 2 +- global.json | 1 - .../redist/D3DCompiler/D3DCompiler.vcxproj | 4 +--- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 732ceba80ea..3ec2ad51396 100644 --- a/.gitignore +++ b/.gitignore @@ -331,6 +331,7 @@ ASALocalRun/ /.dotnet /.packages /.tools/vswhere/2.5.2 +/.tools/vswhere/3.1.7 /.tools/native/iltools ### OSX ### diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index 6d00a6ab758..d9dc232e889 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -17,7 +17,7 @@ preview 12 true - true + true - - $(RepositoryToolsDir)native\bin\windows-sdk-d3d-redist\1.0.0\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll + $(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll 16.0 From 1c20f9a17ca5438af0cfd0be7789dd57229fd7d4 Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Wed, 4 Feb 2026 03:12:39 +0530 Subject: [PATCH 2/9] Updating Windows SDK version --- eng/WpfArcadeSdk/tools/Wpf.Cpp.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props index e489910eaaf..70c6ebbb91a 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props @@ -6,8 +6,8 @@ v143 - - 10.0.19041.0 + + 10.0.26100.0 DynamicLibrary From cc5c23584ad8515dfc3c95b0d45e35d18aef5021 Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Thu, 5 Feb 2026 02:32:49 +0530 Subject: [PATCH 3/9] Fixing global.json formatting issue --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 0cc78bb461f..0b14a078ebc 100644 --- a/global.json +++ b/global.json @@ -20,6 +20,6 @@ }, "native-tools": { "strawberry-perl": "5.38.0.1", - "net-framework-48-ref-assemblies": "0.0.0.1", + "net-framework-48-ref-assemblies": "0.0.0.1" } } From 57b7a2eeea6ac6de1be26a6aa275e31febef78a2 Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Thu, 5 Feb 2026 12:07:42 +0530 Subject: [PATCH 4/9] Temp modification to explicitly updload artifacts --- eng/pipeline-pr.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eng/pipeline-pr.yml b/eng/pipeline-pr.yml index 1da03c1a538..42e2c1f8b42 100644 --- a/eng/pipeline-pr.yml +++ b/eng/pipeline-pr.yml @@ -188,6 +188,13 @@ jobs: displayName: Run xUnit Tests condition: and(or(ne(variables['_HelixPipeline'], 'true'), and(eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))), ne(variables['_Platform'], 'arm64')) + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Artifact Packages + inputs: + targetPath: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)' + artifactName: 'Packages' + condition: succeeded() + - task: PublishTestResults@2 displayName: Publish XUnit Test Results inputs: From d71d73efbe67d7ec6e08e502c1d514fab95db2ca Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Thu, 5 Feb 2026 12:37:40 +0530 Subject: [PATCH 5/9] Modified pipeline --- eng/pipeline-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipeline-pr.yml b/eng/pipeline-pr.yml index 42e2c1f8b42..4b04e29b786 100644 --- a/eng/pipeline-pr.yml +++ b/eng/pipeline-pr.yml @@ -188,7 +188,7 @@ jobs: displayName: Run xUnit Tests condition: and(or(ne(variables['_HelixPipeline'], 'true'), and(eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))), ne(variables['_Platform'], 'arm64')) - - task: 1ES.PublishPipelineArtifact@1 + - task: PublishPipelineArtifact@1 displayName: Publish Artifact Packages inputs: targetPath: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)' From b8bfcca436ec6011c4d6aebf92735a104aa0bfde Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Thu, 5 Feb 2026 12:58:03 +0530 Subject: [PATCH 6/9] Modifying pipeline --- eng/pipeline-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipeline-pr.yml b/eng/pipeline-pr.yml index 4b04e29b786..00261d90d05 100644 --- a/eng/pipeline-pr.yml +++ b/eng/pipeline-pr.yml @@ -193,7 +193,7 @@ jobs: inputs: targetPath: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)' artifactName: 'Packages' - condition: succeeded() + condition: and(eq(variables['_BuildConfig'], 'Release'), eq(variables['_Platform'], 'x64')) - task: PublishTestResults@2 displayName: Publish XUnit Test Results From 2d69205e0e9350712b7e6fda5670cc2e535e1002 Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Fri, 6 Feb 2026 15:22:43 +0530 Subject: [PATCH 7/9] Modifying pipeline --- eng/pipeline-pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipeline-pr.yml b/eng/pipeline-pr.yml index 00261d90d05..f900f02fe89 100644 --- a/eng/pipeline-pr.yml +++ b/eng/pipeline-pr.yml @@ -191,9 +191,9 @@ jobs: - task: PublishPipelineArtifact@1 displayName: Publish Artifact Packages inputs: - targetPath: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)' - artifactName: 'Packages' - condition: and(eq(variables['_BuildConfig'], 'Release'), eq(variables['_Platform'], 'x64')) + targetPath: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\NonShipping' + artifactName: 'Packages\$(_BuildConfig)' + condition: and(eq(variables['_BuildConfig'], 'Release'), ne(variables['_Platform'], 'arm64')) - task: PublishTestResults@2 displayName: Publish XUnit Test Results From ac38437cfdc49cd7077a586e2f98180a8c88e7be Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Fri, 6 Feb 2026 15:59:41 +0530 Subject: [PATCH 8/9] Modifying pipeline --- eng/pipeline-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipeline-pr.yml b/eng/pipeline-pr.yml index f900f02fe89..c3380061284 100644 --- a/eng/pipeline-pr.yml +++ b/eng/pipeline-pr.yml @@ -192,8 +192,8 @@ jobs: displayName: Publish Artifact Packages inputs: targetPath: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\NonShipping' - artifactName: 'Packages\$(_BuildConfig)' - condition: and(eq(variables['_BuildConfig'], 'Release'), ne(variables['_Platform'], 'arm64')) + artifactName: 'Packages' + condition: and(eq(variables['_BuildConfig'], 'Release'), eq(variables['_Platform'], 'x86')) - task: PublishTestResults@2 displayName: Publish XUnit Test Results From fdae93cbf52be4f0f8c977734321aa30a6eb4912 Mon Sep 17 00:00:00 2001 From: Dipesh Kumar Date: Sat, 7 Feb 2026 00:59:45 +0530 Subject: [PATCH 9/9] Reverting pipeline changes --- eng/pipeline-pr.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/eng/pipeline-pr.yml b/eng/pipeline-pr.yml index c3380061284..1da03c1a538 100644 --- a/eng/pipeline-pr.yml +++ b/eng/pipeline-pr.yml @@ -188,13 +188,6 @@ jobs: displayName: Run xUnit Tests condition: and(or(ne(variables['_HelixPipeline'], 'true'), and(eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))), ne(variables['_Platform'], 'arm64')) - - task: PublishPipelineArtifact@1 - displayName: Publish Artifact Packages - inputs: - targetPath: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\NonShipping' - artifactName: 'Packages' - condition: and(eq(variables['_BuildConfig'], 'Release'), eq(variables['_Platform'], 'x86')) - - task: PublishTestResults@2 displayName: Publish XUnit Test Results inputs: