Skip to content

Commit 7d916aa

Browse files
committed
Rework file resolution path
1 parent 4df5079 commit 7d916aa

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<HelixContent Include="..\testassets\**\*" />
4141
<HelixContent Include="$(RepoRoot)global.json" />
4242
<HelixContent Include="$(RepoRoot)eng\Versions.props" />
43+
<HelixContent Include="$(RepoRoot)\src\Components\Blazor\Build\src\ReferenceBlazorBuildFromSource.props"/>
4344
</ItemGroup>
4445

4546
<ItemGroup>

src/Components/WebAssembly/Build/testassets/Directory.Build.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<RepoRoot Condition="'$(RepoRoot)' ==''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), global.json))\</RepoRoot>
88
<ComponentsRoot>$(RepoRoot)src\Components\</ComponentsRoot>
99
<BlazorBuildRoot>$(ComponentsRoot)WebAssembly\Build\src\</BlazorBuildRoot>
10-
<ReferenceBlazorBuildFromSourceProps>$(BlazorBuildRoot)ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
10+
<ReferenceBlazorBuildFromSourceProps Condition="'$(IsHelixJob)' != 'true'">$(BlazorBuildRoot)ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
11+
<ReferenceBlazorBuildFromSourceProps Condition="'$(ReferenceBlazorBuildFromSourceProps)' == ''">..\..\ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
12+
1113

1214
<!-- Workaround for https://github.com/dotnet/aspnetcore/issues/17308 -->
1315
<DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>

0 commit comments

Comments
 (0)