Don't apply Server GC mode for .NET Monitor 6.x

Author: mthalman

eng/dockerfile-templates/monitor/Dockerfile

@@ -72,7 +72,7 @@ ENV \
     DefaultProcess__Filters__0__Key=ProcessId \
     DefaultProcess__Filters__0__Value=1 \
     # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \{{ if monitorMajorMinor != "6.2":
+    DiagnosticPort__DeleteEndpointOnStartup=true \{{ if dotnetMajor != "6":
     # Server GC mode
     DOTNET_gcServer=1 \}}
     # Logging: JSON format so that analytic platforms can get discrete entry information

src/monitor/6.3/alpine/amd64/Dockerfile

@@ -47,8 +47,6 @@ ENV \
     DefaultProcess__Filters__0__Value=1 \
     # Remove Unix Domain Socket before starting diagnostic port server
     DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
     # Logging: JSON format so that analytic platforms can get discrete entry information
     Logging__Console__FormatterName=json \
     # Logging: Use round-trip date/time format without timezone information (always logged in UTC)

src/monitor/6.3/alpine/arm64v8/Dockerfile

@@ -47,8 +47,6 @@ ENV \
     DefaultProcess__Filters__0__Value=1 \
     # Remove Unix Domain Socket before starting diagnostic port server
     DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
     # Logging: JSON format so that analytic platforms can get discrete entry information
     Logging__Console__FormatterName=json \
     # Logging: Use round-trip date/time format without timezone information (always logged in UTC)

src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile

@@ -47,8 +47,6 @@ ENV \
     DefaultProcess__Filters__0__Value=1 \
     # Remove Unix Domain Socket before starting diagnostic port server
     DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
     # Logging: JSON format so that analytic platforms can get discrete entry information
     Logging__Console__FormatterName=json \
     # Logging: Use round-trip date/time format without timezone information (always logged in UTC)

src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile

@@ -47,8 +47,6 @@ ENV \
     DefaultProcess__Filters__0__Value=1 \
     # Remove Unix Domain Socket before starting diagnostic port server
     DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
     # Logging: JSON format so that analytic platforms can get discrete entry information
     Logging__Console__FormatterName=json \
     # Logging: Use round-trip date/time format without timezone information (always logged in UTC)

src/monitor/6.3/cbl-mariner/amd64/Dockerfile

@@ -47,8 +47,6 @@ ENV \
     DefaultProcess__Filters__0__Value=1 \
     # Remove Unix Domain Socket before starting diagnostic port server
     DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
     # Logging: JSON format so that analytic platforms can get discrete entry information
     Logging__Console__FormatterName=json \
     # Logging: Use round-trip date/time format without timezone information (always logged in UTC)

src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile

@@ -47,8 +47,6 @@ ENV \
     DefaultProcess__Filters__0__Value=1 \
     # Remove Unix Domain Socket before starting diagnostic port server
     DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
     # Logging: JSON format so that analytic platforms can get discrete entry information
     Logging__Console__FormatterName=json \
     # Logging: Use round-trip date/time format without timezone information (always logged in UTC)

tests/Microsoft.DotNet.Docker.Tests/MonitorImageTests.cs

@@ -156,7 +156,7 @@ public void VerifyEnvironmentVariables(ProductImageData imageData)
             variables.Add(new EnvironmentVariableInfo("DefaultProcess__Filters__0__Value", "1"));
             // Existing (orphaned) diagnostic port should be delete before starting server
             variables.Add(new EnvironmentVariableInfo("DiagnosticPort__DeleteEndpointOnStartup", "true"));
-            if (imageData.Version.ToString() != "6.2")
+            if (imageData.Version.Major != 6)
             {
                 // GC mode should be set to Server
                 variables.Add(new EnvironmentVariableInfo("DOTNET_gcServer", "1"));