huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Place ref/ layout where SDK can find it (#25987) 

- correct Helix test failures with stable versions, where SDK's packs aren't enough

E.g. from https://dev.azure.com/dnceng/internal/_build/results?buildId=813814
``` text
...\.dotnet\sdk\5.0.100-rc.1.20379.10\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(318,5): error MSB4018: The "ResolveTargetingPackAssets" task failed unexpectedly. [...\src\ProjectTemplates\test\bin\Release\net5.0\TestTemplates\AspNet.m0yq3xrporu\AspNet.m0yq3xrporu.csproj]
...\.dotnet\sdk\5.0.100-rc.1.20379.10\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(318,5): error MSB4018: System.IO.DirectoryNotFoundException: Could not find a part of the path '...\.dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0\data\FrameworkList.xml'. [...\src\ProjectTemplates\test\bin\Release\net5.0\TestTemplates\AspNet.m0yq3xrporu\AspNet.m0yq3xrporu.csproj]
```
This commit is contained in:
Doug Bunting 2020-09-17 21:03:07 -07:00 committed by GitHub
parent 6418c8f78a
commit b592cf6610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eng/helix/content/RunTests/TestRunner.cs
View File

@ -166,9 +166,9 @@ namespace RunTests
{ {
if (File.Exists(Options.AspNetRef)) if (File.Exists(Options.AspNetRef))
{ {
var refPath = $"Microsoft.AspNetCore.App.Ref"; var refPath = $"{Options.DotnetRoot}/packs/Microsoft.AspNetCore.App.Ref/{Options.RuntimeVersion}";
Console.WriteLine($"Found AspNetRef: {Options.AspNetRef}, extracting to {refPath}"); Console.WriteLine($"Found AspNetRef: {Options.AspNetRef}, extracting to {refPath}");
ZipFile.ExtractToDirectory(Options.AspNetRef, "Microsoft.AspNetCore.App.Ref"); ZipFile.ExtractToDirectory(Options.AspNetRef, refPath);
DisplayContents(refPath); DisplayContents(refPath);
} }

11
src/Framework/test/TargetingPackTests.cs
View File

@ -29,9 +29,14 @@ namespace Microsoft.AspNetCore
_output = output; _output = output;
_expectedRid = TestData.GetSharedFxRuntimeIdentifier(); _expectedRid = TestData.GetSharedFxRuntimeIdentifier();
_targetingPackTfm = "net" + TestData.GetSharedFxVersion().Substring(0, 3); _targetingPackTfm = "net" + TestData.GetSharedFxVersion().Substring(0, 3);
_targetingPackRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")) var root = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")) ?
? Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion")) TestData.GetTestDataValue("TargetingPackLayoutRoot") :
: Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Microsoft.AspNetCore.App.Ref"); Environment.GetEnvironmentVariable("DOTNET_ROOT");
_targetingPackRoot = Path.Combine(
root,
"packs",
"Microsoft.AspNetCore.App.Ref",
TestData.GetTestDataValue("TargetingPackVersion"));
_isTargetingPackBuilding = bool.Parse(TestData.GetTestDataValue("IsTargetingPackBuilding")); _isTargetingPackBuilding = bool.Parse(TestData.GetTestDataValue("IsTargetingPackBuilding"));
} }