Skip to content
Draft
Show file tree
Hide file tree
Changes from 2 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should include also the developer manifest too, just in case.

Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

<ItemGroup>
<UpToDateCheckOutput Include="$(StaticWebAssetBuildManifestPath)" Set="StaticWebAssets" />
<UpToDateCheckOutput Include="$(StaticWebAssetEndpointsBuildManifestPath)" Set="StaticWebAssets" />
</ItemGroup>

</Target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ Copyright (c) .NET Foundation. All rights reserved.

<ItemGroup Condition="'$(BuildingInsideVisualStudio)' == 'true'">
<_ReferenceManifestPath Include="@(_ReferencedProjectsConfiguration->'%(BuildManifestPath)')" Condition="'%(_ReferencedProjectsConfiguration.BuildManifestPath)' != ''" />
<_ReferenceManifestPath Include="@(_ReferencedProjectsConfiguration->'%(EndpointsBuildManifestPath)')" Condition="'%(_ReferencedProjectsConfiguration.EndpointsBuildManifestPath)' != ''" />
</ItemGroup>

<WriteLinesToFile Condition="'$(BuildingInsideVisualStudio)' == 'true'"
File="$(StaticWebAssetReferencesUpToDateCheckManifestPath)"
Lines="@(_ReferenceManifestPath)"
Overwrite="false"
Overwrite="true"
WriteOnlyWhenDifferent="true" />

<MergeConfigurationProperties
Expand Down Expand Up @@ -97,6 +98,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<AdditionalPublishPropertiesToRemove>$(StaticWebAssetsAdditionalPublishPropertiesToRemove)</AdditionalPublishPropertiesToRemove>
<!-- Build manifest -->
<BuildManifestPath>$([System.IO.Path]::GetFullPath('$(StaticWebAssetBuildManifestPath)'))</BuildManifestPath>
<EndpointsBuildManifestPath>$([System.IO.Path]::GetFullPath('$(StaticWebAssetEndpointsBuildManifestPath)'))</EndpointsBuildManifestPath>
</_StaticWebAssetThisProjectConfiguration>
</ItemGroup>
</Target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ public void CollectUpToDateCheckInputOutputsDesignTime_ReportsAddedFiles()
var outputFilePath = Path.Combine(build.GetIntermediateDirectory().FullName, "StaticWebAssetsUTDCOutput.txt");
new FileInfo(outputFilePath).Should().Exist();
var outputFiles = File.ReadAllLines(outputFilePath);
outputFiles.Should().ContainSingle();
Path.GetFileName(outputFiles[0]).Should().Be("staticwebassets.build.json");
outputFiles.Should().HaveCount(2);
outputFiles.Should().Contain(x => Path.GetFileName(x) == "staticwebassets.build.json");
outputFiles.Should().Contain(x => Path.GetFileName(x) == "staticwebassets.build.endpoints.json");
}

[Fact]
Expand Down Expand Up @@ -86,8 +87,9 @@ public void CollectUpToDateCheckInputOutputsDesignTime_ReportsRemovedFiles_Once(
var outputFilePath = Path.Combine(build.GetIntermediateDirectory().FullName, "StaticWebAssetsUTDCOutput.txt");
new FileInfo(outputFilePath).Should().Exist();
var outputFiles = File.ReadAllLines(outputFilePath);
outputFiles.Should().ContainSingle();
Path.GetFileName(outputFiles[0]).Should().Be("staticwebassets.build.json");
outputFiles.Should().HaveCount(2);
outputFiles.Should().Contain(x => Path.GetFileName(x) == "staticwebassets.build.json");
outputFiles.Should().Contain(x => Path.GetFileName(x) == "staticwebassets.build.endpoints.json");
}

[Fact]
Expand All @@ -113,14 +115,16 @@ public void CollectUpToDateCheckInputOutputsDesignTime_IncludesReferencedProject
var inputFilePath = Path.Combine(build.GetIntermediateDirectory().FullName, "StaticWebAssetsUTDCInput.txt");
new FileInfo(inputFilePath).Should().Exist();
var inputFiles = File.ReadAllLines(inputFilePath);
inputFiles.Should().HaveCount(1);
inputFiles.Should().HaveCount(2);
inputFiles.Should().Contain(Path.Combine(ProjectDirectory.Path, "ClassLibrary", "obj", "Debug", DefaultTfm, "staticwebassets.build.json"));
inputFiles.Should().Contain(Path.Combine(ProjectDirectory.Path, "ClassLibrary", "obj", "Debug", DefaultTfm, "staticwebassets.build.endpoints.json"));

var outputFilePath = Path.Combine(build.GetIntermediateDirectory().FullName, "StaticWebAssetsUTDCOutput.txt");
new FileInfo(outputFilePath).Should().Exist();
var outputFiles = File.ReadAllLines(outputFilePath);
outputFiles.Should().ContainSingle();
Path.GetFileName(outputFiles[0]).Should().Be("staticwebassets.build.json");
outputFiles.Should().HaveCount(2);
outputFiles.Should().Contain(x => Path.GetFileName(x) == "staticwebassets.build.json");
outputFiles.Should().Contain(x => Path.GetFileName(x) == "staticwebassets.build.endpoints.json");
}

private static MSBuildCommand CreateMSBuildCommand(TestAsset testAsset, string relativeProjectPath, string targets)
Expand Down
Loading