From 3c63059bea2fb4c39f54fccd8f72faa97b0ebdb2 Mon Sep 17 00:00:00 2001 From: Ron Petrusha Date: Mon, 10 Sep 2018 14:28:25 -0700 Subject: [PATCH] Changed TFMs to netcoreapp2.1 (#298) --- .../FibonacciBetterMsBuild/Fibonacci.csproj | 2 +- core/console-apps/FibonacciBetterMsBuild/README.md | 11 ++++------- core/console-apps/HelloMsBuild/Hello.csproj | 2 +- core/console-apps/HelloMsBuild/README.md | 11 ++--------- core/console-apps/NewTypesMsBuild/README.md | 12 ++++-------- .../NewTypesMsBuild/src/NewTypes/NewTypes.csproj | 2 +- .../test/NewTypesTests/NewTypesTests.csproj | 8 ++++---- core/console-apps/fibonacci-msbuild/Hello.csproj | 2 +- core/console-apps/fibonacci-msbuild/README.md | 9 ++------- snippets/csharp/xunit-test/xunit-test.csproj | 2 +- 10 files changed, 21 insertions(+), 40 deletions(-) diff --git a/core/console-apps/FibonacciBetterMsBuild/Fibonacci.csproj b/core/console-apps/FibonacciBetterMsBuild/Fibonacci.csproj index 2c171ec7266..8fb23a8dd31 100644 --- a/core/console-apps/FibonacciBetterMsBuild/Fibonacci.csproj +++ b/core/console-apps/FibonacciBetterMsBuild/Fibonacci.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp1.0 + netcoreapp2.1 \ No newline at end of file diff --git a/core/console-apps/FibonacciBetterMsBuild/README.md b/core/console-apps/FibonacciBetterMsBuild/README.md index 49b8da875da..8fa4007cce5 100644 --- a/core/console-apps/FibonacciBetterMsBuild/README.md +++ b/core/console-apps/FibonacciBetterMsBuild/README.md @@ -14,13 +14,10 @@ results to the initial Fibonacci sample. Build and Run ------------- -To build and run the sample, type the following two commands: +To build and run the sample, type the following command: -`dotnet restore` -`dotnet run` +To build and run the sample, type the following command: -`dotnet restore` ([see note](#dotnet-restore-note)) restores the dependencies for this sample. -`dotnet run` builds the sample and runs the output assembly. +`dotnet run` - -[!INCLUDE[DotNet Restore Note](~/includes/dotnet-restore-note.md)] +`dotnet run` builds the sample and runs the output assembly. It implicitly calls `dotnet restore` on .NET Core 2.0 and later versions. If you're using a .NET Core 1.x SDK, you first have to call `dotnet restore` yourself. diff --git a/core/console-apps/HelloMsBuild/Hello.csproj b/core/console-apps/HelloMsBuild/Hello.csproj index 2c171ec7266..8fb23a8dd31 100644 --- a/core/console-apps/HelloMsBuild/Hello.csproj +++ b/core/console-apps/HelloMsBuild/Hello.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp1.0 + netcoreapp2.1 \ No newline at end of file diff --git a/core/console-apps/HelloMsBuild/README.md b/core/console-apps/HelloMsBuild/README.md index 8f9901b8100..679a0893232 100644 --- a/core/console-apps/HelloMsBuild/README.md +++ b/core/console-apps/HelloMsBuild/README.md @@ -13,15 +13,8 @@ This is the basic Hello World sample. It demonstrates the basics of the environm Build and Run ------------- -To build and run the sample, type the following two commands: +To build and run the sample, type the following command: -`dotnet restore` `dotnet run` -`dotnet restore` -([see note](#dotnet-restore-note)) restores the dependencies for this sample. -`dotnet run` builds the sample and runs the output assembly. - - -[!INCLUDE[DotNet Restore Note](~/includes/dotnet-restore-note.md)] - +`dotnet run` builds the sample and runs the output assembly. It implicitly calls `dotnet restore` on .NET Core 2.0 and later versions. If you're using a .NET Core 1.x SDK, you first have to call `dotnet restore` yourself. diff --git a/core/console-apps/NewTypesMsBuild/README.md b/core/console-apps/NewTypesMsBuild/README.md index 865aff01ef9..be5d11b4378 100644 --- a/core/console-apps/NewTypesMsBuild/README.md +++ b/core/console-apps/NewTypesMsBuild/README.md @@ -8,26 +8,22 @@ This sample builds a program and an associated unit test assembly. Using this sa ## Build and run -To build and run the sample, change to the *src/NewTypes* directory and execute the following two commands: +To build and run the sample, change to the *src/NewTypes* directory and execute the following command: ```console -dotnet restore dotnet run ``` -`dotnet restore` ([see note](#dotnet-restore-note)) restores the dependencies of the sample. `dotnet run` builds the sample and runs the output executable. +`dotnet restore` ([see note](#dotnet-restore-note)) restores the dependencies of the sample. `dotnet run` builds the sample and runs the output executable. It implicitly runs `dotnet restore` to restore the dependencies of the sample. If you're using .NET Core 1.0 or .NET Core 1.1 instead of .NET Core 2.0 or a later version, you have to run `dotnet restore` yourself. -To run the tests, change to the *test/NewTypesTests* directory and execute the following three commands: +To run the tests, change to the *test/NewTypesTests* directory and execute the following two commands: ```console -dotnet restore dotnet build dotnet test ``` `dotnet test` runs the configured tests. -Note that you must run `dotnet restore` ([see note](#dotnet-restore-note)) in the *src/NewTypesMsBuild* directory before you can run the tests. `dotnet build` will follow the dependency on the `NewTypesMsBuild` project and build both the app and unit tests projects, but it won't restore NuGet packages. +`dotnet build` will follow the dependency on the `NewTypesMsBuild` project and build both the app and unit tests projects. It implicitly runs `dotnet restore` on .NET Core 2.0 and later versions. If you're using .NET Core 1.0 or .NET Core 1.1, you first have to run `dotnet restore` yourself. - -[!INCLUDE[DotNet Restore Note](~/includes/dotnet-restore-note.md)] diff --git a/core/console-apps/NewTypesMsBuild/src/NewTypes/NewTypes.csproj b/core/console-apps/NewTypesMsBuild/src/NewTypes/NewTypes.csproj index 9ddc6e14e38..265f318a942 100644 --- a/core/console-apps/NewTypesMsBuild/src/NewTypes/NewTypes.csproj +++ b/core/console-apps/NewTypesMsBuild/src/NewTypes/NewTypes.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp1.1 + netcoreapp2.1 diff --git a/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj b/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj index 823528d9435..521e3eb1ed8 100644 --- a/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj +++ b/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj @@ -1,13 +1,13 @@ - netcoreapp1.1 + netcoreapp2.1 - - - + + + diff --git a/core/console-apps/fibonacci-msbuild/Hello.csproj b/core/console-apps/fibonacci-msbuild/Hello.csproj index 2c171ec7266..8fb23a8dd31 100644 --- a/core/console-apps/fibonacci-msbuild/Hello.csproj +++ b/core/console-apps/fibonacci-msbuild/Hello.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp1.0 + netcoreapp2.1 \ No newline at end of file diff --git a/core/console-apps/fibonacci-msbuild/README.md b/core/console-apps/fibonacci-msbuild/README.md index 711eb3403dc..679a0893232 100644 --- a/core/console-apps/fibonacci-msbuild/README.md +++ b/core/console-apps/fibonacci-msbuild/README.md @@ -13,13 +13,8 @@ This is the basic Hello World sample. It demonstrates the basics of the environm Build and Run ------------- -To build and run the sample, type the following two commands: +To build and run the sample, type the following command: -`dotnet restore` `dotnet run` -`dotnet restore` ([see note](#dotnet-restore-note)) restores the dependencies for this sample. -`dotnet run` builds the sample and runs the output assembly. - - -[!INCLUDE[DotNet Restore Note](~/includes/dotnet-restore-note.md)] +`dotnet run` builds the sample and runs the output assembly. It implicitly calls `dotnet restore` on .NET Core 2.0 and later versions. If you're using a .NET Core 1.x SDK, you first have to call `dotnet restore` yourself. diff --git a/snippets/csharp/xunit-test/xunit-test.csproj b/snippets/csharp/xunit-test/xunit-test.csproj index 7c8da8f68a9..0ffd10766a7 100644 --- a/snippets/csharp/xunit-test/xunit-test.csproj +++ b/snippets/csharp/xunit-test/xunit-test.csproj @@ -1,7 +1,7 @@ - netcoreapp1.1 + netcoreapp2.1