diff --git a/global.json b/global.json index b28c46f99..46ab55818 100644 --- a/global.json +++ b/global.json @@ -3,12 +3,12 @@ "vs": { "version": "15.9" }, - "dotnet": "6.0.100-preview.4.21255.9" + "dotnet": "6.0.100-preview.7.21364.30" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3" }, "sdk": { - "version": "6.0.100-preview.4.21255.9" + "version": "6.0.100-preview.7.21364.30" } } diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/MSTest-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/MSTest-CSharp/UnitTest1.cs index 14ae41756..52ab879e6 100644 --- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/MSTest-CSharp/UnitTest1.cs +++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/MSTest-CSharp/UnitTest1.cs @@ -1,13 +1,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Company.TestProject1 +namespace Company.TestProject1; + +[TestClass] +public class UnitTest1 { - [TestClass] - public class UnitTest1 + [TestMethod] + public void TestMethod1() { - [TestMethod] - public void TestMethod1() - { - } } } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/NUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/NUnit-CSharp/UnitTest1.cs index 79c6630f7..b46dd3a57 100644 --- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/NUnit-CSharp/UnitTest1.cs +++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/NUnit-CSharp/UnitTest1.cs @@ -1,18 +1,17 @@ using NUnit.Framework; -namespace Company.TestProject1 +namespace Company.TestProject1; + +public class Tests { - public class Tests + [SetUp] + public void Setup() { - [SetUp] - public void Setup() - { - } + } - [Test] - public void Test1() - { - Assert.Pass(); - } + [Test] + public void Test1() + { + Assert.Pass(); } } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/XUnit-CSharp/UnitTest1.cs b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/XUnit-CSharp/UnitTest1.cs index d7975564c..0f9240f49 100644 --- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/XUnit-CSharp/UnitTest1.cs +++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.6.0/content/XUnit-CSharp/UnitTest1.cs @@ -1,13 +1,12 @@ using Xunit; -namespace Company.TestProject1 +namespace Company.TestProject1; + +public class UnitTest1 { - public class UnitTest1 + [Fact] + public void Test1() { - [Fact] - public void Test1() - { - } } } \ No newline at end of file diff --git a/test/Microsoft.TestTemplates.Acceptance.Tests/Microsoft.TestTemplates.Acceptance.Tests.csproj b/test/Microsoft.TestTemplates.Acceptance.Tests/Microsoft.TestTemplates.Acceptance.Tests.csproj index 978dde2b4..b80e386df 100644 --- a/test/Microsoft.TestTemplates.Acceptance.Tests/Microsoft.TestTemplates.Acceptance.Tests.csproj +++ b/test/Microsoft.TestTemplates.Acceptance.Tests/Microsoft.TestTemplates.Acceptance.Tests.csproj @@ -4,6 +4,10 @@ net6.0 true false + preview + $(NoWarn);CS0105 + + false diff --git a/test/Microsoft.TestTemplates.Acceptance.Tests/Program.cs b/test/Microsoft.TestTemplates.Acceptance.Tests/Program.cs new file mode 100644 index 000000000..48d374836 --- /dev/null +++ b/test/Microsoft.TestTemplates.Acceptance.Tests/Program.cs @@ -0,0 +1,2 @@ +[Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode] +class AutoGeneratedProgram {static void Main(string[] args){}} \ No newline at end of file