Skip to content

Commit e63b89e

Browse files
Simon Zhao (BEYONDSOFT CONSULTING INC)SimonZhao888
Simon Zhao (BEYONDSOFT CONSULTING INC)
authored and
SimonZhao888
committed
[release/8.0.1xx] Update Microsoft.NET.Build.Tests that depend on System.ValueTuple to arget netstandard2.0
1 parent 682d650 commit e63b89e

File tree

8 files changed

+35
-35
lines changed

8 files changed

+35
-35
lines changed

‎src/Assets/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>

‎src/Assets/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

‎src/Assets/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>

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

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

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public GivenThatWeWantToBuildALibrary(ITestOutputHelper log) : base(log)
1515
}
1616

1717
[Theory]
18-
[InlineData("netstandard1.5")]
18+
[InlineData("netstandard2.0")]
1919
[InlineData("netcoreapp2.1")]
2020
[InlineData(ToolsetInfo.CurrentTargetFramework)]
2121
public void It_builds_the_library_successfully(string targetFramework)
@@ -72,7 +72,7 @@ internal static List<string> GetValuesFromTestLibrary(
7272
{
7373
msbuildArgs = msbuildArgs ?? Array.Empty<string>();
7474

75-
string targetFramework = "netstandard1.5";
75+
string targetFramework = "netstandard2.0";
7676

7777
var testAsset = testAssetsManager
7878
.CopyTestAsset("AppWithLibrary", callingMethod, identifier: identifier)
@@ -153,7 +153,7 @@ public void It_creates_a_documentation_file(string language)
153153
.Should()
154154
.Pass();
155155

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

158158
outputDirectory.Should().OnlyHaveFiles(new[] {
159159
"TestLibrary.dll",
@@ -187,7 +187,7 @@ public void It_allows_us_to_override_the_documentation_file_name(string language
187187
.Should()
188188
.Pass();
189189

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

192192
outputDirectory.Should().OnlyHaveFiles(new[] {
193193
"TestLibrary.dll",
@@ -231,7 +231,7 @@ public void It_does_not_create_a_documentation_file_if_GenerateDocumentationFile
231231
.Should()
232232
.Pass();
233233

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

236236
outputDirectory.Should().OnlyHaveFiles(new[] {
237237
"TestLibrary.dll",
@@ -283,7 +283,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
283283
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
284284

285285
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
286-
"netstandard1.5", "DefineConstants");
286+
"netstandard2.0", "DefineConstants");
287287

288288
getValuesCommand.ShouldCompile = true;
289289
getValuesCommand.Configuration = configuration;
@@ -295,15 +295,15 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
295295

296296
var definedConstants = getValuesCommand.GetValues();
297297

298-
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_5", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
299-
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER" });
298+
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER",
299+
"NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" });
300300
}
301301

302302
[Theory]
303-
[InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD", "NETSTANDARD1_0", "NETSTANDARD1_0_OR_GREATER" })]
304-
[InlineData("netstandard1.3", new[] { "NETSTANDARD", "NETSTANDARD1_3", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER" })]
305-
[InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
306-
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
303+
[InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
304+
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
305+
[InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
306+
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
307307
[InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
308308
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
309309
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void It_builds_the_library_successfully()
2525
.Should()
2626
.Pass();
2727

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

3030
outputDirectory.Should().OnlyHaveFiles(new[] {
3131
"TestLibrary.dll",
@@ -65,7 +65,7 @@ internal static List<string> GetValuesFromTestLibrary(
6565
{
6666
msbuildArgs = msbuildArgs ?? Array.Empty<string>();
6767

68-
string targetFramework = "netstandard1.6";
68+
string targetFramework = "netstandard2.0";
6969

7070
var testAsset = testAssetsManager
7171
.CopyTestAsset("AppWithLibraryFS", callingMethod)
@@ -146,7 +146,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
146146
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
147147

148148
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
149-
"netstandard1.6", "DefineConstants");
149+
"netstandard2.0", "DefineConstants");
150150

151151
getValuesCommand.ShouldCompile = true;
152152
getValuesCommand.Configuration = configuration;
@@ -158,14 +158,14 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
158158

159159
var definedConstants = getValuesCommand.GetValues();
160160

161-
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER",
162-
"NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" });
161+
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER",
162+
"NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER",
163+
"NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" });
163164
}
164165

165166
[Theory]
166-
[InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
167-
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
168-
[InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
167+
[InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
168+
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
169169
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
170170
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]
171171
[InlineData("netcoreapp2.0", new[] { "NETCOREAPP", "NETCOREAPP2_0", "NETCOREAPP1_0_OR_GREATER", "NETCOREAPP1_1_OR_GREATER", "NETCOREAPP2_0_OR_GREATER" })]

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void It_builds_the_library_successfully()
2525
.Should()
2626
.Pass();
2727

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

3030
outputDirectory.Should().OnlyHaveFiles(new[] {
3131
"TestLibrary.dll",
@@ -76,7 +76,7 @@ internal static List<string> GetValuesFromTestLibrary(
7676
{
7777
msbuildArgs = msbuildArgs ?? Array.Empty<string>();
7878

79-
string targetFramework = "netstandard1.6";
79+
string targetFramework = "netstandard2.0";
8080

8181
var testAsset = testAssetsManager
8282
.CopyTestAsset("AppWithLibraryVB", callingMethod)
@@ -157,7 +157,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
157157
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");
158158

159159
var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
160-
"netstandard1.5", "FinalDefineConstants");
160+
"netstandard2.0", "FinalDefineConstants");
161161

162162
getValuesCommand.ShouldCompile = true;
163163
getValuesCommand.Configuration = configuration;
@@ -169,16 +169,16 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
169169

170170
var definedConstants = ExpandSequence(getValuesCommand.GetValues()).ToList();
171171

172-
definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD1_5=-1", "NETSTANDARD1_0_OR_GREATER=-1",
173-
"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" }));
172+
definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD2_0=-1",
173+
"NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1",
174+
"NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1" }));
174175
}
175176

176177
[Theory]
177-
[InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD=-1", "NETSTANDARD1_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
178-
[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\"" })]
179-
[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",
180-
"NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "_MyType=\"Empty\"" })]
181-
[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" })]
178+
[InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1",
179+
"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\"" })]
180+
[InlineData("netstandard2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1",
181+
"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\"" })]
182182
[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",
183183
"NET452_OR_GREATER=-1", "NET46_OR_GREATER=-1", "NET461_OR_GREATER=-1" })]
184184
[InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"", "NETCOREAPP1_0_OR_GREATER=-1" })]

‎src/Tests/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ public void Default_items_have_the_correct_relative_paths()
470470
.Should()
471471
.Pass();
472472

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

475475
outputDirectory.Should().OnlyHaveFiles(new[] {
476476
"TestLibrary.dll",

0 commit comments

Comments
 (0)