Merge branch 'develop'

4 files changed, 6 insertions, 47 deletions

diff --git a/.github/scripts/Install-Vsix.ps1 b/.github/scripts/Install-Vsix.ps1
deleted file mode 100644
index 50ef088b..00000000
--- a/.github/scripts/Install-Vsix.ps1
+++ /dev/null
@@ -1,38 +0,0 @@
-<#

-

-.SYNOPSIS

-Download and install the latest WDK VSIX.

-

-#>

-

-# set uri by resolving amd64 vsix

-$uri = "https://marketplace.visualstudio.com$((Invoke-WebRequest -Uri "https://marketplace.visualstudio.com/items?itemName=DriverDeveloperKits-WDK.WDKVsix").Links | Where-Object outerHTML -like '*(amd64)*' | select -expand href)"

-

-# set download version

-$uri_version = ([regex]'(\d+\.)(\d+\.)(\d+\.)(\d+)').Matches($uri).Value

-

-# set msbuild path

-$msbuild_path = (Resolve-Path "$env:ProgramFiles\Microsoft Visual Studio\2022\*\MSBuild\")

-

-# download vsix, expand, and store the downloaded version extracted from the extension manifest

-"Downloading WDK VSIX version: $uri_version..."

-Invoke-WebRequest -Uri "$uri" -OutFile wdk.zip

-"Expanding WDK VSIX archive..."

-Expand-Archive ".\wdk.zip" .\

-"Extracting version from manifest..."

-$downloaded_version = ([xml](Get-Content .\extension.vsixmanifest)).PackageManifest.Metadata.Identity.Version

-"Downloaded WDK VSIX version: $downloaded_version"

-

-# copy msbuild files, extension manifest, and check installed version from the extension manifest

-"Copying WDK extension files to build path..."

-cp (".\`$MSBuild\*", ".\extension.vsixmanifest") "$msbuild_path" -Recurse -Force

-"Extracting version from copied manifest..."

-$installed_version = ([xml](Get-Content ${msbuild_path}\extension.vsixmanifest)).PackageManifest.Metadata.Identity.Version

-"Installed WDK VSIX Version: $installed_version"

-if (-not ("$downloaded_version" -eq "$installed_version")) { 

-    "WDK VSIX installation failed due to version mismatch"

-    exit 1

-}

-

-# set github environment variable for vsix version

-"SAMPLES_VSIX_VERSION=$installed_version" | Out-File -FilePath "$env:GITHUB_ENV" -Append

diff --git a/.github/workflows/Code-Scanning.yml b/.github/workflows/Code-Scanning.yml
index cd0d8abf..16aaff39 100644
--- a/.github/workflows/Code-Scanning.yml
+++ b/.github/workflows/Code-Scanning.yml
@@ -8,11 +8,17 @@ on:
     branches:
       - main
       - develop
+    paths-ignore:
+      - '**.md'
+      - 'LICENSE'
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
       - main
       - develop
+    paths-ignore:
+      - '**.md'
+      - 'LICENSE'
     
   # Allow manual scheduling
   workflow_dispatch:
@@ -37,9 +43,6 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Install WDK VSIX
-        run: .\.github\scripts\Install-Vsix.ps1
-
       - name: Install Nuget Packages
         run: nuget restore .\packages.config -PackagesDirectory .\packages\
 
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index c04f4adb..72fb176f 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -22,9 +22,6 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Install WDK VSIX
-        run: .\.github\scripts\Install-Vsix.ps1
-
       - name: Install Nuget Packages
         run: nuget restore .\packages.config -PackagesDirectory .\packages\
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c35a81ec..11dee203 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,9 +22,6 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Install WDK VSIX
-        run: .\.github\scripts\Install-Vsix.ps1
-
       - name: Install Nuget Packages
         run: nuget restore .\packages.config -PackagesDirectory .\packages\