From f33edc7fcbe7bd3384bdc5624a9cb6c0e7cb4f3f Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Tue, 2 Jun 2026 14:01:41 -0700 Subject: [PATCH 1/6] Minor fixes to PSScript resource --- resources/PSScript/psscript.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/PSScript/psscript.ps1 b/resources/PSScript/psscript.ps1 index e3d562abb..9af44c38b 100644 --- a/resources/PSScript/psscript.ps1 +++ b/resources/PSScript/psscript.ps1 @@ -154,6 +154,7 @@ try { "Script failed with terminating error: $($ps.InvocationStateInfo.Reason)" } Write-DscTrace -Now -Level Error -Message $message + Write-TraceQueue exit 1 } @@ -162,7 +163,6 @@ try { if ($ps.HadErrors) { - # Errors can be non-terminating, so we just write a warning and continue Write-DscTrace -Now -Level Debug -Message 'Non-terminating errors occurred during script execution.' } From f252089ee7301d4c03bcc0e0cfc5c1554b4c592d Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sun, 7 Jun 2026 10:33:05 -0700 Subject: [PATCH 2/6] write trace queue before exit --- resources/PSScript/psscript.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/PSScript/psscript.ps1 b/resources/PSScript/psscript.ps1 index 9af44c38b..48ed86a38 100644 --- a/resources/PSScript/psscript.ps1 +++ b/resources/PSScript/psscript.ps1 @@ -153,8 +153,8 @@ try { } else { "Script failed with terminating error: $($ps.InvocationStateInfo.Reason)" } - Write-DscTrace -Now -Level Error -Message $message Write-TraceQueue + Write-DscTrace -Now -Level Error -Message $message exit 1 } @@ -171,6 +171,7 @@ try { } } catch { + Write-TraceQueue Write-DscTrace -Now -Level Error -Message ($_ | Format-List -Force * | Out-String) exit 1 } From 3627172393b377181748362c504cc77cc1a5b19f Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Mon, 8 Jun 2026 11:34:06 -0700 Subject: [PATCH 3/6] Update msrustup to use 1.95 --- helpers.build.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers.build.psm1 b/helpers.build.psm1 index e56d10b3b..55961e4d9 100644 --- a/helpers.build.psm1 +++ b/helpers.build.psm1 @@ -387,7 +387,7 @@ function Get-RustUp { if ($null -ne (Get-Command msrustup -CommandType Application -ErrorAction Ignore)) { Write-Verbose -Verbose "Using msrustup" $rustup = 'msrustup' - $channel = 'ms-prod-1.93' + $channel = 'ms-prod-1.95' if ($architecture -eq 'current') { $env:MSRUSTUP_TOOLCHAIN = "$architecture" } @@ -1475,7 +1475,7 @@ function Test-Clippy { Set-DefaultWorkspaceMemberGroup @workspaceParams } } - + process { $clippyFlags = @( '--%' From 952355eff370423b252d51e6e2f8c72dc1307cfd Mon Sep 17 00:00:00 2001 From: "Steve Lee (POWERSHELL HE/HIM) (from Dev Box)" Date: Mon, 8 Jun 2026 14:53:54 -0700 Subject: [PATCH 4/6] remove check to update rust --- build.ps1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.ps1 b/build.ps1 index 57591ee1e..7ab893bbd 100755 --- a/build.ps1 +++ b/build.ps1 @@ -191,10 +191,8 @@ process { Set-CargoEnvironment -UseCFS:$UseCFS @VerboseParam # Install or update rust - if (!$usingADO) { - Write-BuildProgress @progressParams -Status 'Ensuring Rust is up-to-date' - Update-Rust @VerboseParam - } + Write-BuildProgress @progressParams -Status 'Ensuring Rust is up-to-date' + Update-Rust @VerboseParam if ($Clippy) { Write-BuildProgress @progressParams -Status 'Ensuring Clippy is available and updated' From 2ed158f0d52dfddd87658a45f8cea8e8323a9323 Mon Sep 17 00:00:00 2001 From: "Steve Lee (POWERSHELL HE/HIM) (from Dev Box)" Date: Mon, 8 Jun 2026 15:26:11 -0700 Subject: [PATCH 5/6] update pipeline to use 1.95 --- .pipelines/DSC-Windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/DSC-Windows.yml b/.pipelines/DSC-Windows.yml index 0e4810807..e6497f59a 100644 --- a/.pipelines/DSC-Windows.yml +++ b/.pipelines/DSC-Windows.yml @@ -18,7 +18,7 @@ steps: displayName: 🛠️ Workaround for the LoadLibrary ACCESS_VIOLATION OneBranch issue - task: RustInstaller@1 inputs: - rustVersion: ms-prod-1.93 + rustVersion: ms-prod-1.95 toolchainFeed: ${{ parameters.RustSDK }} additionalTargets: ${{ parameters.buildName }} displayName: Install Rust From 8e60f9306e5fcdf5f4bb938da3655ac6f8f54349 Mon Sep 17 00:00:00 2001 From: "Steve Lee (POWERSHELL HE/HIM) (from Dev Box)" Date: Mon, 8 Jun 2026 15:49:12 -0700 Subject: [PATCH 6/6] change pipeline to use 1.95 --- .pipelines/DSC-Official.yml | 11 +++++++---- .pipelines/DSC-Windows.yml | 4 +++- build.ps1 | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.pipelines/DSC-Official.yml b/.pipelines/DSC-Official.yml index 48527d90a..9b511c490 100644 --- a/.pipelines/DSC-Official.yml +++ b/.pipelines/DSC-Official.yml @@ -31,6 +31,8 @@ variables: value: ${{ parameters.OfficialBuild }} - name: PublishToStore value: ${{ parameters.PublishToStore }} + - name: RustVersion + value: ms-prod-1.95 resources: repositories: @@ -114,6 +116,7 @@ extends: signSrcPath: '$(signSrcPath)' PackageRoot: '$(PackageRoot)' rustSDK: '$(Rust.SDK)' + rustVersion: ${{ variables.RustVersion }} - job: BuildWin_arm64 dependsOn: SetPackageVersion @@ -134,7 +137,7 @@ extends: signSrcPath: '$(signSrcPath)' PackageRoot: '$(PackageRoot)' rustSDK: '$(Rust.SDK)' - + rustVersion: ${{ variables.RustVersion }} - job: CreateMsixBundle dependsOn: - BuildWin_x64 @@ -283,7 +286,7 @@ extends: steps: - task: RustInstaller@1 inputs: - rustVersion: ms-prod-1.93 + rustVersion: ${{ variables.RustVersion }} toolchainFeed: $(Rust.SDK) additionalTargets: x86_64-unknown-linux-musl displayName: Install Rust @@ -317,7 +320,7 @@ extends: steps: - task: RustInstaller@1 inputs: - rustVersion: ms-prod-1.93 + rustVersion: ${{ variables.RustVersion }} toolchainFeed: $(Rust.SDK) additionalTargets: aarch64-unknown-linux-musl displayName: Install Rust @@ -375,7 +378,7 @@ extends: steps: - task: RustInstaller@1 inputs: - rustVersion: ms-prod-1.93 + rustVersion: ${{ variables.RustVersion }} toolchainFeed: $(Rust.SDK) additionalTargets: $(buildName) displayName: Install Rust diff --git a/.pipelines/DSC-Windows.yml b/.pipelines/DSC-Windows.yml index e6497f59a..50cac1a3b 100644 --- a/.pipelines/DSC-Windows.yml +++ b/.pipelines/DSC-Windows.yml @@ -10,6 +10,8 @@ parameters: default: Release - name: RustSDK type: string + - name: RustVersion + type: string steps: - pwsh: | @@ -18,7 +20,7 @@ steps: displayName: 🛠️ Workaround for the LoadLibrary ACCESS_VIOLATION OneBranch issue - task: RustInstaller@1 inputs: - rustVersion: ms-prod-1.95 + rustVersion: ${{ parameters.RustVersion }} toolchainFeed: ${{ parameters.RustSDK }} additionalTargets: ${{ parameters.buildName }} displayName: Install Rust diff --git a/build.ps1 b/build.ps1 index 7ab893bbd..57591ee1e 100755 --- a/build.ps1 +++ b/build.ps1 @@ -191,8 +191,10 @@ process { Set-CargoEnvironment -UseCFS:$UseCFS @VerboseParam # Install or update rust - Write-BuildProgress @progressParams -Status 'Ensuring Rust is up-to-date' - Update-Rust @VerboseParam + if (!$usingADO) { + Write-BuildProgress @progressParams -Status 'Ensuring Rust is up-to-date' + Update-Rust @VerboseParam + } if ($Clippy) { Write-BuildProgress @progressParams -Status 'Ensuring Clippy is available and updated'