Merge branch 'main' into 4B

Author: lbussell

.github/ISSUE_TEMPLATE/new-windows-release.md

@@ -2,15 +2,14 @@
 name: ".NET Framework Docker Release - New Windows Version"
 about: "Checklist for releasing .NET Framework container images for new Windows major versions"
 title: ".NET Framework Container Images Release - New Windows Version - <new Windows version>"
-labels: docker
-assignees: lbussell
 ---
 
 ## Prep Tasks
 
-1. - [ ] Ensure a ["New Windows Release" issue](https://github.com/dotnet/docker-tools/blob/main/.github/ISSUE_TEMPLATE/releases/new-windows-release.md) exists for docker-tools repo
+1. - [ ] Ensure a ["New Windows Release" issue](https://github.com/dotnet/docker-tools/blob/main/.github/ISSUE_TEMPLATE/releases/new-windows-release.md) exists for docker-tools repo. Follow that checklist until build images for the new Windows version are available.
 1. - [ ] Update [manifest.json](https://github.com/microsoft/dotnet-framework-docker/blob/main/manifest.json) to include entries for the new images
-1. - [ ] Update [manifest.samples.json](https://github.com/microsoft/dotnet-framework-docker/blob/main/manifest.samples.json) to include the new Windows version for each of the samples
+1. - [ ] Update [manifest.versions.json](https://github.com/microsoft/dotnet-framework-docker/blob/main/manifest.versions.json) and [manifest.datestamps.json](https://github.com/microsoft/dotnet-framework-docker/blob/main/manifest.datestamps.json) and add any variables that are necessary for the new Windows version
+1. - [ ] Update [mcr-tags-metadata-templates](https://github.com/microsoft/dotnet-framework-docker/blob/main/eng/mcr-tags-metadata-templates) to include the new Windows version
 1. - [ ] Update the test data for each of the [test classes](https://github.com/microsoft/dotnet-framework-docker/tree/main/tests/Microsoft.DotNet.Framework.Docker.Tests) to include the new Windows version
 1. - [ ] Run the `update-dependencies` tool to generate the new Dockerfiles and update all the necessary files:
       - [ ] `dotnet run --project .\eng\update-dependencies`
@@ -19,13 +18,17 @@ assignees: lbussell
       1. - [ ] Create a local VM of the new Windows version
       1. - [ ] Clone this repo with the above changes onto the VM
       1. - [ ] Run `.\build-and-test.ps1 -OS windowsservercore-<VERSION>` to build and test your changes
-1. - [ ] Revert any modifications that were made to the 3.5/runtime Dockerfile to support local testing due to the lack of the `https://dotnetbinaries.blob.core.windows.net/dockerassets/microsoft-windows.netfx3-<VERSION>.zip` file.
 1. - [ ] Commit generated changes
 1. - [ ] Create PR
 1. - [ ] Get PR signoff. **Don't merge PR to main.**
 
+## Samples
+
+1. - [ ] Add samples for the new Windows version
+1. - [ ] Update [manifest.samples.json](https://github.com/microsoft/dotnet-framework-docker/blob/main/manifest.samples.json) to include the new Windows version for each of the samples
+1. - [ ] Update [mcr-tags-metadata-templates](https://github.com/microsoft/dotnet-framework-docker/blob/main/eng/mcr-tags-metadata-templates) to include the new samples images
+
 ## Release Day Tasks
 
-1. - [ ] Create a [`microsoft-windows.netfx3-<VERSION>.zip`](https://github.com/microsoft/dotnet-framework-docker/blob/1c3dd6638c6b827b81ffb13386b924f6dcdee533/3.5/runtime/windowsservercore-1909/Dockerfile#L11) file containing the .NET Fx 3.5 cab installer file and upload it to the [blob storage location](https://dotnetbinaries.blob.core.windows.net/dockerassets).
 1. - [ ] Release the images by following the [Servicing Release Checklist](https://github.com/dotnet/release/blob/main/.github/ISSUE_TEMPLATE/dotnet-fx-docker-servicing-release.md)
 1. - [ ] Create an announcement (example: [Windows Server, version 1909](https://github.com/microsoft/dotnet-framework-docker/issues/448))

.github/linters/.linkspector.yml

@@ -7,6 +7,5 @@ dirs:
 excludedDirs:
   - eng/readme-templates
 ignorePatterns:
-  - pattern: "^https://dotnetbinaries.blob.core.windows.net/dockerassets"
-  - pattern: "^https://github.com/dotnet/release/blob/main/.github/ISSUE_TEMPLATE/dotnet-fx-docker-servicing-release.md"
+  - pattern: "^https://github.com/dotnet/release/.*$"
 useGitIgnore: true