diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2022-01-31 21:05:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 21:05:08 +0300 |
| commit | c0575788ecadd6e5cfeb4eab635c13b5fd433d37 (patch) | |
| tree | ae5c8221d0a675c61f302fb8d022ba07a44d56f0 /Directory.Build.targets | |
| parent | aa8d62341d27a515bdfa781d55c3d6b7456cd51d (diff) | |
Remove Interop build step (#39553)
- remove separate step to restore Interop projects
- make Interop test asset projects more "normal"
- use usual mechanism to target latest ASP.NET Core bits
- remove use of `$(BuildInteropProjects)`
- expand FunctionalTestWithAssets.targets to help w/ local testing
- still delayed and done only when necessary
- handle non-Helix testing e.g. handle `dotnet test` too
- build test assets into location `InteropTests` expects on local machine
- add FunctionalTestWithAssets.props, providing relevant defaults
- expand `FunctionalTestWithAssets` use to Identity.FunctionalTests
nits:
- rename `@(FunctionalTestAssetProjectReference)` to `@(TestAssetProjectReference)`
- cleanup leftover reference to ProjectTemplates/testassets/ in Build.props
- should have been removed in 54ff379
- remove `/p:RunTemplateTests=true`; no need to specify the default
- clean up other projects that use `$(MvcTestingTargets)`
- none need special handling for publish (don't need pages, views, or wwwroot files)
Diffstat (limited to 'Directory.Build.targets')
| -rw-r--r-- | Directory.Build.targets | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Directory.Build.targets b/Directory.Build.targets index d8bf2ae9cd..e9e729676f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -192,6 +192,6 @@ <Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" /> <Import Project="eng\targets\Java.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.javaproj'" /> <Import Project="eng\targets\Helix.targets" Condition=" $(IsTestProject) " /> - <Import Project="eng\targets\FunctionalTestAsset.targets" Condition="'$(IsTestAssetProject)' == 'true'" /> - <Import Project="eng\targets\FunctionalTestWithAssets.targets" Condition="'$(ContainsFunctionalTestAssets)' == 'true'" /> + <Import Project="eng\targets\FunctionalTestWithAssets.targets" + Condition=" $(IsTestProject) AND $(ContainsFunctionalTestAssets) " /> </Project> |