From e5fa023a671620b760fe4fec0bd6b69c8cfdb62f Mon Sep 17 00:00:00 2001 From: Matt <138825652+middlemose@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:56:46 -0700 Subject: [PATCH] Remove deprecation statement and install vsix script. --- .github/scripts/Install-Vsix.ps1 | 38 -------------------------------- Building-Locally.md | 9 +------- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 .github/scripts/Install-Vsix.ps1 diff --git a/.github/scripts/Install-Vsix.ps1 b/.github/scripts/Install-Vsix.ps1 deleted file mode 100644 index 3ca8c65d5..000000000 --- a/.github/scripts/Install-Vsix.ps1 +++ /dev/null @@ -1,38 +0,0 @@ -<# - -.SYNOPSIS -DEPRECATED - -#> - -# 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/Building-Locally.md b/Building-Locally.md index cbc44bc85..9f6f0c617 100644 --- a/Building-Locally.md +++ b/Building-Locally.md @@ -79,14 +79,7 @@ To build the Windows Driver Samples you need a "driver build environment". In e * The Windows Driver Kit. ### Option A: Use WDK NuGet Packages -* See [Download the Windows Driver Kit (WDK)](https://learn.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk) for instructions on how to install Visual Studio, but only complete "Step 1". You do not need to install the SDK or the WDK. - -> Deprecated ->* Install the Visual Studio Windows Driver Kit Extension (WDK.vsix). -> * Open Visual Studio -> Extensions -> Manage Extensions... -> Browse. -> * In the search bar type: `Windows Driver Kit`. -> * Find the `Microsoft` signed extension. -> * Click the Install button. +* See [Download the Windows Driver Kit (WDK)](https://learn.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk) for instructions on how to install Visual Studio, but only complete `Step 1`. You do not need to install the SDK or the WDK. Visual Studio now includes the Windows Driver Kit as an individual component. See [Option A](./Building-Locally.md#option-a-install-vs-components) from above.