diff --git a/build/__dotNetCoreRunTimeVersions.sh b/build/__dotNetCoreRunTimeVersions.sh index 08aaa6f8eb..3b416557b5 100644 --- a/build/__dotNetCoreRunTimeVersions.sh +++ b/build/__dotNetCoreRunTimeVersions.sh @@ -1,6 +1,6 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -DOT_NET_CORE_RUNTIME_BASE_TAG='20231108.3' +DOT_NET_CORE_RUNTIME_BASE_TAG='20231109.5' NET_CORE_APP_10='1.0.16' NET_CORE_APP_11='1.1.13' NET_CORE_APP_20='2.0.9' @@ -30,7 +30,7 @@ NET_CORE_APP_70='7.0.13' NET_CORE_APP_70_SHA='00a0b9c101c665ea9e751ce645c68840b02450c4a9f268149e6f59da1f179e85f0932475b8a72162b5271fdfe2ddc88eb21d09aa78bdd7dc285983445503f758' ASPNET_CORE_APP_70='7.0.13' ASPNET_CORE_APP_70_SHA='930c83d7b553529f37b1516848f64ac5bde479bc5dff5e89edaddc4f7b552924f9b51b58367df8cadb9055b4a7220bfa5a4d39e09fb6b51f4bcacf3b82416ba3' -NET_CORE_APP_80='8.0.0-rc.2.23479.6' -NET_CORE_APP_80_SHA='f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828' -ASPNET_CORE_APP_80='8.0.0-rc.2.23480.2' -ASPNET_CORE_APP_80_SHA='5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9' +NET_CORE_APP_80='8.0.0' +NET_CORE_APP_80_SHA='16a93af328bcf61775875f4007c23081e2cb7aa8e2fba724aea6a61bc7ecf7466cc368121b08b58ac3b72f68cb67801c68c6505591eb35f18461db856bb08b37' +ASPNET_CORE_APP_80='8.0.0' +ASPNET_CORE_APP_80_SHA='c0aa3a926d6c2bc0d4cc14f5d7677a4592111bf3ebefa65c5273c4b979a6e2b5d58305a5aaf4ac78f593b46605ec02f40b610dcbff070b1d8cf8ddc656cac7dc' diff --git a/build/constants.yaml b/build/constants.yaml index 1f57bd79f8..ee0ff4dd59 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -69,7 +69,7 @@ file-name-prefix: __ - name: dot-net-core-run-time-versions constants: - dot-net-core-runtime-base-tag: 20231108.3 + dot-net-core-runtime-base-tag: 20231109.5 net-core-app-10: 1.0.16 net-core-app-11: 1.1.13 net-core-app-20: 2.0.9 @@ -99,10 +99,10 @@ net-core-app-70-sha: 00a0b9c101c665ea9e751ce645c68840b02450c4a9f268149e6f59da1f179e85f0932475b8a72162b5271fdfe2ddc88eb21d09aa78bdd7dc285983445503f758 aspnet-core-app-70: 7.0.13 aspnet-core-app-70-sha: 930c83d7b553529f37b1516848f64ac5bde479bc5dff5e89edaddc4f7b552924f9b51b58367df8cadb9055b4a7220bfa5a4d39e09fb6b51f4bcacf3b82416ba3 - net-core-app-80: 8.0.0-rc.2.23479.6 - net-core-app-80-sha: f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828 - aspnet-core-app-80: 8.0.0-rc.2.23480.2 - aspnet-core-app-80-sha: 5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9 + net-core-app-80: 8.0.0 + net-core-app-80-sha: 16a93af328bcf61775875f4007c23081e2cb7aa8e2fba724aea6a61bc7ecf7466cc368121b08b58ac3b72f68cb67801c68c6505591eb35f18461db856bb08b37 + aspnet-core-app-80: 8.0.0 + aspnet-core-app-80-sha: c0aa3a926d6c2bc0d4cc14f5d7677a4592111bf3ebefa65c5273c4b979a6e2b5d58305a5aaf4ac78f593b46605ec02f40b610dcbff070b1d8cf8ddc656cac7dc outputs: - type: csharp directory: src/BuildScriptGenerator/DotNetCore diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md index 6f3ced89d3..2c7f577ab3 100644 --- a/doc/supportedPlatformVersions.md +++ b/doc/supportedPlatformVersions.md @@ -1210,6 +1210,7 @@ - 3.9.1rc1 - 3.9.7 - 3.9.15 +- 3.9.15 - 3.9.18 - 3.10.0a2 - 3.10.0 diff --git a/images/runtime/dotnetcore/8.0/base.bookworm.Dockerfile b/images/runtime/dotnetcore/8.0/base.bookworm.Dockerfile index 306ca631ad..56af51fc40 100644 --- a/images/runtime/dotnetcore/8.0/base.bookworm.Dockerfile +++ b/images/runtime/dotnetcore/8.0/base.bookworm.Dockerfile @@ -6,9 +6,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump -# Update dotnet-monitor after .NET is out of preview to: -# dotnet-monitor --version 8.* -RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.0.0-preview.7.23402 +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.* FROM mcr.microsoft.com/mirror/docker/library/debian:bookworm-slim ARG BUILD_DIR=/tmp/oryx/build diff --git a/images/runtime/dotnetcore/8.0/base.bookworm.staging.Dockerfile b/images/runtime/dotnetcore/8.0/base.bookworm.staging.Dockerfile index dd3002cd83..ea4e9d0c25 100644 --- a/images/runtime/dotnetcore/8.0/base.bookworm.staging.Dockerfile +++ b/images/runtime/dotnetcore/8.0/base.bookworm.staging.Dockerfile @@ -49,7 +49,7 @@ RUN --mount=type=secret,id=dotnet_storage_account_token_id \ && apt-get update \ && apt-get install -f ca-certificates -y --no-install-recommends \ && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ - && curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$NET_CORE_APP_80/dotnet-runtime-$NET_CORE_APP_80-linux-x64.tar.gz \ + && curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$NET_CORE_APP_80/dotnet-runtime-$NET_CORE_APP_80-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ && echo "$NET_CORE_APP_80_SHA dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ @@ -57,7 +57,7 @@ RUN --mount=type=secret,id=dotnet_storage_account_token_id \ && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ # Install ASP.NET Core && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ - && curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_CORE_APP_80/aspnetcore-runtime-$ASPNET_CORE_APP_80-linux-x64.tar.gz \ + && curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$ASPNET_CORE_APP_80/aspnetcore-runtime-$ASPNET_CORE_APP_80-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ && echo "$ASPNET_CORE_APP_80_SHA aspnetcore.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/images/runtime/dotnetcore/8.0/base.bullseye.Dockerfile b/images/runtime/dotnetcore/8.0/base.bullseye.Dockerfile index 68c99cb51b..173b722196 100644 --- a/images/runtime/dotnetcore/8.0/base.bullseye.Dockerfile +++ b/images/runtime/dotnetcore/8.0/base.bullseye.Dockerfile @@ -6,9 +6,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump -# Update dotnet-monitor after .NET is out of preview to: -# dotnet-monitor --version 8.* -RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.0.0-preview.7.23402 +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.* FROM mcr.microsoft.com/mirror/docker/library/debian:bullseye-slim ARG BUILD_DIR=/tmp/oryx/build diff --git a/images/runtime/dotnetcore/8.0/base.bullseye.staging.Dockerfile b/images/runtime/dotnetcore/8.0/base.bullseye.staging.Dockerfile index 1db1953e6c..1cf1353a40 100644 --- a/images/runtime/dotnetcore/8.0/base.bullseye.staging.Dockerfile +++ b/images/runtime/dotnetcore/8.0/base.bullseye.staging.Dockerfile @@ -9,6 +9,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump # Update dotnet-monitor after .NET is out of preview to: # dotnet-monitor --version 8.* RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.0.0-preview.7.23402 + FROM mcr.microsoft.com/mirror/docker/library/debian:bullseye-slim ARG BUILD_DIR=/tmp/oryx/build ADD build ${BUILD_DIR} @@ -48,7 +49,7 @@ RUN --mount=type=secret,id=dotnet_storage_account_token_id \ && apt-get update \ && apt-get install -f ca-certificates -y --no-install-recommends \ && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ - && curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$NET_CORE_APP_80/dotnet-runtime-$NET_CORE_APP_80-linux-x64.tar.gz \ + && curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$NET_CORE_APP_80/dotnet-runtime-$NET_CORE_APP_80-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ && echo "$NET_CORE_APP_80_SHA dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ @@ -56,7 +57,7 @@ RUN --mount=type=secret,id=dotnet_storage_account_token_id \ && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ # Install ASP.NET Core && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ - && curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_CORE_APP_80/aspnetcore-runtime-$ASPNET_CORE_APP_80-linux-x64.tar.gz \ + && curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$ASPNET_CORE_APP_80/aspnetcore-runtime-$ASPNET_CORE_APP_80-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ && echo "$ASPNET_CORE_APP_80_SHA aspnetcore.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs index 407c9c5a50..277eadbb11 100644 --- a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs +++ b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs @@ -4,7 +4,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore { public static class DotNetCoreRunTimeVersions { - public const string DotNetCoreRuntimeBaseTag = "20231108.3"; + public const string DotNetCoreRuntimeBaseTag = "20231109.5"; public const string NetCoreApp10 = "1.0.16"; public const string NetCoreApp11 = "1.1.13"; public const string NetCoreApp20 = "2.0.9"; @@ -34,9 +34,9 @@ public static class DotNetCoreRunTimeVersions public const string NetCoreApp70Sha = "00a0b9c101c665ea9e751ce645c68840b02450c4a9f268149e6f59da1f179e85f0932475b8a72162b5271fdfe2ddc88eb21d09aa78bdd7dc285983445503f758"; public const string AspnetCoreApp70 = "7.0.13"; public const string AspnetCoreApp70Sha = "930c83d7b553529f37b1516848f64ac5bde479bc5dff5e89edaddc4f7b552924f9b51b58367df8cadb9055b4a7220bfa5a4d39e09fb6b51f4bcacf3b82416ba3"; - public const string NetCoreApp80 = "8.0.0-rc.2.23479.6"; - public const string NetCoreApp80Sha = "f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828"; - public const string AspnetCoreApp80 = "8.0.0-rc.2.23480.2"; - public const string AspnetCoreApp80Sha = "5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9"; + public const string NetCoreApp80 = "8.0.0"; + public const string NetCoreApp80Sha = "16a93af328bcf61775875f4007c23081e2cb7aa8e2fba724aea6a61bc7ecf7466cc368121b08b58ac3b72f68cb67801c68c6505591eb35f18461db856bb08b37"; + public const string AspnetCoreApp80 = "8.0.0"; + public const string AspnetCoreApp80Sha = "c0aa3a926d6c2bc0d4cc14f5d7677a4592111bf3ebefa65c5273c4b979a6e2b5d58305a5aaf4ac78f593b46605ec02f40b610dcbff070b1d8cf8ddc656cac7dc"; } } \ No newline at end of file