From 4b4cdecc361ce4c372d3123ed7a747d0e5ad47ee Mon Sep 17 00:00:00 2001
From: Jonathon Marolf <jmarolf@microsoft.com>
Date: Thu, 17 Jun 2021 15:34:43 -0700
Subject: [PATCH 1/2] do not enable nullable on netstandard2.0

---
 .../content/ClassLibrary-CSharp/Company.ClassLibrary1.csproj    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.6.0/content/ClassLibrary-CSharp/Company.ClassLibrary1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.6.0/content/ClassLibrary-CSharp/Company.ClassLibrary1.csproj
index e96296e937..c2d00666a4 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.6.0/content/ClassLibrary-CSharp/Company.ClassLibrary1.csproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.6.0/content/ClassLibrary-CSharp/Company.ClassLibrary1.csproj
@@ -5,7 +5,7 @@
     <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ClassLibrary1</RootNamespace>
     <LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
-    <Nullable Condition="'$(Nullable)' == 'true'">enable</Nullable>
+    <Nullable Condition="('$(Nullable)' == 'true') AND ('$(Framework)' != 'netstandard2.0')">enable</Nullable>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
 

From 6e6a85d4c581b23923f67ae832845d973157aeaf Mon Sep 17 00:00:00 2001
From: Jonathon Marolf <jmarolf@microsoft.com>
Date: Thu, 17 Jun 2021 15:53:16 -0700
Subject: [PATCH 2/2] add netstandard tests

---
 test/dotnet-new3.UnitTests/CommonTemplatesTests.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/dotnet-new3.UnitTests/CommonTemplatesTests.cs b/test/dotnet-new3.UnitTests/CommonTemplatesTests.cs
index 569cede6f6..406f7516ad 100644
--- a/test/dotnet-new3.UnitTests/CommonTemplatesTests.cs
+++ b/test/dotnet-new3.UnitTests/CommonTemplatesTests.cs
@@ -63,6 +63,9 @@ public CommonTemplatesTests(SharedHomeDirectory fixture, ITestOutputHelper log)
         [InlineData("Class Library", "classlib", "C#", "netcoreapp2.1")]
         [InlineData("Class Library", "classlib", "F#", "netcoreapp2.1")]
         [InlineData("Class Library", "classlib", "VB", "netcoreapp2.1")]
+        [InlineData("Class Library", "classlib", "C#", "netstandard2.0")]
+        [InlineData("Class Library", "classlib", "VB", "netstandard2.0")]
+        [InlineData("Class Library", "classlib", "F#", "netstandard2.0")]
 
         [InlineData("Simple Console Application", "app")]
         [InlineData("Simple Console Application", "app", "C#")]
@@ -167,6 +170,9 @@ Determining projects to restore\.\.\.
         [InlineData("Class Library", "classlib", "C#", "netcoreapp2.1")]
         [InlineData("Class Library", "classlib", "F#", "netcoreapp2.1")]
         [InlineData("Class Library", "classlib", "VB", "netcoreapp2.1")]
+        [InlineData("Class Library", "classlib", "C#", "netstandard2.0")]
+        [InlineData("Class Library", "classlib", "VB", "netstandard2.0")]
+        [InlineData("Class Library", "classlib", "F#", "netstandard2.0")]
 
         [InlineData("Simple Console Application", "app")]
         [InlineData("Simple Console Application", "app", "C#")]
@@ -306,7 +312,7 @@ public void SetPropertiesByDefault(string propertyName, string? propertyValue, s
         }
 
         [Theory]
-        //unset nullable 
+        //unset nullable
         [InlineData("Nullable", null, "--nullable", "false", "Simple Console Application", "app", null, null)]
         [InlineData("Nullable", null, "--nullable", "false", "Class Library", "classlib", null, null)]