Merge branch 'microsoft:master' into master

Author: jonwis

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -0,0 +1,14 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  98194:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2023-12-06
+        eslint:
+          lastModifiedDate: 2023-12-06
+        psscriptanalyzer:
+          lastModifiedDate: 2023-12-06
+        armory:
+          lastModifiedDate: 2023-12-06

.config/tsaoptions.json

@@ -0,0 +1,8 @@
+{
+    "instanceUrl": "https://microsoft.visualstudio.com",
+    "projectName": "os",
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\AmUse- App Metadata and User Setup Experience\\Projections\\Cppwinrt",
+    "notificationAliases": [ "[email protected]" ],
+    "ignoreBranchName": true,
+    "codebaseName": "cppwinrt"
+}

.gdn/.gdnsettings

@@ -0,0 +1,7 @@
+{
+  "files": { },
+  "folders": { },
+  "overwriteLogs": true,
+  "telemetryFlushTimeout": 10,
+  "variables": { }
+}

.gdn/.gitignore

@@ -0,0 +1,11 @@
+## Ignore Guardian internal files
+.r/
+rc/
+rs/
+i/
+p/
+c/
+o/
+
+## Ignore Guardian Local settings
+LocalSettings.gdn.json

.github/actions/setup-llvm-mingw/action.yml

@@ -19,7 +19,7 @@ runs:
     - name: Cache llvm-mingw (Windows)
       id: cache-llvm
       if: runner.os == 'Windows'
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: .llvm-mingw
         key: llvm-mingw-${{ runner.os }}-${{ inputs.llvm-mingw-version }}-${{ inputs.host-arch }}
@@ -50,7 +50,7 @@ runs:
     - name: Cache llvm-mingw (Linux)
       id: cache-llvm-linux
       if: runner.os == 'Linux'
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: /opt/llvm-mingw
         key: llvm-mingw-${{ runner.os }}-${{ inputs.llvm-mingw-version }}-${{ inputs.host-arch }}

.github/actions/setup-llvm-msvc/action.yml

@@ -4,7 +4,7 @@ inputs:
   llvm-version:
     description: 'LLVM version'
     required: true
-    default: '15.0.5'
+    default: '17.0.5'
 outputs:
   llvm-path:
     description: "The path in which LLVM is installed to"
@@ -14,7 +14,7 @@ runs:
   steps:
     - name: Cache LLVM and tools
       id: cache-llvm
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           .LLVM

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -23,12 +23,7 @@ jobs:
             config: Release
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-
-      - id: setup-llvm
-        name: Set up LLVM (MSVC)
-        uses: ./.github/actions/setup-llvm-msvc
-        if: matrix.compiler == 'clang-cl'
+      - uses: actions/checkout@v4
 
       - name: Download nuget
         run: |
@@ -49,7 +44,7 @@ jobs:
           $target_version = "1.2.3.4"
           $props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
           if ("${{ matrix.compiler }}" -eq "clang-cl") {
-            $props += ",Clang=1,PlatformToolset=LLVM_v143,LLVMInstallDir=${{ steps.setup-llvm.outputs.llvm-path }}"
+            $props += ",Clang=1,PlatformToolset=ClangCl"
           }
           Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:$props"
 
@@ -71,9 +66,9 @@ jobs:
           cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" cppwinrt.sln /t:cppwinrt
 
       - name: Upload built executables
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
+          name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
           path: |
             _build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
             _build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
@@ -107,25 +102,20 @@ jobs:
             config: Release
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-
-      - id: setup-llvm
-        name: Set up LLVM (MSVC)
-        uses: ./.github/actions/setup-llvm-msvc
-        if: matrix.compiler == 'clang-cl'
+      - uses: actions/checkout@v4
 
       - name: Fetch cppwinrt executables
         if: matrix.arch != 'arm64'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
+          name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
           path: _build/${{ matrix.arch }}/${{ matrix.config }}/
 
       - name: Fetch x86 cppwinrt executables (arm64 only)
         if: matrix.arch == 'arm64'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: msvc-build-x86-Release-bin
