Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default configs to be consumed by the new schema #949

Merged
merged 4 commits into from
Mar 16, 2017
Merged

Add default configs to be consumed by the new schema #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecdaaf6
Remove ProjectConfigurationsInferredFromUsage capability (which is de…
Mar 6, 2017
fcee9ac
Add default Platforms/Configurations properties and remove the previo…
Mar 6, 2017
523c055
Move the capability workaround out of the SDK (it will be in the desi…
Mar 16, 2017
33a551f
Fix issue link
Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,12 @@ Copyright (c) .NET Foundation. All rights reserved.

<!-- Default configuration and platform to Debug|AnyCPU-->
<PropertyGroup>
<Configurations Condition=" '$(Configurations)' == '' ">Debug;Release</Configurations>
<Platforms Condition=" '$(Platforms)' == '' ">AnyCPU</Platforms>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</PropertyGroup>

<!--
Ensure VS sees two default configurations: Debug|AnyCPU and Release|AnyCPU

This is temporary until we have designed and implemented a new configuration management scheme,
which is tracked by https://github.com/dotnet/sdk/issues/350. In the meantime, one consequence of
defining these defaults here with the old inference-from-usage scheme here is that the user cannot
remove or rename them.
-->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>

<!-- User-facing configuration-agnostic defaults -->
<PropertyGroup>
<OutputType>Library</OutputType>
Expand Down Expand Up @@ -128,6 +119,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<GenerateResourceMSBuildRuntime>CurrentRuntime</GenerateResourceMSBuildRuntime>
</PropertyGroup>

<!-- Workaround: https://github.com/dotnet/sdk/issues/1001 -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>

<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.CSharp.props" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.VisualBasic.props" Condition="'$(MSBuildProjectExtension)' == '.vbproj'" />
</Project>
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,5 +433,5 @@ Copyright (c) .NET Foundation. All rights reserved.
<Message Importance="Low" Text="Including @(ReferencePath)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandDesignTimeFacades'" />

</Target>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: extra whitespace line.

</Project>