develop to main (#1171)

* Init commit

* Upgrade NuGet to 26100.1 (#1162)

* Upgrade NuGet to 10.0.26100.1-preview.ge-release

* Upgrade NuGet to 10.0.26100.2 pre

* Upgrade NuGet to 10.0.26100

* Upgrade NuGet to 10.0.26100.1

* Update Building-Locally.md

* Update Building-Locally.md

---------

Co-authored-by: Phan Trinh Ha <[email protected]>

6 files changed, 22 insertions, 26 deletions

diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1
index 059dc5b2..b0da097a 100644
--- a/Build-SampleSet.ps1
+++ b/Build-SampleSet.ps1
@@ -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'.
diff --git a/Building-Locally.md b/Building-Locally.md
index d9ad76e1..bb9fc610 100644
--- a/Building-Locally.md
+++ b/Building-Locally.md
@@ -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)
diff --git a/Directory.Build.props b/Directory.Build.props
index 9f333db0..811c5f30 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -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>
diff --git a/hid/firefly/sauron/Sauron.cpp b/hid/firefly/sauron/Sauron.cpp
index 16cb12d4..36ef367b 100644
--- a/hid/firefly/sauron/Sauron.cpp
+++ b/hid/firefly/sauron/Sauron.cpp
@@ -445,7 +445,7 @@ HRESULT CSauron::WzToColor(const WCHAR *pwszColor, COLORREF *pcrColor)
         return E_POINTER;
     }
 
-    if (0 == lstrlenW(pwszColor))
+    if (0 == wcslen(pwszColor))
     {
         //Empty color string passed in
         return E_INVALIDARG;
@@ -457,7 +457,7 @@ HRESULT CSauron::WzToColor(const WCHAR *pwszColor, COLORREF *pcrColor)
         return E_POINTER;
     }
 
-    if (lstrlenW(pwszColor) != 7)
+    if (wcslen(pwszColor) != 7)
     {
         //hex color string is not of the correct length
         return E_INVALIDARG;
@@ -534,5 +534,3 @@ inline DWORD CSauron::SwapBytes(DWORD dwRet)
 {
     return ((dwRet & 0x0000FF00) | ((dwRet & 0x00FF0000) >> 16) | ((dwRet & 0x000000FF) << 16));
 }
-
-
diff --git a/hid/hclient/ecdisp.c b/hid/hclient/ecdisp.c
index 0d15774f..28433aea 100644
--- a/hid/hclient/ecdisp.c
+++ b/hid/hclient/ecdisp.c
@@ -3588,8 +3588,7 @@ bSetDataDlgProc(
                 break;
             }
 
-            #pragma prefast(suppress: 28750, "Banned API check.")
-            CharUpperBuff(DataString, lstrlen(DataString));
+            CharUpperBuff(DataString, (DWORD)strlen(DataString));
 
             if (0 == lstrcmp(DataString, "TRUE"))
             {
diff --git a/packages.config b/packages.config
index 3b62f4bb..257a510d 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.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>