msrust

build/windows.yml

@@ -23,23 +23,27 @@ steps:
   displayName: Apply patches
   condition: succeeded()
 
-- powershell: |
-    echo $env:reason
-    echo $BUILD_SOURCEVERSION
-    Invoke-WebRequest https://win.rustup.rs -UseBasicParsing -OutFile rustup-init.exe
-    .\rustup-init.exe -y
-    $env:PATH+=";C:\Users\appveyor\.cargo\bin"
+- task: RustInstaller@1
+  inputs:
+    toolchainFeed: https://pkgs.dev.azure.com/vscode/_packaging/RustTools/nuget/v3/index.json
+    additionalRustTargets: ${{ parameters.target }}
+  displayName: Install Rust toolchain
 
-    rustup default $env:RUST_VERSION
-    rustc -V
-    cargo -V
+# - powershell: |
+#     echo $env:reason
+#     echo $BUILD_SOURCEVERSION
+#     $env:PATH+=";C:\Users\appveyor\.cargo\bin"
 
-    rustup target add $env:TARGET
-  env:
-    RUST_VERSION: ${{ parameters.rust_version }}
-    TARGET: ${{ parameters.target }}
-    reason: variables['Build.Reason']
-  displayName: Install Rust
+#     msrustup default $env:RUST_VERSION
+#     rustc -V
+#     cargo -V
+
+#     msrustup target add $env:TARGET
+#   env:
+#     RUST_VERSION: ${{ parameters.rust_version }}
+#     TARGET: ${{ parameters.target }}
+#     reason: variables['Build.Reason']
+#   displayName: msrustup
 
 - powershell: |
     cargo build --release --target $env:TARGET --features pcre2

config.json

@@ -4,6 +4,7 @@
     "patches": [
         "0001-feat-pass-env-for-aarch64-unknown-linux-musl-via-cross.patch",
         "0002-msvc-spectre-libs.patch",
-        "0003-windows-rust-flags.patch"
+        "0003-windows-rust-flags.patch",
+        "0004-rust-toolchain.patch"
     ]
 }

patches/0004-rust-toolchain.patch

@@ -0,0 +1,9 @@
+diff --git a/rust-toolchain.toml b/rust-toolchain.toml
+new file mode 100644
+index 0000000..dc98d7c
+--- /dev/null
++++ b/rust-toolchain.toml
+@@ -0,0 +1,3 @@
++[toolchain]
++channel = "ms-stable"
++targets = ["i686-pc-windows-msvc", "aarch64-pc-windows-msvc", "x86_64-pc-windows-msvc"]