diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2020-05-30 05:02:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 05:02:03 +0300 |
| commit | 14d6b6e2866122616e9487732447f647c7beb9a3 (patch) | |
| tree | 1eb88a1031622163d5a2e4bd0236a5ae23739575 /Directory.Build.props | |
| parent | b9800cf557e1add5b8ea251c03d274cb8853c4e6 (diff) | |
Build primarily with `dotnet msbuild` (#22017)
* Make `dotnet msbuild` the default on Windows too
- add step using desktop `msbuild` when native builds may be involved
- `-All` (without `-NoBuildNative`), `-BuildNative` or `-BuildInstallers` run this step
- but `-ForceCoreMsbuild` unconditionally skips this step
nits:
- add binary log for RepoTasks build if `$BinaryLog` (echoes the `dotnet msbuild` command)
- add blank lines between build steps
* Enable building managed projects depending on native assets
- splitting native builds out confuses these projects
- use `$(BuildNative)` less, only to control actual building (not bundling)
- build both native platforms in one `msbuild` invocation
* Adjust generation scripts to explicitly choose the MSBuild engine
- ensure native assets are included in GenerateReferenceAssemblies.ps1 build
- clean up the global state that tools.ps1 corrupts
* Revert move to VS2019.Pre queues
This reverts part of commit b67d161e03350053e4664af6386f5ace4991b254
- was "[release/5.0-preview5] Update dependencies from dotnet/aspnetcore-tooling (#21710)"
* Revert "!temporary! Require `msbuild` from VS2019 16.6"
- this reverts commit 58cf2304a642312477dc41cd9651e6f4c2d39286
* Reduce build duplication in pipelines
- build native assets and repo tasks once per CI job
- only cleanup framework references after packing managed projects
nits:
- wrap a few long lines
- remove extra `-forceCoreMsbuild` options in SiteExtensions' build.cmd
* Fix Helix jobs
- restore.cmd doesn't work well with `-projects`; script unconditionally adds `-all`
* !fixup! Reduce duplications further
- missed a couple of places `-noBuildRepoTasks` helps
* Cleanup: Remove a few dangling binary logs
* !fixup! Correct typos in generation scripts
* !fixup! Another typo in the generation scripts
Diffstat (limited to 'Directory.Build.props')
| -rw-r--r-- | Directory.Build.props | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index edd4ebe1aa..010f6b68fb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -180,7 +180,7 @@ <!-- Projects which reference Microsoft.AspNetCore.Mvc.Testing should import this targets file to ensure dependency .deps.json files are copied into test output. --> <MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets> <!-- IIS native projects can only be built on Windows for x86 and x64. --> - <BuildIisNativeProjects Condition=" $(BuildNative) AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64') ">true</BuildIisNativeProjects> + <BuildIisNativeProjects Condition=" '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64') ">true</BuildIisNativeProjects> <!-- This property is shared by several projects to layout the AspNetCore.App targeting pack for installers --> <TargetingPackLayoutRoot>$(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\</TargetingPackLayoutRoot> <!-- This property is shared by several projects to layout the AspNetCore.App shared framework for installers --> |