Skip to content

Commit d5a3779

Browse files
authored
Updates for December servicing
2 parents 84b3ced + 35346a8 commit d5a3779

File tree

241 files changed

+2186
-1082
lines changed

Some content is hidden

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

241 files changed

+2186
-1082
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ The following examples illustrate how to run `update-dependencies`:
8282
> ./eng/Set-DotnetVersions.ps1 -ProductVersion 3.1 -SdkVersion 3.1.302 -RuntimeVersion 3.1.6 -AspnetVersion 3.1.6
8383
```
8484

85-
- Update the .NET Monitor version
85+
- Update the .NET Monitor version (uses a helper script for running update-dependencies)
8686

8787
``` console
88-
> dotnet run --project .\eng\update-dependencies\update-dependencies.csproj 6.0 --product-version monitor=6.0.0-rc.1.21515.7 --channel-name 6.0/rc.1
88+
> ./eng/Set-DotnetVersions.ps1 -ProductVersion 6.0 -MonitorVersion 6.0.0-rc.1.21515.7
8989
```
9090

9191
- Update the PowerShell version used in the 6.0 images

README.aspnet.md

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

README.monitor.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how
4545
## Linux amd64 Tags
4646
Tags | Dockerfile | OS Version
4747
-----------| -------------| -------------
48-
7.0.0-alpine-amd64, 7.0-alpine-amd64, 7-alpine-amd64, 7.0.0-alpine, 7.0-alpine, 7-alpine, 7.0.0, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/amd64/Dockerfile) | Alpine 3.16
49-
6.3.0-alpine-amd64, 6.3-alpine-amd64, 6-alpine-amd64, 6.3.0-alpine, 6.3-alpine, 6-alpine, 6.3.0, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.16
48+
7.0.1-alpine-amd64, 7.0-alpine-amd64, 7-alpine-amd64, 7.0.1-alpine, 7.0-alpine, 7-alpine, 7.0.1, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/amd64/Dockerfile) | Alpine 3.17
49+
6.3.1-alpine-amd64, 6.3-alpine-amd64, 6-alpine-amd64, 6.3.1-alpine, 6.3-alpine, 6-alpine, 6.3.1, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.17
5050
6.2.2-alpine-amd64, 6.2-alpine-amd64, 6.2.2-alpine, 6.2-alpine, 6.2.2, 6.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.2/alpine/amd64/Dockerfile) | Alpine 3.16
5151

5252
## Linux arm64 Tags
5353
Tags | Dockerfile | OS Version
5454
-----------| -------------| -------------
55-
7.0.0-alpine-arm64v8, 7.0-alpine-arm64v8, 7-alpine-arm64v8, 7.0.0-alpine, 7.0-alpine, 7-alpine, 7.0.0, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/arm64v8/Dockerfile) | Alpine 3.16
56-
6.3.0-alpine-arm64v8, 6.3-alpine-arm64v8, 6-alpine-arm64v8, 6.3.0-alpine, 6.3-alpine, 6-alpine, 6.3.0, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.16
55+
7.0.1-alpine-arm64v8, 7.0-alpine-arm64v8, 7-alpine-arm64v8, 7.0.1-alpine, 7.0-alpine, 7-alpine, 7.0.1, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/arm64v8/Dockerfile) | Alpine 3.17
56+
6.3.1-alpine-arm64v8, 6.3-alpine-arm64v8, 6-alpine-arm64v8, 6.3.1-alpine, 6.3-alpine, 6-alpine, 6.3.1, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.17
5757
6.2.2-alpine-arm64v8, 6.2-alpine-arm64v8, 6.2.2-alpine, 6.2-alpine, 6.2.2, 6.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.2/alpine/arm64v8/Dockerfile) | Alpine 3.16
5858

5959
You can retrieve a list of all available tags for dotnet/monitor at https://mcr.microsoft.com/v2/dotnet/monitor/tags/list.

README.runtime-deps.md

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

README.runtime.md

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

README.sdk.md

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

build-and-test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ param(
2525
)
2626

2727
if (($Mode -eq "BuildAndTest" -or $Mode -eq "Test") -and $TestCategories.Contains("pre-build")) {
28-
& ./tests/run-tests.ps1 -TestCategories "pre-build"
28+
& ./tests/run-tests.ps1 -TestCategories "pre-build" -Version "*"
2929
}
3030

3131
if ($Mode -eq "BuildAndTest" -or $Mode -eq "Build") {

eng/dockerfile-templates/Dockerfile.linux.install-deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"krb5-libs",
1414
"libgcc",
1515
"libintl",
16-
"libssl1.1",
16+
cat("libssl", VARIABLES[cat("libssl|", OS_VERSION_BASE)]),
1717
"libstdc++",
1818
"zlib"
1919
],

eng/dockerfile-templates/monitor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ 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 \{{ if dotnetMajor = "7":
75+
DiagnosticPort__DeleteEndpointOnStartup=true \{{ if dotnetMajor != "6":
7676
# Server GC mode
7777
DOTNET_gcServer=1 \}}
7878
# Logging: JSON format so that analytic platforms can get discrete entry information

eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN {{InsertTemplate("Dockerfile.linux.distroless-user",
3131
COPY --from=chisel /opt/chisel/chisel /usr/bin/
3232
RUN chisel cut --release "ubuntu-{{osVersionNumber}}" --root /rootfs \
3333
base-files_base \
34+
base-files_release-info \
3435
ca-certificates_data \
3536
libc6_libs \
3637
libgcc-s1_libs \

0 commit comments

Comments
 (0)