From 7fdad24c26ba94a131ca985997bd8caf441f0362 Mon Sep 17 00:00:00 2001
From: Rainer Stropek <rainer@software-architects.at>
Date: Mon, 18 Nov 2019 08:00:03 +0100
Subject: [PATCH] Update C# 7 and 8 samples to .NET Core 3.1 Preview

---
 CSharp7/AsyncMain/AsyncMain.csproj                          | 2 +-
 .../ExpressionBodiedMembers/ExpressionBodiedMembers.csproj  | 2 +-
 CSharp7/LocalFunction/LocalFunction.csproj                  | 2 +-
 CSharp7/LocalFunctionLambda/LocalFunctionLambda.csproj      | 2 +-
 CSharp7/OutVars/OutVars.csproj                              | 2 +-
 CSharp7/PatternMatching/PatternMatching.csproj              | 2 +-
 CSharp7/Ref/Ref.csproj                                      | 2 +-
 CSharp7/RefReturns/RefReturns.csproj                        | 2 +-
 CSharp7/TupleDemo/TupleDemo.csproj                          | 2 +-
 CSharp7/ValueTask/ValueTask.csproj                          | 4 ++--
 CSharp7/global.json                                         | 2 +-
 CSharp8/AeadCrypto/AeadCrypto.csproj                        | 4 ++--
 CSharp8/AsyncStreams/AsyncStreams.csproj                    | 2 +-
 CSharp8/GenericHost/GenericHost.csproj                      | 6 +++---
 CSharp8/Http2Client/Http2Client.csproj                      | 2 +-
 .../InterfaceImplementation/InterfaceImplementation.csproj  | 2 +-
 CSharp8/Json/Json.csproj                                    | 2 +-
 CSharp8/LocalTools/EolFixer.csproj                          | 2 +-
 .../NullableReferenceTypes/NullableReferenceTypes.csproj    | 2 +-
 CSharp8/PatternMatching/PatternMatching.csproj              | 2 +-
 CSharp8/PatternMatching/Program.cs                          | 2 ++
 CSharp8/RangesIndexes/RangesIndexes.csproj                  | 2 +-
 CSharp8/ReadonlyMembers/ReadonlyMembers.csproj              | 2 +-
 CSharp8/UsingDeclarations/UsingDeclarations.csproj          | 2 +-
 CSharp8/global.json                                         | 2 +-
 25 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/CSharp7/AsyncMain/AsyncMain.csproj b/CSharp7/AsyncMain/AsyncMain.csproj
index 5635c9dc..9acff6d2 100644
--- a/CSharp7/AsyncMain/AsyncMain.csproj
+++ b/CSharp7/AsyncMain/AsyncMain.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/ExpressionBodiedMembers/ExpressionBodiedMembers.csproj b/CSharp7/ExpressionBodiedMembers/ExpressionBodiedMembers.csproj
index 5a1d8fc0..82ebe417 100644
--- a/CSharp7/ExpressionBodiedMembers/ExpressionBodiedMembers.csproj
+++ b/CSharp7/ExpressionBodiedMembers/ExpressionBodiedMembers.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/LocalFunction/LocalFunction.csproj b/CSharp7/LocalFunction/LocalFunction.csproj
index 5a1d8fc0..82ebe417 100644
--- a/CSharp7/LocalFunction/LocalFunction.csproj
+++ b/CSharp7/LocalFunction/LocalFunction.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/LocalFunctionLambda/LocalFunctionLambda.csproj b/CSharp7/LocalFunctionLambda/LocalFunctionLambda.csproj
index 5a1d8fc0..82ebe417 100644
--- a/CSharp7/LocalFunctionLambda/LocalFunctionLambda.csproj
+++ b/CSharp7/LocalFunctionLambda/LocalFunctionLambda.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/OutVars/OutVars.csproj b/CSharp7/OutVars/OutVars.csproj
index 5a1d8fc0..82ebe417 100644
--- a/CSharp7/OutVars/OutVars.csproj
+++ b/CSharp7/OutVars/OutVars.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/PatternMatching/PatternMatching.csproj b/CSharp7/PatternMatching/PatternMatching.csproj
index 5a1d8fc0..82ebe417 100644
--- a/CSharp7/PatternMatching/PatternMatching.csproj
+++ b/CSharp7/PatternMatching/PatternMatching.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/Ref/Ref.csproj b/CSharp7/Ref/Ref.csproj
index 059d046d..256f89bf 100644
--- a/CSharp7/Ref/Ref.csproj
+++ b/CSharp7/Ref/Ref.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/CSharp7/RefReturns/RefReturns.csproj b/CSharp7/RefReturns/RefReturns.csproj
index 5a1d8fc0..82ebe417 100644
--- a/CSharp7/RefReturns/RefReturns.csproj
+++ b/CSharp7/RefReturns/RefReturns.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/TupleDemo/TupleDemo.csproj b/CSharp7/TupleDemo/TupleDemo.csproj
index 5a1d8fc0..82ebe417 100644
--- a/CSharp7/TupleDemo/TupleDemo.csproj
+++ b/CSharp7/TupleDemo/TupleDemo.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/CSharp7/ValueTask/ValueTask.csproj b/CSharp7/ValueTask/ValueTask.csproj
index 9cca733a..da7249d5 100644
--- a/CSharp7/ValueTask/ValueTask.csproj
+++ b/CSharp7/ValueTask/ValueTask.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/CSharp7/global.json b/CSharp7/global.json
index c33f6a5e..ca74bf45 100644
--- a/CSharp7/global.json
+++ b/CSharp7/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100-rc1-014190"
+    "version": "3.1.100-preview3-014645"
   }
 }
