Changed TFMs to netcoreapp2.1 (dotnet#298)

duydevelopers · Sep 10, 2018 · 3c63059 · 3c63059
1 parent b9018f8
commit 3c63059
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 40 deletions.
diff --git a/core/console-apps/FibonacciBetterMsBuild/Fibonacci.csproj b/core/console-apps/FibonacciBetterMsBuild/Fibonacci.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git 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`
 
-<a name="dotnet-restore-note"></a>
-[!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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git 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.
-
-<a name="dotnet-restore-note"></a>
-[!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
@@ -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. 
 
-<a name="dotnet-restore-note"></a>
-[!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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj b/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/console-apps/fibonacci-msbuild/Hello.csproj b/core/console-apps/fibonacci-msbuild/Hello.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git 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.
-
-<a name="dotnet-restore-note"></a>
-[!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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>