docs: Upgrade samples to .NET Core 3.1

natemcmaster · natemcmaster · commit 4df2d8a72d52 · 2020-03-29T14:32:35.000-07:00
diff --git a/docs/samples/Directory.Build.props b/docs/samples/Directory.Build.props
@@ -1,10 +1,6 @@
 <Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
   <PropertyGroup>
-    <!-- Set samples to use the latest stable C# until C# 8 is released -->
-    <LangVersion>7.3</LangVersion>
-    <Nullable />
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
 </Project>
diff --git a/docs/samples/Directory.Build.targets b/docs/samples/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
 
-  <ItemGroup Condition="'$(UsePackage)' != 'true'">
+  <ItemGroup>
     <PackageReference Remove="McMaster.Extensions.CommandLineUtils" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\CommandLineUtils\*.csproj" />
   </ItemGroup>
diff --git a/docs/samples/attributes/Attributes.csproj b/docs/samples/attributes/Attributes.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/custom-attribute/CustomAttribute.csproj b/docs/samples/custom-attribute/CustomAttribute.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/custom-conventions/CustomConvention.csproj b/docs/samples/custom-conventions/CustomConvention.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/dependency-injection/custom/CustomServices.csproj b/docs/samples/dependency-injection/custom/CustomServices.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/samples/dependency-injection/generic-host/GenericHostDI.csproj b/docs/samples/dependency-injection/generic-host/GenericHostDI.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/docs/samples/dependency-injection/standard/StandardServices.csproj b/docs/samples/dependency-injection/standard/StandardServices.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/generic-host/AttributeApi/AttributeApi.csproj b/docs/samples/generic-host/AttributeApi/AttributeApi.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/docs/samples/generic-host/AttributeApi/Program.cs b/docs/samples/generic-host/AttributeApi/Program.cs
@@ -12,9 +12,9 @@ static Task<int> Main(string[] args)
     [Option]
     public int Port { get; } = 8080;
 
-    private IHostingEnvironment _env;
+    private IHostEnvironment _env;
 
-    public Program(IHostingEnvironment env)
+    public Program(IHostEnvironment env)
     {
         _env = env;
     }
diff --git a/docs/samples/generic-host/BuilderApi/BuilderApi.csproj b/docs/samples/generic-host/BuilderApi/BuilderApi.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/docs/samples/generic-host/BuilderApi/Program.cs b/docs/samples/generic-host/BuilderApi/Program.cs
@@ -15,7 +15,7 @@ static Task<int> Main(string[] args)
             app.OnExecute(() =>
             {
                 var port = portOption.HasValue() ? portOption.ParsedValue : 8080;
-                var env = app.GetRequiredService<IHostingEnvironment>();
+                var env = app.GetRequiredService<IHostEnvironment>();
                 Console.WriteLine($"Starting on port {port}, env = {env.EnvironmentName}");
             });
         });
diff --git a/docs/samples/helloworld-async-attributes/AsyncAttributes.csproj b/docs/samples/helloworld-async-attributes/AsyncAttributes.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/helloworld-async/AsyncBuilderApi.csproj b/docs/samples/helloworld-async/AsyncBuilderApi.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/interactive-prompts/Prompt.csproj b/docs/samples/interactive-prompts/Prompt.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/pager/Pager.csproj b/docs/samples/pager/Pager.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/passthru-args/attributes/AttributesPassThru.csproj b/docs/samples/passthru-args/attributes/AttributesPassThru.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/passthru-args/builder-api/BuilderApiPassThru.csproj b/docs/samples/passthru-args/builder-api/BuilderApiPassThru.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/response-file-parsing/attributes/RspAttributes.csproj b/docs/samples/response-file-parsing/attributes/RspAttributes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/response-file-parsing/builder-api/RspBuilderApi.csproj b/docs/samples/response-file-parsing/builder-api/RspBuilderApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/subcommands/builder-api/BuilderApiSubcommands.csproj b/docs/samples/subcommands/builder-api/BuilderApiSubcommands.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/subcommands/inheritance/InheritanceSubcommands.csproj b/docs/samples/subcommands/inheritance/InheritanceSubcommands.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/subcommands/nested-types/NestedTypeSubcommands.csproj b/docs/samples/subcommands/nested-types/NestedTypeSubcommands.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/validation/attributes/ValidationAttributes.csproj b/docs/samples/validation/attributes/ValidationAttributes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/docs/samples/validation/builder-api/ValidationBuilderApi.csproj b/docs/samples/validation/builder-api/ValidationBuilderApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ static Task<int> Main(string[] args)`
`12`	`12`	`[Option]`
`13`	`13`	`public int Port { get; } = 8080;`
`14`	`14`
`15`		`- private IHostingEnvironment _env;`
	`15`	`+ private IHostEnvironment _env;`
`16`	`16`
`17`		`- public Program(IHostingEnvironment env)`
	`17`	`+ public Program(IHostEnvironment env)`
`18`	`18`	`{`
`19`	`19`	`_env = env;`
`20`	`20`	`}`