From dc2bbc2f050c046f86ae94f6ea0e98d58c997795 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Mon, 8 Jun 2026 11:34:06 -0700 Subject: [PATCH 1/4] Update msrustup to use 1.95 --- helpers.build.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers.build.psm1 b/helpers.build.psm1 index 0dbaa3564..32d007a27 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" } From b8fa69fcc581079a75eceb60f9a93b66a7df883d 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 2/4] 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 a8d1cf738cb1fd922af3b049a4194b54a6ffb585 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 3/4] 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 cb7c11c0331820bfe26307f56dd7205378c5666e 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 4/4] 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'