added conditions based on langVersion

dotnet · Jul 13, 2021 · 4a16adf · 4a16adf
1 parent 7c97b77
commit 4a16adf
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/...ProjectTemplates.6.0/content/ConsoleApplication-CSharp/Company.ConsoleApplication1.csproj b/...ProjectTemplates.6.0/content/ConsoleApplication-CSharp/Company.ConsoleApplication1.csproj
@@ -4,8 +4,9 @@
  <OutputType>Exe</OutputType>
  <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net6.0</TargetFramework>
  <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
+ <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ConsoleApplication1</RootNamespace>
  <LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
- <Nullable>enable</Nullable>
+ <Nullable Condition="('$(langVersion)' == '' OR '$(langVersion)' == '8.0' OR '$(langVersion)' == '9.0' OR '$(langVersion)' == '10.0')">enable</Nullable>
  </PropertyGroup>
 
 </Project>
diff --git a/...Microsoft.DotNet.Common.ProjectTemplates.6.0/content/ConsoleApplication-CSharp/Program.cs b/...Microsoft.DotNet.Common.ProjectTemplates.6.0/content/ConsoleApplication-CSharp/Program.cs
@@ -1,3 +1,20 @@
-//We've made changes to the Console template! Find out more at https://aka.ms/new-console-template
+// We've made changes to the Console template! Find out more at https://aka.ms/new-console-template
 
+#if (langVersion != "" && langVersion != "10.0")
+using System;
+
+#endif
+#if (langVersion != "" && langVersion != "10.0" && langVersion != "9.0")
+namespace Console.ConsoleApplication1
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+ Console.WriteLine("Hello, World!");
+ }
+ }
+}
+#else
 Console.WriteLine("Hello, World!");
+#endif
diff --git a/test/dotnet-new3.UnitTests/CommonTemplatesTests.cs b/test/dotnet-new3.UnitTests/CommonTemplatesTests.cs
@@ -73,6 +73,14 @@ public CommonTemplatesTests(SharedHomeDirectory fixture, ITestOutputHelper log)
  [InlineData("Class Library", "classlib", "C#", "net6.0", "7.2")]
  [InlineData("Class Library", "classlib", "C#", "net6.0", "7.1")]
  [InlineData("Class Library", "classlib", "C#", "net6.0", "7")]
+
+ [InlineData("Console Application", "console", "C#", "net6.0", "10.0")]
+ [InlineData("Console Application", "console", "C#", "net6.0", "9.0")]
+ [InlineData("Console Application", "console", "C#", "net6.0", "8.0")]
+ [InlineData("Console Application", "console", "C#", "net6.0", "7.3")]
+ [InlineData("Console Application", "console", "C#", "net6.0", "7.2")]
+ [InlineData("Console Application", "console", "C#", "net6.0", "7.1")]
+ [InlineData("Console Application", "console", "C#", "net6.0", "7")]
  public void AllCommonProjectsCreateRestoreAndBuild(string expectedTemplateName, string templateShortName, string? language = null, string? framework = null, string? langVersion = null)
  {
  string workingDir = TestUtils.CreateTemporaryFolder();
@@ -243,6 +251,9 @@ public void AllCommonItemsCreate(string expectedTemplateName, string templateSho
  [InlineData("Nullable", null, "Console Application", "console", null, "net5.0")]
  [InlineData("Nullable", null, "Console Application", "console", null, "netcoreapp3.1")]
  [InlineData("Nullable", null, "Console Application", "console", null, "netcoreapp2.1")]
+ [InlineData("Nullable", "enable", "Console Application", "console", null, null, "9.0")]
+ [InlineData("Nullable", "enable", "Console Application", "console", null, null, "8.0")]
+ [InlineData("Nullable", "enable", "Console Application", "console", null, null, "7.3")]
 
  [InlineData("Nullable", null, "Console Application", "console", "F#", null)]
  [InlineData("CheckForOverflowUnderflow", null, "Console Application", "console", "F#", null)]
@@ -275,7 +286,7 @@ public void AllCommonItemsCreate(string expectedTemplateName, string templateSho
  [InlineData("TargetFramework", "net6.0", "Class Library", "classlib", "VB", null)]
  [InlineData("Nullable", null, "Class Library", "classlib", "VB", "netstandard2.0")]
 
- public void SetPropertiesByDefault(string propertyName, string? propertyValue, string expectedTemplateName, string templateShortName, string? language, string? framework)
+ public void SetPropertiesByDefault(string propertyName, string? propertyValue, string expectedTemplateName, string templateShortName, string? language, string? framework, string? langVersion = null)
  {
  string workingDir = TestUtils.CreateTemporaryFolder();
  List<string> args = new List<string>() { templateShortName, "--no-restore" };
@@ -289,6 +300,11 @@ public void SetPropertiesByDefault(string propertyName, string? propertyValue, s
  args.Add("--framework");
  args.Add(framework);
  }
+ if (!string.IsNullOrWhiteSpace(langVersion))
+ {
+ args.Add("--langVersion");
+ args.Add(langVersion);
+ }
 
  new DotnetNewCommand(_log, args.ToArray())
  .WithCustomHive(_fixture.HomeDirectory)