Skip to content

Commit b3755e5

Browse files
committed
Fix project template tests
1 parent 2b30484 commit b3755e5

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

src/Assets/Pack/Microsoft.AspNetCore.Assets.Pack.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
<ItemGroup>
2727
<None Include="build\*" Pack="true" PackagePath="%(Identity)" />
28+
<None Include="buildMultiTargeting\*" Pack="true" PackagePath="%(Identity)" />
29+
<None Include="buildTransitive\*" Pack="true" PackagePath="%(Identity)" />
2830
</ItemGroup>
2931

3032
<PropertyGroup>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Microsoft.AspNetCore.Assets.Pack.targets"/>
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.AspNetCore.Assets.Pack.targets"/>
3+
</Project>

src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
<TestRequiresRuntimePackDownload>true</TestRequiresRuntimePackDownload>
2020
</PropertyGroup>
2121

22+
<ItemGroup>
23+
<PackageReference
24+
Include="Microsoft.AspNetCore.Assets.Pack"
25+
Version="${MicrosoftAspNetCoreAppRuntimeVersion}"
26+
ReferenceOutputAssembly="false" />
27+
</ItemGroup>
28+
2229
<Import Project="${ArtifactsBinDir}GenerateFiles\Directory.Build.props" />
2330

2431
<PropertyGroup>

src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
<GenerateFileFromTemplate
134134
TemplateFile="$(MSBuildThisFileDirectory)..\TestInfrastructure\Directory.Build.props.in"
135-
Properties="RepoRoot=$(RepoRoot);ArtifactsBinDir=$(ArtifactsBinDir);TargetingPackLayoutRoot=$(TargetingPackLayoutRoot);SharedFrameworkLayoutRoot=$(SharedFrameworkLayoutRoot);TestDependsOnAspNetPackages=$(TestDependsOnAspNetPackages);"
135+
Properties="RepoRoot=$(RepoRoot);ArtifactsBinDir=$(ArtifactsBinDir);TargetingPackLayoutRoot=$(TargetingPackLayoutRoot);SharedFrameworkLayoutRoot=$(SharedFrameworkLayoutRoot);TestDependsOnAspNetPackages=$(TestDependsOnAspNetPackages);MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion)"
136136
OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" />
137137

138138
<!-- Workaround https://github.com/dotnet/core-setup/issues/6420 - there is no MSBuild setting for rollforward yet -->

0 commit comments

Comments
 (0)