Skip to content

Commit 35586ef

Browse files
committed
fix test TestInstrument_NetCoreSharedFrameworkResolver_SelfContained
1 parent 6711c1b commit 35586ef

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Diff for: src/coverlet.core/Instrumentation/CecilAssemblyResolver.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public RuntimeConfigurationReader(string runtimeConfigFile)
318318
return frameworksElement.EnumerateArray().Select(x => (x.GetProperty("name").GetString(), x.GetProperty("version").GetString())).ToList();
319319
}
320320

321-
if (runtimeOptionsElement.TryGetProperty("includedframeworks", out JsonElement runtimeoptionselement))
321+
if (runtimeOptionsElement.TryGetProperty("includedFrameworks", out JsonElement runtimeoptionselement))
322322
{
323323
return runtimeoptionselement.EnumerateArray().Select(x => (x.GetProperty("name").GetString(), x.GetProperty("version").GetString())).ToList();
324324
}

Diff for: test/coverlet.integration.tests/DotnetTool.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ public DotnetGlobalTools(ITestOutputHelper output)
2121
}
2222
private string InstallTool(string projectPath)
2323
{
24-
_ = DotnetCli($"tool install coverlet.console --version {GetPackageVersion("*console*.nupkg")} --tool-path \"{Path.Combine(projectPath, "coverletTool")}\"", out string standardOutput, out _, projectPath);
24+
_ = DotnetCli($"tool install coverlet.console --version {GetPackageVersion("*console*.nupkg")} --tool-path \"{Path.Combine(projectPath, "coverletTool")}\"", out string standardOutput, out string standardError, projectPath);
25+
if (!string.IsNullOrEmpty(standardError))
26+
{
27+
_output.WriteLine(standardError);
28+
}
2529
Assert.Contains("was successfully installed.", standardOutput);
2630
return Path.Combine(projectPath, "coverletTool", "coverlet");
2731
}

Diff for: test/coverlet.tests.projectsample.wpf8.selfcontained/coverlet.tests.projectsample.wpf8.selfcontained.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<IsPackable>false</IsPackable>
1111
<SelfContained>true</SelfContained>
1212
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
13-
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
13+
<!--<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>-->
1414
</PropertyGroup>
1515

1616
</Project>

0 commit comments

Comments
 (0)