diff --git a/CSharp8/AeadCrypto/AeadCrypto.csproj b/CSharp8/AeadCrypto/AeadCrypto.csproj
index 64c8b718..e7b2b810 100644
--- a/CSharp8/AeadCrypto/AeadCrypto.csproj
+++ b/CSharp8/AeadCrypto/AeadCrypto.csproj
@@ -2,12 +2,12 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 
     <ItemGroup>
-        <PackageReference Include="System.Security.Cryptography.Cng" Version="4.5.0" />
+        <PackageReference Include="System.Security.Cryptography.Cng" Version="4.7.0-preview3.19551.4" />
     </ItemGroup>
 
 </Project>
diff --git a/CSharp8/AsyncStreams/AsyncStreams.csproj b/CSharp8/AsyncStreams/AsyncStreams.csproj
index 9529c4df..5d5886b0 100644
--- a/CSharp8/AsyncStreams/AsyncStreams.csproj
+++ b/CSharp8/AsyncStreams/AsyncStreams.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
     <NullableReferenceTypes>true</NullableReferenceTypes>
   </PropertyGroup>
diff --git a/CSharp8/GenericHost/GenericHost.csproj b/CSharp8/GenericHost/GenericHost.csproj
index bab53c14..757889bd 100644
--- a/CSharp8/GenericHost/GenericHost.csproj
+++ b/CSharp8/GenericHost/GenericHost.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0-rc1.19456.10" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0-preview3.19553.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CSharp8/Http2Client/Http2Client.csproj b/CSharp8/Http2Client/Http2Client.csproj
index c67284f2..17792376 100644
--- a/CSharp8/Http2Client/Http2Client.csproj
+++ b/CSharp8/Http2Client/Http2Client.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/CSharp8/InterfaceImplementation/InterfaceImplementation.csproj b/CSharp8/InterfaceImplementation/InterfaceImplementation.csproj
index 2c2d0813..cde7f666 100644
--- a/CSharp8/InterfaceImplementation/InterfaceImplementation.csproj
+++ b/CSharp8/InterfaceImplementation/InterfaceImplementation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
diff --git a/CSharp8/Json/Json.csproj b/CSharp8/Json/Json.csproj
index 4a390516..46545025 100644
--- a/CSharp8/Json/Json.csproj
+++ b/CSharp8/Json/Json.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/CSharp8/LocalTools/EolFixer.csproj b/CSharp8/LocalTools/EolFixer.csproj
index abbca07c..81544627 100644
--- a/CSharp8/LocalTools/EolFixer.csproj
+++ b/CSharp8/LocalTools/EolFixer.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
 
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>eolfixer</ToolCommandName>
diff --git a/CSharp8/NullableReferenceTypes/NullableReferenceTypes.csproj b/CSharp8/NullableReferenceTypes/NullableReferenceTypes.csproj
index 0909ab7d..0a4ab756 100644
--- a/CSharp8/NullableReferenceTypes/NullableReferenceTypes.csproj
+++ b/CSharp8/NullableReferenceTypes/NullableReferenceTypes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
diff --git a/CSharp8/PatternMatching/PatternMatching.csproj b/CSharp8/PatternMatching/PatternMatching.csproj
index 5e3b7016..30c15f43 100644
--- a/CSharp8/PatternMatching/PatternMatching.csproj
+++ b/CSharp8/PatternMatching/PatternMatching.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
diff --git a/CSharp8/PatternMatching/Program.cs b/CSharp8/PatternMatching/Program.cs
index 853f4822..6de86831 100644
--- a/CSharp8/PatternMatching/Program.cs
+++ b/CSharp8/PatternMatching/Program.cs
@@ -28,6 +28,8 @@ public Person(string name)
             Name = name;
         }
 
+        public string GenerateName() => Name.ToUpper();
+
         public string Name { get; set; }
     }
 
diff --git a/CSharp8/RangesIndexes/RangesIndexes.csproj b/CSharp8/RangesIndexes/RangesIndexes.csproj
index 5e3b7016..30c15f43 100644
--- a/CSharp8/RangesIndexes/RangesIndexes.csproj
+++ b/CSharp8/RangesIndexes/RangesIndexes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
diff --git a/CSharp8/ReadonlyMembers/ReadonlyMembers.csproj b/CSharp8/ReadonlyMembers/ReadonlyMembers.csproj
index 5e3b7016..30c15f43 100644
--- a/CSharp8/ReadonlyMembers/ReadonlyMembers.csproj
+++ b/CSharp8/ReadonlyMembers/ReadonlyMembers.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
diff --git a/CSharp8/UsingDeclarations/UsingDeclarations.csproj b/CSharp8/UsingDeclarations/UsingDeclarations.csproj
index 5e3b7016..30c15f43 100644
--- a/CSharp8/UsingDeclarations/UsingDeclarations.csproj
+++ b/CSharp8/UsingDeclarations/UsingDeclarations.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
diff --git a/CSharp8/global.json b/CSharp8/global.json
index c33f6a5e..ca74bf45 100644
--- a/CSharp8/global.json
+++ b/CSharp8/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100-rc1-014190"
+    "version": "3.1.100-preview3-014645"
   }
 }