Skip to content

Commit 9b50a36

Browse files
carlossanlopJason Zhai
carlossanlop
authored and
Jason Zhai
committed
Update Microsoft.NET.Build.Tests that depend on System.ValueTuple to target netstandard2.0 as it's the minimum supported by that assembly.
1 parent ed664c5 commit 9b50a36

File tree

7 files changed

+26
-34
lines changed

7 files changed

+26
-34
lines changed

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public GivenThatWeWantToBuildADesktopExeWithFSharp(ITestOutputHelper log) : base
1414
[WindowsOnlyFact]
1515
public void It_builds_a_simple_desktop_app()
1616
{
17-
var targetFramework = "net45";
17+
var targetFramework = "net462";
1818
var testAsset = _testAssetsManager
1919
.CopyTestAsset("HelloWorldFS")
2020
.WithSource()

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public GivenThatWeWantToBuildALibrary(ITestOutputHelper log) : base(log)
1717
}
1818

1919
[Theory]
20-
[InlineData("netstandard1.5")]
20+
[InlineData("netstandard2.0")]
2121
[InlineData("netcoreapp2.1")]
2222
[InlineData(ToolsetInfo.CurrentTargetFramework)]
2323
public void It_builds_the_library_successfully(string targetFramework)
@@ -74,7 +74,7 @@ internal static List<string> GetValuesFromTestLibrary(
7474
{
7575
msbuildArgs = msbuildArgs ?? Array.Empty<string>();
7676

77-
string targetFramework = "netstandard1.5";
77+
string targetFramework = "netstandard2.0";
7878

7979
var testAsset = testAssetsManager
8080
.CopyTestAsset("AppWithLibrary", callingMethod, identifier: identifier)
@@ -155,7 +155,7 @@ public void It_creates_a_documentation_file(string language)
155155
.Should()
156156
.Pass();
157157

158-
var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
158+
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
159159

160160
outputDirectory.Should().OnlyHaveFiles(new[] {
161161
"TestLibrary.dll",
@@ -189,7 +189,7 @@ public void It_allows_us_to_override_the_documentation_file_name(string language
189189
.Should()
190190
.Pass();
191191

192-
var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
192+
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
193193

194194
outputDirectory.Should().OnlyHaveFiles(new[] {
195195
"TestLibrary.dll",
@@ -233,7 +233,7 @@ public void It_does_not_create_a_documentation_file_if_GenerateDocumentationFile
233233
.Should()
234234
.Pass();
235235

236-
var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
236+
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
237237

238238
outputDirectory.Should().OnlyHaveFiles(new[] {
239239
"TestLibrary.dll",
@@ -285,7 +285,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
285285
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
286286

287287
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
288-
"netstandard1.5", "DefineConstants")
288+
"netstandard2.0", "DefineConstants")
289289
{
290290
ShouldCompile = true,
291291
Configuration = configuration
@@ -298,15 +298,12 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
298298

299299
var definedConstants = getValuesCommand.GetValues();
300300

301-
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_5", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
302-
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER" });
301+
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" });
303302
}
304303

305304
[Theory]
306-
[InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD", "NETSTANDARD1_0", "NETSTANDARD1_0_OR_GREATER" })]
307-
[InlineData("netstandard1.3", new[] { "NETSTANDARD", "NETSTANDARD1_3", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER" })]
308-
[InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
309-
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
305+
[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" })]
306+
[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" })]
310307
[InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
311308
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
312309
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void It_builds_the_library_successfully()
2727
.Should()
2828
.Pass();
2929

30-
var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.6");
30+
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
3131

3232
outputDirectory.Should().OnlyHaveFiles(new[] {
3333
"TestLibrary.dll",
@@ -67,7 +67,7 @@ internal static List<string> GetValuesFromTestLibrary(
6767
{
6868
msbuildArgs = msbuildArgs ?? Array.Empty<string>();
6969

70-
string targetFramework = "netstandard1.6";
70+
string targetFramework = "netstandard2.0";
7171

7272
var testAsset = testAssetsManager
7373
.CopyTestAsset("AppWithLibraryFS", callingMethod)
@@ -148,7 +148,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
148148
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
149149

150150
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
151-
"netstandard1.6", "DefineConstants")
151+
"netstandard2.0", "DefineConstants")
152152
{
153153
ShouldCompile = true,
154154
Configuration = configuration
@@ -161,14 +161,11 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
161161

162162
var definedConstants = getValuesCommand.GetValues();
163163

164-
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER",
165-
"NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" });
164+
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" });
166165
}
167166

168167
[Theory]
169-
[InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
170-
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
171-
[InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
168+
[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" })]
172169
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
173170
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]
174171
[InlineData("netcoreapp2.0", new[] { "NETCOREAPP", "NETCOREAPP2_0", "NETCOREAPP1_0_OR_GREATER", "NETCOREAPP1_1_OR_GREATER", "NETCOREAPP2_0_OR_GREATER" })]

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void It_builds_the_library_successfully()
2727
.Should()
2828
.Pass();
2929

30-
var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
30+
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");
3131

3232
outputDirectory.Should().OnlyHaveFiles(new[] {
3333
"TestLibrary.dll",
@@ -78,7 +78,7 @@ internal static List<string> GetValuesFromTestLibrary(
7878
{
7979
msbuildArgs = msbuildArgs ?? Array.Empty<string>();
8080

81-
string targetFramework = "netstandard1.6";
81+
string targetFramework = "netstandard2.0";
8282

8383
var testAsset = testAssetsManager
8484
.CopyTestAsset("AppWithLibraryVB", callingMethod)
@@ -159,7 +159,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
159159
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
160160

161161
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
162-
"netstandard1.5", "FinalDefineConstants")
162+
"netstandard2.0", "FinalDefineConstants")
163163
{
164164
ShouldCompile = true,
165165
Configuration = configuration
@@ -172,16 +172,14 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
172172

173173
var definedConstants = ExpandSequence(getValuesCommand.GetValues()).ToList();
174174

175-
definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD1_5=-1", "NETSTANDARD1_0_OR_GREATER=-1",
176-
"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" }));
175+
definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1",
176+
"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" }));
177177
}
178178

179179
[Theory]
180-
[InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD=-1", "NETSTANDARD1_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
181-
[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\"" })]
182-
[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",
183-
"NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "_MyType=\"Empty\"" })]
184-
[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" })]
180+
[InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1",
181+
"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\"" })]
182+
[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\"" })]
185183
[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",
186184
"NET452_OR_GREATER=-1", "NET46_OR_GREATER=-1", "NET461_OR_GREATER=-1" })]
187185
[InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"", "NETCOREAPP1_0_OR_GREATER=-1" })]

‎test/TestAssets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<PropertyGroup>
33
<Version>42.43.44.45-alpha</Version>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>netstandard1.5</TargetFramework>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
</PropertyGroup>
77
</Project>

‎test/TestAssets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.6</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<FSharpCoreImplicitPackageVersion>4.2.3</FSharpCoreImplicitPackageVersion>
66
</PropertyGroup>
77

‎test/TestAssets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Version>42.43.44.45-alpha</Version>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>netstandard1.5</TargetFramework>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<RootNamespace />
77
</PropertyGroup>
88
</Project>

0 commit comments

Comments
 (0)