diff options
| author | chcosta <chcosta@microsoft.com> | 2016-12-17 00:05:30 +0300 |
|---|---|---|
| committer | Wes Haggard <weshaggard@users.noreply.github.com> | 2016-12-17 00:05:30 +0300 |
| commit | 3398321b7a54c5d47e4530651d3bee43794c1320 (patch) | |
| tree | b58cf1202155e3b5813513586d8e50c871458373 /dir.targets | |
| parent | 8cc83b44f3d4a799199c4c7eb9c85b7dd853e220 (diff) | |
Use static configurations for building a vertical (#14489)
* Build each configuration of corefx tools
* Fully qualify path to props files for import
* Build using static configurations
* Package build, ignore references to System.Threading.Overlapped and
System.Runtime.Serialization.Formatters which aren't being built at the
moment.
* Rename target
* Remove unintentional add of baseline file
* Configuration fixes, fix typo in netci.groovy, re-enable specifying
OSGroup property
* Interim build, overbuilds reference assemblies
* Reduce to passing Configurations
* Fix traversal, undefine configuration for contract projects, remove
trimunconverted (not used)
* lower message importance
* Minor fixes, changing messages, fixing comment
* system.runtime.extensions contract causes binclash because it requires a
configuration. temporarily disable configuration
* Fix trimming of projects
* Eliminate circular dependency in package build
* Fix OSX build
* Cleanup, less msbuild invocations
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dir.targets b/dir.targets index e61cdbd86b..198c9b508a 100644 --- a/dir.targets +++ b/dir.targets @@ -13,24 +13,17 @@ <Target Name="RebuildAndTest" DependsOnTargets="Rebuild;Test" /> <Target Name="Test" /> - <Target Name="AnnotateProjectsWithConfiguration" - Returns="@(ProjectWithConfiguration)" > - <ItemGroup> - <ProjectWithConfiguration Include="@(Project)" /> - </ItemGroup> - </Target> - - - <!-- build vertical requires the FindBestConfiguration task which is currently in CoreFx.Tools.dll --> - <Import Project="buildvertical.targets" Condition="Exists('$(CoreFxToolsTaskDir)CoreFx.Tools.dll')" /> + <!-- build vertical requires the FindBestConfiguration task which is currently in CoreFx.Tools.dll --> + <Import Project="buildvertical.targets" Condition="Exists('$(CoreFxToolsTaskDir)CoreFx.Tools.dll')" /> - <Target Name="UndefineTestTFM" BeforeTargets="AssignProjectConfiguration"> + <Target Name="UndefineTestTFM" + BeforeTargets="AssignProjectConfiguration"> <ItemGroup> - <ProjectReference> <!-- Always undefine TestTFM and FilterToTestTFM for all project reference as not needed for compilation and avoid bin clash tool to fail --> + <ProjectReference> <UndefineProperties>%(ProjectReference.UndefineProperties);TestTFM;FilterToTestTFM</UndefineProperties> </ProjectReference> </ItemGroup> @@ -85,4 +78,11 @@ </ItemGroup> </Target> + <Target Name="ReportConfigurationErrorMessage" + BeforeTargets="AssignProjectConfiguration" + Condition="'$(BuildConfigurations)' != ''" > + <Message Importance="Low" Text="$(MSBuildProjectFullPath), C: $(Configuration) BC: $(BuildConfiguration) BCs: $(BuildConfigurations)" /> + <Message Importance="High" Condition="'$(ConfigurationErrorMsg)' != ''" Text="$(MSBuildProjectFullPath) ConfigurationErrorMessage: $(ConfigurationErrorMsg)" /> + </Target> + </Project> |