Skip to content

Commit 1788d8c

Browse files
committed
Delay Razor SDK test asset project restoration
- depend on Microsoft.AspNetCore.App projects - do not restore test asset projects until just before tests run nit: do not pass `$(MicrosoftNetCompilersToolsetPackageVersion)` into test asset projects - not needed because generated files already contain the right information - even without that, the Directory.Build.* files import eng/Versions.props
1 parent 730254a commit 1788d8c

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

Diff for: src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj

+16-4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@
3333
<Reference Include="Microsoft.NET.Sdk.Razor" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
3434
</ItemGroup>
3535

36+
<!-- Ensure shared framework and targeting packs are laid out under .dotnet/ before executing non-Helix tests. -->
37+
<ItemGroup Condition=" '$(ASPNETCORE_TEST_LOG_DIR)' == '' AND '$(IsHelixJob)' != 'true' ">
38+
<ProjectReference Include="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
39+
Condition=" $(IsTargetingPackBuilding) "
40+
ReferenceOutputAssembly="false"
41+
SkipGetTargetFrameworkProperties="true" />
42+
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
43+
Condition=" !$(IsTargetingPackBuilding) "
44+
ReferenceOutputAssembly="false"
45+
SkipGetTargetFrameworkProperties="true" />
46+
</ItemGroup>
47+
3648
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes">
3749
<Exec Condition="'$(OS)' == 'Windows_NT'" Command="&quot;$(NuGetPackageRoot)vswhere\$(VSWhereVersion)\tools\vswhere.exe&quot; -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild" ConsoleToMsBuild="true" StandardErrorImportance="high">
3850
<Output TaskParameter="ConsoleOutput" PropertyName="_VSInstallDir" />
@@ -54,10 +66,10 @@
5466
</ItemGroup>
5567
</Target>
5668

57-
<Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
58-
<MSBuild Projects="..\..\test\testassets\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);RepoRoot=$(RepoRoot)" />
59-
<MSBuild Projects="..\..\test\testassets\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);RepoRoot=$(RepoRoot)" />
60-
<MSBuild Projects="..\..\test\testassets\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);RepoRoot=$(RepoRoot)" />
69+
<Target Name="RestoreTestProjects" BeforeTargets="RunTests;Test;VSTest" Condition="'$(DotNetBuildFromSource)' != 'true'">
70+
<MSBuild Projects="..\..\test\testassets\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="RepoRoot=$(RepoRoot)" />
71+
<MSBuild Projects="..\..\test\testassets\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj" Targets="Restore" Properties="RepoRoot=$(RepoRoot)" />
72+
<MSBuild Projects="..\..\test\testassets\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" Targets="Restore" Properties="RepoRoot=$(RepoRoot)" />
6173
</Target>
6274

6375
<Target Name="EnsureLogFolder" AfterTargets="Build">

0 commit comments

Comments
 (0)