Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions .pipelines/DSC-Official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ variables:
value: ${{ parameters.OfficialBuild }}
- name: PublishToStore
value: ${{ parameters.PublishToStore }}
- name: RustVersion
value: ms-prod-1.95

resources:
repositories:
Expand Down Expand Up @@ -114,6 +116,7 @@ extends:
signSrcPath: '$(signSrcPath)'
PackageRoot: '$(PackageRoot)'
rustSDK: '$(Rust.SDK)'
rustVersion: ${{ variables.RustVersion }}

Comment thread
SteveL-MSFT marked this conversation as resolved.
- job: BuildWin_arm64
dependsOn: SetPackageVersion
Expand All @@ -134,7 +137,7 @@ extends:
signSrcPath: '$(signSrcPath)'
PackageRoot: '$(PackageRoot)'
rustSDK: '$(Rust.SDK)'

rustVersion: ${{ variables.RustVersion }}
Comment thread
SteveL-MSFT marked this conversation as resolved.
- job: CreateMsixBundle
dependsOn:
- BuildWin_x64
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .pipelines/DSC-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ parameters:
default: Release
- name: RustSDK
type: string
- name: RustVersion
type: string
Comment thread
SteveL-MSFT marked this conversation as resolved.

steps:
- pwsh: |
Expand All @@ -18,7 +20,7 @@ steps:
displayName: 🛠️ Workaround for the LoadLibrary ACCESS_VIOLATION OneBranch issue
- task: RustInstaller@1
inputs:
rustVersion: ms-prod-1.93
rustVersion: ${{ parameters.RustVersion }}
toolchainFeed: ${{ parameters.RustSDK }}
additionalTargets: ${{ parameters.buildName }}
displayName: Install Rust
Expand Down
2 changes: 1 addition & 1 deletion helpers.build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Loading