Updates for August servicing

Author: mthalman

eng/update-dependencies/NuGet.config renamed to NuGet.config

@@ -43,23 +43,23 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-6.2.1-alpine-amd64, 6.2-alpine-amd64, 6-alpine-amd64, 6.2.1-alpine, 6.2-alpine, 6-alpine, 6.2.1, 6.2, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.2/alpine/amd64/Dockerfile) | Alpine 3.16
-6.1.3-alpine-amd64, 6.1-alpine-amd64, 6.1.3-alpine, 6.1-alpine, 6.1.3, 6.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.1/alpine/amd64/Dockerfile) | Alpine 3.16
+6.2.2-alpine-amd64, 6.2-alpine-amd64, 6-alpine-amd64, 6.2.2-alpine, 6.2-alpine, 6-alpine, 6.2.2, 6.2, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.2/alpine/amd64/Dockerfile) | Alpine 3.16
+6.1.4-alpine-amd64, 6.1-alpine-amd64, 6.1.4-alpine, 6.1-alpine, 6.1.4, 6.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.1/alpine/amd64/Dockerfile) | Alpine 3.16
 
 ##### .NET Monitor Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-7.0.0-preview.6-alpine-amd64, 7.0-alpine-amd64, 7-alpine-amd64, 7.0.0-preview.6-alpine, 7.0-alpine, 7-alpine, 7.0.0-preview.6, 7.0, 7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/amd64/Dockerfile) | Alpine 3.16
+7.0.0-preview.7-alpine-amd64, 7.0-alpine-amd64, 7-alpine-amd64, 7.0.0-preview.7-alpine, 7.0-alpine, 7-alpine, 7.0.0-preview.7, 7.0, 7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/amd64/Dockerfile) | Alpine 3.16
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-6.2.1-alpine-arm64v8, 6.2-alpine-arm64v8, 6.2.1-alpine, 6.2-alpine, 6-alpine, 6.2.1, 6.2, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.2/alpine/arm64v8/Dockerfile) | Alpine 3.16
+6.2.2-alpine-arm64v8, 6.2-alpine-arm64v8, 6.2.2-alpine, 6.2-alpine, 6-alpine, 6.2.2, 6.2, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.2/alpine/arm64v8/Dockerfile) | Alpine 3.16
 
 ##### .NET Monitor Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-7.0.0-preview.6-alpine-arm64v8, 7.0-alpine-arm64v8, 7-alpine-arm64v8, 7.0.0-preview.6-alpine, 7.0-alpine, 7-alpine, 7.0.0-preview.6, 7.0, 7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/arm64v8/Dockerfile) | Alpine 3.16
+7.0.0-preview.7-alpine-arm64v8, 7.0-alpine-arm64v8, 7-alpine-arm64v8, 7.0.0-preview.7-alpine, 7.0-alpine, 7-alpine, 7.0.0-preview.7, 7.0, 7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.0/alpine/arm64v8/Dockerfile) | Alpine 3.16
 
 You can retrieve a list of all available tags for dotnet/monitor at https://mcr.microsoft.com/v2/dotnet/monitor/tags/list.
 <!--End of generated tags-->

README.aspnet.md

@@ -97,7 +97,7 @@ if ($versionSourceName) {
 }
 
 $branch = & $PSScriptRoot/Get-Branch.ps1
-$updateDepsArgs += "--branch=$branch"
+$updateDepsArgs += "--source-branch=$branch"
 
 if ($PrintArgsVariableOnly) {
     Write-Host "##vso[task.setvariable variable=updateDepsArgs]$updateDepsArgs"

README.monitor.md

@@ -6,9 +6,12 @@
         url: URL to download
         sha: Expected checksum of the downloaded file
         sha-var-name: Name of variable that stores the checksum
+        hash-algorithm: Algorithm type to use to get the checksum. Defaults to sha512 ^
+
+    set hashAlgorithm to when(ARGS["hash-algorithm"], ARGS["hash-algorithm"], "sha512")
 }}Invoke-WebRequest -OutFile {{ARGS["out-file"]}} {{ARGS["url"]}}; `
 ${{ARGS["sha-var-name"]}} = '{{ARGS["sha"]}}'; `
-if ((Get-FileHash {{ARGS["out-file"]}} -Algorithm sha512).Hash -ne ${{ARGS["sha-var-name"]}}) { `
+if ((Get-FileHash {{ARGS["out-file"]}} -Algorithm {{hashAlgorithm}}).Hash -ne ${{ARGS["sha-var-name"]}}) { `
     Write-Host 'CHECKSUM VERIFICATION FAILED!'; `
     exit 1; `
 }

README.runtime-deps.md

@@ -0,0 +1,10 @@
+{{
+    _ Appends a path to the PATH environment variable.
+    ARGS:
+        path: Path to append to the PATH environment variable ^
+
+    set isNanoServer to find(OS_VERSION, "nanoserver") >= 0
+}}{{ if isNanoServer:# In order to set system PATH, ContainerAdministrator must be used
+USER ContainerAdministrator
+}}RUN setx /M PATH "%PATH%;{{ARGS["path"]}}"{{ if isNanoServer:
+USER ContainerUser}}

README.runtime.md

@@ -17,7 +17,8 @@
       Otherwise, use the account that is associated with the current branch. ^
     set urlBranch to when(find(monitorVersion, "-") >= 0 || buildVersion != monitorVersion, VARIABLES["branch"], "main") ^
     _ Use the $DOTNET_MONITOR_VERSION variable for the version folder if the build and product versions are the same. ^
-    set versionFolder to when(buildVersion != monitorVersion, buildVersion, '$DOTNET_MONITOR_VERSION')
+    set versionFolder to when(buildVersion != monitorVersion, buildVersion, '$DOTNET_MONITOR_VERSION') ^
+    set supportsEndpointDeletion to monitorMajorMinor != "6.1"
 }}ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
 ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
 
@@ -64,7 +65,9 @@ ENV \
     COMPlus_EnableDiagnostics=0 \
     # Default Filter
     DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
+    DefaultProcess__Filters__0__Value=1 \{{if supportsEndpointDeletion:
+    # Remove Unix Domain Socket before starting diagnostic port server
+    DiagnosticPort__DeleteEndpointOnStartup=true \}}
     # 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)