Skip to content

Commit 76410e1

Browse files
mthalmanmthalman
committed
Merge branch 'main' into nightly
2 parents 28edf60 + d5a3779 commit 76410e1

File tree

221 files changed

+1019
-1044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+1019
-1044
lines changed

‎README.aspnet.md‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

‎README.runtime-deps.md‎

Lines changed: 45 additions & 45 deletions
Large diffs are not rendered by default.

‎README.runtime.md‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

‎README.sdk.md‎

Lines changed: 50 additions & 50 deletions
Large diffs are not rendered by default.

‎eng/dockerfile-templates/monitor/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ ENV \
7272
DefaultProcess__Filters__0__Key=ProcessId \
7373
DefaultProcess__Filters__0__Value=1 \
7474
# Remove Unix Domain Socket before starting diagnostic port server
75-
DiagnosticPort__DeleteEndpointOnStartup=true \
75+
DiagnosticPort__DeleteEndpointOnStartup=true \{{ if dotnetMajor != "6":
7676
# Server GC mode
77-
DOTNET_gcServer=1 \
77+
DOTNET_gcServer=1 \}}
7878
# Logging: JSON format so that analytic platforms can get discrete entry information
7979
Logging__Console__FormatterName=json \
8080
# Logging: Use round-trip date/time format without timezone information (always logged in UTC)

‎manifest.versions.json‎

Lines changed: 119 additions & 119 deletions
Large diffs are not rendered by default.

‎src/aspnet/3.1/alpine3.16/amd64/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
2-
FROM $REPO:3.1.31-alpine3.16
2+
FROM $REPO:3.1.32-alpine3.16
33

44
# .NET Core globalization APIs will use invariant mode by default because DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true is set
55
# by the base runtime-deps image. See https://aka.ms/dotnet-globalization-alpine-containers for more information.
66

77
# Install ASP.NET Core
8-
RUN aspnetcore_version=3.1.31 \
8+
RUN aspnetcore_version=3.1.32 \
99
&& wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
10-
&& aspnetcore_sha512='f3e28547974303257a76af87fec7d0084c8efce4359ecf761ecab191336679f2ffe12928f7edb6624442ad7b0a38738c9a3fe2fd5d7fece1fa16441e4898de32' \
10+
&& aspnetcore_sha512='d67edf1ed7817c002e1f444baf3a48b71d6f3328ed3f63287d744445665db846f63d24f4f8dd97f99d85f9d5f28fd0d1f1b8efa0c88ed7545a3ee9cfc491f7d0' \
1111
&& echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \
1212
&& tar -oxzf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \
1313
&& rm aspnetcore.tar.gz

‎src/aspnet/3.1/alpine3.16/arm64v8/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
2-
FROM $REPO:3.1.31-alpine3.16-arm64v8
2+
FROM $REPO:3.1.32-alpine3.16-arm64v8
33

44
# .NET Core globalization APIs will use invariant mode by default because DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true is set
55
# by the base runtime-deps image. See https://aka.ms/dotnet-globalization-alpine-containers for more information.
66

77
# Install ASP.NET Core
8-
RUN aspnetcore_version=3.1.31 \
8+
RUN aspnetcore_version=3.1.32 \
99
&& wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
10-
&& aspnetcore_sha512='ce61ffe110dc5dbac31f1abdf040d06d1fae2bf52065f6a88f77785d879f4f916e3335cd9c75cf4cb4e6c8a0208089e663f81972c4b4bd84a8589e73aed03450' \
10+
&& aspnetcore_sha512='3d4baee2ca9e064c6f53ba1d89c099273a245c0fa3f6406485b2d6ed0e0526df2e28d0f69ede1c5855d8eb6b2401c1d862b0a622e2ec7cc8ec671266d9563f2f' \
1111
&& echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \
1212
&& tar -oxzf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \
1313
&& rm aspnetcore.tar.gz

‎src/aspnet/3.1/bionic/amd64/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
2-
FROM $REPO:3.1.31-bionic
2+
FROM $REPO:3.1.32-bionic
33

44
# Install ASP.NET Core
5-
RUN aspnetcore_version=3.1.31 \
5+
RUN aspnetcore_version=3.1.32 \
66
&& curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \
7-
&& aspnetcore_sha512='9ea1fb4c9a656de8392b8f92c608c2f927fd03ad8e8b195f3f0b69c1433cfbf2679827b1ce2fac783f8ef77307c7b1b36563d0813f914b75b025b5cca6c773f9' \
7+
&& aspnetcore_sha512='0aa2aceda3d0b9f6bf02456d4e4b917c221c4f18eff30c8b6418e7514681baa9bb9ccc6b8c78949a92664922db4fb2b2a0dac9da11f775aaef618d9c491bb319' \
88
&& echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \
99
&& tar -oxzf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \
1010
&& rm aspnetcore.tar.gz

‎src/aspnet/3.1/bionic/arm32v7/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ARG REPO=mcr.microsoft.com/dotnet/runtime
2-
FROM $REPO:3.1.31-bionic-arm32v7
2+
FROM $REPO:3.1.32-bionic-arm32v7
33

44
# Install ASP.NET Core
5-
RUN aspnetcore_version=3.1.31 \
5+
RUN aspnetcore_version=3.1.32 \
66
&& curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \
7-
&& aspnetcore_sha512='77bd03a2f9d3ea15401b7b6004794cad77c43ac972b2fd0817daf73003ce12358009faf60c2058f5a29366514c458b89a0d0f719829996f81f38e8510f70b3e7' \
7+
&& aspnetcore_sha512='f984a6bf0d0c917fc74bee1d03af79a7e6ca6ce3bd722b14c0cf82641fdadb2d48014ea30989239f5082e4320668172409ee8a99c4acf7d9db155405187d7578' \
88
&& echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \
99
&& tar -oxzf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \
1010
&& rm aspnetcore.tar.gz

0 commit comments

Comments
 (0)