diff --git a/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj b/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj
index 2ba689d92653..3e3942db0b5e 100644
--- a/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj
+++ b/src/Assets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj
@@ -2,6 +2,6 @@
42.43.44.45-alpha
Library
- netstandard1.5
+ netstandard2.0
\ No newline at end of file
diff --git a/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj b/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj
index 7f47ec9e14f4..56a7b25661aa 100644
--- a/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj
+++ b/src/Assets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj
@@ -1,7 +1,7 @@
- netstandard1.6
+ netstandard2.0
4.2.3
diff --git a/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj b/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj
index aef4739a2ebc..f510fdae7355 100644
--- a/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj
+++ b/src/Assets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj
@@ -2,7 +2,7 @@
42.43.44.45-alpha
Library
- netstandard1.5
+ netstandard2.0
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs
index 1dfd5b8c2ef9..50836fe13e06 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs
@@ -12,7 +12,7 @@ public GivenThatWeWantToBuildADesktopExeWithFSharp(ITestOutputHelper log) : base
[WindowsOnlyFact]
public void It_builds_a_simple_desktop_app()
{
- var targetFramework = "net45";
+ var targetFramework = "net462";
var testAsset = _testAssetsManager
.CopyTestAsset("HelloWorldFS")
.WithSource()
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs
index 367536df5d06..8543e8853c59 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs
@@ -15,7 +15,7 @@ public GivenThatWeWantToBuildALibrary(ITestOutputHelper log) : base(log)
}
[Theory]
- [InlineData("netstandard1.5")]
+ [InlineData("netstandard2.0")]
[InlineData("netcoreapp2.1")]
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void It_builds_the_library_successfully(string targetFramework)
@@ -72,7 +72,7 @@ internal static List GetValuesFromTestLibrary(
{
msbuildArgs = msbuildArgs ?? Array.Empty();
- string targetFramework = "netstandard1.5";
+ string targetFramework = "netstandard2.0";
var testAsset = testAssetsManager
.CopyTestAsset("AppWithLibrary", callingMethod, identifier: identifier)
@@ -153,7 +153,7 @@ public void It_creates_a_documentation_file(string language)
.Should()
.Pass();
- var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
+ var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
@@ -187,7 +187,7 @@ public void It_allows_us_to_override_the_documentation_file_name(string language
.Should()
.Pass();
- var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
+ var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
@@ -231,7 +231,7 @@ public void It_does_not_create_a_documentation_file_if_GenerateDocumentationFile
.Should()
.Pass();
- var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
+ var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
@@ -283,7 +283,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
- "netstandard1.5", "DefineConstants");
+ "netstandard2.0", "DefineConstants");
getValuesCommand.ShouldCompile = true;
getValuesCommand.Configuration = configuration;
@@ -295,15 +295,15 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var definedConstants = getValuesCommand.GetValues();
- definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_5", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
- "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER" });
+ definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER",
+ "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" });
}
[Theory]
- [InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD", "NETSTANDARD1_0", "NETSTANDARD1_0_OR_GREATER" })]
- [InlineData("netstandard1.3", new[] { "NETSTANDARD", "NETSTANDARD1_3", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER" })]
- [InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
- "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
+ [InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
+ "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
+ [InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
+ "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
[InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs
index 2ff22a04a58f..69f14024836a 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs
@@ -25,7 +25,7 @@ public void It_builds_the_library_successfully()
.Should()
.Pass();
- var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.6");
+ var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
@@ -65,7 +65,7 @@ internal static List GetValuesFromTestLibrary(
{
msbuildArgs = msbuildArgs ?? Array.Empty();
- string targetFramework = "netstandard1.6";
+ string targetFramework = "netstandard2.0";
var testAsset = testAssetsManager
.CopyTestAsset("AppWithLibraryFS", callingMethod)
@@ -146,7 +146,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
- "netstandard1.6", "DefineConstants");
+ "netstandard2.0", "DefineConstants");
getValuesCommand.ShouldCompile = true;
getValuesCommand.Configuration = configuration;
@@ -158,14 +158,14 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var definedConstants = getValuesCommand.GetValues();
- definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER",
- "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" });
+ definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER",
+ "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER",
+ "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" });
}
[Theory]
- [InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
- "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
- [InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
+ [InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
+ "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]
[InlineData("netcoreapp2.0", new[] { "NETCOREAPP", "NETCOREAPP2_0", "NETCOREAPP1_0_OR_GREATER", "NETCOREAPP1_1_OR_GREATER", "NETCOREAPP2_0_OR_GREATER" })]
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs
index 109776e31e53..52e64ee18a0c 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs
@@ -25,7 +25,7 @@ public void It_builds_the_library_successfully()
.Should()
.Pass();
- var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
+ var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
@@ -76,7 +76,7 @@ internal static List GetValuesFromTestLibrary(
{
msbuildArgs = msbuildArgs ?? Array.Empty();
- string targetFramework = "netstandard1.6";
+ string targetFramework = "netstandard2.0";
var testAsset = testAssetsManager
.CopyTestAsset("AppWithLibraryVB", callingMethod)
@@ -157,7 +157,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
- "netstandard1.5", "FinalDefineConstants");
+ "netstandard2.0", "FinalDefineConstants");
getValuesCommand.ShouldCompile = true;
getValuesCommand.Configuration = configuration;
@@ -169,16 +169,16 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var definedConstants = ExpandSequence(getValuesCommand.GetValues()).ToList();
- definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD1_5=-1", "NETSTANDARD1_0_OR_GREATER=-1",
- "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1" }));
+ definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD2_0=-1",
+ "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1",
+ "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1" }));
}
[Theory]
- [InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD=-1", "NETSTANDARD1_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
- [InlineData("netstandard1.3", new[] { "NETSTANDARD=-1", "NETSTANDARD1_3=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "_MyType=\"Empty\"" })]
- [InlineData("netstandard1.6", new[] { "NETSTANDARD=-1", "NETSTANDARD1_6=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1",
- "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "_MyType=\"Empty\"" })]
- [InlineData("net45", new[] { "NETFRAMEWORK=-1", "NET45=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1" })]
+ [InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1",
+ "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
+ [InlineData("netstandard2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1",
+ "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
[InlineData("net461", new[] { "NETFRAMEWORK=-1", "NET461=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1", "NET451_OR_GREATER=-1",
"NET452_OR_GREATER=-1", "NET46_OR_GREATER=-1", "NET461_OR_GREATER=-1" })]
[InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"", "NETCOREAPP1_0_OR_GREATER=-1" })]
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs
index 03d608d7afa3..501267e0dadf 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs
@@ -470,7 +470,7 @@ public void Default_items_have_the_correct_relative_paths()
.Should()
.Pass();
- var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
+ var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",