Skip to content

Commit e7e425d

Browse files
committed
Rework file resolution path
1 parent add21bb commit e7e425d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<HelixContent Include="..\testassets\**\*" />
4646
<HelixContent Include="$(RepoRoot)global.json" />
4747
<HelixContent Include="$(RepoRoot)eng\Versions.props" />
48+
<HelixContent Include="$(RepoRoot)\src\Components\Blazor\Build\src\ReferenceBlazorBuildFromSource.props"/>
4849
</ItemGroup>
4950

5051
<ItemGroup>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
<PropertyGroup>
55
<RepoRoot Condition="'$(RepoRoot)' ==''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), global.json))\</RepoRoot>
6-
<ComponentsRoot>$(RepoRoot)src\Components\</ComponentsRoot>
6+
<ComponentsRoot>$(RepoRoot)\src\Components\</ComponentsRoot>
77
<BlazorBuildRoot>$(ComponentsRoot)Blazor\Build\src\</BlazorBuildRoot>
8-
<ReferenceBlazorBuildFromSourceProps>$(BlazorBuildRoot)ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
8+
<ReferenceBlazorBuildFromSourceProps Condition="'$(IsHelixJob)' != 'true'">$(BlazorBuildRoot)ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
9+
<ReferenceBlazorBuildFromSourceProps Condition="'$(ReferenceBlazorBuildFromSourceProps)' == ''">..\..\ReferenceBlazorBuildFromSource.props</ReferenceBlazorBuildFromSourceProps>
10+
911

1012
<!-- Workaround for https://github.com/dotnet/aspnetcore/issues/17308 -->
1113
<DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
@@ -16,7 +18,7 @@
1618

1719
<Import Project="$(RepoRoot)eng\Versions.props" Condition="'$(HELIX_WORKITEM_ROOT)' == ''" />
1820
<Import Project="$(MSBuildThisFileDirectory)Versions.props" Condition="Exists('$(MSBuildThisFileDirectory)Versions.props')" />
19-
21+
2022
<ItemGroup>
2123
<!-- Use the sample compiler \ SDK that the rest of our build uses-->
2224
<PackageReference Include="Microsoft.Net.Compilers.Toolset"

src/Components/Blazor/Build/testassets/standalone/standalone.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="$(ReferenceBlazorBuildFromSourceProps)" />
2+
<!-- <Import Project="$(ReferenceBlazorBuildFromSourceProps)" /> -->
33

44
<PropertyGroup>
55
<TargetFramework>netstandard2.1</TargetFramework>

0 commit comments

Comments
 (0)