Skip to content

Re-enabling disabled VSBuild steps #776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dipeshmsft merged 4 commits into from
May 14, 2026
+77 −44
Merged

Re-enabling disabled VSBuild steps #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e074a4
Re-enabling disabled VSBuild steps
dipeshmsft May 14, 2026
12f3ec7
Updating images used
dipeshmsft May 14, 2026
3925a11
Fixing issues in WPF Samples msbuild solution
dipeshmsft May 14, 2026
86d5961
Fixing build issues in AitEncoder.cpp
dipeshmsft May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Graphics/AITCodec/cpp/aitencoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ static HRESULT EndBlock(IStream *stream)
// Remember where we are
ULARGE_INTEGER curPos = { 0 };

LARGE_INTEGER zero = { 0 };
result = stream->Seek(zero, STREAM_SEEK_CUR, &curPos);
if (FAILED(result))
{
Expand Down
34 changes: 34 additions & 0 deletions WPFSamples.msbuild.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,106 +41,140 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|ARM64.Build.0 = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|x64.ActiveCfg = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|x64.Build.0 = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|x86.ActiveCfg = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Debug|x86.Build.0 = Debug|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|Any CPU.Build.0 = Release|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|ARM64.ActiveCfg = Release|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|ARM64.Build.0 = Release|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|x64.ActiveCfg = Release|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|x64.Build.0 = Release|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|x86.ActiveCfg = Release|Any CPU
{75E45E90-2C6F-4512-A551-C255303C436F}.Release|x86.Build.0 = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|ARM64.Build.0 = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|x64.ActiveCfg = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|x64.Build.0 = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|x86.ActiveCfg = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Debug|x86.Build.0 = Debug|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|Any CPU.Build.0 = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|ARM64.ActiveCfg = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|ARM64.Build.0 = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|x64.ActiveCfg = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|x64.Build.0 = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|x86.ActiveCfg = Release|Any CPU
{6E8CC9C4-566C-43F1-8353-80D1FBFB483C}.Release|x86.Build.0 = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|ARM64.Build.0 = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|x64.ActiveCfg = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|x64.Build.0 = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|x86.ActiveCfg = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Debug|x86.Build.0 = Debug|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|Any CPU.Build.0 = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|ARM64.ActiveCfg = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|ARM64.Build.0 = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|x64.ActiveCfg = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|x64.Build.0 = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|x86.ActiveCfg = Release|Any CPU
{B105D741-5DA2-4857-B603-932EC96A9A94}.Release|x86.Build.0 = Release|Any CPU
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Debug|Any CPU.ActiveCfg = Debug|Win32
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Debug|x64.ActiveCfg = Debug|x64
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Debug|x86.ActiveCfg = Debug|Win32
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Release|Any CPU.ActiveCfg = Release|Win32
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Release|ARM64.ActiveCfg = Release|ARM64
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Release|x64.ActiveCfg = Release|x64
{138FAB00-1FAE-4A24-8F47-6D7CE86BF82F}.Release|x86.ActiveCfg = Release|Win32
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|ARM64.Build.0 = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|x64.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|x64.Build.0 = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|x86.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Debug|x86.Build.0 = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|Any CPU.Build.0 = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|ARM64.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|ARM64.Build.0 = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|x64.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|x64.Build.0 = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|x86.ActiveCfg = Debug|Any CPU
{7289753F-C0EF-4C91-82DA-D53F75222152}.Release|x86.Build.0 = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|ARM64.Build.0 = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|x64.ActiveCfg = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|x64.Build.0 = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|x86.ActiveCfg = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Debug|x86.Build.0 = Debug|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|Any CPU.Build.0 = Release|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|ARM64.ActiveCfg = Release|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|ARM64.Build.0 = Release|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|x64.ActiveCfg = Release|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|x64.Build.0 = Release|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|x86.ActiveCfg = Release|Any CPU
{27E26A5C-1333-44FF-81DC-DD4DB0BFC313}.Release|x86.Build.0 = Release|Any CPU
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Debug|Any CPU.ActiveCfg = Debug|Win32
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Debug|x64.ActiveCfg = Debug|x64
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Debug|x86.ActiveCfg = Debug|Win32
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Release|Any CPU.ActiveCfg = Release|Win32
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Release|ARM64.ActiveCfg = Release|ARM64
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Release|x64.ActiveCfg = Release|x64
{8E4A7F4E-64A9-4313-AAD8-C0E888223A32}.Release|x86.ActiveCfg = Release|Win32
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|ARM64.Build.0 = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|x64.ActiveCfg = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|x64.Build.0 = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|x86.ActiveCfg = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Debug|x86.Build.0 = Debug|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|Any CPU.Build.0 = Release|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|ARM64.ActiveCfg = Release|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|ARM64.Build.0 = Release|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|x64.ActiveCfg = Release|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|x64.Build.0 = Release|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|x86.ActiveCfg = Release|Any CPU
{73B41952-C297-4064-AAF9-99E564B13EAF}.Release|x86.Build.0 = Release|Any CPU
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|Any CPU.ActiveCfg = Debug|Win32
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|Any CPU.Build.0 = Debug|Win32
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|ARM64.ActiveCfg = Debug|ARM64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|ARM64.Build.0 = Debug|ARM64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|x64.ActiveCfg = Debug|x64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|x64.Build.0 = Debug|x64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|x86.ActiveCfg = Debug|ARM64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Debug|x86.Build.0 = Debug|ARM64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|Any CPU.ActiveCfg = Release|Win32
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|Any CPU.Build.0 = Release|Win32
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|ARM64.ActiveCfg = Release|ARM64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|ARM64.Build.0 = Release|ARM64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|x64.ActiveCfg = Release|x64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|x64.Build.0 = Release|x64
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|x86.ActiveCfg = Release|Win32
{1D6ED2DF-D22A-4660-8197-A4D05B051CE6}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
Expand Down
86 changes: 42 additions & 44 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ trigger:
- release/*

pool:
vmImage: 'windows-latest'
vmImage: 'windows-2025-vs2026'

stages:
- stage: Build
displayName: Build
jobs:
- job: Windows
pool:
vmImage: 'windows-latest'
vmImage: 'windows-2025-vs2026'
variables:
- name: _Configuration
value: Debug
Expand Down Expand Up @@ -98,49 +98,47 @@ stages:
inputs:
restoreSolution: '$(wpfgallerysolution)'

# Temporarily disabling VSBuild steps for .NET Core projects because the images are not updated to use VS2026.
# - task: VSBuild@1
# continueOnError: true
# displayName: 'Build .NET Core Samples using VSBuild'
# inputs:
# vsVersion: latest
# solution: '$(solution)'
# platform: '$(_Platform)'
# msbuildArchitecture: '$(_ToolPlatform)'
# configuration: '$(_Configuration)'
# msbuildArgs: /m /bl:"$(Build.ArtifactStagingDirectory)\vsbuild\vsbuild.$(_Configuration).$(_Platform).$(_TargetFramework).binlog" /p:LangVersion=$(LangVersion)

# - task: VSBuild@1
# continueOnError: true
# displayName: 'Build MSBuild-only.NET Core Samples using VSBuild'
# inputs:
# vsVersion: latest
# solution: '$(msbuildonlysolution)'
# platform: '$(_Platform)'
# msbuildArchitecture: '$(_ToolPlatform)'
# configuration: '$(_Configuration)'
# msbuildArgs: /m /bl:"$(Build.ArtifactStagingDirectory)\vsbuild\msbuild.vsbuild.$(_Configuration).$(_Platform).$(_TargetFramework).binlog" /p:LangVersion=$(LangVersion)

# Temporarily disabling VSBuild steps for .NET Core projects because the images are not updated to use VS2026.
# - task: VSBuild@1
# continueOnError: true
# displayName: 'Build WPF Gallery using VSBuild'
# inputs:
# vsVersion: latest
# solution: '$(wpfgallerysolution)'
# platform: '$(_Platform)'
# msbuildArchitecture: '$(_ToolPlatform)'
# configuration: '$(_Configuration)'
# msbuildArgs: /m /bl:"$(Build.ArtifactStagingDirectory)\vsbuild\wpfgallery.vsbuild.$(_Configuration).$(_Platform).$(_TargetFramework).binlog" /p:LangVersion=$(LangVersion)
# condition: ne(variables['_Platform'], 'x86')
- task: VSBuild@1
continueOnError: true
displayName: 'Build .NET Core Samples using VSBuild'
inputs:
vsVersion: latest
solution: '$(solution)'
platform: '$(_Platform)'
msbuildArchitecture: '$(_ToolPlatform)'
configuration: '$(_Configuration)'
msbuildArgs: /m /bl:"$(Build.ArtifactStagingDirectory)\vsbuild\vsbuild.$(_Configuration).$(_Platform).$(_TargetFramework).binlog" /p:LangVersion=$(LangVersion)

- task: VSBuild@1
continueOnError: true
displayName: 'Build MSBuild-only.NET Core Samples using VSBuild'
inputs:
vsVersion: latest
solution: '$(msbuildonlysolution)'
platform: '$(_Platform)'
msbuildArchitecture: '$(_ToolPlatform)'
configuration: '$(_Configuration)'
msbuildArgs: /m /bl:"$(Build.ArtifactStagingDirectory)\vsbuild\msbuild.vsbuild.$(_Configuration).$(_Platform).$(_TargetFramework).binlog" /p:LangVersion=$(LangVersion)

- task: VSBuild@1
continueOnError: true
displayName: 'Build WPF Gallery using VSBuild'
inputs:
vsVersion: latest
solution: '$(wpfgallerysolution)'
platform: '$(_Platform)'
msbuildArchitecture: '$(_ToolPlatform)'
configuration: '$(_Configuration)'
msbuildArgs: /m /bl:"$(Build.ArtifactStagingDirectory)\vsbuild\wpfgallery.vsbuild.$(_Configuration).$(_Platform).$(_TargetFramework).binlog" /p:LangVersion=$(LangVersion)
condition: ne(variables['_Platform'], 'x86')

# - task: PublishBuildArtifacts@1
# continueOnError: true
# displayName: 'Publish .NET Core VSBuild Build Logs'
# inputs:
# PathtoPublish: $(Build.ArtifactStagingDirectory)\vsbuild
# ArtifactName: 'Build Logs'
# publishLocation: 'Container'
- task: PublishBuildArtifacts@1
continueOnError: true
displayName: 'Publish .NET Core VSBuild Build Logs'
inputs:
PathtoPublish: $(Build.ArtifactStagingDirectory)\vsbuild
ArtifactName: 'Build Logs'
publishLocation: 'Container'

- task: PowerShell@2
displayName: 'Clean Files From Previous Build'
Expand Down
Loading