Skip to content

Commit ebb24d3

Browse files
committed
fix building test assemblies
1 parent 3f03879 commit ebb24d3

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi.Core.Tests.csproj

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,20 @@ SPDX-License-Identifier: MIT
3030
<TestProjects Include="$(TestAssemblyRootDirectory)\LibB\LibB.csproj" />
3131
</ItemGroup>
3232

33-
<PropertyGroup>
34-
<_TestProjectBuildTargets>Restore;Build</_TestProjectBuildTargets>
35-
</PropertyGroup>
33+
<!--
34+
run `dotnet restore` instead of calling target 'Restore'
35+
ref: https://github.com/dotnet/msbuild/issues/2811
36+
-->
37+
<!--<MSBuild Projects="@(TestProjects)" Targets="Restore"/>-->
38+
<Exec Command="dotnet restore %(TestProjects.Identity)" />
3639

37-
<MSBuild Projects="@(TestProjects)" Targets="$(_TestProjectBuildTargets)" Properties="Configuration=Release;TargetFramework=netstandard2.1">
40+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=netstandard2.1">
3841
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNetStandard21" />
3942
</MSBuild>
40-
<MSBuild Projects="@(TestProjects)" Targets="$(_TestProjectBuildTargets)" Properties="Configuration=Release;TargetFramework=net6.0" Condition="'$(RunningOnNet7PreviewSdk)' != 'true'">
43+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net6.0" Condition="'$(RunningOnNet7PreviewSdk)' != 'true'">
4144
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet60" />
4245
</MSBuild>
43-
<MSBuild Projects="@(TestProjects)" Targets="$(_TestProjectBuildTargets)" Properties="Configuration=Release;TargetFramework=net7.0" Condition="'$(RunningOnNet7PreviewSdk)' != 'true' and $(TargetFrameworks.Contains('net7.0'))">
46+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net7.0" Condition="'$(RunningOnNet7PreviewSdk)' != 'true' and $(TargetFrameworks.Contains('net7.0'))">
4447
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet70" />
4548
</MSBuild>
4649

tests/Smdn.Reflection.ReverseGenerating.ListApi/Smdn.Reflection.ReverseGenerating.ListApi.Tests.csproj

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,33 @@ SPDX-License-Identifier: MIT
2020

2121
<Target Name="WriteTestAssemblyInfo" BeforeTargets="BeforeBuild">
2222
<PropertyGroup>
23-
<_TestProjectBuildTargets>Restore;Build</_TestProjectBuildTargets>
23+
<TestAssemblyExeProjectPath>$(TestAssemblyRootDirectory)\Exe\Exe.csproj</TestAssemblyExeProjectPath>
24+
<TestAssemblyLibProjectPath>$(TestAssemblyRootDirectory)\Lib\Lib.csproj</TestAssemblyLibProjectPath>
2425
</PropertyGroup>
26+
<!--
27+
run `dotnet restore` instead of calling target 'Restore'
28+
ref: https://github.com/dotnet/msbuild/issues/2811
29+
-->
30+
<Exec Command="dotnet restore $(TestAssemblyExeProjectPath)" />
31+
<Exec Command="dotnet restore $(TestAssemblyLibProjectPath)" />
2532

26-
<MSBuild Projects="$(TestAssemblyRootDirectory)\Exe\Exe.csproj" Targets="$(_TestProjectBuildTargets)" Properties="Configuration=Release;TargetFramework=net6.0">
33+
<MSBuild Projects="$(TestAssemblyExeProjectPath)" Targets="Build" Properties="Configuration=Release;TargetFramework=net6.0">
2734
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesExeNet60" />
2835
</MSBuild>
29-
<MSBuild Projects="$(TestAssemblyRootDirectory)\Lib\Lib.csproj" Targets="$(_TestProjectBuildTargets)" Properties="Configuration=Release;TargetFramework=net6.0">
36+
<MSBuild Projects="$(TestAssemblyLibProjectPath)" Targets="Build" Properties="Configuration=Release;TargetFramework=net6.0">
3037
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesLibNet60" />
3138
</MSBuild>
3239

3340
<ItemGroup>
3441
<TestProjects Include="$(TestAssemblyRootDirectory)\LibA\LibA.csproj" />
3542
</ItemGroup>
3643

37-
<MSBuild Projects="@(TestProjects)" Targets="$(_TestProjectBuildTargets)" Properties="Configuration=Release;TargetFramework=netstandard2.1">
44+
<Exec Command="dotnet restore %(TestProjects.Identity)" />
45+
46+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=netstandard2.1">
3847
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNetStandard21" />
3948
</MSBuild>
40-
<MSBuild Projects="@(TestProjects)" Targets="$(_TestProjectBuildTargets)" Properties="Configuration=Release;TargetFramework=net6.0">
49+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net6.0">
4150
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet60" />
4251
</MSBuild>
4352

0 commit comments

Comments
 (0)