Skip to content

Commit ff00042

Browse files
authored
Avoid having duplicate project references (#33565)
Duplicate project references with insufficiently different parameters cause file concurrency issues. We don't really need duplicate references since the trimmed and non-trimmed apps are mutually exclusive.
1 parent 468ef7a commit ff00042

File tree

2 files changed

+16
-21
lines changed

2 files changed

+16
-21
lines changed

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,37 +38,38 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<ProjectReference Include="..\..\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj" />
41+
<ProjectReference Include="..\testassets\TestServer\Components.TestServer.csproj" />
42+
<ProjectReference Include="..\..\WebAssembly\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj" />
4243
<ProjectReference Include="..\..\WebAssembly\testassets\HostedInAspNet.Client\HostedInAspNet.Client.csproj" />
4344
<ProjectReference Include="..\..\WebAssembly\testassets\HostedInAspNet.Server\HostedInAspNet.Server.csproj" />
45+
</ItemGroup>
46+
47+
<ItemGroup Condition="'$(TestTrimmedApps)' != 'true'">
48+
<ProjectReference Include="..\..\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj" />
4449
<ProjectReference Include="..\..\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj" />
4550
<ProjectReference Include="..\testassets\BasicTestApp\BasicTestApp.csproj" />
4651
<ProjectReference Include="..\testassets\GlobalizationWasmApp\GlobalizationWasmApp.csproj" />
47-
<ProjectReference Include="..\testassets\TestServer\Components.TestServer.csproj" />
48-
<ProjectReference Include="..\..\WebAssembly\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj" />
52+
</ItemGroup>
4953

54+
<ItemGroup Condition="'$(TestTrimmedApps)' == 'true'">
5055
<ProjectReference Include="..\..\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj"
51-
Targets="Publish"
52-
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\Wasm.Performance.TestApp\"
53-
Condition="'$(TestTrimmedApps)' == 'true'" />
56+
Targets="Build;Publish"
57+
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\Wasm.Performance.TestApp\" />
5458

5559
<ProjectReference
5660
Include="..\testassets\BasicTestApp\BasicTestApp.csproj"
57-
Targets="Publish"
58-
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\BasicTestApp\"
59-
Condition="'$(TestTrimmedApps)' == 'true'" />
61+
Targets="Build;Publish"
62+
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\BasicTestApp\" />
6063

6164
<ProjectReference
6265
Include="..\testassets\GlobalizationWasmApp\GlobalizationWasmApp.csproj"
63-
Targets="Publish"
64-
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\GlobalizationWasmApp\;"
65-
Condition="'$(TestTrimmedApps)' == 'true'" />
66+
Targets="Build;Publish"
67+
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\GlobalizationWasmApp\;" />
6668

6769
<ProjectReference
6870
Include="..\..\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj"
69-
Targets="Publish"
70-
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\StandaloneApp\;"
71-
Condition="'$(TestTrimmedApps)' == 'true'" />
71+
Targets="Build;Publish"
72+
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\StandaloneApp\;" />
7273
</ItemGroup>
7374

7475
<!-- Shared testing infrastructure for running E2E tests using selenium -->

src/Components/test/E2ETestMigration/Microsoft.AspNetCore.Components.Migration.E2ETests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
<ItemGroup>
2727
<ProjectReference Include="..\E2ETest\Microsoft.AspNetCore.Components.E2ETests.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
2828
<ProjectReference Include="$(RepoRoot)src\Shared\BrowserTesting\src\Microsoft.AspNetCore.BrowserTesting.csproj" />
29-
<ProjectReference Include="..\..\WebAssembly\testassets\HostedInAspNet.Client\HostedInAspNet.Client.csproj" />
30-
<ProjectReference Include="..\..\WebAssembly\testassets\HostedInAspNet.Server\HostedInAspNet.Server.csproj" />
31-
<ProjectReference Include="..\..\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj" />
32-
<ProjectReference Include="..\testassets\BasicTestApp\BasicTestApp.csproj" />
33-
<ProjectReference Include="..\testassets\GlobalizationWasmApp\GlobalizationWasmApp.csproj" />
3429
<ProjectReference Include="..\testassets\TestServer\Components.TestServer.csproj" />
3530
</ItemGroup>
3631

@@ -46,7 +41,6 @@
4641
<HelixContent Include="..\..\Blazor\testassets\StandaloneApp\**\*" />
4742
</ItemGroup>
4843

49-
5044
<ItemGroup>
5145
<!-- Shared descriptor infrastructure with MVC -->
5246
<Compile Include="$(RepoRoot)src\Shared\Components\ServerComponent.cs" />

0 commit comments

Comments
 (0)