From 37cd9d4cb1717363822828addebeaf82f5786c59 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 15 Jul 2024 16:13:48 -0500 Subject: [PATCH 1/2] Copy artifacts to publishing directory (#20005) --- .../templates/job/source-build-build-tarball-pr.yml | 9 ++++++++- .../common/templates/job/source-build-build-tarball.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml index f5569e26b..5e2c804e7 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml @@ -216,7 +216,14 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/' + - task: CopyFiles@2 + inputs: + SourceFolder: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + TargetFolder: $(Build.ArtifactStagingDirectory)/publishing + displayName: Copy artifacts to Artifact Staging Directory + condition: succeededOrFailed() + + - publish: $(Build.ArtifactStagingDirectory)/publishing artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts condition: succeededOrFailed() diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index f13e9193b..b63317425 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -218,10 +218,17 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) + - task: CopyFiles@2 + inputs: + SourceFolder: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + TargetFolder: $(Build.ArtifactStagingDirectory)/publishing + displayName: Copy artifacts to Artifact Staging Directory + condition: succeededOrFailed() + - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Artifacts inputs: - targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/ + targetPath: $(Build.ArtifactStagingDirectory)/publishing artifactName: $(Agent.JobName)_Artifacts continueOnError: true condition: succeededOrFailed() From e5fb1ef5fb15fcf86790e1cec4049ae262ab75b5 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 15 Jul 2024 14:39:34 -0700 Subject: [PATCH 2/2] Add support for targeting Windows version 26100 and update Windows SDK projection versions --- eng/ManualVersions.props | 13 +++++++------ src/redist/targets/GenerateBundledVersions.targets | 1 + test/EndToEnd/GivenWindowsApp.cs | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57a4b6415..8ea5be208 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.31 - 10.0.18362.31 - 10.0.19041.31 - 10.0.20348.31 - 10.0.22000.31 - 10.0.22621.31 + 10.0.17763.34 + 10.0.18362.34 + 10.0.19041.34 + 10.0.20348.34 + 10.0.22000.34 + 10.0.22621.34 + 10.0.26100.34 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index db2c5feb2..6eb27f874 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -674,6 +674,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index 59f28eee8..96595fe27 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -19,6 +19,7 @@ namespace EndToEnd [InlineData("10.0.20348.0")] [InlineData("10.0.22000.0")] [InlineData("10.0.22621.0")] + [InlineData("10.0.26100.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt")