diff options
| author | v-junyli <[email protected]> | 2025-06-28 00:17:59 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-06-28 00:17:59 -0700 |
| commit | eccce42b231fd243476dc2de1af714362b27037d (patch) | |
| tree | 3e78aa54c83d0e183744e37eb5600c13f5cbf582 | |
| parent | 65bdf7d504df8f520d32268b93b4f31a1bff0b7d (diff) | |
| parent | 5ae59499cd5372eb00ef11a6abeb322989b22bb0 (diff) | |
Merge pull request #1301 from microsoft/main
FI main->dev 2505D
| -rw-r--r-- | Directory.Build.props | 10 | ||||
| -rw-r--r-- | exclusions.csv | 1 | ||||
| -rw-r--r-- | packages.config | 10 |
3 files changed, 11 insertions, 10 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index dfdef8b5..d2276426 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ <Project> -<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/> -<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/> -<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/> -<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/> -<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.props')"/> +<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.4202\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.4202\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/> +<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.4202\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.4202\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4202\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4202\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4202\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4202\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.4202\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.4202\build\native\Microsoft.Windows.SDK.cpp.props')"/> </Project> diff --git a/exclusions.csv b/exclusions.csv index 6fb2cf35..1a6884f7 100644 --- a/exclusions.csv +++ b/exclusions.csv @@ -11,3 +11,4 @@ general\pcidrv,*,,26100,"failure introduced in VS17.14, suppressed until fix" serial\serial,*,,26100,"failure introduced in VS17.14, suppressed until fix" network\wlan\wdi,*,,26100,"failure introduced in VS17.14, suppressed until fix" tools\kasan\samples\kasandemo-wdm,*|x64,,26100,"failure introduced in VS17.14, suppressed until fix" + diff --git a/packages.config b/packages.config index fa8c2142..b09451c7 100644 --- a/packages.config +++ b/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.3323" targetFramework="native" /> - <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.3323" targetFramework="native" /> - <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.3323" targetFramework="native" /> - <package id="Microsoft.Windows.WDK.x64" version="10.0.26100.3323" targetFramework="native" /> - <package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.3323" targetFramework="native" /> + <package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.4202" targetFramework="native" /> + <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.4202" targetFramework="native" /> + <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.4202" targetFramework="native" /> + <package id="Microsoft.Windows.WDK.x64" version="10.0.26100.4202" targetFramework="native" /> + <package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.4202" targetFramework="native" /> </packages> |