Skip to content

Commit eccce42

Browse files
authored
Merge pull request #1301 from microsoft/main
FI main->dev 2505D
2 parents 65bdf7d + 5ae5949 commit eccce42

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

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.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'"/>
3-
<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'"/>
4-
<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'"/>
5-
<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'"/>
6-
<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')"/>
2+
<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'"/>
3+
<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'"/>
4+
<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'"/>
5+
<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'"/>
6+
<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')"/>
77
</Project>

exclusions.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ general\pcidrv,*,,26100,"failure introduced in VS17.14, suppressed until fix"
1111
serial\serial,*,,26100,"failure introduced in VS17.14, suppressed until fix"
1212
network\wlan\wdi,*,,26100,"failure introduced in VS17.14, suppressed until fix"
1313
tools\kasan\samples\kasandemo-wdm,*|x64,,26100,"failure introduced in VS17.14, suppressed until fix"
14+

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.3323" targetFramework="native" />
4-
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.3323" targetFramework="native" />
5-
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.3323" targetFramework="native" />
6-
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.3323" targetFramework="native" />
7-
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.3323" targetFramework="native" />
3+
<package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.4202" targetFramework="native" />
4+
<package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.4202" targetFramework="native" />
5+
<package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.4202" targetFramework="native" />
6+
<package id="Microsoft.Windows.WDK.x64" version="10.0.26100.4202" targetFramework="native" />
7+
<package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.4202" targetFramework="native" />
88
</packages>

0 commit comments

Comments
 (0)