Skip to content

Commit c2e6aee

Browse files
pfeiglpfeigl
authored
Fix RuntimeConfigurationReader to support SelfContained builds (#1705)
1 parent de1a30a commit c2e6aee

9 files changed

Lines changed: 86 additions & 2 deletions

File tree

‎coverlet.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "coverlet.tests.projectsampl
8888
EndProject
8989
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.tests.utils", "test\coverlet.tests.utils\coverlet.tests.utils.csproj", "{0B109210-03CB-413F-888C-3023994AA384}"
9090
EndProject
91+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.tests.projectsample.wpf8.selfcontained", "test\coverlet.tests.projectsample.wpf8.selfcontained\coverlet.tests.projectsample.wpf8.selfcontained.csproj", "{71004336-9896-4AE5-8367-B29BB1680542}"
92+
EndProject
9193
Global
9294
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9395
Debug|Any CPU = Debug|Any CPU
@@ -190,6 +192,10 @@ Global
190192
{0B109210-03CB-413F-888C-3023994AA384}.Debug|Any CPU.Build.0 = Debug|Any CPU
191193
{0B109210-03CB-413F-888C-3023994AA384}.Release|Any CPU.ActiveCfg = Release|Any CPU
192194
{0B109210-03CB-413F-888C-3023994AA384}.Release|Any CPU.Build.0 = Release|Any CPU
195+
{71004336-9896-4AE5-8367-B29BB1680542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
196+
{71004336-9896-4AE5-8367-B29BB1680542}.Debug|Any CPU.Build.0 = Debug|Any CPU
197+
{71004336-9896-4AE5-8367-B29BB1680542}.Release|Any CPU.ActiveCfg = Release|Any CPU
198+
{71004336-9896-4AE5-8367-B29BB1680542}.Release|Any CPU.Build.0 = Release|Any CPU
193199
EndGlobalSection
194200
GlobalSection(SolutionProperties) = preSolution
195201
HideSolutionNode = FALSE
@@ -220,6 +226,7 @@ Global
220226
{351A034E-E642-4DB9-A21D-F71C8151C243} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
221227
{03400776-1F9A-4326-B927-1CA9B64B42A1} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
222228
{0B109210-03CB-413F-888C-3023994AA384} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
229+
{71004336-9896-4AE5-8367-B29BB1680542} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
223230
EndGlobalSection
224231
GlobalSection(ExtensibilityGlobals) = postSolution
225232
SolutionGuid = {9CA57C02-97B0-4C38-A027-EA61E8741F10}

‎src/coverlet.core/Instrumentation/CecilAssemblyResolver.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@ public RuntimeConfigurationReader(string runtimeConfigFile)
318318
return runtimeOptionsElement["frameworks"].Select(x => (x["name"]?.Value<string>(), x["version"]?.Value<string>())).ToList();
319319
}
320320

321+
if (runtimeOptionsElement?["includedFrameworks"] != null)
322+
{
323+
return runtimeOptionsElement["includedFrameworks"].Select(x => (x["name"]?.Value<string>(), x["version"]?.Value<string>())).ToList();
324+
}
325+
321326
throw new InvalidOperationException($"Unable to read runtime configuration from {_runtimeConfigFile}.");
322327
}
323328
}

‎test/coverlet.integration.tests/WpfResolverTests.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,33 @@ public void TestInstrument_NetCoreSharedFrameworkResolver()
4343
"sample assembly shall be resolved");
4444
Assert.NotEmpty(assemblies);
4545
}
46+
47+
[ConditionalFact]
48+
[SkipOnOS(OS.Linux, "WPF only runs on Windows")]
49+
[SkipOnOS(OS.MacOS, "WPF only runs on Windows")]
50+
public void TestInstrument_NetCoreSharedFrameworkResolver_SelfContained()
51+
{
52+
string buildConfiguration = TestUtils.GetAssemblyBuildConfiguration().ToString().ToLowerInvariant();
53+
string wpfProjectPath = TestUtils.GetTestProjectPath("coverlet.tests.projectsample.wpf8.selfcontained");
54+
string testBinaryPath = Path.Combine(TestUtils.GetTestBinaryPath("coverlet.tests.projectsample.wpf8.selfcontained"), $"{buildConfiguration}_win-x64");
55+
Assert.True(DotnetCli($"build \"{wpfProjectPath}\"", out string output, out string error));
56+
string assemblyLocation = Directory.GetFiles(testBinaryPath, "coverlet.tests.projectsample.wpf8.selfcontained.dll", SearchOption.AllDirectories).First();
57+
58+
var mockLogger = new Mock<ILogger>();
59+
var resolver = new NetCoreSharedFrameworkResolver(assemblyLocation, mockLogger.Object);
60+
var compilationLibrary = new CompilationLibrary(
61+
"package",
62+
"System.Drawing",
63+
"0.0.0.0",
64+
"sha512-not-relevant",
65+
Enumerable.Empty<string>(),
66+
Enumerable.Empty<Dependency>(),
67+
true);
68+
69+
var assemblies = new List<string>();
70+
Assert.True(resolver.TryResolveAssemblyPaths(compilationLibrary, assemblies),
71+
"sample assembly shall be resolved");
72+
Assert.NotEmpty(assemblies);
73+
}
4674
}
4775
}

‎test/coverlet.tests.projectsample.wpf8.selfcontained/.editorconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# top-most EditorConfig file
2+
# We don't want to import other EditorConfig files and we want
3+
# to ensure no rules are enabled for these asset source files.
4+
root = true
5+
6+
[*.cs]
7+
# Default severity for all analyzer diagnostics
8+
dotnet_analyzer_diagnostic.severity = none

‎test/coverlet.tests.projectsample.wpf8.selfcontained/Program.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright (c) Toni Solarin-Sodara
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
namespace coverlet.tests.projectsample.wpf8.selfcontained;
5+
6+
public static class Program
7+
{
8+
public static void Main() { }
9+
}

‎test/coverlet.tests.projectsample.wpf8.selfcontained/TestClass.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Copyright (c) Toni Solarin-Sodara
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System.Windows.Controls;
5+
6+
namespace coverlet.tests.projectsample.wpf8.selfcontained
7+
{
8+
public class TestClass
9+
{
10+
public UserControl? Control { get; set; }
11+
}
12+
}

‎test/coverlet.tests.projectsample.wpf8.selfcontained/coverlet.tests.projectsample.wpf8.selfcontained.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net8.0-windows</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<UseWpf>true</UseWpf>
8+
<IsTestProject>false</IsTestProject>
9+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
10+
<IsPackable>false</IsPackable>
11+
<SelfContained>true</SelfContained>
12+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
13+
</PropertyGroup>
14+
15+
</Project>

‎test/coverlet.tests.projectsample.wpf8/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Toni Solarin-Sodara
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

4-
namespace coverlet.tests.projectsample.wpf6;
4+
namespace coverlet.tests.projectsample.wpf8;
55

66
public static class Program
77
{

‎test/coverlet.tests.projectsample.wpf8/TestClass.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Windows.Controls;
55

6-
namespace coverlet.tests.projectsample.wpf6
6+
namespace coverlet.tests.projectsample.wpf8
77
{
88
public class TestClass
99
{

0 commit comments

Comments
 (0)