diff --git a/README.md b/README.md index 1c37a1632..7bb074ea3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The [.NET Framework](https://www.microsoft.com/net/framework) is a general purpo You can use C#, F# and VB to write .NET Framework apps. C# is simple, powerful, type-safe, and object-oriented while retaining the expressiveness and elegance of C-style languages. F# is a multi-paradigm programming language, enabling both functional and object-oriented patterns and practices. VB is a rapid development programming language with the deepest integration between the language and Visual Studio, providing the fastest path to a working app. -The .NET Framework was first released by Microsoft in 2001. The latest version is [.NET Framework 4.7.2](https://www.microsoft.com/net/framework). +The .NET Framework was first released by Microsoft in 2001. The latest version is [.NET Framework 4.8](https://www.microsoft.com/net/framework). > https://docs.microsoft.com/dotnet/framework/ diff --git a/samples/aspnetapp/Dockerfile b/samples/aspnetapp/Dockerfile index 777c25707..f15246a5b 100644 --- a/samples/aspnetapp/Dockerfile +++ b/samples/aspnetapp/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -13,6 +13,6 @@ WORKDIR /app/aspnetapp RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/aspnet:4.7.2 AS runtime +FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8 AS runtime WORKDIR /inetpub/wwwroot COPY --from=build /app/aspnetapp/. ./ diff --git a/samples/aspnetapp/Dockerfile.windowsservercore-ltsc2016 b/samples/aspnetapp/Dockerfile.windowsservercore-ltsc2016 index d31580523..c96604b59 100644 --- a/samples/aspnetapp/Dockerfile.windowsservercore-ltsc2016 +++ b/samples/aspnetapp/Dockerfile.windowsservercore-ltsc2016 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -13,6 +13,6 @@ WORKDIR /app/aspnetapp RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/aspnet:4.7.2-windowsservercore-ltsc2016 AS runtime +FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 AS runtime WORKDIR /inetpub/wwwroot COPY --from=build /app/aspnetapp/. ./ diff --git a/samples/aspnetapp/README.md b/samples/aspnetapp/README.md index 5f5a62254..ebf63304b 100644 --- a/samples/aspnetapp/README.md +++ b/samples/aspnetapp/README.md @@ -103,9 +103,9 @@ We recommend that you do not use `--rm` in production. It cleans up container re ## Build the sample locally -You can build this [.NET Framework 4.7.2](https://www.microsoft.com/net/download/dotnet-framework-runtime/net472) application locally with MSBuild and [NuGet](https://www.nuget.org/downloads) using the following instructions. The instructions assume that you are in the root of the repository and using the `Developer Command Prompt for VS 2017`. +You can build this [.NET Framework 4.8](https://www.microsoft.com/net/download/dotnet-framework-runtime/net48) application locally with MSBuild and [NuGet](https://www.nuget.org/downloads) using the following instructions. The instructions assume that you are in the root of the repository and using the `Developer Command Prompt for VS 2019`. -You must have the [.NET Framework 4.7.2 targeting pack](https://go.microsoft.com/fwlink/?LinkId=863261) installed. It is easiest to install with [Visual Studio 2017](https://www.microsoft.com/net/download/Windows/build) with the Visual Studio Installer. +You must have the [.NET Framework 4.8 targeting pack](http://go.microsoft.com/fwlink/?LinkId=2085167) installed. ```console cd samples @@ -114,7 +114,7 @@ nuget restore msbuild ``` -You can test and debug the application with [Visual Studio 2017](https://www.microsoft.com/net/download/Windows/build). +You can test and debug the application with [Visual Studio 2019](https://visualstudio.microsoft.com/vs/). ## .NET Core Resources diff --git a/samples/aspnetapp/aspnetapp/Web.config b/samples/aspnetapp/aspnetapp/Web.config index dd34b2850..494741d9a 100644 --- a/samples/aspnetapp/aspnetapp/Web.config +++ b/samples/aspnetapp/aspnetapp/Web.config @@ -5,8 +5,8 @@ --> - - + + diff --git a/samples/aspnetapp/aspnetapp/aspnetapp.csproj b/samples/aspnetapp/aspnetapp/aspnetapp.csproj index cd4bd5e76..f5ee76a86 100644 --- a/samples/aspnetapp/aspnetapp/aspnetapp.csproj +++ b/samples/aspnetapp/aspnetapp/aspnetapp.csproj @@ -15,7 +15,7 @@ Properties aspnetapp aspnetapp - v4.7.2 + v4.8 true diff --git a/samples/aspnetmvcapp/Dockerfile b/samples/aspnetmvcapp/Dockerfile index 6d2b6b245..1d2aff97b 100644 --- a/samples/aspnetmvcapp/Dockerfile +++ b/samples/aspnetmvcapp/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -13,6 +13,6 @@ WORKDIR /app/aspnetmvcapp RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/aspnet:4.7.2 AS runtime +FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8 AS runtime WORKDIR /inetpub/wwwroot COPY --from=build /app/aspnetmvcapp/. ./ diff --git a/samples/aspnetmvcapp/aspnetmvcapp/Web.config b/samples/aspnetmvcapp/aspnetmvcapp/Web.config index 93a666e2e..495851bc5 100644 --- a/samples/aspnetmvcapp/aspnetmvcapp/Web.config +++ b/samples/aspnetmvcapp/aspnetmvcapp/Web.config @@ -11,8 +11,8 @@ - - + + diff --git a/samples/aspnetmvcapp/aspnetmvcapp/aspnetmvcapp.csproj b/samples/aspnetmvcapp/aspnetmvcapp/aspnetmvcapp.csproj index 80c20ade5..d5fe4e2b6 100644 --- a/samples/aspnetmvcapp/aspnetmvcapp/aspnetmvcapp.csproj +++ b/samples/aspnetmvcapp/aspnetmvcapp/aspnetmvcapp.csproj @@ -15,7 +15,7 @@ Properties aspnetmvcapp aspnetmvcapp - v4.7.2 + v4.8 false true diff --git a/samples/dotnetapp/Dockerfile b/samples/dotnetapp/Dockerfile index 57f697485..3bada6a61 100644 --- a/samples/dotnetapp/Dockerfile +++ b/samples/dotnetapp/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -29,7 +29,7 @@ WORKDIR /app/dotnetapp RUN dotnet publish -c Release -o out -FROM mcr.microsoft.com/dotnet/framework/runtime:4.7.2 AS runtime +FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime WORKDIR /app COPY --from=publish /app/dotnetapp/out ./ ENTRYPOINT ["dotnetapp.exe"] diff --git a/samples/dotnetapp/Dockerfile.basic b/samples/dotnetapp/Dockerfile.basic index 3ba00b548..172c3bf95 100644 --- a/samples/dotnetapp/Dockerfile.basic +++ b/samples/dotnetapp/Dockerfile.basic @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -14,7 +14,7 @@ WORKDIR /app/dotnetapp RUN dotnet publish -c Release -o out -FROM mcr.microsoft.com/dotnet/framework/runtime:4.7.2 AS runtime +FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime WORKDIR /app COPY --from=build /app/dotnetapp/out ./ ENTRYPOINT ["dotnetapp.exe"] diff --git a/samples/dotnetapp/README.md b/samples/dotnetapp/README.md index 2a0e21913..e90604d2e 100644 --- a/samples/dotnetapp/README.md +++ b/samples/dotnetapp/README.md @@ -60,9 +60,9 @@ You can push the image to a container registry so that you can pull and run it o ## Build and run the sample locally with the .NET Core SDK -You can build this [.NET Framework 4.7.2](https://www.microsoft.com/net/download/dotnet-framework-runtime/net472) application locally with the [.NET Core 2.0 SDK](https://www.microsoft.com/net/download/core) using the following instructions. The instructions assume that you are in the root of the repository. +You can build this [.NET Framework 4.8](https://www.microsoft.com/net/download/dotnet-framework-runtime/net48) application locally with the [.NET Core 2.0 SDK](https://www.microsoft.com/net/download/core) using the following instructions. The instructions assume that you are in the root of the repository. -You must have the [.NET Framework 4.7.2 targeting pack](https://go.microsoft.com/fwlink/?LinkId=863261) installed. It is easiest to install with [Visual Studio 2017](https://www.microsoft.com/net/download/Windows/build) and the the Visual Studio Installer. +You must have the [.NET Framework 4.8 targeting pack](http://go.microsoft.com/fwlink/?LinkId=2085167) installed. It is easiest to install with [Visual Studio 2019](https://visualstudio.microsoft.com/vs/) and the the Visual Studio Installer. ```console cd samples @@ -86,16 +86,16 @@ Note: The `-c release` argument builds the application in release mode (the defa ## Build and run the sample locally with MSBuild -You can build this [.NET Framework 4.7.2](https://www.microsoft.com/net/download/dotnet-framework-runtime/net472) application locally with MSBuild using the following instructions. The instructions assume that you are in the root of the repository and using the `Developer Command Prompt for VS 2017`. +You can build this [.NET Framework 4.8](https://www.microsoft.com/net/download/dotnet-framework-runtime/net48) application locally with MSBuild using the following instructions. The instructions assume that you are in the root of the repository and using the `Developer Command Prompt for VS 2019`. -You must have the [.NET Framework 4.7.2 targeting pack](https://go.microsoft.com/fwlink/?LinkId=863261) installed. It is easiest to install with [Visual Studio 2017](https://www.microsoft.com/net/download/Windows/build) and the the Visual Studio Installer. +You must have the [.NET Framework 4.8 targeting pack](https://go.microsoft.com/fwlink/?LinkId=2085167) installed. It is easiest to install with [Visual Studio 2019](https://visualstudio.microsoft.com/vs/) and the the Visual Studio Installer. ```console cd samples cd dotnetapp msbuild /t:restore msbuild /p:Configuration=Release -dotnetapp\bin\Release\net471\dotnetapp.exe +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. diff --git a/samples/dotnetapp/dotnetapp/dotnetapp.csproj b/samples/dotnetapp/dotnetapp/dotnetapp.csproj index 380001390..66301c71d 100644 --- a/samples/dotnetapp/dotnetapp/dotnetapp.csproj +++ b/samples/dotnetapp/dotnetapp/dotnetapp.csproj @@ -2,7 +2,7 @@ Exe - net472 + net48 diff --git a/samples/dotnetapp/tests/tests.csproj b/samples/dotnetapp/tests/tests.csproj index a150760da..1ea6495b9 100644 --- a/samples/dotnetapp/tests/tests.csproj +++ b/samples/dotnetapp/tests/tests.csproj @@ -1,7 +1,7 @@ - net472 + net48 diff --git a/samples/wcfapp/Dockerfile.client b/samples/wcfapp/Dockerfile.client index dd3eaedd4..76767319c 100644 --- a/samples/wcfapp/Dockerfile.client +++ b/samples/wcfapp/Dockerfile.client @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app COPY WcfClient/. . RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/runtime:4.7.2 AS runtime +FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime WORKDIR /app COPY --from=build /app/bin/Release . ENTRYPOINT WcfClient.exe diff --git a/samples/wcfapp/Dockerfile.console b/samples/wcfapp/Dockerfile.console index d9578aa09..413f8c555 100644 --- a/samples/wcfapp/Dockerfile.console +++ b/samples/wcfapp/Dockerfile.console @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app COPY WcfServiceConsoleApp/. . RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/runtime:4.7.2 AS runtime +FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime EXPOSE 80 EXPOSE 808 WORKDIR /app diff --git a/samples/wcfapp/Dockerfile.web b/samples/wcfapp/Dockerfile.web index ca2be6b00..ed8d931a2 100644 --- a/samples/wcfapp/Dockerfile.web +++ b/samples/wcfapp/Dockerfile.web @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.7.2 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build WORKDIR /app COPY WcfServiceWebApp/. . RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/wcf:4.7.2 AS runtime +FROM mcr.microsoft.com/dotnet/framework/wcf:4.8 AS runtime WORKDIR /inetpub/wwwroot COPY --from=build /app/ . diff --git a/samples/wcfapp/README.md b/samples/wcfapp/README.md index 05b808753..9a979c766 100644 --- a/samples/wcfapp/README.md +++ b/samples/wcfapp/README.md @@ -36,7 +36,7 @@ You can also [download the repository as a zip](https://github.com/microsoft/dot WCF service is supported on .NET Framework, which can run in Windows Server Core based containers. For simplicity, we disabled security in these samples. ### 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/_/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.7.2` for .NET Framework 4.7.2 in this example, but you can change it to use other tags (eg. `4.7`) 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/_/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](https://hub.docker.com/_/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/_/microsoft-dotnet-framework-wcf/). 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). ``` @@ -95,9 +95,9 @@ docker-compose -f docker-compose-selfhosted.yml up ## Build the sample locally -You can build this [.NET Framework 4.7.2](https://www.microsoft.com/net/download/dotnet-framework-runtime/net472) application locally with MSBuild using the following instructions. The instructions assume that you are in the root of the repository and using the `Developer Command Prompt for VS 2017`. +You can build this [.NET Framework 4.8](https://www.microsoft.com/net/download/dotnet-framework-runtime/net48) application locally with MSBuild using the following instructions. The instructions assume that you are in the root of the repository and using the `Developer Command Prompt for VS 2019`. -You must have the [.NET Framework 4.7.2 targeting pack](https://go.microsoft.com/fwlink/?LinkId=863261) installed. It is easiest to install with [Visual Studio 2017](https://www.microsoft.com/net/download/Windows/build) with the Visual Studio Installer. +You must have the [.NET Framework 4.8 targeting pack](https://go.microsoft.com/fwlink/?LinkId=2085167) installed. It is easiest to install with [Visual Studio 2019](https://visualstudio.microsoft.com/vs/) with the Visual Studio Installer. ```console cd samples @@ -106,7 +106,7 @@ 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. -You can also build, test and debug the application with [Visual Studio 2017](https://www.microsoft.com/net/download/Windows/build). +You can also build, test and debug the application with [Visual Studio 2019](https://visualstudio.microsoft.com/vs/). ## .NET Resources diff --git a/samples/wcfapp/WcfClient/App.config b/samples/wcfapp/WcfClient/App.config index ecdcf8a54..4bfa00561 100644 --- a/samples/wcfapp/WcfClient/App.config +++ b/samples/wcfapp/WcfClient/App.config @@ -1,6 +1,6 @@ - + diff --git a/samples/wcfapp/WcfClient/WcfClient.csproj b/samples/wcfapp/WcfClient/WcfClient.csproj index a73188814..3185a2cf5 100644 --- a/samples/wcfapp/WcfClient/WcfClient.csproj +++ b/samples/wcfapp/WcfClient/WcfClient.csproj @@ -8,7 +8,7 @@ Exe WcfClient WcfClient - v4.7.2 + v4.8 512 true diff --git a/samples/wcfapp/WcfServiceConsoleApp/App.config b/samples/wcfapp/WcfServiceConsoleApp/App.config index c89370cb1..93e372ab2 100644 --- a/samples/wcfapp/WcfServiceConsoleApp/App.config +++ b/samples/wcfapp/WcfServiceConsoleApp/App.config @@ -1,7 +1,7 @@ - + diff --git a/samples/wcfapp/WcfServiceConsoleApp/WcfServiceConsoleApp.csproj b/samples/wcfapp/WcfServiceConsoleApp/WcfServiceConsoleApp.csproj index 0a537bf9e..b3601a766 100644 --- a/samples/wcfapp/WcfServiceConsoleApp/WcfServiceConsoleApp.csproj +++ b/samples/wcfapp/WcfServiceConsoleApp/WcfServiceConsoleApp.csproj @@ -8,7 +8,7 @@ Exe WcfServiceConsoleApp WcfServiceConsoleApp - v4.7.2 + v4.8 512 true True diff --git a/samples/wcfapp/WcfServiceWebApp/WcfServiceWebApp.csproj b/samples/wcfapp/WcfServiceWebApp/WcfServiceWebApp.csproj index b56e714c1..671973049 100644 --- a/samples/wcfapp/WcfServiceWebApp/WcfServiceWebApp.csproj +++ b/samples/wcfapp/WcfServiceWebApp/WcfServiceWebApp.csproj @@ -12,7 +12,7 @@ Properties WcfServiceWebApp WcfServiceWebApp - v4.7.2 + v4.8 True true true diff --git a/samples/wcfapp/WcfServiceWebApp/Web.config b/samples/wcfapp/WcfServiceWebApp/Web.config index 95bbe457e..07a7a6af0 100644 --- a/samples/wcfapp/WcfServiceWebApp/Web.config +++ b/samples/wcfapp/WcfServiceWebApp/Web.config @@ -8,12 +8,12 @@ The following attributes can be set on the tag. - + --> - - + +