From 2a91b045f7f3c95eff3bcb586dee1f59b8cc129b Mon Sep 17 00:00:00 2001
From: Igor Abdrakhimov <igorabd@amazon.com>
Date: Thu, 10 Jul 2025 13:29:50 -0700
Subject: [PATCH 1/3] Use latest windows in ci

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96d329815..906065f6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -197,8 +197,8 @@ jobs:
         run: |
           cd ${{ env.CI_FOLDER }}/aws-iot-device-sdk-cpp-v2
           python ./deviceadvisor/script/DATestRun.py
-  windows-vs14:
-    runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
+  windows-vs17:
+    runs-on: windows-2025
     strategy:
       matrix:
         arch: [Win32, x64]
@@ -216,7 +216,7 @@ jobs:
           md ${{ env.CI_FOLDER }}
           cd ${{ env.CI_FOLDER }}
           python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
-          python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-Tv140 --cmake-extra=-A${{ matrix.arch }}
+          python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-Tv143 --cmake-extra=-A${{ matrix.arch }}
       - name: Running samples in CI setup
         run: |
           python -m pip install boto3
@@ -302,7 +302,7 @@ jobs:
           cd ${{ env.CI_FOLDER }}/aws-iot-device-sdk-cpp-v2
           python ./deviceadvisor/script/DATestRun.py
   windows-app-verifier:
-    runs-on: windows-2022 # latest
+    runs-on: windows-2025 # latest
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:

From 03e43e5dd2d351efcec382215a53814b352ebdb5 Mon Sep 17 00:00:00 2001
From: Igor Abdrakhimov <igorabd@amazon.com>
Date: Thu, 10 Jul 2025 13:37:29 -0700
Subject: [PATCH 2/3] Fix unused var error

---
 eventstream_rpc/source/EventStreamClient.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eventstream_rpc/source/EventStreamClient.cpp b/eventstream_rpc/source/EventStreamClient.cpp
index b1f8ce8f2..6ab84adb3 100644
--- a/eventstream_rpc/source/EventStreamClient.cpp
+++ b/eventstream_rpc/source/EventStreamClient.cpp
@@ -1396,7 +1396,10 @@ namespace Aws
             return true;
         }
 
-        void StreamResponseHandler::OnStreamEvent(Crt::ScopedResource<AbstractShapeBase> response) {}
+        void StreamResponseHandler::OnStreamEvent(Crt::ScopedResource<AbstractShapeBase> response)
+        {
+            (void)response;
+        }
 
         void StreamResponseHandler::OnStreamClosed() {}
 

From 34f4e7026cd59a77da879eac17425a7aa9cadad1 Mon Sep 17 00:00:00 2001
From: Igor Abdrakhimov <igorabd@amazon.com>
Date: Fri, 11 Jul 2025 10:33:33 -0700
Subject: [PATCH 3/3] Add comment

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 906065f6a..f8dc8b21e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -212,6 +212,8 @@ jobs:
           role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
+        # The "--cmake-extra=-Tv143" explicitly sets VS 17 2022 to be used for compilation.
+        # See https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2017%202022.html#toolset-selection
         run: |
           md ${{ env.CI_FOLDER }}
           cd ${{ env.CI_FOLDER }}