From c077ce435a9e848fd8e852c75aec9af61701d593 Mon Sep 17 00:00:00 2001
From: Karunakaran A <karunakaran_amirthalingam@cable.comcast.com>
Date: Wed, 11 Dec 2024 11:09:07 -0500
Subject: [PATCH 1/2] Release of v0.6.0

Signed-off-by: Karunakaran A <karunakaran_amirthalingam@cable.comcast.com>
---
 CHANGELOG.md                 | 8 ++++++++
 CMakeLists.txt               | 4 ++--
 NetworkManager.json          | 2 +-
 docs/NetworkManagerPlugin.md | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56932775..6ffd188e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,14 @@ All notable changes to this RDK Service will be documented in this file.
 
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
+## [0.6.0] - 2024-12-10
+### Added
+- Added specific SSID/frequency scanning
+- Added retry logic in WPS Connect
+- Added Unittest for Connectivity Class
+- Fixed Continuous Connectivity Monitoring when no interface connected
+- Fixed SetIPSettings on GNome backed
+
 ## [0.5.4] - 2024-11-29
 ### Fixed
 - Fixed documentation of NetworkManager
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 592e9915..3670fe97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ find_package(WPEFramework)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 5)
-set(VERSION_PATCH 4)
+set(VERSION_MINOR 6)
+set(VERSION_PATCH 0)
 
 add_compile_definitions(NETWORKMANAGER_MAJOR_VERSION=${VERSION_MAJOR})
 add_compile_definitions(NETWORKMANAGER_MINOR_VERSION=${VERSION_MINOR})
diff --git a/NetworkManager.json b/NetworkManager.json
index d18ca007..7636a552 100644
--- a/NetworkManager.json
+++ b/NetworkManager.json
@@ -9,7 +9,7 @@
         "status": "development",
         "description": "A Unified `NetworkManager` plugin that allows you to manage Ethernet and Wifi interfaces on the device.",
         "sourcelocation": "https://github.com/rdkcentral/networkmanager/blob/main/NetworkManager.json",
-        "version": "0.5.3"
+        "version": "0.6.0"
     },
     "definitions": {
         "success": {
diff --git a/docs/NetworkManagerPlugin.md b/docs/NetworkManagerPlugin.md
index 757fb68f..8c6b3f3e 100644
--- a/docs/NetworkManagerPlugin.md
+++ b/docs/NetworkManagerPlugin.md
@@ -2,7 +2,7 @@
 <a name="head.NetworkManager_Plugin"></a>
 # NetworkManager Plugin
 
-**Version: 0.5.4**
+**Version: 0.6.0**
 
 **Status: :white_circle::white_circle::white_circle:**
 
@@ -23,7 +23,7 @@ org.rdk.NetworkManager interface for Thunder framework.
 <a name="head.Scope"></a>
 ## Scope
 
-This document describes purpose and functionality of the org.rdk.NetworkManager interface (version 0.5.4). It includes detailed specification about its methods provided and notifications sent.
+This document describes purpose and functionality of the org.rdk.NetworkManager interface (version 0.6.0). It includes detailed specification about its methods provided and notifications sent.
 
 <a name="head.Case_Sensitivity"></a>
 ## Case Sensitivity

From 398d924532cc99280dfba01520f2ceb590833e15 Mon Sep 17 00:00:00 2001
From: parvathika <131966254+parvathika@users.noreply.github.com>
Date: Fri, 13 Dec 2024 19:27:44 +0530
Subject: [PATCH 2/2] To fix the workflow issue  (#58)

* fix the workflow issue

* Update gnome_unit_test.yml
---
 .github/workflows/gnome_unit_test.yml             |  2 +-
 .../unit_test/test_NetworkManagerConnectivity.cpp | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/.github/workflows/gnome_unit_test.yml b/.github/workflows/gnome_unit_test.yml
index 4dcb52e8..3d8fd278 100644
--- a/.github/workflows/gnome_unit_test.yml
+++ b/.github/workflows/gnome_unit_test.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   unit-tests:
     name: Build and run unit tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
         
     steps:
       - name: Configure cache
diff --git a/Tests/unit_test/test_NetworkManagerConnectivity.cpp b/Tests/unit_test/test_NetworkManagerConnectivity.cpp
index 74f4309f..a0452029 100644
--- a/Tests/unit_test/test_NetworkManagerConnectivity.cpp
+++ b/Tests/unit_test/test_NetworkManagerConnectivity.cpp
@@ -1,20 +1,5 @@
 #include "NetworkManagerImplementation.h"
 #include "NetworkManagerConnectivity.h"
-
-#include <cstring>
-#include <atomic>
-#include <vector>
-#include <thread>
-#include <chrono>
-#include <map>
-#include <curl/curl.h>
-#include <condition_variable>
-#include <mutex>
-#include <cerrno>
-#include <cstdlib>
-#include <fstream>
-#include <algorithm>
-#include <ctime>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>