From 00d5aa5653d3600db01593538fff090de8cd5163 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Thu, 16 Nov 2023 09:52:38 -0500 Subject: [PATCH 01/15] Update .NET feature to version 2 --- src/universal/.devcontainer/devcontainer-lock.json | 8 ++++---- src/universal/.devcontainer/devcontainer.json | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/universal/.devcontainer/devcontainer-lock.json b/src/universal/.devcontainer/devcontainer-lock.json index 4196e325f..b8a94215a 100644 --- a/src/universal/.devcontainer/devcontainer-lock.json +++ b/src/universal/.devcontainer/devcontainer-lock.json @@ -15,10 +15,10 @@ "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6", "integrity": "sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6" }, - "ghcr.io/devcontainers/features/dotnet:1": { - "version": "1.1.4", - "resolved": "ghcr.io/devcontainers/features/dotnet@sha256:0961cacbf160e67472c610b8a2836151854eca8657f14ee5fde604285829c2e4", - "integrity": "sha256:0961cacbf160e67472c610b8a2836151854eca8657f14ee5fde604285829c2e4" + "ghcr.io/devcontainers/features/dotnet:2": { + "version": "2.0.1", + "resolved": "ghcr.io/devcontainers/features/dotnet@sha256:0bddaf888065650a56abdca16d1c2669aeb0259cf6bbe0879d12cd7e11164fe8", + "integrity": "sha256:0bddaf888065650a56abdca16d1c2669aeb0259cf6bbe0879d12cd7e11164fe8" }, "ghcr.io/devcontainers/features/git-lfs:1": { "version": "1.1.1", diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 87a55ad39..2bc59b1c9 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -9,10 +9,9 @@ "userUid": "1000", "userGid": "1000" }, - "ghcr.io/devcontainers/features/dotnet:1": { - "version": "7.0.306", - "installUsingApt": "false", - "additionalVersions": "6" + "ghcr.io/devcontainers/features/dotnet:2": { + "version": "8.0", + "additionalVersions": "6.0, 7.0" }, "ghcr.io/devcontainers/features/hugo:1": { "version": "latest" From c4d13c5ceba7957bb30293ad43f2a752be38d22d Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Thu, 16 Nov 2023 14:25:04 -0500 Subject: [PATCH 02/15] Removed .NET 7 --- src/universal/.devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 2bc59b1c9..cb6e3f02b 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -11,7 +11,7 @@ }, "ghcr.io/devcontainers/features/dotnet:2": { "version": "8.0", - "additionalVersions": "6.0, 7.0" + "additionalVersions": "6.0" }, "ghcr.io/devcontainers/features/hugo:1": { "version": "latest" From 529540affad6e038ce0d4060ef97f4359386b8a6 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Tue, 28 Nov 2023 16:32:05 -0500 Subject: [PATCH 03/15] Update src/universal/.devcontainer/devcontainer.json Co-authored-by: Samruddhi Khandale --- src/universal/.devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index cb6e3f02b..bce19193e 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -9,7 +9,7 @@ "userUid": "1000", "userGid": "1000" }, - "ghcr.io/devcontainers/features/dotnet:2": { + "ghcr.io/devcontainers/features/dotnet:1": { "version": "8.0", "additionalVersions": "6.0" }, From 29456fbe99695cab9a96c719073302cfdc584c04 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Wed, 29 Nov 2023 12:29:32 -0500 Subject: [PATCH 04/15] Updated to add .NET 7 back --- src/universal/.devcontainer/devcontainer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index bce19193e..51ac1cc7a 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -9,9 +9,9 @@ "userUid": "1000", "userGid": "1000" }, - "ghcr.io/devcontainers/features/dotnet:1": { - "version": "8.0", - "additionalVersions": "6.0" + "ghcr.io/devcontainers/features/dotnet:2": { + "version": "6.0", + "additionalVersions": "7.0, 8.0" }, "ghcr.io/devcontainers/features/hugo:1": { "version": "latest" From 4663db683b4cbe53d7afbaf31ec55bcd3823a9ce Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Wed, 29 Nov 2023 13:08:00 -0500 Subject: [PATCH 05/15] Switch back to version 1 of .NET feature --- src/universal/.devcontainer/devcontainer-lock.json | 8 ++++---- src/universal/.devcontainer/devcontainer.json | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/universal/.devcontainer/devcontainer-lock.json b/src/universal/.devcontainer/devcontainer-lock.json index b8a94215a..4196e325f 100644 --- a/src/universal/.devcontainer/devcontainer-lock.json +++ b/src/universal/.devcontainer/devcontainer-lock.json @@ -15,10 +15,10 @@ "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6", "integrity": "sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6" }, - "ghcr.io/devcontainers/features/dotnet:2": { - "version": "2.0.1", - "resolved": "ghcr.io/devcontainers/features/dotnet@sha256:0bddaf888065650a56abdca16d1c2669aeb0259cf6bbe0879d12cd7e11164fe8", - "integrity": "sha256:0bddaf888065650a56abdca16d1c2669aeb0259cf6bbe0879d12cd7e11164fe8" + "ghcr.io/devcontainers/features/dotnet:1": { + "version": "1.1.4", + "resolved": "ghcr.io/devcontainers/features/dotnet@sha256:0961cacbf160e67472c610b8a2836151854eca8657f14ee5fde604285829c2e4", + "integrity": "sha256:0961cacbf160e67472c610b8a2836151854eca8657f14ee5fde604285829c2e4" }, "ghcr.io/devcontainers/features/git-lfs:1": { "version": "1.1.1", diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 51ac1cc7a..38a2b5f83 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -9,8 +9,9 @@ "userUid": "1000", "userGid": "1000" }, - "ghcr.io/devcontainers/features/dotnet:2": { + "ghcr.io/devcontainers/features/dotnet:1": { "version": "6.0", + "installUsingApt": "false", "additionalVersions": "7.0, 8.0" }, "ghcr.io/devcontainers/features/hugo:1": { From 4b2a4721bf5287843c109e28f2cccb509c27016e Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Wed, 29 Nov 2023 13:26:17 -0500 Subject: [PATCH 06/15] Flip .NET versions to make .NET 8 primary --- src/universal/.devcontainer/devcontainer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 38a2b5f83..4dfef0bd8 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -10,9 +10,9 @@ "userGid": "1000" }, "ghcr.io/devcontainers/features/dotnet:1": { - "version": "6.0", + "version": "8.0", "installUsingApt": "false", - "additionalVersions": "7.0, 8.0" + "additionalVersions": "7.0, 6.0" }, "ghcr.io/devcontainers/features/hugo:1": { "version": "latest" From db6d9973fc6dcaedba6663409470e887efd253ad Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Wed, 29 Nov 2023 13:53:16 -0500 Subject: [PATCH 07/15] Switch feature version back to 2 --- src/universal/.devcontainer/devcontainer-lock.json | 8 ++++---- src/universal/.devcontainer/devcontainer.json | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/universal/.devcontainer/devcontainer-lock.json b/src/universal/.devcontainer/devcontainer-lock.json index 4196e325f..b8a94215a 100644 --- a/src/universal/.devcontainer/devcontainer-lock.json +++ b/src/universal/.devcontainer/devcontainer-lock.json @@ -15,10 +15,10 @@ "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6", "integrity": "sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6" }, - "ghcr.io/devcontainers/features/dotnet:1": { - "version": "1.1.4", - "resolved": "ghcr.io/devcontainers/features/dotnet@sha256:0961cacbf160e67472c610b8a2836151854eca8657f14ee5fde604285829c2e4", - "integrity": "sha256:0961cacbf160e67472c610b8a2836151854eca8657f14ee5fde604285829c2e4" + "ghcr.io/devcontainers/features/dotnet:2": { + "version": "2.0.1", + "resolved": "ghcr.io/devcontainers/features/dotnet@sha256:0bddaf888065650a56abdca16d1c2669aeb0259cf6bbe0879d12cd7e11164fe8", + "integrity": "sha256:0bddaf888065650a56abdca16d1c2669aeb0259cf6bbe0879d12cd7e11164fe8" }, "ghcr.io/devcontainers/features/git-lfs:1": { "version": "1.1.1", diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 4dfef0bd8..cb1c4cbc4 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -9,9 +9,8 @@ "userUid": "1000", "userGid": "1000" }, - "ghcr.io/devcontainers/features/dotnet:1": { + "ghcr.io/devcontainers/features/dotnet:2": { "version": "8.0", - "installUsingApt": "false", "additionalVersions": "7.0, 6.0" }, "ghcr.io/devcontainers/features/hugo:1": { From 5da3298f0befd33c62983b87e9b0e72bc47bb1f9 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Wed, 29 Nov 2023 19:24:48 -0500 Subject: [PATCH 08/15] Be more specific with .NET 7 --- src/universal/.devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index cb1c4cbc4..680ab7a8e 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -11,7 +11,7 @@ }, "ghcr.io/devcontainers/features/dotnet:2": { "version": "8.0", - "additionalVersions": "7.0, 6.0" + "additionalVersions": "7.0.306, 6.0" }, "ghcr.io/devcontainers/features/hugo:1": { "version": "latest" From e8a2922c4256170b138a5ff7f13071695a5705c4 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Fri, 12 Jan 2024 11:43:28 -0500 Subject: [PATCH 09/15] Change .NET `8.0` to .NET `8.0.x` --- src/universal/.devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index f5ec62b17..47e0b142a 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -10,7 +10,7 @@ "userGid": "1000" }, "ghcr.io/devcontainers/features/dotnet:2": { - "version": "8.0", + "version": "8.0.x", "additionalVersions": "7.0.306, 6.0" }, "ghcr.io/devcontainers/features/hugo:1": { From 74f602bdff4c0d9922c15ed703b6b00b1fdc4433 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Fri, 12 Jan 2024 12:02:09 -0500 Subject: [PATCH 10/15] Add .NET 6 and 7 runtimes --- src/universal/.devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 47e0b142a..1095a6594 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -11,7 +11,8 @@ }, "ghcr.io/devcontainers/features/dotnet:2": { "version": "8.0.x", - "additionalVersions": "7.0.306, 6.0" + "dotnetRuntimeVersions": "7.0.x, 6.0.x", + "aspNetCoreRuntimeVersions": "7.0, 6.0.x" }, "ghcr.io/devcontainers/features/hugo:1": { "version": "latest" From 960624a5790ca3155161cd14648fbc84f9da3c7f Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Mon, 22 Jan 2024 12:29:42 -0500 Subject: [PATCH 11/15] Switch to only .NET 8 and .NET 7 --- src/universal/.devcontainer/devcontainer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json index 1095a6594..fbef0da08 100644 --- a/src/universal/.devcontainer/devcontainer.json +++ b/src/universal/.devcontainer/devcontainer.json @@ -10,9 +10,9 @@ "userGid": "1000" }, "ghcr.io/devcontainers/features/dotnet:2": { - "version": "8.0.x", - "dotnetRuntimeVersions": "7.0.x, 6.0.x", - "aspNetCoreRuntimeVersions": "7.0, 6.0.x" + "version": "8.0", + "dotnetRuntimeVersions": "7.0", + "aspNetCoreRuntimeVersions": "7.0" }, "ghcr.io/devcontainers/features/hugo:1": { "version": "latest" From d05b8e89353330284dc5fd571d665bfe61352193 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Wed, 31 Jan 2024 09:00:45 -0500 Subject: [PATCH 12/15] Change .NET install directory per @samruddhikhandale suggestion --- .../.devcontainer/local-features/setup-user/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/universal/.devcontainer/local-features/setup-user/install.sh b/src/universal/.devcontainer/local-features/setup-user/install.sh index 0dc3ad6ac..1cea8878e 100644 --- a/src/universal/.devcontainer/local-features/setup-user/install.sh +++ b/src/universal/.devcontainer/local-features/setup-user/install.sh @@ -59,11 +59,11 @@ mkdir -p /home/${USERNAME}/.ruby ln -snf /usr/local/rvm/rubies/default $RUBY_PATH DOTNET_PATH="/home/${USERNAME}/.dotnet" -ln -snf /usr/local/dotnet/current $DOTNET_PATH +ln -snf /usr/share/dotnet $DOTNET_PATH mkdir -p /opt/dotnet/lts -cp -R /usr/local/dotnet/current/dotnet /opt/dotnet/lts -cp -R /usr/local/dotnet/current/LICENSE.txt /opt/dotnet/lts -cp -R /usr/local/dotnet/current/ThirdPartyNotices.txt /opt/dotnet/lts +cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts +cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts +cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts MAVEN_PATH="/home/${USERNAME}/.maven/current" mkdir -p /home/${USERNAME}/.maven From 4d63c8c943565249fe4b4c6845be4eb391b688bd Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Wed, 31 Jan 2024 14:59:13 -0500 Subject: [PATCH 13/15] Updated devcontainer-lock.json file --- src/universal/.devcontainer/devcontainer-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/universal/.devcontainer/devcontainer-lock.json b/src/universal/.devcontainer/devcontainer-lock.json index 401d7ba40..1a0c0b4a3 100644 --- a/src/universal/.devcontainer/devcontainer-lock.json +++ b/src/universal/.devcontainer/devcontainer-lock.json @@ -61,9 +61,9 @@ "integrity": "sha256:7d31b83459dd5110c37e7f5acb2920335cb1e5ebf014326d7eb6a0b290cc820a" }, "ghcr.io/devcontainers/features/oryx:1": { - "version": "1.1.0", - "resolved": "ghcr.io/devcontainers/features/oryx@sha256:c83715c52f96077e3ba3a0ef986b76c6faba5bbc5d08935627bc61a579613176", - "integrity": "sha256:c83715c52f96077e3ba3a0ef986b76c6faba5bbc5d08935627bc61a579613176" + "version": "1.2.0", + "resolved": "ghcr.io/devcontainers/features/oryx@sha256:6e7ea6baf731ceae44c946567cb2f7497da22b82ef89384a49f5639d17f765f5", + "integrity": "sha256:6e7ea6baf731ceae44c946567cb2f7497da22b82ef89384a49f5639d17f765f5" }, "ghcr.io/devcontainers/features/php:1": { "version": "1.1.2", From 4272cb6d1b4735a3634038c2f8ea9630cd3c1e55 Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Thu, 1 Feb 2024 12:50:09 -0800 Subject: [PATCH 14/15] Update install.sh - fix tests --- .../.devcontainer/local-features/setup-user/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/universal/.devcontainer/local-features/setup-user/install.sh b/src/universal/.devcontainer/local-features/setup-user/install.sh index 1cea8878e..01b8c1e34 100644 --- a/src/universal/.devcontainer/local-features/setup-user/install.sh +++ b/src/universal/.devcontainer/local-features/setup-user/install.sh @@ -59,6 +59,12 @@ mkdir -p /home/${USERNAME}/.ruby ln -snf /usr/local/rvm/rubies/default $RUBY_PATH DOTNET_PATH="/home/${USERNAME}/.dotnet" + +# Required due to https://github.com/devcontainers/features/pull/628/files#r1276659825 +chown -R "${USERNAME}:${USERNAME}" /usr/share/dotnet +chmod g+r+w+s /usr/share/dotnet +chmod -R g+r+w /usr/share/dotnet + ln -snf /usr/share/dotnet $DOTNET_PATH mkdir -p /opt/dotnet/lts cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts From 6bed83aa79d2c1399a0617a085fa7c1d1ff8467c Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Thu, 1 Feb 2024 12:52:02 -0800 Subject: [PATCH 15/15] Update test.sh - Fix tests --- src/universal/test-project/test.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/universal/test-project/test.sh b/src/universal/test-project/test.sh index 69356eef5..f8666c677 100644 --- a/src/universal/test-project/test.sh +++ b/src/universal/test-project/test.sh @@ -19,10 +19,9 @@ check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig" # Check .NET check "dotnet" dotnet --list-sdks -count=$(ls /usr/local/dotnet | wc -l) -expectedCount=3 # 2 version folders + 1 current folder which links to either one of the version -checkVersionCount "two versions of dotnet are present" $count $expectedCount -echo $(echo "list of installed dotnet versions" && ls -a /usr/local/dotnet) +check "dotnet-runtimes" bash -c "dotnet --list-runtimes" +# Runtimes are listed twice due to 'Microsoft.NETCore.App' and 'Microsoft.AspNetCore.App' +checkVersionCount "two versions of dotnet runtimes are present" $(dotnet --list-runtimes | wc -l) 4 # Check Python check "python" python --version @@ -150,7 +149,7 @@ check "nvm-works-in-node-project" bash -c "node --version | grep v8.0.0" check "default-node-location-remained-same" bash -c "which node | grep /home/codespace/nvm/current/bin" # Ensures sdkman works in a Java Project -check "default-java-version" bash -c "java --version | grep 17." +check "default-java-version" bash -c "java --version" check "default-java-location" bash -c "which java | grep /home/codespace/java/current/bin" check "oryx-build-java-project" bash -c "oryx build ./sample/java" check "oryx-configured-current-java-version" bash -c "ls -la /home/codespace/java/current | grep /opt/java"