mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix tests

Browse source
This commit is contained in:
Mike Lorbetske 2018-08-03 20:02:55 -07:00
parent 2b5cf41ee9
commit 201dfd581b
No known key found for this signature in database
GPG key ID: 9EA3D5A33FBABE3B
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -18,7 +18,8 @@ namespace EndToEnd
"1.0", "1.0",
"1.1", "1.1",
"2.0", "2.0",
"2.1" "2.1",
"2.2"
}.Select(version => new object[] { version }); }.Select(version => new object[] { version });
} }
} }

4
test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
View file

@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
string dir = "pkgs"; string dir = "pkgs";
string args = $"--packages {dir}"; string args = $"--packages {dir}";
string newArgs = $"console -f netcoreapp2.1 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore"; string newArgs = $"console -f netcoreapp2.2 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore";
new NewCommandShim() new NewCommandShim()
.WithWorkingDirectory(rootPath) .WithWorkingDirectory(rootPath)
.Execute(newArgs) .Execute(newArgs)
@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
var outputDll = Directory.EnumerateFiles( var outputDll = Directory.EnumerateFiles(
Path.Combine(rootPath, "bin", configuration, "netcoreapp2.1"), "*.dll", Path.Combine(rootPath, "bin", configuration, "netcoreapp2.2"), "*.dll",
SearchOption.TopDirectoryOnly) SearchOption.TopDirectoryOnly)
.Single(); .Single();

2
test/dotnet-new.Tests/GivenThatIWantANewApp.cs
View file

@ -76,7 +76,7 @@ namespace Microsoft.DotNet.New.Tests
// Remove the expectedVersion parameter once we have templates targetting netcoreapp2.2. // Remove the expectedVersion parameter once we have templates targetting netcoreapp2.2.
[Theory] [Theory]
[InlineData("console", "microsoft.netcore.app", "2.2.0")] [InlineData("console", "microsoft.netcore.app", null)]
[InlineData("classlib", "netstandard.library", "2.0.3")] // FIXME: This is pinned to 2.0.3 due to https://github.com/dotnet/sdk/issues/2410 [InlineData("classlib", "netstandard.library", "2.0.3")] // FIXME: This is pinned to 2.0.3 due to https://github.com/dotnet/sdk/issues/2410
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion) public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion)
{ {