From ed5dce633aeda76633b012bdadf1034335b8b693 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 21 Aug 2025 14:10:29 +0000
Subject: [PATCH 1/3] [universal] - Fixing multiple vulnerability issues

---
 src/universal/.devcontainer/devcontainer.json   |  4 ++--
 .../local-features/patch-conda/install.sh       | 17 +++++++++++++----
 src/universal/manifest.json                     |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json
index ec7a87f1dd..1a413edc73 100644
--- a/src/universal/.devcontainer/devcontainer.json
+++ b/src/universal/.devcontainer/devcontainer.json
@@ -11,8 +11,8 @@
         },
         "ghcr.io/devcontainers/features/dotnet:2": {
             "version": "8.0",
-            "dotnetRuntimeVersions": "7.0", 
-            "aspNetCoreRuntimeVersions": "7.0"
+            "dotnetRuntimeVersions": "9.0", 
+            "aspNetCoreRuntimeVersions": "9.0"
         },
         "ghcr.io/devcontainers/features/hugo:1": {
             "version": "latest"
diff --git a/src/universal/.devcontainer/local-features/patch-conda/install.sh b/src/universal/.devcontainer/local-features/patch-conda/install.sh
index c110702e36..283c9f0869 100644
--- a/src/universal/.devcontainer/local-features/patch-conda/install.sh
+++ b/src/universal/.devcontainer/local-features/patch-conda/install.sh
@@ -51,8 +51,17 @@ sudo_if /opt/conda/bin/python3 -m pip install --upgrade pip
 # Temporary: Upgrade python packages due to security vulnerabilities
 # They are installed by the conda feature and Conda distribution does not have the patches.
 
-# https://github.com/advisories/GHSA-v8gr-m533-ghj9
-update_python_package /opt/conda/bin/python3 cryptography "41.0.4"
+# https://github.com/advisories/GHSA-h4gh-qq45-vh27
+update_python_package /opt/conda/bin/python3 cryptography "43.0.1"
 
-# https://github.com/advisories/GHSA-v845-jxx5-vc9f
-update_conda_package urllib3 "1.26.18"
+# https://github.com/advisories/GHSA-34jh-p97f-mpxf
+update_conda_package urllib3 "1.26.19"
+
+# https://github.com/advisories/GHSA-9hjg-9r4m-mvj7
+update_conda_package requests "2.32.4"
+
+# https://github.com/advisories/GHSA-5rjg-fvgr-3xxf
+update_conda_package setuptools "78.1.1"
+
+# https://github.com/advisories/GHSA-g7vv-2v7x-gj9p
+update_python_package /opt/conda/bin/python3 tqdm "4.66.3"
\ No newline at end of file
diff --git a/src/universal/manifest.json b/src/universal/manifest.json
index b8bcb65db3..129546e04a 100644
--- a/src/universal/manifest.json
+++ b/src/universal/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.0.3",
+	"version": "3.0.4",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",

From 1405d00d57d6d71049304ecafdef71287620ab1b Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 28 Aug 2025 15:10:38 +0000
Subject: [PATCH 2/3] Doing a major version bump as per suggestion.

---
 src/universal/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/universal/manifest.json b/src/universal/manifest.json
index 129546e04a..5d2f269c43 100644
--- a/src/universal/manifest.json
+++ b/src/universal/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.0.4",
+	"version": "4.0.0",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",

From 83fcee4a3e5679e977d39a6916438eb7543c7b4c Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 29 Aug 2025 15:35:59 +0000
Subject: [PATCH 3/3] Updating readme file wih correct major version.

---
 src/universal/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/universal/README.md b/src/universal/README.md
index bb99c437e8..cfc1c85767 100644
--- a/src/universal/README.md
+++ b/src/universal/README.md
@@ -27,9 +27,9 @@ The container includes the `zsh` (and Oh My Zsh!) and `fish` shells that you can
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image.
 For example:
 
-- `mcr.microsoft.com/devcontainers/universal:3-noble`
-- `mcr.microsoft.com/devcontainers/universal:3.0-noble`
-- `mcr.microsoft.com/devcontainers/universal:3.0.0-noble`
+- `mcr.microsoft.com/devcontainers/universal:4-noble`
+- `mcr.microsoft.com/devcontainers/universal:4.0-noble`
+- `mcr.microsoft.com/devcontainers/universal:4.0.0-noble`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/universal/tags/list).
 
@@ -47,7 +47,7 @@ Access to the Anaconda repository is covered by the [Anaconda Terms of Service](
 
 While the image itself works unmodified, you can also directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to:
 
-`mcr.microsoft.com/devcontainers/universal:2-linux`
+`mcr.microsoft.com/devcontainers/universal:4-linux`
 
 Alternatively, you can use the contents of [.devcontainer](.devcontainer) to fully customize your container's contents or to build it for a container host architecture not supported by the image.