Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade NuGet to 26100.1 #1162

Merged
merged 8 commits into from
May 22, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build-SampleSet.ps1
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ if (-not $env:GITHUB_REPOSITORY -eq '') {
#
elseif(Test-Path(".\packages")) {
$build_environment=("NuGet")
$build_number=26095
$build_number=26100
}
#
# EWDK sets environment variable BuildLab. For example 'ni_release_svc_prod1.22621.2428'.
17 changes: 8 additions & 9 deletions Building-Locally.md
Original file line number Diff line number Diff line change
@@ -78,9 +78,8 @@ To build the Windows Driver Samples you need a "driver build environment". In e
* The Windows Driver Kit.

### Option A: Use WDK NuGet Packages
* Note: This option is only available in pre-release form.
* 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.
* Install the Visual Studio Windows Driver Kit Extension (WDK.vsix). Open Visual Studio -> Extensions -> Manage Extensions... -> Online -> Visual Studio Market Place -> Windows Driver Kit -> 10.0.26090.10 -> Download
* Install the Visual Studio Windows Driver Kit Extension (WDK.vsix). Open Visual Studio -> Extensions -> Manage Extensions... -> Online -> Visual Studio Market Place -> Windows Driver Kit -> 10.0.26100.0 -> Download
* Launch a "Developer Command Prompt for VS 2022".
* Restore WDK packages from feed :

@@ -93,11 +92,11 @@ To build the Windows Driver Samples you need a "driver build environment". In e
```
>cd path\to\your\repos\Windows-driver-samples
>dir /b packages
Microsoft.Windows.SDK.CPP.10.0.26095.2-preview.ge-release
Microsoft.Windows.SDK.CPP.x64.10.0.26095.2-preview.ge-release
Microsoft.Windows.SDK.CPP.arm64.10.0.26095.2-preview.ge-release
Microsoft.Windows.WDK.x64.10.0.26095.2-preview.ge-release
Microsoft.Windows.WDK.arm64.10.0.26095.2-preview.ge-release
Microsoft.Windows.SDK.CPP.10.0.26000.1
Microsoft.Windows.SDK.CPP.x64.10.0.26000.1
Microsoft.Windows.SDK.CPP.arm64.10.0.26000.1
Microsoft.Windows.WDK.x64.10.0.26000.1
Microsoft.Windows.WDK.arm64.10.0.26000.1
```
### Option B: Use the Windows Driver Kit
* Here you will install each of above prerequisites one at a time.
@@ -106,7 +105,7 @@ Microsoft.Windows.WDK.arm64.10.0.26095.2-preview.ge-release

### Option C: Use an Enterprise WDK
* You can also simply use the Enterprise WDK (EWDK), a standalone, self-contained command-line environment for building drivers that contains all prerequisites in one combined ISO.
* Download the Windows 11, version 22H2 EWDK ISO image from the [official site](https://learn.microsoft.com/en-us/legal/windows/hardware/enterprise-wdk-license-2022)
* See [Download the Windows Driver Kit (WDK)](https://learn.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk) for instructions on how to download the EWDK.
* Mount ISO image
* Open a terminal
* `.\LaunchBuildEnv`
@@ -145,7 +144,7 @@ Expected output:
```
PS > .\build-AllSamples.ps1
Build Environment: NuGet
Build Number: 26095
Build Number: 26100
Samples: 132
Configurations: 2 (Debug Release)
Platforms: 2 (x64 arm64)
10 changes: 5 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/>
<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/>
<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/>
<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/>
<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26095.2-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.props')"/>
<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.1\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.1\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/>
<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.1\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.1\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/>
<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/>
<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/>
<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.1\build\native\Microsoft.Windows.SDK.cpp.props')"/>
</Project>
10 changes: 5 additions & 5 deletions packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26095.2-preview.ge-release" targetFramework="native" />
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26095.2-preview.ge-release" targetFramework="native" />
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26095.2-preview.ge-release" targetFramework="native" />
<package id="Microsoft.Windows.WDK.x64" version="10.0.26095.2-preview.ge-release" targetFramework="native" />
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26095.2-preview.ge-release" targetFramework="native" />
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.1" targetFramework="native" />
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.1" targetFramework="native" />
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.1" targetFramework="native" />
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.1" targetFramework="native" />
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.1" targetFramework="native" />
</packages>