Removing Additional Framework entirely and renaming LegacyRuntime to something more appropriate: BackwardsCompatibleRuntimes. Also, turning off some tests that I forgot to turn off for linux-x64.
This commit is contained in:
parent
4c926ec9c5
commit
e286c65d25
20 changed files with 80 additions and 283 deletions
|
@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
|||
private string _builtDotnet;
|
||||
private string _nugetPackages;
|
||||
private string _stage2Sdk;
|
||||
private string _stage2WithLegacyRuntimeDirectory;
|
||||
private string _stage2WithBackwardsCompatibleRuntimesDirectory;
|
||||
private string _testPackages;
|
||||
private string _pjDotnet;
|
||||
|
||||
|
@ -83,7 +83,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
|||
public string NugetPackages => _nugetPackages;
|
||||
public string PjDotnet => _pjDotnet;
|
||||
public string Stage2Sdk => _stage2Sdk;
|
||||
public string Stage2WithLegacyRuntimeDirectory => _stage2WithLegacyRuntimeDirectory;
|
||||
public string Stage2WithBackwardsCompatibleRuntimesDirectory => _stage2WithBackwardsCompatibleRuntimesDirectory;
|
||||
public string TestPackages => _testPackages;
|
||||
|
||||
public RepoDirectoriesProvider(
|
||||
|
@ -99,7 +99,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
|
|||
_nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");
|
||||
_pjDotnet = pjDotnet ?? GetPjDotnetPath();
|
||||
_stage2Sdk = Directory.EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")).First();
|
||||
_stage2WithLegacyRuntimeDirectory = Path.Combine(_artifacts, "stage2WithLegacyRuntime");
|
||||
_stage2WithBackwardsCompatibleRuntimesDirectory =
|
||||
Path.Combine(_artifacts, "stage2WithBackwardsCompatibilityRuntimes");
|
||||
_testPackages = Path.Combine(RepoRoot, "artifacts", "testpackages", "packages");
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue