diff --git a/.portal-docs/docker-hub/README.aspnet.md b/.portal-docs/docker-hub/README.aspnet.md index a41b1b08..7b5a4457 100644 --- a/.portal-docs/docker-hub/README.aspnet.md +++ b/.portal-docs/docker-hub/README.aspnet.md @@ -89,5 +89,5 @@ View the current tags at the [Microsoft Artifact Registry portal](https://mcr.mi # License * [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) * [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) diff --git a/.portal-docs/docker-hub/README.runtime.md b/.portal-docs/docker-hub/README.runtime.md index a42b21c4..5ce75e74 100644 --- a/.portal-docs/docker-hub/README.runtime.md +++ b/.portal-docs/docker-hub/README.runtime.md @@ -80,5 +80,5 @@ View the current tags at the [Microsoft Artifact Registry portal](https://mcr.mi # License * [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) * [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) diff --git a/.portal-docs/docker-hub/README.samples.md b/.portal-docs/docker-hub/README.samples.md index d04516e2..36be24a2 100644 --- a/.portal-docs/docker-hub/README.samples.md +++ b/.portal-docs/docker-hub/README.samples.md @@ -97,5 +97,5 @@ View the current tags at the [Microsoft Artifact Registry portal](https://mcr.mi # License * [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) * [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) diff --git a/.portal-docs/docker-hub/README.sdk.md b/.portal-docs/docker-hub/README.sdk.md index e574a770..3496df09 100644 --- a/.portal-docs/docker-hub/README.sdk.md +++ b/.portal-docs/docker-hub/README.sdk.md @@ -88,5 +88,5 @@ View the current tags at the [Microsoft Artifact Registry portal](https://mcr.mi # License * [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) * [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) diff --git a/.portal-docs/docker-hub/README.wcf.md b/.portal-docs/docker-hub/README.wcf.md index e826ed5e..5eff1eea 100644 --- a/.portal-docs/docker-hub/README.wcf.md +++ b/.portal-docs/docker-hub/README.wcf.md @@ -88,5 +88,5 @@ View the current tags at the [Microsoft Artifact Registry portal](https://mcr.mi # License * [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) * [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) diff --git a/.portal-docs/mar/README.aspnet.portal.md b/.portal-docs/mar/README.aspnet.portal.md index 2751b945..6033acb0 100644 --- a/.portal-docs/mar/README.aspnet.portal.md +++ b/.portal-docs/mar/README.aspnet.portal.md @@ -25,15 +25,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/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 +* [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/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples +* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples ## Usage @@ -41,7 +41,7 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor ### Container sample: Run an ASP.NET application -You can quickly run a container with a pre-built [sample ASP.NET Docker image](https://mcr.microsoft.com/product/dotnet/framework/samples/about/), based on the [ASP.NET Docker sample]. +You can quickly run a container with a pre-built [sample ASP.NET Docker image](https://mcr.microsoft.com/product/dotnet/framework/samples/about), based on the [ASP.NET Docker sample]. Type the following [Docker](https://www.docker.com/products/docker) command: @@ -85,5 +85,5 @@ 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) -* [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/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): 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) diff --git a/.portal-docs/mar/README.runtime.portal.md b/.portal-docs/mar/README.runtime.portal.md index 7a440b74..e91117ed 100644 --- a/.portal-docs/mar/README.runtime.portal.md +++ b/.portal-docs/mar/README.runtime.portal.md @@ -18,15 +18,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/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 +* [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/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples +* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples ## Usage @@ -34,7 +34,7 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor ### Container sample: Run a simple application -You can quickly run a container with a pre-built [.NET Framework Docker image](https://mcr.microsoft.com/product/dotnet/framework/samples/about/), based on the [.NET Framework console sample](https://github.com/microsoft/dotnet-framework-docker/blob/main/samples/dotnetapp/README.md). +You can quickly run a container with a pre-built [.NET Framework Docker image](https://mcr.microsoft.com/product/dotnet/framework/samples/about), based on the [.NET Framework console sample](https://github.com/microsoft/dotnet-framework-docker/blob/main/samples/dotnetapp/README.md). Type the following command to run a sample console application: @@ -76,5 +76,5 @@ 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) -* [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/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): 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) diff --git a/.portal-docs/mar/README.samples.portal.md b/.portal-docs/mar/README.samples.portal.md index 0db1fcdb..c0a87ef5 100644 --- a/.portal-docs/mar/README.samples.portal.md +++ b/.portal-docs/mar/README.samples.portal.md @@ -20,15 +20,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/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) +* [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/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples +* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples ## Usage @@ -93,5 +93,5 @@ 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) -* [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/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): 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) diff --git a/.portal-docs/mar/README.sdk.portal.md b/.portal-docs/mar/README.sdk.portal.md index 9900e695..dcab2a3e 100644 --- a/.portal-docs/mar/README.sdk.portal.md +++ b/.portal-docs/mar/README.sdk.portal.md @@ -27,15 +27,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/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 +* [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/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples +* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples ## Usage @@ -84,5 +84,5 @@ 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) -* [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/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): 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) diff --git a/.portal-docs/mar/README.wcf.portal.md b/.portal-docs/mar/README.wcf.portal.md index 708e0e52..d07ea7fc 100644 --- a/.portal-docs/mar/README.wcf.portal.md +++ b/.portal-docs/mar/README.wcf.portal.md @@ -16,15 +16,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/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 +* [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/samples](https://mcr.microsoft.com/product/dotnet/samples/about/): .NET Samples +* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples ## Usage @@ -32,7 +32,7 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor ### Container sample: Run a WCF application -You can quickly run a container with a pre-built [sample WCF Docker image](https://mcr.microsoft.com/product/dotnet/framework/samples/about/), based on the WCF Docker sample. +You can quickly run a container with a pre-built [sample WCF Docker image](https://mcr.microsoft.com/product/dotnet/framework/samples/about), based on the WCF Docker sample. Type the following [Docker](https://www.docker.com/products/docker) command to start a WCF service container: @@ -84,5 +84,5 @@ 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) -* [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/) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): 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) diff --git a/README.aspnet.md b/README.aspnet.md index b1c2edc7..19a0703c 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -28,7 +28,7 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor ### Container sample: Run an ASP.NET application -You can quickly run a container with a pre-built [sample ASP.NET Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/), based on the [ASP.NET Docker sample]. +You can quickly run a container with a pre-built [sample ASP.NET Docker image](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md), based on the [ASP.NET Docker sample]. Type the following [Docker](https://www.docker.com/products/docker) command: @@ -56,16 +56,16 @@ Version Tag | OS Version | Supported .NET Versions .NET Framework: -* [dotnet/framework](https://hub.docker.com/r/microsoft/dotnet-framework/): .NET Framework -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md): .NET Framework +* [dotnet/framework/sdk](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md): .NET Framework SDK +* [dotnet/framework/runtime](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples ## Full Tag Listing @@ -119,6 +119,6 @@ See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/framework/aspnet ## License -* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) +* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md) diff --git a/README.md b/README.md index 453e63f8..564fb700 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ ## Featured Repos -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/sdk](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md): .NET Framework, ASP.NET and WCF Samples ## About @@ -46,8 +46,8 @@ After the application starts, navigate to `http://localhost:8000` in your web br ## Related repositories -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples ## Support @@ -68,6 +68,6 @@ After the application starts, navigate to `http://localhost:8000` in your web br ## License -* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) +* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md) diff --git a/README.runtime.md b/README.runtime.md index 0cc055c6..b3d06e3f 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -21,7 +21,7 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor ### Container sample: Run a simple application -You can quickly run a container with a pre-built [.NET Framework Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/), based on the [.NET Framework console sample](https://github.com/microsoft/dotnet-framework-docker/blob/main/samples/dotnetapp/README.md). +You can quickly run a container with a pre-built [.NET Framework Docker image](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md), based on the [.NET Framework console sample](https://github.com/microsoft/dotnet-framework-docker/blob/main/samples/dotnetapp/README.md). Type the following command to run a sample console application: @@ -47,16 +47,16 @@ Version Tag | OS Version | Supported .NET Versions .NET Framework: -* [dotnet/framework](https://hub.docker.com/r/microsoft/dotnet-framework/): .NET Framework -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md): .NET Framework +* [dotnet/framework/sdk](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/wcf](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples ## Full Tag Listing @@ -110,6 +110,6 @@ See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/framework/runtim ## License -* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) +* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md) diff --git a/README.samples.md b/README.samples.md index 641b7a12..713481d9 100644 --- a/README.samples.md +++ b/README.samples.md @@ -64,16 +64,16 @@ docker run --name wcfclient_sample --rm -it -e HOST=172.26.236.119 mcr.microsoft .NET Framework: -* [dotnet/framework](https://hub.docker.com/r/microsoft/dotnet-framework/): .NET Framework -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) +* [dotnet/framework](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md): .NET Framework +* [dotnet/framework/sdk](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.wcf.md): Windows Communication Foundation (WCF) .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples ## Full Tag Listing @@ -127,6 +127,6 @@ See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/framework/sample ## License -* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) +* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md) diff --git a/README.sdk.md b/README.sdk.md index 135e31bc..91a52d80 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -55,16 +55,16 @@ Version Tag | OS Version | Supported .NET Versions .NET Framework: -* [dotnet/framework](https://hub.docker.com/r/microsoft/dotnet-framework/): .NET Framework -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md): .NET Framework +* [dotnet/framework/aspnet](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples ## Full Tag Listing @@ -113,6 +113,6 @@ See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/framework/sdk/ta ## License -* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) +* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md) diff --git a/README.wcf.md b/README.wcf.md index 243cced1..2fd219ed 100644 --- a/README.wcf.md +++ b/README.wcf.md @@ -19,7 +19,7 @@ The [.NET Framework Docker samples](https://github.com/microsoft/dotnet-framewor ### Container sample: Run a WCF application -You can quickly run a container with a pre-built [sample WCF Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/), based on the WCF Docker sample. +You can quickly run a container with a pre-built [sample WCF Docker image](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md), based on the WCF Docker sample. Type the following [Docker](https://www.docker.com/products/docker) command to start a WCF service container: @@ -55,16 +55,16 @@ Version Tag | OS Version | Supported .NET Versions .NET Framework: -* [dotnet/framework](https://hub.docker.com/r/microsoft/dotnet-framework/): .NET Framework -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md): .NET Framework +* [dotnet/framework/sdk](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.runtime.md): .NET Framework Runtime +* [dotnet/framework/samples](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples ## Full Tag Listing @@ -115,6 +115,6 @@ See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/framework/wcf/ta ## License -* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Microsoft Software Supplemental License for Windows Container Base Image](https://hub.docker.com/r/microsoft/windows-servercore/): applies to all [.NET Framework container images](https://hub.docker.com/r/microsoft/dotnet-framework/) -* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/) +* [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.md) +* [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images](https://github.com/microsoft/dotnet-framework-docker/blob/main/README.sdk.md) diff --git a/SECURITY.md b/SECURITY.md index 1fd696a7..aeb17bfb 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,6 +6,6 @@ The .NET Framework support policy, including supported versions, can be found at ## Reporting a Vulnerability -Security issues and bugs should be reported privately to the Microsoft Security Response Center (MSRC), either by emailing or via the [Microsoft Security Response Center](https://msrc.microsoft.com). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [MSRC Report an Issue FAQ](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue). +Security issues and bugs should be reported privately to the Microsoft Security Response Center (MSRC), either by emailing or via the [Microsoft Security Response Center](https://msrc.microsoft.com). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [MSRC Report an Issue FAQ](https://www.microsoft.com/msrc/faqs-report-an-issue). Please do not open issues for anything you think might have a security implication. diff --git a/documentation/guiding-principles.md b/documentation/guiding-principles.md index 59456ebb..334b7d66 100644 --- a/documentation/guiding-principles.md +++ b/documentation/guiding-principles.md @@ -14,11 +14,11 @@ These are the guiding principles for the content, tagging and production of the 1. If support for a new version of Windows is added for a particular .NET Framework version, then support will be added across all `runtime`, `aspnet`, `wcf`, and `sdk` image variants. 1. If a new component is added, it should be available across all supported OS versions. -1. Windows Server Core is the only Windows SKU supported by the official .NET Framework images. Windows Server Core is the best Windows SKU to run .NET Framework apps from a performance perspective. Windows Server Core doesn't have support for every scenario. For these cases, it is expected that consumers will need to manage their own custom .NET Framework images based on the [Windows](https://hub.docker.com/r/microsoft/windows) base image. +1. Windows Server Core is the only Windows SKU supported by the official .NET Framework images. Windows Server Core is the best Windows SKU to run .NET Framework apps from a performance perspective. Windows Server Core doesn't have support for every scenario. For these cases, it is expected that consumers will need to manage their own custom .NET Framework images based on the [Windows](https://mcr.microsoft.com/product/windows/about) base image. ## Image Tagging -The .NET Framework image tags strive to align with the tagging practices utilized by the [Official Images on Docker Hub](https://hub.docker.com/search?q=&type=image&image_filter=official). The [Supported Tags](supported-tags.md) document describe this in detail. +See the [supported tags](supported-tags.md) for the tagging practices and policies used by the .NET team. ## Engineering @@ -26,7 +26,7 @@ The .NET Framework image tags strive to align with the tagging practices utilize 1. Images will be rebuilt within hours of base image changes. For example, suppose a particular version of Windows is patched. The .NET Framework images based on this version of Windows will be rebuilt with this new base image within hours of its release. -1. Images will never be deleted from the [official Docker repositories](https://hub.docker.com/r/microsoft/dotnet-framework/). +1. Images will never be deleted from the [official .NET Framework Docker repositories on the Microsoft Artifact Registry](https://mcr.microsoft.com/catalog?search=dotnet/framework). 1. The [Dockerfiles](https://github.com/microsoft/dotnet-framework-docker/search?q=filename%3ADockerfile) used to produce all of the images will be publicly available. Customers will be able to take the Dockerfiles and build them to produce their own equivalent images. No special build steps or permissions should be needed to build the Dockerfiles. diff --git a/documentation/supported-tags.md b/documentation/supported-tags.md index 41187c99..c94d534f 100644 --- a/documentation/supported-tags.md +++ b/documentation/supported-tags.md @@ -1,8 +1,16 @@ # Supported Tags -This document describes the tagging practices used with the official .NET Framework Docker images. +This document describes the tagging patterns and policies that are used for the official .NET Framework container images. +.NET tags are intended to closely match the tagging patterns used by [Official Images on Docker Hub](https://hub.docker.com/search?q=&type=image&image_filter=official). + Please [log an issue](https://github.com/dotnet/dotnet-docker/issues/new/choose) if you encounter problems using .NET images or applying these tagging patterns. -The .NET image tags strive to align with the tagging practices utilized by the [Official Images on Docker Hub](https://hub.docker.com/search?q=&type=image&image_filter=official). +Complete tag lists: + +* [sdk](../README.sdk.md#full-tag-listing): .NET Framework SDK +* [aspnet](../README.aspnet.md#full-tag-listing): ASP.NET Web Forms and MVC +* [runtime](../README.runtime.md#full-tag-listing): .NET Framework Runtime +* [wcf](../README.wcf.md#full-tag-listing): Windows Communication Foundation (WCF) +* [samples](../README.samples.md#full-tag-listing): .NET Framework, ASP.NET and WCF Samples ## Simple Tags @@ -50,22 +58,18 @@ All shared tags [support multiple platforms](https://blog.docker.com/2017/09/doc * `` - The name of the OS release and variant the image is based upon. The image the tag references is updated whenever a new OS patch is released. The OS release name does support pinning to specific OS patches. If OS patch pinning is required then the image digest should be used (e.g. `mcr.microsoft.com/dotnet/framework/runtime@sha256:c2310f61b429d6e9780c56068e4e9d35ab8a36deae03eff0e5b3d276f707e5b8`). -## Tag Listing - -Each [Docker Hub repository](https://hub.docker.com/r/microsoft/dotnet-framework) contains a detailed listing of all supported tags. Any tag not included in the listing should be considered unsupported. The listing is broken apart by Windows Server version. Each row represents a single image and contains all of the tags that reference it. For example, the following entry represents the .NET Framework 4.8 image for Windows Server Core 2022 which is referenced by four tags: - -Tags | Dockerfile ------------| ------------- -4.8-20220412-windowsservercore-ltsc2022, 4.8-windowsservercore-ltsc2022, 4.8, latest | [Dockerfile](https://github.com/microsoft/dotnet-framework-docker/blob/228ad35840777951381456d3f89392c3a8fe8a89/src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile) - ## Tag Lifecycle -Each tag will be supported for the lifetime of the .NET Framework and Windows Server version referenced by the tag. Once either of these reaches EOL, the tag will be considered unsupported, will no longer be updated and will be removed from the [Tag Listing](#tag-listing). There are two exceptions: +Each tag will be supported for the lifetime of the .NET and OS version referenced by the tag. There are two exceptions: * Tags containing a timestamp are only supported until a newer timestamp is published for that same .NET Framework and Windows Server version. The timeframe for this is typically on a monthly basis on ["Patch Tuesday"](https://www.microsoft.com/msrc/faqs-security-update-guide). * The `latest` tag will always reference the latest version of .NET Framework. -Unsupported tags will be preserved to prevent breaking any references to it. +When an OS version reaches End-of-Life (EOL), its tags will no longer be maintained. + +When a .NET version reaches EOL, its tags will continue to be maintained (rebuilt for base image updates) until the next .NET servicing date (typically on "Patch Tuesday", the 2nd Tuesday of the month). + +Once a tag is no longer maintained, it will be considered unsupported, and will no longer be updated. Unsupported tags will continue to exist in the container registry to prevent breaking any references to it. ### Examples diff --git a/eng/readme-templates/Support.md b/eng/readme-templates/Support.md index 63e83c22..f55123f1 100644 --- a/eng/readme-templates/Support.md +++ b/eng/readme-templates/Support.md @@ -18,5 +18,5 @@ {{ARGS["top-header"]}} License * [Microsoft Container Images Legal Notice](https://aka.ms/mcr/osslegalnotice): applies to all [.NET Framework container images]({{InsertTemplate("Url.md", [ "readme-host": ARGS["readme-host"], "repo": "dotnet/framework", "is-product-family": "true" ])}}) -* [Microsoft Software Supplemental License for Windows Container Base Image]({{InsertTemplate("Url.md", [ "readme-host": ARGS["readme-host"], "repo": "windows/servercore", ])}}): applies to all [.NET Framework container images]({{InsertTemplate("Url.md", [ "readme-host": ARGS["readme-host"], "repo": "dotnet/framework", "is-product-family": "true" ])}}) +* [Windows Base Image License](https://learn.microsoft.com/virtualization/windowscontainers/images-eula): applies to all [.NET Framework container images]({{InsertTemplate("Url.md", [ "readme-host": ARGS["readme-host"], "repo": "dotnet/framework", "is-product-family": "true" ])}}) * [Visual Studio Tools License](https://visualstudio.microsoft.com/license-terms/mlt031519/): applies to all [.NET Framework SDK container images]({{InsertTemplate("Url.md", [ "readme-host": ARGS["readme-host"], "repo": "dotnet/framework/sdk" ])}}) diff --git a/eng/readme-templates/Url.md b/eng/readme-templates/Url.md index d6740d67..15fa0d50 100644 --- a/eng/readme-templates/Url.md +++ b/eng/readme-templates/Url.md @@ -3,12 +3,27 @@ ARGS: readme-host: Moniker of the site that will host the readme repo: Repo path of the URL to be generated - is-product-family: Indicates whether the URL refers to a product family page + is-product-family: Indicates whether the URL refers to a product family page ^ + + set isProductFamily to ARGS["is-product-family"] ^ + set readmeHost to ARGS["readme-host"] ^ + set repo to ARGS["repo"] ^ + set repoParts to split(repo, "/") ^ + set isFrameworkRepo to match(repoParts[1], "framework") + }}{{ -when(ARGS["readme-host"] = "mar", - when(ARGS["is-product-family"], - 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"], "/"), "-"), "/"), - cat("UNKNOWN HOST: ", ARGS["readme-host"])))}} +when(readmeHost = "mar", + when(isProductFamily, + cat("https://mcr.microsoft.com/catalog?search=", repo), + cat("https://mcr.microsoft.com/product/", repo, "/about")), + when(readmeHost = "github", + cat("https://github.com/", + when(isFrameworkRepo, "microsoft", "dotnet"), + "/dotnet", + when(isFrameworkRepo, "-framework", ""), + "-docker/blob/main/README.", + when(isProductFamily, "", cat(join(slice(repoParts, when(isFrameworkRepo, 2, 1)), "-"), ".")), + "md"), + when(readmeHost = "dockerhub", + cat("https://hub.docker.com/r/microsoft/", join(repoParts, "-"), "/"), + cat("UNKNOWN HOST: ", readmeHost))))}} diff --git a/samples/README.md b/samples/README.md index 7f9ea409..a40f7b48 100644 --- a/samples/README.md +++ b/samples/README.md @@ -6,7 +6,7 @@ The samples demonstrate basic functionality. The [.NET Docker Samples](https://g ## Try a pre-built .NET Framework Docker Image -You can quickly run a container with a pre-built [.NET Framework Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/), based on the [.NET Framework console sample](dotnetapp/README.md). +You can quickly run a container with a pre-built [.NET Framework Docker image](../README.samples.md), based on the [.NET Framework console sample](dotnetapp/README.md). Type the following [Docker](https://www.docker.com/products/docker) command: @@ -16,7 +16,7 @@ docker run --rm mcr.microsoft.com/dotnet/framework/samples ## Try a pre-built ASP.NET Docker Image -You can quickly run a container with a pre-built [sample ASP.NET Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/), based on the [ASP.NET Docker sample]. +You can quickly run a container with a pre-built [sample ASP.NET Docker image](../README.samples.md), based on the [ASP.NET Docker sample](aspnetapp/README.md). Type the following [Docker](https://www.docker.com/products/docker) command: @@ -57,13 +57,13 @@ Docs and More Information: .NET Framework: -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/sdk](../README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](../README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](../README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](../README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](../README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples diff --git a/samples/aspnetapp/README.md b/samples/aspnetapp/README.md index f98de329..e4515122 100644 --- a/samples/aspnetapp/README.md +++ b/samples/aspnetapp/README.md @@ -2,13 +2,13 @@ This [sample](Dockerfile) demonstrates how to use ASP.NET and Docker together. -The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/). It builds the application and then copies the final build result into a Docker image based on the smaller [ASP.NET Runtime Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/). It uses Docker [multi-stage build](https://github.com/dotnet/announcements/issues/18) and [multi-arch tags](https://github.com/dotnet/announcements/issues/14). +The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](../../README.sdk.md). It builds the application and then copies the final build result into a Docker image based on the smaller [ASP.NET Runtime Docker image](../../README.aspnet.md). It uses Docker [multi-stage build](https://github.com/dotnet/announcements/issues/18) and [multi-arch tags](https://github.com/dotnet/announcements/issues/14). -This sample requires the [Docker client](https://store.docker.com/editions/community/docker-ce-desktop-windows). +This sample requires the [Docker Desktop for Windows](https://docs.docker.com/desktop/install/windows-install/). ## Try a pre-built ASP.NET Docker Image -You can quickly run a container with a pre-built [sample ASP.NET Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/). +You can quickly run a container with a pre-built [sample ASP.NET Docker image](../../README.samples.md). Type the following [Docker](https://www.docker.com/products/docker) command: @@ -129,13 +129,13 @@ Docs and More Information: .NET Framework: -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/sdk](../../README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](../../README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](../../README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](../../README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](../../README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples diff --git a/samples/aspnetmvcapp/README.md b/samples/aspnetmvcapp/README.md index b79bdaa7..0411545c 100644 --- a/samples/aspnetmvcapp/README.md +++ b/samples/aspnetmvcapp/README.md @@ -2,13 +2,13 @@ This [sample](Dockerfile) demonstrates how to use ASP.NET MVC and Docker together. See [ASP.NET Docker Sample](../aspnetapp/README.md) and [.NET Framework Console Docker Sample](../dotnetapp/README.md) for using Docker in other scenarios. -The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/). It builds the application and then copies the final build result into a Docker image based on the smaller [ASP.NET Runtime Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/). It uses Docker [multi-stage build](https://github.com/dotnet/announcements/issues/18) and [multi-arch tags](https://github.com/dotnet/announcements/issues/14). +The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](../../README.sdk.md). It builds the application and then copies the final build result into a Docker image based on the smaller [ASP.NET Runtime Docker image](../../README.aspnet.md). It uses Docker [multi-stage build](https://github.com/dotnet/announcements/issues/18) and [multi-arch tags](https://github.com/dotnet/announcements/issues/14). -This sample requires the [Docker client](https://store.docker.com/editions/community/docker-ce-desktop-windows). +This sample requires the [Docker Desktop for Windows](https://docs.docker.com/desktop/install/windows-install/). ## Try a pre-built ASP.NET Docker Image -You can quickly run a container with a pre-built [sample ASP.NET Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/), based on the [ASP.NET Docker sample](../aspnetapp/README.md). +You can quickly run a container with a pre-built [sample ASP.NET Docker image](../../README.samples.md), based on the [ASP.NET Docker sample](../aspnetapp/README.md). Type the following [Docker](https://www.docker.com/products/docker) command: @@ -104,13 +104,13 @@ Docs and More Information: .NET Framework: -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/sdk](../../README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](../../README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](../../README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](../../README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](../../README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples diff --git a/samples/dotnetapp/README.md b/samples/dotnetapp/README.md index 9b890925..ce787680 100644 --- a/samples/dotnetapp/README.md +++ b/samples/dotnetapp/README.md @@ -2,13 +2,13 @@ This [sample](Dockerfile) demonstrates how to use .NET Framework and Docker together. -The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/). +The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](../../README.sdk.md). -This sample requires the [Docker client](https://store.docker.com/editions/community/docker-ce-desktop-windows). +This sample requires the [Docker Desktop for Windows](https://docs.docker.com/desktop/install/windows-install/). ## Try a pre-built .NET Framework Docker Image -You can quickly run a container with a pre-built [.NET Framework Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/). +You can quickly run a container with a pre-built [.NET Framework Docker image](../../README.samples.md). Type the following [Docker](https://www.docker.com/products/docker) command: @@ -77,7 +77,7 @@ msbuild /p:Configuration=Release dotnetapp\bin\Release\net48\dotnetapp.exe ``` -Note: The `/p:Configuration=Release` argument builds the application in release mode (the default is debug mode). See the [MSBuild Command-Line reference](https://msdn.microsoft.com/en-us/library/ms164311.aspx) for more information on commandline parameters. +Note: The `/p:Configuration=Release` argument builds the application in release mode (the default is debug mode). See the [MSBuild Command-Line reference](https://msdn.microsoft.com/library/ms164311.aspx) for more information on commandline parameters. ## .NET Resources @@ -97,13 +97,13 @@ Docs and More Information: .NET Framework: -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/sdk](../../README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](../../README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](../../README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](../../README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](../../README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples diff --git a/samples/wcfapp/README.md b/samples/wcfapp/README.md index 516286b8..863e2b76 100644 --- a/samples/wcfapp/README.md +++ b/samples/wcfapp/README.md @@ -2,13 +2,13 @@ This sample demonstrates how to dockerize WCF services, either IIS-hosted or self-hosted. A simple "hello world" service contract is used in all samples for both HTTP and NET.TCP transport bindings. The sample can also be used without Docker. -The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/). It builds the application and then copies the final build result into a Docker image based on the smaller [WCF Runtime Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/) or [.NET Framework Runtime Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/). It uses Docker [multi-stage build](https://github.com/dotnet/announcements/issues/18) and [multi-arch tags](https://github.com/dotnet/announcements/issues/14). +The sample builds the application in a container based on the larger [.NET Framework SDK Docker image](../../README.sdk.md). It builds the application and then copies the final build result into a Docker image based on the smaller [WCF Runtime Docker image](../../README.wcf.md) or [.NET Framework Runtime Docker image](../../README.runtime.md). It uses Docker [multi-stage build](https://github.com/dotnet/announcements/issues/18) and [multi-arch tags](https://github.com/dotnet/announcements/issues/14). -This sample requires [Docker 17.06](https://docs.docker.com/release-notes/docker-ce) or later of the [Docker client](https://store.docker.com/editions/community/docker-ce-desktop-windows). +This sample requires [Docker 17.06](https://docs.docker.com/release-notes/docker-ce) or later of the [Docker Desktop for Windows](https://docs.docker.com/desktop/install/windows-install/). ## Try pre-built WCF Docker Images -You can quickly run a container with a pre-built [sample WCF Docker image](https://hub.docker.com/r/microsoft/dotnet-framework-samples/), based on the WCF Docker sample. +You can quickly run a container with a pre-built [sample WCF Docker image](../../README.samples.md), based on the WCF Docker sample. Type the following [Docker](https://www.docker.com/products/docker) command to start a WCF service container: @@ -45,7 +45,7 @@ WCF service is supported on .NET Framework, which can run in Windows Server Core ### Build a Container with IIS-hosted WCF Service -Project `WcfServiceWebApp` is created from 'WCF Service Application' template in Visual Studio. A [Dockerfile](Dockerfile.web) is added to the project. We use a [WCF image](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/) as the base image, which has both HTTP and NET.TCP protocols enabled in IIS and exposes ports 80 (for HTTP) and 808 (for NET.TCP) for the container. We use the WCF image with tag `4.8` for .NET Framework 4.8 in this example, but you can change it to use other tags (eg. `4.7.2`) for WCF images with different versions of .NET Framework. The complete list of supported WCF tags can be found on [Docker Hub](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/). +Project `WcfServiceWebApp` is created from 'WCF Service Application' template in Visual Studio. A [Dockerfile](Dockerfile.web) is added to the project. We use a [WCF image](../../README.wcf.md) as the base image, which has both HTTP and NET.TCP protocols enabled in IIS and exposes ports 80 (for HTTP) and 808 (for NET.TCP) for the container. We use the WCF image with tag `4.8` for .NET Framework 4.8 in this example, but you can change it to use other tags (eg. `4.7.2`) for WCF images with different versions of .NET Framework. The [WCF Tag Listing](../../README.wcf.md#full-tag-listing) has the complete list of supported WCF tags. Run commands below to build the container image with name `iishostedwcfservice` and start an instance of it named `myservice1`. Docker parameter `-d` will run the container in background (detached mode). @@ -65,7 +65,7 @@ docker inspect --format="{{.NetworkSettings.Networks.nat.IPAddress}}" myservice1 ### Build a Container with Self-hosted WCF Service -Project `WcfServiceConsoleApp` is created from Windows Classic Desktop 'Console App' template in Visual Studio. We added a [Dockerfile](Dockerfile.console) to the project. We use the [.NET Framework runtime image](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/) as the base image and expose ports 80 (for HTTP) and 808 (for NET.TCP) for the container. +Project `WcfServiceConsoleApp` is created from Windows Classic Desktop 'Console App' template in Visual Studio. We added a [Dockerfile](Dockerfile.console) to the project. We use the [.NET Framework runtime image](../../README.runtime.md) as the base image and expose ports 80 (for HTTP) and 808 (for NET.TCP) for the container. Run commands below to build the container image with name `selfhostedwcfservice` and start an instance of it named `myservice2`. @@ -132,7 +132,7 @@ cd wcfapp msbuild wcfapp.sln /p:Configuration=Release ``` -Note: The /p:Configuration=Release argument builds the application in release mode (the default is debug mode). See the [MSBuild Command-Line reference](https://msdn.microsoft.com/en-us/library/ms164311.aspx) for more information on commandline parameters. +Note: The /p:Configuration=Release argument builds the application in release mode (the default is debug mode). See the [MSBuild Command-Line reference](https://msdn.microsoft.com/library/ms164311.aspx) for more information on commandline parameters. You can also build, test and debug the application with [Visual Studio 2019](https://visualstudio.microsoft.com/vs/). ## .NET Resources @@ -154,13 +154,13 @@ Docs and More Information: .NET Framework: -* [dotnet/framework/sdk](https://hub.docker.com/r/microsoft/dotnet-framework-sdk/): .NET Framework SDK -* [dotnet/framework/aspnet](https://hub.docker.com/r/microsoft/dotnet-framework-aspnet/): ASP.NET Web Forms and MVC -* [dotnet/framework/runtime](https://hub.docker.com/r/microsoft/dotnet-framework-runtime/): .NET Framework Runtime -* [dotnet/framework/wcf](https://hub.docker.com/r/microsoft/dotnet-framework-wcf/): Windows Communication Foundation (WCF) -* [dotnet/framework/samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/sdk](../../README.sdk.md): .NET Framework SDK +* [dotnet/framework/aspnet](../../README.aspnet.md): ASP.NET Web Forms and MVC +* [dotnet/framework/runtime](../../README.runtime.md): .NET Framework Runtime +* [dotnet/framework/wcf](../../README.wcf.md): Windows Communication Foundation (WCF) +* [dotnet/framework/samples](../../README.samples.md): .NET Framework, ASP.NET and WCF Samples .NET: -* [dotnet](https://hub.docker.com/r/microsoft/dotnet/): .NET -* [dotnet/samples](https://hub.docker.com/r/microsoft/dotnet-samples/): .NET Samples +* [dotnet](https://github.com/dotnet/dotnet-docker/blob/main/README.md): .NET +* [dotnet/samples](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md): .NET Samples diff --git a/tests/run-tests.ps1 b/tests/run-tests.ps1 index d4851f48..177c1ccf 100644 --- a/tests/run-tests.ps1 +++ b/tests/run-tests.ps1 @@ -96,7 +96,7 @@ $testFilter = "" if ($TestCategories) { # Construct an expression that filters the test to each of the # selected TestCategories (using an OR operator between each category). - # See https://docs.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests + # See https://docs.microsoft.com/dotnet/core/testing/selective-unit-tests $TestCategories | foreach { # Skip pre-build tests on Windows because of missing pre-reqs (https://github.com/dotnet/dotnet-docker/issues/2261) if ($_ -eq "pre-build" -and $activeOS -eq "windows") {