Skip to content

Commit

Permalink
Fix MAR search links with trailing slash (#1175)
Browse files Browse the repository at this point in the history
  • Loading branch information
lbussell authored Oct 1, 2024
1 parent 58907b7 commit 069a515
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions .portal-docs/mar/README.aspnet.portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

.NET Framework:

* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework/): .NET Framework
* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework
* [dotnet/framework/sdk](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/): .NET Framework SDK
* [dotnet/framework/runtime](https://mcr.microsoft.com/product/dotnet/framework/runtime/about/): .NET Framework Runtime
* [dotnet/framework/wcf](https://mcr.microsoft.com/product/dotnet/framework/wcf/about/): Windows Communication Foundation (WCF)
* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about/): .NET Framework, ASP.NET and WCF Samples

.NET:

* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet/): .NET
* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET
* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples

## Usage
Expand Down Expand Up @@ -84,6 +84,6 @@ Version Tag | OS Version | Supported .NET Versions

## License

* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/)
8 changes: 4 additions & 4 deletions .portal-docs/mar/README.runtime.portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

.NET Framework:

* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework/): .NET Framework
* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework
* [dotnet/framework/sdk](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/): .NET Framework SDK
* [dotnet/framework/aspnet](https://mcr.microsoft.com/product/dotnet/framework/aspnet/about/): ASP.NET Web Forms and MVC
* [dotnet/framework/wcf](https://mcr.microsoft.com/product/dotnet/framework/wcf/about/): Windows Communication Foundation (WCF)
* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about/): .NET Framework, ASP.NET and WCF Samples

.NET:

* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet/): .NET
* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET
* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples

## Usage
Expand Down Expand Up @@ -75,6 +75,6 @@ Version Tag | OS Version | Supported .NET Versions

## License

* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/)
8 changes: 4 additions & 4 deletions .portal-docs/mar/README.samples.portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

.NET Framework:

* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework/): .NET Framework
* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework
* [dotnet/framework/sdk](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/): .NET Framework SDK
* [dotnet/framework/aspnet](https://mcr.microsoft.com/product/dotnet/framework/aspnet/about/): ASP.NET Web Forms and MVC
* [dotnet/framework/runtime](https://mcr.microsoft.com/product/dotnet/framework/runtime/about/): .NET Framework Runtime
* [dotnet/framework/wcf](https://mcr.microsoft.com/product/dotnet/framework/wcf/about/): Windows Communication Foundation (WCF)

.NET:

* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet/): .NET
* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET
* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples

## Usage
Expand Down Expand Up @@ -92,6 +92,6 @@ docker run --name wcfclient_sample --rm -it -e HOST=172.26.236.119 mcr.microsoft

## License

* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/)
8 changes: 4 additions & 4 deletions .portal-docs/mar/README.sdk.portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

.NET Framework:

* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework/): .NET Framework
* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework
* [dotnet/framework/aspnet](https://mcr.microsoft.com/product/dotnet/framework/aspnet/about/): ASP.NET Web Forms and MVC
* [dotnet/framework/runtime](https://mcr.microsoft.com/product/dotnet/framework/runtime/about/): .NET Framework Runtime
* [dotnet/framework/wcf](https://mcr.microsoft.com/product/dotnet/framework/wcf/about/): Windows Communication Foundation (WCF)
* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about/): .NET Framework, ASP.NET and WCF Samples

.NET:

* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet/): .NET
* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET
* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples

## Usage
Expand Down Expand Up @@ -83,6 +83,6 @@ Version Tag | OS Version | Supported .NET Versions

## License

* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/)
8 changes: 4 additions & 4 deletions .portal-docs/mar/README.wcf.portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss

.NET Framework:

* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework/): .NET Framework
* [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework
* [dotnet/framework/sdk](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/): .NET Framework SDK
* [dotnet/framework/aspnet](https://mcr.microsoft.com/product/dotnet/framework/aspnet/about/): ASP.NET Web Forms and MVC
* [dotnet/framework/runtime](https://mcr.microsoft.com/product/dotnet/framework/runtime/about/): .NET Framework Runtime
* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about/): .NET Framework, ASP.NET and WCF Samples

.NET:

* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet/): .NET
* [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET
* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples

## Usage
Expand Down Expand Up @@ -83,6 +83,6 @@ Version Tag | OS Version | Supported .NET Versions

## License

* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework/)
* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Microsoft Software Supplemental License for Windows Container Base Image](https://mcr.microsoft.com/product/windows/servercore/about/): applies to all [.NET Framework container images](https://mcr.microsoft.com/catalog?search=dotnet/framework)
* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://mcr.microsoft.com/product/dotnet/framework/sdk/about/)
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ The [`build-and-test.ps1`](https://github.com/microsoft/dotnet-framework-docker/

### Editing Dockerfiles

The [Dockerfiles](https://github.com/search?q=repo%3Amicrosoft%2Fdotnet-framework-docker+filename%3ADockerfile&type=Code&ref=advsearch&l=&l=) contained in this repo are generated from a set of [Cottle](https://cottle.readthedocs.io/en/stable/page/01-overview.html) based [templates](https://github.com/microsoft/dotnet-framework-docker/tree/main/eng/dockerfile-templates). A single template generates the set of Dockerfiles that are similar (e.g. all wcf Dockerfiles). This ensures consistency across the various Dockerfiles and eases the burden of making changes to the Dockerfiles. Instead of editing the Dockerfiles directly, the templates should be updated and then the Dockerfiles should get regenerated by running the [generate Dockerfiles script](https://github.com/microsoft/dotnet-framework-docker/blob/main/eng/dockerfile-templates/Get-GeneratedDockerfiles.ps1).
The [Dockerfiles](https://github.com/search?q=repo%3Amicrosoft%2Fdotnet-framework-docker+path%3Asrc%2F**%2FDockerfile&type=code) contained in this repo are generated from a set of [Cottle](https://cottle.readthedocs.io/en/stable/page/01-overview.html) based [templates](https://github.com/microsoft/dotnet-framework-docker/tree/main/eng/dockerfile-templates). A single template generates the set of Dockerfiles that are similar (e.g. all wcf Dockerfiles). This ensures consistency across the various Dockerfiles and eases the burden of making changes to the Dockerfiles. Instead of editing the Dockerfiles directly, the templates should be updated and then the Dockerfiles should get regenerated by running the [generate Dockerfiles script](https://github.com/microsoft/dotnet-framework-docker/blob/main/eng/dockerfile-templates/Get-GeneratedDockerfiles.ps1).

### Editing READMEs

The [READMEs](https://github.com/search?q=repo%3Amicrosoft%2Fdotnet-framework-docker+filename%3AREADME+path%3A%2F&type=Code&ref=advsearch&l=&l=) contained in this repo are used as the descriptions for the Docker repositories the images are published to. Just like the Dockerfiles, the READMEs are generated from a set of [Cottle](https://cottle.readthedocs.io/en/stable/page/01-overview.html) based [templates](https://github.com/microsoft/dotnet-framework-docker/tree/main/eng/readme-templates). This ensures consistency across the various READMEs and eases the burden of making changes. Instead of editing the READMEs directly, the templates should be updated and then the READMEs should get regenerated by running the [generate READMEs script](https://github.com/microsoft/dotnet-framework-docker/blob/main/eng/readme-templates/Get-GeneratedReadmes.ps1).
The [READMEs](https://github.com/search?q=repo%3Amicrosoft%2Fdotnet-framework-docker+path%3A**%2FREADME*+-path%3Aeng+-path%3Asamples&type=code&ref=advsearch) contained in this repo are used as the descriptions for the Docker repositories the images are published to. Just like the Dockerfiles, the READMEs are generated from a set of [Cottle](https://cottle.readthedocs.io/en/stable/page/01-overview.html) based [templates](https://github.com/microsoft/dotnet-framework-docker/tree/main/eng/readme-templates). This ensures consistency across the various READMEs and eases the burden of making changes. Instead of editing the READMEs directly, the templates should be updated and then the READMEs should get regenerated by running the [generate READMEs script](https://github.com/microsoft/dotnet-framework-docker/blob/main/eng/readme-templates/Get-GeneratedReadmes.ps1).

### Tests

Expand Down
2 changes: 1 addition & 1 deletion eng/readme-templates/Url.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}}{{
when(ARGS["readme-host"] = "mar",
when(ARGS["is-product-family"],
cat("https://mcr.microsoft.com/catalog?search=", ARGS["repo"], "/"),
cat("https://mcr.microsoft.com/catalog?search=", ARGS["repo"]),
cat("https://mcr.microsoft.com/product/", ARGS["repo"], "/about/")),
when(ARGS["readme-host"] = "github" || ARGS["readme-host"] = "dockerhub",
cat("https://hub.docker.com/r/microsoft/", join(split(ARGS["repo"], "/"), "-"), "/"),
Expand Down

0 comments on commit 069a515

Please sign in to comment.