|
33 | 33 | <Reference Include="Microsoft.NET.Sdk.Razor" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
|
34 | 34 | </ItemGroup>
|
35 | 35 |
|
| 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 | + |
36 | 48 | <Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes">
|
37 | 49 | <Exec Condition="'$(OS)' == 'Windows_NT'" Command=""$(NuGetPackageRoot)vswhere\$(VSWhereVersion)\tools\vswhere.exe" -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild" ConsoleToMsBuild="true" StandardErrorImportance="high">
|
38 | 50 | <Output TaskParameter="ConsoleOutput" PropertyName="_VSInstallDir" />
|
|
54 | 66 | </ItemGroup>
|
55 | 67 | </Target>
|
56 | 68 |
|
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)" /> |
61 | 73 | </Target>
|
62 | 74 |
|
63 | 75 | <Target Name="EnsureLogFolder" AfterTargets="Build">
|
|
0 commit comments