Merge pull request #1242 from SteveL-MSFT/bot-fixes

Update Appx manifest with new cap and fix statically linking to vcruntime

Author: SteveL-MSFT

.cargo/config.toml

@@ -8,12 +8,33 @@ POWERSHELL = { index = "sparse+https://pkgs.dev.azure.com/powershell/PowerShell/
 [registry]
 global-credential-providers = ["cargo:token"]
 
-# Enable Control Flow Guard (needed for OneBranch's post-build analysis).
+# Avoid linking with vcruntime140.dll by statically linking everything,
+# and then explicitly linking with ucrtbase.dll dynamically.
+# We do this, because vcruntime140.dll is an optional Windows component.
 [target.x86_64-pc-windows-msvc]
-rustflags = ["-Ccontrol-flow-guard", "-Ctarget-feature=+crt-static", "-Clink-args=/DYNAMICBASE /CETCOMPAT"]
+rustflags = [
+    "-Ccontrol-flow-guard",
+    "-Ctarget-feature=+crt-static",
+    "-Clink-args=/DEFAULTLIB:ucrt.lib",
+    "-Clink-args=/NODEFAULTLIB:vcruntime.lib",
+    "-Clink-args=/NODEFAULTLIB:msvcrt.lib",
+    "-Clink-args=/NODEFAULTLIB:libucrt.lib",
+    "-Clink-args=/DYNAMICBASE",
+    "-Clink-args=/CETCOMPAT",
+    "-Dwarnings"
+]
 
 [target.aarch64-windows-msvc]
-rustflags = ["-Ccontrol-flow-guard", "-Ctarget-feature=+crt-static", "-Clink-args=/DYNAMICBASE"]
+rustflags = [
+    "-Ccontrol-flow-guard",
+    "-Ctarget-feature=+crt-static",
+    "-Clink-args=/DEFAULTLIB:ucrt.lib",
+    "-Clink-args=/NODEFAULTLIB:vcruntime.lib",
+    "-Clink-args=/NODEFAULTLIB:msvcrt.lib",
+    "-Clink-args=/NODEFAULTLIB:libucrt.lib",
+    "-Clink-args=/DYNAMICBASE",
+    "-Dwarnings"
+]
 
 # The following is only needed for release builds
 [source.crates-io]

.github/ISSUE_TEMPLATE/Feature_Request.yml

@@ -14,7 +14,7 @@ body:
       new feature would solve. Try formulating it in user story style
       (if applicable).
     placeholder: >-
-      'As a user I want X so that Y...' with X being the being the
+      'As a user I want X so that Y...' with X being the
       action and Y being the value of the action.
   validations:
     required: true

.pipelines/DSC-Official.yml

@@ -585,7 +585,7 @@ extends:
                 throw "PackageVersion variable is not set. Cannot proceed with publishing Universal Package."
               }
               Write-Verbose -Verbose "Universal Package version: $packageVersion"
-              az artifacts universal publish --organization https://dev.azure.com//PowerShell --project PowerShell --feed PowerShell-Universal --name microsoft.dsc-linux --version $packageVersion --description "Microsoft Desired State Configuration (DSC) - Universal Package" --path "$(LinuxDirectory)" --scope project --verbose
+              az artifacts universal publish --organization https://dev.azure.com/PowerShell --project PowerShell --feed PowerShell-Universal --name microsoft.dsc-linux --version $packageVersion --description "Microsoft Desired State Configuration (DSC) - Universal Package" --path "$(LinuxDirectory)" --scope project --verbose
           condition: succeeded()
 
         - task: AzureCLI@2

Cargo.lock

@@ -210,8 +210,6 @@ ipnetwork = { version = "0.21" }
 # build-only dependencies
 # dsc-lib, dsc-lib-registry, sshdconfig, tree-sitter-dscexpression, tree-sitter-ssh-server-config
 cc = { version = "1.2" }
-# registry, dsc-lib-registry
-static_vcruntime = { version = "2.0" }
 
 # test-only dependencies
 # dsc-lib-jsonschema

Cargo.toml

@@ -29,6 +29,3 @@ thiserror = "1.0"
 
 [target.'cfg(onecore)'.dependencies]
 pal = { path = "../pal" }
-
-[build-dependencies]
-static_vcruntime = "2.0"

archive/ntreg/Cargo.toml

@@ -7,11 +7,9 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rustc-link-lib=onecore_apiset");
     println!("cargo:rustc-link-lib=onecoreuap_apiset");
-    static_vcruntime::metabuild();
 }
 
 #[cfg(not(onecore))]
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
-    static_vcruntime::metabuild();
 }

archive/ntreg/build.rs

@@ -24,6 +24,3 @@ serde_json = { version = "1.0", features = ["preserve_order"] }
 
 [target.'cfg(onecore)'.dependencies]
 pal = { path = "../pal" }
-
-[build-dependencies]
-static_vcruntime = "2.0"

archive/registry/Cargo.toml

@@ -7,12 +7,10 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rustc-link-lib=onecore_apiset");
     println!("cargo:rustc-link-lib=onecoreuap_apiset");
-    static_vcruntime::metabuild();
 }
 
 #[cfg(not(onecore))]
 fn main() {
     // Prevent this build script from rerunning unnecessarily.
     println!("cargo:rerun-if-changed=build.rs");
-    static_vcruntime::metabuild();
 }

archive/registry/build.rs

@@ -750,9 +750,6 @@ function Set-RustEnvironment {
         Write-Verbose "Caching current rust environment variables..."
         [hashtable]$currentRustEnvironment = Get-RustEnvironment
 
-        Write-Verbose "Setting RUSTFLAGS to '-Dwarnings'"
-        $env:RUSTFLAGS='-Dwarnings'
-
         if ($VerbosePreference -eq 'Continue') {
             Write-Verbose "Running verbose, setting RUSTC_LOG "
             # $env:RUSTC_LOG='rustc_codegen_ssa::back::link=info'