+          name: msvc-build-${{ matrix.compiler}}-x86-Release-bin
           path: _build/x86/Release/
 
       - name: Download nuget
@@ -147,7 +137,7 @@ jobs:
           $target_version = "1.2.3.4"
           $props = "Configuration=$target_configuration,Platform=$target_platform,CppWinRTBuildVersion=$target_version"
           if ("${{ matrix.compiler }}" -eq "clang-cl") {
-            $props += ",Clang=1,PlatformToolset=LLVM_v143,LLVMInstallDir=${{ steps.setup-llvm.outputs.llvm-path }}"
+            $props += ",Clang=1,PlatformToolset=ClangCl"
           }
           Add-Content $env:GITHUB_ENV "msbuild_config_props=/p:$props"
 
@@ -240,9 +230,9 @@ jobs:
 
       - name: Upload arm64 test executables
         if: matrix.arch == 'arm64'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: msvc-tests-${{ matrix.arch }}-${{ matrix.config }}-bin
+          name: msvc-tests-${{ matrix.test_exe }}-${{ matrix.compiler }}-${{ matrix.arch }}-${{ matrix.config }}-bin
           path: |
             _build/${{ matrix.arch }}/${{ matrix.config }}/*.exe
             _build/${{ matrix.arch }}/${{ matrix.config }}/*.dll
@@ -260,7 +250,7 @@ jobs:
       CMAKE_COLOR_DIAGNOSTICS: 1
       CLICOLOR_FORCE: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install cross compiler
         run: |
@@ -279,7 +269,7 @@ jobs:
           cmake --build build/cross_x64/ --target install -j2
 
       - name: Upload cppwinrt.exe
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cross-build-${{ matrix.arch }}-bin
           path: install/bin/cppwinrt.exe
@@ -293,7 +283,7 @@ jobs:
         Deployment: [Component, Standalone]
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download nuget
         run: |
@@ -323,20 +313,22 @@ jobs:
           cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" /p:Deployment=${{ matrix.Deployment }} natvis\cppwinrtvisualizer.sln
 
   build-msvc-nuget-test:
-    name: 'Build nuget test'
+    name: 'Build nuget test (${{ matrix.arch }})'
     needs: test-msvc-cppwinrt-build
     strategy:
       matrix:
+        compiler:
+          - MSVC
         arch: [x86, x64]
         config: [Release]
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Fetch cppwinrt executables
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: msvc-build-${{ matrix.arch }}-${{ matrix.config }}-bin
+          name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
           path: _build/${{ matrix.arch }}/${{ matrix.config }}/
 
       - name: Download nuget
@@ -371,17 +363,12 @@ jobs:
       - name: Run nuget test
         run: |
           cmd /c "$env:VSDevCmd" "&" msbuild /m /clp:ForceConsoleColor "$env:msbuild_config_props" test\nuget\NugetTest.sln
-          if ($LastExitCode -ne 0) {
-            echo "::warning::nuget test failed"
-          }
-          # FIXME: This build was failing from the start
-          exit 0
 
   build-nuget:
     name: Build nuget package with MSVC
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Package
         run: |
@@ -396,7 +383,7 @@ jobs:
           }
 
       - name: Upload nuget package artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: package
           path: "*.nupkg"

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v6
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 10

.pipelines/OneBranch.Official.yml

@@ -27,17 +27,26 @@ extends:
     platform:
       name: 'windows_undocked'
       product: 'build_tools'
+    
+    featureFlags:
+      WindowsHostVersion:
+        Version: 2022
 
     cloudvault:
       enabled: false
 
     globalSdl:
+      isNativeCode: true
+      asyncSdl:
+        enabled: true
       tsa:
-        enabled: false
-    
-    nugetPublishing:
-      feeds:
-        name: CppWinRT
+        enabled: true
+      codeql:
+        compiled: 
+          enabled: true
+        tsaEnabled: true
+      prefast:
+        enabled: true
 
     stages:
     - stage: build
@@ -72,48 +81,6 @@ extends:
             ob_createvpack_metadata: $(Build.SourceBranchName).x86.$(Build.BuildNumber).$(Build.SourceVersion)
             ob_createvpack_target: $(OSBuildToolsRoot)\cppwinrt
 
-          steps:
-            - task: UseDotNet@2
-              continueOnError: true
-              inputs: 
-                packageType: 'runtime'
-                version: '6.x'
-                performMultiLevelLookup: true
-
-            - task: DownloadPipelineArtifact@2
-              displayName: 'Download x86 artifacts'
-              inputs:
-                artifactName: 'drop_build_x86'
-                targetPath: '$(Build.SourcesDirectory)/x86'
-
-            - task: CopyFiles@2
-              displayName: 'Stage compiler vpack contents'
-              inputs:
-                SourceFolder: $(Build.SourcesDirectory)/x86
-                Contents: |
-                  cppwinrt/cppwinrt.exe
-                  cppwinrt/cppwinrt.pdb
-                TargetFolder: $(ob_outputDirectory)
-            
-        - job: MSBuild_vpack
-          pool:
-            type: windows
-          variables:
-            ob_outputDirectory: '$(Build.SourcesDirectory)\out'
-
-            ob_createvpack_enabled: true
-            ob_createvpack_packagename: CppWinRT.MSBuild
-            ob_createvpack_owneralias: cpp4uwpt
-            ob_createvpack_description: C++/WinRT MSBuild
-            ob_createvpack_provData: true
-            ob_createvpack_versionAs: parts
-            ob_createvpack_majorVer: $(MajorVersion)
-            ob_createvpack_minorVer: $(MinorVersion)
-            ob_createvpack_patchVer: $(PatchVersion)
-            ob_createvpack_metadata: $(Build.SourceBranchName).$(Build.BuildNumber).$(Build.SourceVersion)
-            ob_createvpack_verbose: true
-            ob_createvpack_target: $(OSBuildToolsRoot)\cppwinrt
-
           steps:
             - task: UseDotNet@2
               continueOnError: true
@@ -134,25 +101,26 @@ extends:
                 artifactName: 'drop_build_x64'
                 targetPath: '$(Build.SourcesDirectory)/x64'
 
-            - task: DownloadPipelineArtifact@2
-              displayName: 'Download arm artifacts'
-              inputs:
-                artifactName: 'drop_build_arm'
-                targetPath: '$(Build.SourcesDirectory)/arm'
-
             - task: DownloadPipelineArtifact@2
               displayName: 'Download arm64 artifacts'
               inputs:
                 artifactName: 'drop_build_arm64'
                 targetPath: '$(Build.SourcesDirectory)/arm64'
+
+            - task: CopyFiles@2
+              displayName: 'Stage compiler vpack contents'
+              inputs:
+                SourceFolder: $(Build.SourcesDirectory)/x86/cppwinrt
+                Contents: |
+                  cppwinrt.exe
+                  cppwinrt.pdb
+                TargetFolder: $(ob_outputDirectory)
 
             - task: CmdLine@2
               displayName: 'Stage MSBuild vpack contents'
               inputs:
                 script: |
                   set TargetDir=$(ob_outputDirectory)
-                  rd /s /q %TargetDir% >nul 2>&1
-                  md %TargetDir%
                   cd %TargetDir%
 
                   copy $(Build.SourcesDirectory)\vsix\Microsoft.Cpp.CppWinRT.props
@@ -163,9 +131,8 @@ extends:
                   echo d | xcopy $(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib build\native\lib\Win32
                   echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib  build\native\lib\amd64
                   echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib  build\native\lib\x64
-                  echo d | xcopy $(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib  build\native\lib\arm
                   echo d | xcopy $(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib  build\native\lib\arm64
-
+            
     - stage: NuGet
       dependsOn: build
       jobs: