From 376f378c0acf08188013fb6811507ffb0ea04eba Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 11 Feb 2020 09:12:17 -0800
Subject: [PATCH] Ensure resolved assemblies works correctly when not linked +
incremental build (#18797)
Fixes https://github.com/dotnet/aspnetcore/issues/18752
---
.../src/targets/Blazor.MonoRuntime.targets | 4 +-
.../PublishIntegrationTest.cs | 60 +++++++++++++++++++
2 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets b/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets
index 3c7d1265619..911c6167c89 100644
--- a/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets
+++ b/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.targets
@@ -304,7 +304,7 @@
<Output TaskParameter="Dependencies" ItemName="_BlazorResolvedAssembly" />
</ResolveBlazorRuntimeDependencies>
- <WriteLinesToFile File="$(_BlazorApplicationAssembliesCacheFile)" Lines="@(_BlazorResolvedRuntimeDependencies)" Overwrite="true" />
+ <WriteLinesToFile File="$(_BlazorApplicationAssembliesCacheFile)" Lines="@(_BlazorResolvedAssembly)" Overwrite="true" />
<ItemGroup>
<FileWrites Include="$(_BlazorApplicationAssembliesCacheFile)" />
@@ -315,7 +315,7 @@
<Target
Name="_GenerateBlazorBootJson"
- Inputs="@(BlazorOutputWithTargetPath)"
+ Inputs="$(MSBuildAllProjects);@(BlazorOutputWithTargetPath)"
Outputs="$(BlazorBootJsonIntermediateOutputPath)">
<ItemGroup>
<_BlazorRuntimeFile Include="@(BlazorOutputWithTargetPath->WithMetadataValue('BlazorRuntimeFile', 'true'))" />
diff --git a/src/Components/Blazor/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs b/src/Components/Blazor/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
index 3556f119f40..88fd2798e42 100644
--- a/src/Components/Blazor/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
@@ -182,6 +182,66 @@ namespace Microsoft.AspNetCore.Blazor.Build
Assert.Equal("standalone/", blazorConfigLines[1]);
}
+ [Fact]
+ // Regression test for https://github.com/dotnet/aspnetcore/issues/18752
+ public async Task Publish_HostedApp_WithLinkOnBuildFalse_Works()
+ {
+ // Arrange
+ using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
+ project.TargetFramework = "netcoreapp3.1";
+
+ AddSiblingProjectFileContent(@"
+<PropertyGroup>
+ <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
+</PropertyGroup>");
+
+ // VS builds projects individually and then a publish with BuildDependencies=false, but building the main project is a close enough approximation for this test.
+ var result = await MSBuildProcessManager.DotnetMSBuild(project, "Build");
+
+ Assert.BuildPassed(result);
+
+ // Publish
+ result = await MSBuildProcessManager.DotnetMSBuild(project, "Publish", "/p:BuildDependencies=false");
+
+ var publishDirectory = project.PublishOutputDirectory;
+ // Make sure the main project exists
+ Assert.FileExists(result, publishDirectory, "blazorhosted.dll");
+
+ var blazorPublishDirectory = Path.Combine(publishDirectory, "standalone");
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.boot.json");
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "blazor.webassembly.js");
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.wasm");
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "wasm", "dotnet.js");
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "standalone.dll");
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
+
+ // Verify static assets are in the publish directory
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "index.html");
+
+ // Verify static web assets from referenced projects are copied.
+ Assert.FileExists(result, publishDirectory, "wwwroot", "_content", "RazorClassLibrary", "wwwroot", "exampleJsInterop.js");
+ Assert.FileExists(result, publishDirectory, "wwwroot", "_content", "RazorClassLibrary", "styles.css");
+
+ // Verify static assets are in the publish directory
+ Assert.FileExists(result, blazorPublishDirectory, "dist", "index.html");
+
+ // Verify web.config
+ Assert.FileExists(result, publishDirectory, "web.config");
+
+ var blazorConfig = Path.Combine(result.Project.DirectoryPath, publishDirectory, "standalone.blazor.config");
+ var blazorConfigLines = File.ReadAllLines(blazorConfig);
+ Assert.Equal(".", blazorConfigLines[0]);
+ Assert.Equal("standalone/", blazorConfigLines[1]);
+
+ void AddSiblingProjectFileContent(string content)
+ {
+ var path = Path.Combine(project.SolutionPath, "standalone", "standalone.csproj");
+ var existing = File.ReadAllText(path);
+ var updated = existing.Replace("<!-- Test Placeholder -->", content);
+ File.WriteAllText(path, updated);
+ }
+ }
+
[Fact]
public async Task Publish_HostedApp_WithNoBuild_Works()
{
--
GitLab