Skip to content

Commit 3267d50

Browse files
JohnMcPMSJohnMcPMS
authored
Fixes for pipeline stability (microsoft#5359)
## Issue Due to an issue with dsc.exe creating child processes (which after much investigation appears to be a race that only occurs on older OS versions), we get arbitrary failures. We also occasionally get spurious failures of configuration tests. ## Change Move to `windows-2025` to avoid the process creation failures from dsc.exe. Move to Windows 11 SDK 26100 as 22000 is not installed by default on `windows-2025`. Flush output at the end of a configuration unit info dump. Add missing interface to manifest (@yao-msft was right). Use `pwsh` task at least once to ensure that it is present.
1 parent 1b74fd4 commit 3267d50

File tree

49 files changed

+74
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+74
-70
lines changed

‎.vsconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"Microsoft.VisualStudio.Component.VC.ASAN",
5151
"Microsoft.VisualStudio.Component.Vcpkg",
5252
"Microsoft.VisualStudio.Component.Windows10SDK.19041",
53-
"Microsoft.VisualStudio.Component.Windows11SDK.22000",
53+
"Microsoft.VisualStudio.Component.Windows11SDK.26100",
5454
"Microsoft.VisualStudio.Workload.NativeDesktop",
5555
"Microsoft.Component.NetFX.Native",
5656
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",

‎azure-pipelines.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pr:
1515
- schemas/JSON/manifests/*
1616

1717
pool:
18-
vmImage: 'windows-latest'
18+
vmImage: 'windows-2025'
1919

2020
variables:
2121
solution: 'src\AppInstallerCLI.sln'
@@ -186,7 +186,7 @@ jobs:
186186
Microsoft.Management.Deployment\Microsoft.Management.Deployment.winmd
187187
WindowsPackageManager\WindowsPackageManager.dll
188188
UndockedRegFreeWinRT\winrtact.dll
189-
TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net8.0-windows10.0.22000.0\SharedDependencies\$(BuildPlatform)
189+
TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net8.0-windows10.0.26100.0\SharedDependencies\$(BuildPlatform)
190190
flattenFolders: true
191191

192192
- task: CopyFiles@2
@@ -215,7 +215,7 @@ jobs:
215215
inputs:
216216
SourceFolder: $(buildOutDirAnyCpu)
217217
Contents: |
218-
Microsoft.Management.Configuration.Projection\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.Projection.dll
218+
Microsoft.Management.Configuration.Projection\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.Projection.dll
219219
TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Configuration\SharedDependencies\$(BuildPlatform)
220220
flattenFolders: true
221221

@@ -351,21 +351,15 @@ jobs:
351351
inputs:
352352
packageFeedSelector: 'nugetOrg'
353353

354-
# TODO: Repair-WinGetPackageManager will fail because it tries to install x64 for an x86 build machine.
355-
# Remove manual installation of VCLibs (x64) once this is fixed.
356354
- powershell: |
357-
if ("$(buildPlatform)" -eq "x86") {
358-
iwr https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx -OutFile Microsoft.VCLibs.x64.appx
359-
Add-AppxPackage Microsoft.VCLibs.x64.appx
360-
}
361355
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
362356
Install-Module Microsoft.WinGet.Client -Repository PSGallery -Force
363357
Repair-WingetPackageManager -AllUsers -Latest
364358
Install-WinGetPackage -Id Microsoft.Sysinternals.PsTools -Source winget
365359
displayName: Install Sysinternals PsTools Using Winget
366360
condition: succeededOrFailed()
367361
368-
- powershell: |
362+
- pwsh: |
369363
$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
370364
PsExec -accepteula -s -i $(buildOutDir)\AppInstallerCLITests\AppInstallerCLITests.exe -logto $(artifactsDir)\AICLI-Unpackaged-System.log -s -r junit -o $(artifactsDir)\TEST-AppInstallerCLI-Unpackaged-System.xml
371365
displayName: Run Unit Tests Unpackaged Under System Context

‎doc/Developing.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* Universal Windows Platform Development
1313
* Check [.vsconfig file](../.vsconfig) for full components list
1414

15-
* [Windows SDK for Windows 11 (10.0.22000.194)](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/)
15+
* [Windows SDK for Windows 11 (10.0.26100)](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/)
1616

1717
> [!NOTE]
18-
> You can also get it through `winget install Microsoft.WindowsSDK --version 10.0.22000.832` (use --force if you have a newer version installed) or via Visual Studio > Get Tools and Features > Individual Components > Windows 10 SDK (10.0.22000.0)
18+
> You can also get it through `winget install Microsoft.WindowsSDK.10.0.26100` or via Visual Studio > Get Tools and Features > Individual Components > Windows 10 SDK (10.0.26100.0)
1919
2020
* The following extensions:
2121

‎src/AppInstallerCLI/AppInstallerCLI.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectGuid>{5b6f90df-fd19-4bae-83d9-24dad128e777}</ProjectGuid>
1010
<Keyword>Win32Proj</Keyword>
1111
<RootNamespace>AppInstallerCLI</RootNamespace>
12-
<WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
12+
<WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
1313
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
1414
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
1515
</PropertyGroup>

‎src/AppInstallerCLICore/AppInstallerCLICore.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectGuid>{1c6e0108-2860-4b17-9f7e-fa5c6c1f3d3d}</ProjectGuid>
1010
<Keyword>Win32Proj</Keyword>
1111
<RootNamespace>AppInstallerCLICore</RootNamespace>
12-
<WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
12+
<WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
1313
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
1414
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
1515
</PropertyGroup>

‎src/AppInstallerCLICore/Commands/DebugCommand.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ namespace AppInstaller::CLI
106106
OutputProxyStubInterfaceRegistration<winrt::Windows::Foundation::Collections::IIterable<winrt::Microsoft::Management::Configuration::ConfigurationEnvironment>>(context);
107107
OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IConfigurationUnitProcessorDetails2>(context);
108108
OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IGetAllSettingsConfigurationUnitProcessor>(context);
109+
OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IGetAllUnitsConfigurationUnitProcessor>(context);
109110
OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IConfigurationStatics2>(context);
110111
OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::SetProcessorFactory::IPwshConfigurationSetProcessorFactoryProperties>(context);
111112

‎src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,8 @@ namespace AppInstaller::CLI::Workflow
551551
m_context.Reporter.Info() << " "_liv << Resource::String::ConfigurationSettings << '\n';
552552
OutputValueSet(settings, 4);
553553
}
554+
555+
m_context.Reporter.Info() << std::flush;
554556
}
555557

556558
private:

‎src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!--
1212
!!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
1313
-->
14-
<WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion>
14+
<WindowsSdkPackageVersion>10.0.26100.53</WindowsSdkPackageVersion>
1515
</PropertyGroup>
1616

1717
<PropertyGroup>
@@ -43,7 +43,7 @@
4343

4444
<!-- CsWinRT properties -->
4545
<PropertyGroup>
46-
<CsWinRTWindowsMetadata>10.0.22000.0</CsWinRTWindowsMetadata>
46+
<CsWinRTWindowsMetadata>10.0.26100.0</CsWinRTWindowsMetadata>
4747
</PropertyGroup>
4848

4949
<ItemGroup>

‎src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
4444
<PropertyGroup>
4545
<ProjectGuid>6aa3791a-0713-4548-a357-87a323e7ac3a</ProjectGuid>
46-
<TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
46+
<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
4747
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
4848
<DefaultLanguage>en-US</DefaultLanguage>
4949
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
@@ -236,7 +236,7 @@
236236
<WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\Microsoft.Management.Configuration\Microsoft.Management.Configuration.winmd">
237237
<PackagePath>Microsoft.Management.Configuration.winmd</PackagePath>
238238
</WinGetAdditionalPackageFile>
239-
<WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\ConfigurationRemotingServer\net8.0-windows10.0.22000.0\$(ConfigServerRid)\**\*">
239+
<WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\ConfigurationRemotingServer\net8.0-windows10.0.26100.0\$(ConfigServerRid)\**\*">
240240
<PackagePath>ConfigurationRemotingServer</PackagePath>
241241
<Recurse>true</Recurse>
242242
</WinGetAdditionalPackageFile>

‎src/AppInstallerCLIPackage/Package.appxmanifest‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<Interface Name="Windows.Foundation.Collections.IIterable`1&lt;Microsoft.Management.Configuration.ConfigurationEnvironment&gt;" InterfaceId="47B18106-976B-5532-8E81-F58D304DFA43" />
117117
<Interface Name="Microsoft.Management.Configuration.IConfigurationUnitProcessorDetails2" InterfaceId="E89623ED-76E2-5145-B920-D09659554E35" />
118118
<Interface Name="Microsoft.Management.Configuration.IGetAllSettingsConfigurationUnitProcessor" InterfaceId="72EB8304-D8D3-57D4-9940-7C1C4AD8C40C" />
119+
<Interface Name="Microsoft.Management.Configuration.IGetAllUnitsConfigurationUnitProcessor" InterfaceId="D5CB3357-8AD6-5A3C-8695-057C01867D5F" />
119120
<Interface Name="Microsoft.Management.Configuration.IConfigurationStatics2" InterfaceId="540BE073-F2EF-5375-83AA-8E23086B0669" />
120121
<Interface Name="Microsoft.Management.Configuration.SetProcessorFactory.IPwshConfigurationSetProcessorFactoryProperties" InterfaceId="2C298A30-BD3B-5D00-BCD1-2EB633AB7E3B" />
121122
</ProxyStub>

0 commit comments

Comments
 (0)