FreeRTOS Windows Simulator Build Changes and LTS 2.0 Update (#872)

* Update mbedtls to version v3.2.1

* Adjust include paths for github workflow

* Update FreeRTOS+TCP to v3.1.0

* Add initial VS project files for Kernel, +TCP, and mbedtls

* winpcap: Consolidate to a single copy of WinPcap

* Downgrade library projects to VS 2019. Add heap_4 to kernel.

* Remove *.vcxproj.user files and add to gitignore

* Disable unwanted kernel config options

* Update FreeRTOS+TCP and Kernel include paths

* Update FreeRTOS+TCP Windows Minimal sln

* Remove .suo and .vcxproj.user files

* Update mbedtls transport implementations for mbedtls v3.2.1

* Fix typo in mbedtls_freertos_port.c

* Update vcxproj files for +TCP, Kernel, Mbedtls

* Fix typo in name WindowSimulator -> WindowsSimulator

* Add wpcap lib to FreeRTOS+TCP.vcxproj

* Update FreeRTOS+TCP Minimal Demo for Windows Simulator

* Mask MSVC string function warnings

Aad _CRT_SECURE_NO_WARNINGS preprocessor definition.

* Move projects to their own directories to make VisualStudio happy

* mbedtls_freertos_port.c: Fix formatting?

* Add coreHTTP, Logging libs. Adjust dependencies

* Disable FreeRTOS Kernel malloc failed hook

* Update coreHTTP Plaintext demo

* Rename / relocate transport interface implementations

* Remove old VS project files

* Remove extra core_http_config.h files

* Remove extra FreeRTOSConfig.h files

* Remove extra FreeRTOSIPConfig.h files

* Remove old mbedtls_config.h files

* Remove old FreeRTOSConfig and core_http_config files

* Update HTTP Mutual Auth Demo build files

* Fix transport_plaintext.h include name

* Update HTTP_Plaintext demo build files

* Update CoreHTTP_S3_Download VS project files

* Update HTTP_S3_Upload demo build files

* Update CoreHTTP_S3_Download_Multithreaded demo build files

* Add GithubActions builds for FreeRTOS+ CoreHTTP Demos

* Update S3DownloadHTTPExample.c to be compatible with mbedtls 3.x

* Update GithubActions FreeRTOS+ config file

* Combine core_pkcs11_config.h files into a single one

* Add corePKCS11 VS project file

* Update corePKCS11 WinSim demo project and build files

* Update corePKCS11 library to version 3.5.0

* Modifiying demos to build using static libraries

* Adding a header file

* Two more demos

* Update corePKCS11 demo code and auto-format

* Downgrade corePKCS11 library build file to v142 / VS 2019

* Speed up CI builds with selective submodule initialization

* Separate corePKCS11 demo into it's own job.

* Remove WIN32.vcxproj and WIN32.vcxproj.filters files

* Remove old configuration header files

Partially reverts 73829ced6061e4584e521185178a61b4a437c5e0

* Revert unwanted coreHTTP demo changes

* Changing include paths for demos

* Adding an include

* MQTT WoflSSL Demo update

* wolfSSL Demo changes

* Config changes for MQTT Demos

* Initial Device Defender demo update.

* Initial Device Shadow demo update.

* Update mbedtls_transport_pkcs11 for Mbedtls 3.x

* Update corePKCS11 MQTT Mutual Auth demo

* Add a default definition of SdkLog

* Update CorePKCS11 + MQTT Mutual Auth demo sln name

* Build all configs of coreHTTP demos

* Update coreSNTP Demo build files.

* Update coreSNTP Demo sln name

* Update FreeRTOS+TCP Posix demo

* Update FreeRTOS+TCP Qemu ARM MPS2 AN385 Demo

* Update FreeRTOS+TCP Demo Github Actions builds

* Update Fleet Provisioning WinSim Demo build files

* Remove mbedtls_pk_info_t references from mbedtls_pk_pkcs11.h

* Restore / update the FreeRTOS+TCP Minimal WinSim demo

* Initial Jobs demo update.

* Fix jobs demo build.

* Initial OTA over HTTP demo update.

* Initial OTA over MQTT demo update.

* Ota_Over_Mqtt_Demo build fix.

* OTA over MQTT demo fix.

* Update HTTP demo solution file name for CI.

* Update Github actions workflow to old HTTP demo names.

* Update coreSTNP demo to old solution name.

* Fix defender demo / fix mbedtls config to use threading alt.

* Add MBEDTLS_CONFIG_FILE definition to each config

* Fix config file name.

* MQTT Mutual auth fixes.

* Fix job demo.

* Device shadow demo fixes.

* Fix coreSNTP demo not setting alt threading functions for mbedtls.

* Enable Static allocation, Add default hooks for FreeRTOS Kernel and +TCP

* Add xPlatformIsNetworkUp platform function to FreeRTOS+TCP hooks

* Enable runtime statistics in the Windows Simualator Kernel config

* Revert "Fix coreSNTP demo not setting alt threading functions for mbedtls."

This reverts commit 9069707519561ca8136d58c0f18fb176c9050a1d.

* Revert mbedtls threading related config changes

* Add xPlatformIsNetworkUp function prototype

* Remove boileplate FreeRTOS kernel and +tcp hooks

* Refactor device defender demo for clarity

* Add wait loop calling xPlatformIsNetworkUp

* Add missing vPlatformInitLogging function

* Add vPlatformInitLogging and vLoggingPrintf defitions to logging headers

* Updating the FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator

* Updating the FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator demo

* Updates to the FreeRTOS_Plus_WolfSSL_Windows_Simulator demo

* Fixing wrong include path

* Upating FreeRTOS_Plus_WolfSSL_FIPS_Ready_Windows_Simulator demo

* Update coreMQTT WinSim demos to print start and end condition.

* Modifiying repos updated as part of the CLI demo GitHub workflow

* Removing duplicate functions from the FreeRTOS_Plus_TCP_Minimal_Windows_Simulator demo

* Updated FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator demo

* Updating corePKCS11_MQTT_Mutual_Auth_Windows_Simulator Demo to call the static function that creates task

* Fix log message using unitialized string in MQTT Multitask demo.

* Fixing a broken extern function

* Fixing a typo extern function name

* Added a reference to coreHTTP

* Fixing a pre-processor issue in the OTA_Over_Http_Demo

* Updating the MQTT_Mutual_Auth_Demo_with_BG96 demo

* Updating the MQTT_Mutual_Auth_Demo_with_HL7802 demo

* Changes to the MQTT_Mutual_Auth_Demo_with_SARA_R4 demo

* Fix demos for CI.

* Adding the source path to the CBMC proofs for FreeRTOS+TCP

* Spell check fixes, adding words to lexicons

* Fixing a typo

* Add arg to skip prompt in setup script.

* Update paths of script to be relative to the file.

* Changing manifest.yml file to point to corePKCS11 3.5.0

* Added CI markers to cellular demos.

* Fix cellular demo flow.

* Fix celullar demos.

* Initial TCP sockets wrapper rework - will break things.

* First cellular demo fix for new sockets wrapper.

* Minor fix to cellular sockets wrapper.

* Fix mbedtls bio using FreeRTOS Plus TCP call.

* Clean up BG96 demo project files.

* Update HL7802 demo.

* Fix SARA R4 demo for new sockets wrapper.

* Fix Device Defender, Device Shadow, and Fleet PRovisioning.

* Fix Jobs demo.

* Fix OTA over HTTP demo.

* Fix OTA over MQTT demo.

* Fix HTTP mutual auth demo.

* Fix OTA over MQTT demo endianness.

* Fix OTA over HTTP demo endianness.

* Fix HTTP Plaintext demo.

* Fix HTTP S3 download demo.

* Fix plaintext transport

* Fix OTA demos.

* Fix OTA demos.

* Fix OTA HTTP demo.

* Fix HTTP S3 Download multithreaded demo.

* Fix HTTP S3 Upload demo

* Fix corePKCS11 Mutual Auth demo.

* Updating MQTT_Mutual_Auth

* Update pkcs11 setup script.

* Updating the MQTT_Basic_TLS Demo

* Organize PKCS11 demos project.

* Updating MQTT_Keep_Alive demo

* Clean up SNTP demo.

* Updated MQTT_Multitask demo

* Updated MQTT_Plain_Text

* Updating the MQTT_Serializer Demo

* Updating corePKCS11_MQTT_Mutual_Auth_Windows_Simulator

* Updating coreSNTP_Windows_Simulator

* Clean up demo projects.

* Add markers to PKCS11 mutual auth demo.

* Fix Fleet Provisioning demo script.

* Fix SNTP demo solution.

* Fix coreSNTP project files.

* Fix Fleet Provisiong script.

* Fix fleet provisioning script.

* Fix demo config template.

* Fleet provisioning demo markers.

* Updating MQTT_Mutual_Auth_wolfSSL demo and the transport_wolfSSL file

* Fixing FreeRTOS_Plus_TCP_Echo_POSIX

* Fixing CLI and Trace Demos

* Fixing TCP_ECHO_POSIX demo

* Adding a word to the lexicon

* Remove unneeded files.

* Update github workflows to use Ubuntu 20.04.

* Change OTA demo target names to RTOSDemo for OTAE2E tests.

* Fixing Headers

* Updating headers

* Two more headers

* Adding words to the lexicon

* Whitepsace

* Ignore mbedtls config file for header check.

* Removing FreeRTOS Header from the mbedtls_config_v3.2.1.h file

* Fix bug in lPKCS11PkMbedtlsCloseSessionAndFree. Add doxygen api docs.

* Update lexicon.txt

* Fix spelling

* Apply suggestions from code review

Co-authored-by: jasonpcarroll <23126711+jasonpcarroll@users.noreply.github.com>

* Add return code comment for p11_ecdsa_ctx_init

* Rename WindowsSimulator folder to VisualStudio_StaticProjects.

* Remove references to coroutines

* Fix mbedtls_pk_pkcs11.c

* Update to LTS 2.0 submodule pointers (#880)

* Update submodule pointers to LTS 2.0

* Initial coreMQTT 2.1.1 update.

* Update AWS demos for coreMQTT 2.1.1

* Fix deprecated macro for coreMQTT demos.

* Fix keep alive demo.

* Fix plaintext demo.

* Fix MQTT wolfSSL demo.

* Fix MQTT PKCS11 demo.

* Remove duplicate functions.

* Fix Mutual auth demos for Cellular.

* Fix OTA demos.

* Fix header of plaintext demo config.

* Set writev to NULL for OTA demos.

* Fix mbedlts config for OTA demos.

* Fix spelling.

Co-authored-by: Jason Carroll <czjaso@amazon.com>

* Removing blank line

* Fix jobs demo race condition.

* Fix race condition from WinPCap network interface.

* Update lexicon.

Co-authored-by: Paul Bartell <pbartell@amazon.com>
Co-authored-by: Jason Carroll <czjaso@amazon.com>
Co-authored-by: Paul Bartell <paul.bartell@gmail.com>
Co-authored-by: jasonpcarroll <23126711+jasonpcarroll@users.noreply.github.com>

.github/scripts/core_checker.py

@@ -289,6 +289,7 @@ FREERTOS_IGNORED_FILES = [
     '.project',
     'fyi-another-way-to-ignore-file.txt',
     'mbedtls_config.h',
+    'mbedtls_config_v3.2.1.h',
     'requirements.txt',
     'run-cbmc-proofs.py',
     '.editorconfig',

.github/workflows/auto-release.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   auto-release:
     name: Auto Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Tool Setup
         uses: actions/setup-python@v2

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   git-secrets:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -93,7 +93,7 @@ jobs:
           retention-days: 2
 
   spell-check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout Parent Repo
         uses: actions/checkout@v2
@@ -125,7 +125,7 @@ jobs:
           fi
 
   verify-manifest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -143,7 +143,7 @@ jobs:
           fail-on-incorrect-version: true
 
   memory-statistics:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       ARM_GCC_TOOLCHAIN_URL: "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2?revision=05382cca-1721-44e1-ae19-1e7c3dc96118&la=en&hash=D7C9D18FCA2DD9F894FD9F3C3DC9228498FA281A"
     steps:

.github/workflows/core-checks.yml

@@ -46,7 +46,7 @@ jobs:
           exit $?
   build-checker:
     name: FreeRTOS Posix Build Check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Clone This Repo
         uses: actions/checkout@v2
@@ -65,7 +65,7 @@ jobs:
             bash workspace/.github/scripts/posix_network_build_checker.sh workspace
   arm-gcc-build-checker:
     name: FreeRTOS ARM GCC Build Check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       ARM_GCC_TOOLCHAIN_URL: "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2?revision=05382cca-1721-44e1-ae19-1e7c3dc96118&la=en&hash=D7C9D18FCA2DD9F894FD9F3C3DC9228498FA281A"
     steps:

.github/workflows/freertos_plus_demos.yml

@@ -2,19 +2,9 @@ name: Build FreeRTOS+ Demos
 on:
   push:
     branches: ["**"]
-    paths:
-      - "FreeRTOS/Source"
-      - "FreeRTOS-Plus/Source/**"
-      - "FreeRTOS-Plus/Demo/Common/**"
-      - "FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/**"
 
   pull_request:
     branches: [main]
-    paths:
-      - "FreeRTOS/Source"
-      - "FreeRTOS-Plus/Source/**"
-      - "FreeRTOS-Plus/Demo/Common/**"
-      - "FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/**"
 
 jobs:
   winsim_cellular:
@@ -25,7 +15,22 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Fetch Submodules
-        run: git submodule update --checkout --init --recursive
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \
+            FreeRTOS-Plus/Source/Utilities/backoff_algorithm \
+            FreeRTOS-Plus/Source/coreJSON \
+            FreeRTOS-Plus/Source/corePKCS11 \
+            FreeRTOS-Plus/ThirdParty/mbedtls \
+            FreeRTOS-Plus/ThirdParty/tinycbor
+          git -C FreeRTOS-Plus/Source/corePKCS11 submodule update --checkout --init --depth 1 source/dependency/3rdparty/pkcs11
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.1
@@ -59,6 +64,103 @@ jobs:
         working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/MQTT_Mutual_Auth_Demo_with_SARA_R4
         run: msbuild mqtt_mutual_auth_demo_with_sara_r4.sln -t:rebuild -property:Configuration=Debug
 
+  winsim_coreHTTP:
+    name: coreHTTP WinSim Demos
+    runs-on: windows-2019
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Fetch Submodules
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/AWS/sigv4 \
+            FreeRTOS-Plus/Source/Application-Protocols/coreHTTP \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \
+            FreeRTOS-Plus/Source/Utilities/backoff_algorithm \
+            FreeRTOS-Plus/Source/coreJSON \
+            FreeRTOS-Plus/ThirdParty/mbedtls
+          git -C FreeRTOS-Plus/Source/Application-Protocols/coreHTTP submodule update --checkout --init --depth 1 source/dependency/3rdparty/llhttp
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.1
+
+      - name: Configure coreHTTP Demos
+        shell: bash
+        working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator
+        run: |
+          echo '#ifndef DEMO_CONFIG_H_TEST_BUILD' | tee -a */demo_config.h
+          echo '    #define DEMO_CONFIG_H_TEST_BUILD' | tee -a */demo_config.h
+          echo '    #define democonfigSERVER_HOSTNAME ""' | tee -a */demo_config.h
+          echo '    #define democonfigAWS_IOT_ENDPOINT ""' | tee -a */demo_config.h
+          echo '    #define democonfigROOT_CA_PEM ""' | tee -a */demo_config.h
+          echo '    #define democonfigCLIENT_CERTIFICATE_PEM ""' | tee -a */demo_config.h
+          echo '    #define democonfigCLIENT_PRIVATE_KEY_PEM ""' | tee -a */demo_config.h
+          echo '    #define democonfigIOT_CRED_PROVIDER_ROOT_CA_PEM ""' | tee -a */demo_config.h
+          echo '    #define democonfigIOT_CREDENTIAL_PROVIDER_ENDPOINT ""' | tee -a */demo_config.h
+          echo '    #define democonfigIOT_CREDENTIAL_PROVIDER_ROLE ""' | tee -a */demo_config.h
+          echo '    #define democonfigIOT_THING_NAME ""' | tee -a */demo_config.h
+          echo '    #define democonfigS3_PRESIGNED_GET_URL "ABCDEF"' | tee -a */demo_config.h
+          echo '    #define democonfigS3_PRESIGNED_PUT_URL "ABCDEF"' | tee -a */demo_config.h
+          echo '    #define democonfigS3_ROOT_CA_PEM ""' | tee -a */demo_config.h
+          echo '    #define democonfigS3_BUCKET_NAME ""' | tee -a */demo_config.h
+          echo '    #define democonfigS3_BUCKET_REGION ""' | tee -a */demo_config.h
+          echo '    #define democonfigS3_OBJECT_NAME ""' | tee -a */demo_config.h
+          echo '#endif /* DEMO_CONFIG_H_TEST_BUILD */' | tee -a */demo_config.h
+
+      - name: Build HTTP Mutual Auth Demo
+        working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth
+        run: msbuild http_mutual_auth_demo.sln -t:rebuild
+
+      - name: Build HTTP Plain Text Demo
+        working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext
+        run: msbuild http_plain_text_demo.sln -t:rebuild
+
+      - name: Build HTTP S3 Download Demo
+        working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download
+        run: msbuild http_s3_download_demo.sln -t:rebuild
+
+      - name: Build HTTP S3 Download Multithreaded Demo
+        working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded
+        run: msbuild http_s3_download_multithreaded_demo.sln -t:rebuild
+
+      - name: Build HTTP S3 Upload Demo
+        working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload
+        run: msbuild http_s3_upload_demo.sln -t:rebuild
+
+
+  winsim_corePKCS11:
+    name: corePKCS11 WinSim Demos
+    runs-on: windows-2019
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Fetch Submodules
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/AWS/fleet-provisioning \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \
+            FreeRTOS-Plus/Source/Utilities/backoff_algorithm \
+            FreeRTOS-Plus/Source/coreJSON \
+            FreeRTOS-Plus/Source/corePKCS11 \
+            FreeRTOS-Plus/ThirdParty/mbedtls
+
+          git -C FreeRTOS-Plus/Source/corePKCS11 submodule update --checkout --init --depth 1 source/dependency/3rdparty/pkcs11
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.1
+
+      - name: corePKCS11 Demo
+        working-directory: FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator
+        run: msbuild CorePKCS11_Demos.sln -t:rebuild -m
+
   winsim_corelibs:
     name: core Library Windows Simulator Demos
     runs-on: windows-2019
@@ -67,7 +169,34 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Fetch Submodules
-        run: git submodule update --checkout --init --recursive
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/AWS/device-defender \
+            FreeRTOS-Plus/Source/AWS/device-shadow \
+            FreeRTOS-Plus/Source/AWS/fleet-provisioning \
+            FreeRTOS-Plus/Source/AWS/jobs \
+            FreeRTOS-Plus/Source/AWS/ota \
+            FreeRTOS-Plus/Source/AWS/sigv4 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 \
+            FreeRTOS-Plus/Source/Application-Protocols/coreHTTP \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent \
+            FreeRTOS-Plus/Source/Application-Protocols/coreSNTP \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \
+            FreeRTOS-Plus/Source/Utilities/backoff_algorithm \
+            FreeRTOS-Plus/Source/coreJSON \
+            FreeRTOS-Plus/Source/corePKCS11 \
+            FreeRTOS-Plus/ThirdParty/mbedtls \
+            FreeRTOS-Plus/ThirdParty/tinycbor \
+            FreeRTOS-Plus/ThirdParty/wolfSSL
+
+          git -C FreeRTOS-Plus/Source/Application-Protocols/coreHTTP submodule update --checkout --init --depth 1 source/dependency/3rdparty/llhttp
+          git -C FreeRTOS-Plus/Source/corePKCS11 submodule update --checkout --init --depth 1 source/dependency/3rdparty/pkcs11
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.1
@@ -135,11 +264,7 @@ jobs:
 
       - name: Build corePKCS11 + coreMQTT Mutual Auth Demo
         working-directory: FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator
-        run: msbuild pkcs11_mqtt_mutual_auth_demo.sln -t:rebuild -property:Configuration=Debug -m
-
-      - name: corePKCS11 Demo
-        working-directory: FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator
-        run: msbuild pkcs11_demos.sln -t:rebuild -property:Configuration=Debug -m
+        run: msbuild corePKCS11_MQTT_Mutual_Auth.sln -t:rebuild
 
       - name: Configure coreSNTP_Windows_Simulator
         shell: bash
@@ -155,7 +280,7 @@ jobs:
 
       - name: coreSNTP Demo
         working-directory: FreeRTOS-Plus/Demo/coreSNTP_Windows_Simulator
-        run: msbuild core_sntp_demo.sln -t:rebuild -property:Configuration=Debug -m
+        run: msbuild core_sntp_demo.sln -t:rebuild
 
 
   winsim_aws_iot:
@@ -167,7 +292,34 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Fetch Submodules
-        run: git submodule update --checkout --init --recursive
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/AWS/device-defender \
+            FreeRTOS-Plus/Source/AWS/device-shadow \
+            FreeRTOS-Plus/Source/AWS/fleet-provisioning \
+            FreeRTOS-Plus/Source/AWS/jobs \
+            FreeRTOS-Plus/Source/AWS/ota \
+            FreeRTOS-Plus/Source/AWS/sigv4 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 \
+            FreeRTOS-Plus/Source/Application-Protocols/coreHTTP \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent \
+            FreeRTOS-Plus/Source/Application-Protocols/coreSNTP \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \
+            FreeRTOS-Plus/Source/Utilities/backoff_algorithm \
+            FreeRTOS-Plus/Source/coreJSON \
+            FreeRTOS-Plus/Source/corePKCS11 \
+            FreeRTOS-Plus/ThirdParty/mbedtls \
+            FreeRTOS-Plus/ThirdParty/tinycbor \
+            FreeRTOS-Plus/ThirdParty/wolfSSL
+
+          git -C FreeRTOS-Plus/Source/Application-Protocols/coreHTTP submodule update --checkout --init --depth 1 source/dependency/3rdparty/llhttp
+          git -C FreeRTOS-Plus/Source/corePKCS11 submodule update --checkout --init --depth 1 source/dependency/3rdparty/pkcs11
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.1
@@ -213,7 +365,49 @@ jobs:
         working-directory: FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/Ota_Over_Http_Demo
         run: msbuild ota_over_http_demo.sln -t:rebuild -property:Configuration=Debug -m
 
-  winsim_plus_tcp:
+  plus_tcp_posix:
+    name: FreeRTOS+TCP Posix Simulator Demo
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Fetch Submodules
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP
+
+      - name: Install prerequisite packages
+        run: sudo apt-get install -y git build-essential libpcap-dev
+
+      - name: Build FreeRTOS+TCP Minimal Demo
+        working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix
+        run: make -j
+
+  plus_tcp_arm:
+    name: FreeRTOS+TCP QEMU ARM MPS2 AN385
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Fetch Submodules
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP
+
+      - name: Install prerequisite packages
+        run: sudo apt-get install -y git make gcc-arm-none-eabi
+
+      - name: Build FreeRTOS+TCP Minimal Demo
+        working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2
+        run: make -j
+
+  plus_tcp_winsim:
     name: FreeRTOS+TCP Windows Simulator Demos
     runs-on: windows-2019
     continue-on-error: true
@@ -222,7 +416,13 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Fetch Submodules
-        run: git submodule update --checkout --init --recursive
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \
+            FreeRTOS-Plus/ThirdParty/mbedtls \
+            FreeRTOS-Plus/ThirdParty/wolfSSL
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.1
@@ -252,7 +452,34 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Fetch Submodules
-        run: git submodule update --checkout --init --recursive
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 \
+            FreeRTOS/Source \
+            FreeRTOS-Plus/Source/AWS/device-defender \
+            FreeRTOS-Plus/Source/AWS/device-shadow \
+            FreeRTOS-Plus/Source/AWS/fleet-provisioning \
+            FreeRTOS-Plus/Source/AWS/jobs \
+            FreeRTOS-Plus/Source/AWS/ota \
+            FreeRTOS-Plus/Source/AWS/sigv4 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 \
+            FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 \
+            FreeRTOS-Plus/Source/Application-Protocols/coreHTTP \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT \
+            FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent \
+            FreeRTOS-Plus/Source/Application-Protocols/coreSNTP \
+            FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \
+            FreeRTOS-Plus/Source/Utilities/backoff_algorithm \
+            FreeRTOS-Plus/Source/coreJSON \
+            FreeRTOS-Plus/Source/corePKCS11 \
+            FreeRTOS-Plus/ThirdParty/mbedtls \
+            FreeRTOS-Plus/ThirdParty/tinycbor \
+            FreeRTOS-Plus/ThirdParty/wolfSSL
+
+          git -C FreeRTOS-Plus/Source/Application-Protocols/coreHTTP submodule update --checkout --init --depth 1 source/dependency/3rdparty/llhttp
+          git -C FreeRTOS-Plus/Source/corePKCS11 submodule update --checkout --init --depth 1 source/dependency/3rdparty/pkcs11
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.1