Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

## Bug fixes:

* Fix: Binding discovery for .NET 10 projects that depend on an ASP.NET project and use the MSDI plugin (#156)

*Contributors of this release (in alphabetical order):* @304NotModified, @clrudolphi, @gasparnagy

# v2025.3.395 - 2025-12-17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ namespace ReqnrollConnector.AssemblyLoading;

public class NugetCacheAssemblyResolver : ICompilationAssemblyResolver
{
private const string NetStandard20 = "netstandard2.0";
private readonly string _targetFramework;

public NugetCacheAssemblyResolver(string targetFramework)
{
_targetFramework = targetFramework;
}

public bool TryResolveAssemblyPaths(CompilationLibrary library, List<string>? assemblies)
{
if (library.Path == null || assemblies == null)
Expand All @@ -15,14 +23,31 @@ public bool TryResolveAssemblyPaths(CompilationLibrary library, List<string>? as
if (!Directory.Exists(directory))
return false;

var libs = Directory.GetDirectories(directory);
foreach (var lib in libs)
string assemblyFileName = library.Name + ".dll";

// If the target framework folder exists, use it, even if it doesn't contain the assembly.
// An empty folder indicates that the package is included to the target framework by default.
if (Directory.Exists(Path.Combine(directory, _targetFramework)))
{
assemblies.Add(Path.Combine(directory, _targetFramework, assemblyFileName));
return true;
}

// Fallback to netstandard2.0, similarly
if (Directory.Exists(Path.Combine(directory, NetStandard20)))
{
assemblies.Add(Path.Combine(directory, NetStandard20, assemblyFileName));
return true;
}

// Finally, check if the assembly exists directly under lib (old .NET Framework style packages)
if (Directory.Exists(Path.Combine(directory, assemblyFileName)))
{
var assemblyFilePath = Path.Combine(lib, library.Name + ".dll");
assemblies.Add(assemblyFilePath);
assemblies.Add(Path.Combine(directory, assemblyFileName));
return true;
}

return libs.Any();
return false;
}

private string NugetCacheExpandedPath()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public TestAssemblyLoadContext(
new ReferenceAssemblyPathResolver(),
new PackageCompilationAssemblyResolver(),
new AspNetCoreAssemblyResolver(),
new NugetCacheAssemblyResolver()
new NugetCacheAssemblyResolver(_shortFrameworkName)
}, _log);
}

Expand Down Expand Up @@ -187,6 +187,12 @@ private IEnumerable<string> SelectAssets(IReadOnlyList<RuntimeAssetGroup> runtim

private CompilationLibrary GetRequestedLibrary(AssemblyName assemblyName)
{
// Using a x.y.z path allows finding the library in NuGet cache folders.
// This causes problems with System.* assemblies (e.g. System.Text.Encodings.Web in .NET 8.0), so we use the full version string for those.
string path = !assemblyName.Name!.StartsWith("System.", StringComparison.InvariantCultureIgnoreCase) ?
Path.Combine(assemblyName.Name!, $"{assemblyName.Version!.Major}.{assemblyName.Version!.Minor}.{assemblyName.Version!.MajorRevision}".ToString()) :
Path.Combine(assemblyName.Name!, $"{assemblyName.Version}".ToString());

// This reference might help finding dependencies that are otherwise not listed in the
// deps.json file of the test assembly. E.g. Microsoft.AspNetCore.Hosting.Abstractions in the ReqOverflow.Specs.API project of the https://github.com/reqnroll/Sample-ReqOverflow sample
return new CompilationLibrary(
Expand All @@ -197,7 +203,7 @@ private CompilationLibrary GetRequestedLibrary(AssemblyName assemblyName)
new[] {assemblyName.Name + ".dll"},
Array.Empty<Dependency>(),
true,
Path.Combine(assemblyName.Name!, $"{assemblyName.Version}".ToString()),
path,
string.Empty);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void ReqOverflow(string testCase, string projectFile, string repositoryDi
}

private const string IgnoredExploratoryTestProjects =
"SpecFlowCompatibilityProject.Net472;CleanReqnrollProject.Net481.x86;VsExtConnectorTestSamples";
"SpecFlowCompatibilityProject.Net472;CleanReqnrollProject.Net481.x86;VsExtConnectorTestSamples.NetFwSystemDataDep";

[Theory]
[MemberData(nameof(GetProjectsForRepository), "https://github.com/reqnroll/Reqnroll.ExploratoryTestProjects", $"BigReqnrollProject;SpecFlowProject;OldProjectFileFormat.Empty;ReqnrollFormatters.CustomizedHtml;CustomPlugins.TagDecoratorGeneratorPlugin;{IgnoredExploratoryTestProjects}")]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System.Diagnostics;
using Microsoft.AspNetCore.Mvc;
using VsExtConnectorTestSamples.AspNetAndMSDI.App.Models;

namespace VsExtConnectorTestSamples.AspNetAndMSDI.App.Controllers;

public class HomeController : Controller
{
public IActionResult Index()
{
return View();
}

public IActionResult Privacy()
{
return View();
}

[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error()
{
return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace VsExtConnectorTestSamples.AspNetAndMSDI.App.Interfaces;

public interface IDateTimeService
{
DateTime GetDateTime();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace VsExtConnectorTestSamples.AspNetAndMSDI.App.Models;

public class ErrorViewModel
{
public string? RequestId { get; set; }

public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using VsExtConnectorTestSamples.AspNetAndMSDI.App.Interfaces;
using VsExtConnectorTestSamples.AspNetAndMSDI.App.Services;

namespace VsExtConnectorTestSamples.AspNetAndMSDI.App;

public class Program
{
public static void Main(string[] args)
{
var builder = WebApplication.CreateBuilder(args);

// Add services to the container.
builder.Services.AddControllersWithViews();
builder.Services.AddSingleton<IDateTimeService, DateTimeService>();

var app = builder.Build();

// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())
{
app.UseExceptionHandler("/Home/Error");
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
app.UseHsts();
}

app.UseHttpsRedirection();
app.UseRouting();

app.UseAuthorization();

app.MapStaticAssets();
app.MapControllerRoute(
name: "default",
pattern: "{controller=Home}/{action=Index}/{id?}")
.WithStaticAssets();

app.Run();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using VsExtConnectorTestSamples.AspNetAndMSDI.App.Interfaces;

namespace VsExtConnectorTestSamples.AspNetAndMSDI.App.Services;

public class DateTimeService : IDateTimeService
{
public DateTime GetDateTime()
{
return DateTime.Now;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@{
ViewData["Title"] = "Home Page";
}

<div class="text-center">
<h1 class="display-4">Welcome</h1>
<p>Learn about <a href="https://learn.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@{
ViewData["Title"] = "Privacy Policy";
}
<h1>@ViewData["Title"]</h1>

<p>Use this page to detail your site's privacy policy.</p>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@model VsExtConnectorTestSamples.AspNetAndMSDI.App.Models.ErrorViewModel
@{
ViewData["Title"] = "Error";
}

<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>

@if (Model.ShowRequestId)
{
<p>
<strong>Request ID:</strong> <code>@Model.RequestId</code>
</p>
}

<h3>Development Mode</h3>
<p>
Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
</p>
<p>
<strong>The Development environment shouldn't be enabled for deployed applications.</strong>
It can result in displaying sensitive information from exceptions to end users.
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
and restarting the app.
</p>
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - TestWithNet10AndMSDI</title>
<script type="importmap"></script>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
<link rel="stylesheet" href="~/TestWithNet10AndMSDI.styles.css" asp-append-version="true" />
</head>
<body>
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container-fluid">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">TestWithNet10AndMSDI</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</li>
</ul>
</div>
</div>
</nav>
</header>
<div class="container">
<main role="main" class="pb-3">
@RenderBody()
</main>
</div>

<footer class="border-top footer text-muted">
<div class="container">
&copy; 2026 - TestWithNet10AndMSDI - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</div>
</footer>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
@await RenderSectionAsync("Scripts", required: false)
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */

a.navbar-brand {
white-space: normal;
text-align: center;
word-break: break-all;
}

a {
color: #0077cc;
}

.btn-primary {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}

.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}

.border-top {
border-top: 1px solid #e5e5e5;
}
.border-bottom {
border-bottom: 1px solid #e5e5e5;
}

.box-shadow {
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
}

button.accept-policy {
font-size: 1rem;
line-height: inherit;
}

.footer {
position: absolute;
bottom: 0;
width: 100%;
white-space: nowrap;
line-height: 60px;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
<script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.min.js"></script>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@{
Layout = "_Layout";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
}
Loading