Skip to content

Commit 9eabe38

Browse files
5an7y-Microsoft5an7y-Microsoft
authored
Merge pull request #1378 from microsoft/main
FI: main -> develop
2 parents 1afe1d0 + 9920a06 commit 9eabe38

7 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎.github/Build-with-GitHub.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
If you use GitHub to host your code, you can leverage [GitHub Actions](https://docs.github.com/en/actions) to create automated workflows to build your driver projects.
44

5-
`windows-2022` runner (provided by `windows-latest`) is configured with Windows Driver Kit version 22H2 and Visual Studio 2022 off the box, so most solutions can be built by running `msbuild` directly.
5+
`windows-2025-vs2026` runner is configured with Visual Studio 2026 off the box, so most solutions can be built by running `msbuild` directly using the WDK NuGet package.
66

77
```yaml
88
name: Build driver solution
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
configuration: [Debug, Release]
1818
platform: [x64]
19-
runs-on: windows-2022
19+
runs-on: windows-2025-vs2026
2020
env:
2121
Solution_Path: path\to\driver\solution.sln
2222
steps:

‎.github/workflows/Code-Scanning.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
run: nuget restore .\packages.config -PackagesDirectory .\packages\
4949
- name: Get changed files
5050
id: get-changed-files
51-
uses: tj-actions/changed-files@v41
51+
uses: tj-actions/changed-files@v46
5252
with:
5353
separator: ","
5454
- name: Initialize CodeQL

‎.github/workflows/ci-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
configuration: [Debug, Release]
1717
platform: [x64, arm64]
18-
runs-on: windows-2022
18+
runs-on: windows-2025-vs2026
1919
steps:
2020
- name: Check out repository code
2121
uses: actions/checkout@v4

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
configuration: [Debug, Release]
2020
platform: [x64, arm64]
21-
runs-on: windows-2022
21+
runs-on: windows-2025-vs2026
2222
steps:
2323
- name: Check out repository code
2424
uses: actions/checkout@v4

‎Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
2-
<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/>
3-
<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.6584\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/>
4-
<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/>
5-
<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/>
6-
<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.6584\build\native\Microsoft.Windows.SDK.cpp.props')"/>
2+
<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.28000.1839\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.28000.1839\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/>
3+
<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.28000.1839\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.28000.1839\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/>
4+
<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.28000.1839\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.28000.1839\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/>
5+
<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.28000.1839\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.28000.1839\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/>
6+
<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.28000.1839\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.28000.1839\build\native\Microsoft.Windows.SDK.cpp.props')"/>
77
</Project>

‎exclusions.csv‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ network\trans\WFPSampler,Debug|ARM64,,22621,Only NI: Only ARM: Fails to build on
66
prm,*,,22621,Only NI: Not supported on NI.
77
powerlimit\plclient,*,,22621,Only NI: Not supported on NI.
88
powerlimit\plpolicy,*,,22621,Only NI: Not supported on NI.
9-
general\pcidrv,*,,26100,"failure introduced in VS17.14, suppressed until fix"
10-
serial\serial,*,,26100,"failure introduced in VS17.14, suppressed until fix"
11-
network\wlan\wdi,*,,26100,"failure introduced in VS17.14, suppressed until fix"
12-
tools\kasan\samples\kasandemo-wdm,*|x64,,26100,"failure introduced in VS17.14, suppressed until fix"
9+
general\pcidrv,*,26100,,"failure introduced in VS17.14, suppressed until fix"
10+
serial\serial,*,26100,,"failure introduced in VS17.14, suppressed until fix"
11+
network\wlan\wdi,*,26100,,"failure introduced in VS17.14, suppressed until fix"
12+
tools\kasan\samples\kasandemo-wdm,*|x64,26100,,"failure introduced in VS17.14, suppressed until fix"
1313

‎packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.6584" targetFramework="native" />
4-
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.6584" targetFramework="native" />
5-
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.6584" targetFramework="native" />
6-
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.6584" targetFramework="native" />
7-
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.6584" targetFramework="native" />
3+
<package id="Microsoft.Windows.SDK.CPP" version="10.0.28000.1839" targetFramework="native" />
4+
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.28000.1839" targetFramework="native" />
5+
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.28000.1839" targetFramework="native" />
6+
<package id="Microsoft.Windows.WDK.x64" version="10.0.28000.1839" targetFramework="native" />
7+
<package id="Microsoft.Windows.WDK.arm64" version="10.0.28000.1839" targetFramework="native" />
88
</packages>

0 commit comments

Comments
 (0)