Skip to content

Commit 069a515

Browse files
authored
Fix MAR search links with trailing slash (#1175)
1 parent 58907b7 commit 069a515

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

.portal-docs/mar/README.aspnet.portal.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
2424

2525
.NET Framework:
2626

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

3333
.NET:
3434

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

3838
## Usage
@@ -84,6 +84,6 @@ Version Tag | OS Version | Supported .NET Versions
8484

8585
## License
8686

87-
* [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/)
88-
* [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/)
87+
* [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)
88+
* [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)
8989
* [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/)

.portal-docs/mar/README.runtime.portal.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
1717

1818
.NET Framework:
1919

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

2626
.NET:
2727

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

3131
## Usage
@@ -75,6 +75,6 @@ Version Tag | OS Version | Supported .NET Versions
7575

7676
## License
7777

78-
* [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/)
79-
* [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/)
78+
* [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)
79+
* [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)
8080
* [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/)

.portal-docs/mar/README.samples.portal.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
1919

2020
.NET Framework:
2121

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

2828
.NET:
2929

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

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

9393
## License
9494

95-
* [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/)
96-
* [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/)
95+
* [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)
96+
* [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)
9797
* [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/)

.portal-docs/mar/README.sdk.portal.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
2626

2727
.NET Framework:
2828

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

3535
.NET:
3636

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

4040
## Usage
@@ -83,6 +83,6 @@ Version Tag | OS Version | Supported .NET Versions
8383

8484
## License
8585

86-
* [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/)
87-
* [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/)
86+
* [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)
87+
* [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)
8888
* [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/)

.portal-docs/mar/README.wcf.portal.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ Watch [discussions](https://github.com/microsoft/dotnet-framework-docker/discuss
1515

1616
.NET Framework:
1717

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

2424
.NET:
2525

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

2929
## Usage
@@ -83,6 +83,6 @@ Version Tag | OS Version | Supported .NET Versions
8383

8484
## License
8585

86-
* [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/)
87-
* [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/)
86+
* [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)
87+
* [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)
8888
* [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/)

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ The [`build-and-test.ps1`](https://github.com/microsoft/dotnet-framework-docker/
2222

2323
### Editing Dockerfiles
2424

25-
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).
25+
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).
2626

2727
### Editing READMEs
2828

29-
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).
29+
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).
3030

3131
### Tests
3232

eng/readme-templates/Url.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}}{{
88
when(ARGS["readme-host"] = "mar",
99
when(ARGS["is-product-family"],
10-
cat("https://mcr.microsoft.com/catalog?search=", ARGS["repo"], "/"),
10+
cat("https://mcr.microsoft.com/catalog?search=", ARGS["repo"]),
1111
cat("https://mcr.microsoft.com/product/", ARGS["repo"], "/about/")),
1212
when(ARGS["readme-host"] = "github" || ARGS["readme-host"] = "dockerhub",
1313
cat("https://hub.docker.com/r/microsoft/", join(split(ARGS["repo"], "/"), "-"), "/"),

0 commit comments

Comments
 (0)