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.

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

Merge master into future #857

Merged
merged 41 commits into from
Feb 10, 2017
Merged

Merge master into future #857

merged 41 commits into from
Feb 10, 2017

Conversation

eerhardt
Copy link
Member

mavasani and others added 30 commits February 3, 2017 11:14
…pilationContext targets.

TreatWarningsAsErrors controls warning as error behavior for the entire compilation, while WarningsAsErrors is a string of set of diagnostic IDs that need to be treated as errors.

Fixes dotnet#756
Partially fixes dotnet#739.

The first iteration of cross-targeting support code unconditionally
queried each ProjectReference for the best TFM to build against, and
then explicitly specified that TFM when building the reference. This
caused a race condition when building a set of projects that had a
single-TFM project and another project that had a reference to it. The
entry point (probably .sln) build would build the referenced project
with no TF specified, and then the referencing project would build it
with an explicit TF specified. These two builds appeared different to
the MSBuild engine (because they had different sets of global
properties) and so were both executed, resulting in a race condition.

The fix is in two parts:
* Allow a project to report back through GetTargetFrameworkProperties
that it only has one TF to build.
* When a project reports that it has only one TF to build, issue its
build request without specifying any TF (dotnet/msbuild#1667)

This commit is the former.
Use TreatWarningsAsErrors instead of WarningsAsErrors for PreserveCom…
Update property name for exclude pattern in project folder to match where it's consumed
Giving more information on 'No compatiblity target frameowrk' failure
Add options for appending TFM and RID to the output path.  Default the RID option to 'false', since it would be a breaking change at this point.

Add extra comments explaining the difference between build and publish outputs in .NET Core projects.
Update the assembly version with every nightly build. Fixes dotnet#488.
Use case insensitive comparison for determining which packages should be excluded from publishing
'dotnet run' doesn't work on self-contained apps
This prevents a conflict with Version being set to 1.0.0.0 by
desktop targets before we have a chance to set it to 1.0.0, which
was breaking restore. It also breaks VersionPrefix for net4x
projects built with desktop msbuild.

Also leaving VersionPrefix unset if we do not use it.
Add default values for boolean properties consumed on the advanced build property page
This was benign because imports are already relative to the importing
project and the misspelling of MSBuildThisFileDirectory evaluated to
empty.
Set version early enough not to be overridden by winfx targets on desktop
eerhardt and others added 11 commits February 7, 2017 17:10
Our self-contained tests use netcoreapp1.0 and the current machine's RID.  When building/running on OSX Sierra this is a problem because netcoreapp1.0 only supported the previous 2 OSX versions.

The fix is to check if we are running on a newer OSX machine than what was supported, and downgrade the RID to a supported RID.

Fix dotnet#834
Fixing self-contained tests on OSX Sierra
Fix typo in .targets header comment
…on-686

Match Microsoft.NETCore.App package version to runtime version, and allow it to float
@eerhardt eerhardt merged commit 1f2a62b into dotnet:future Feb 10, 2017
@eerhardt eerhardt deleted the merge-master branch February 10, 2017 23:12
mmitche pushed a commit to mmitche/sdk that referenced this pull request Jun 5, 2020
…807.9 (dotnet#857)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19407.9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants