dotnet · eerhardt · Feb 10, 2017 · Feb 3, 2017 · Feb 3, 2017 · Feb 3, 2017
diff --git a/Common.props b/Common.props
@@ -50,7 +50,8 @@
     <!-- Prepare assembly metadata -->
     <Authors>Microsoft Corporation</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(BUILD_BUILDNUMBER)' == ''">$(VersionPrefix).0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(BUILD_BUILDNUMBER)' != ''">$(VersionPrefix).$([MSBuild]::Subtract($(BuildNumberPart1), $(BuildEpoch)))</AssemblyVersion>
     <FileVersion Condition="'$(BUILD_BUILDNUMBER)' == ''">$(VersionPrefix).0</FileVersion>
     <FileVersion Condition="'$(BUILD_BUILDNUMBER)' != ''">$(VersionPrefix).$([MSBuild]::Subtract($(BuildNumberPart1), $(BuildEpoch)))</FileVersion>
     <InformationalVersion>$(VersionPrefix).$(BuildNumber)</InformationalVersion>

diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-1.0.0-rc4-004711
+1.0.0-rc4-004771
diff --git a/TestAssets/TestProjects/NetCoreApp11WithP2P/App/App.csproj b/TestAssets/TestProjects/NetCoreApp11WithP2P/App/App.csproj
@@ -9,8 +9,4 @@
     <ProjectReference Include="..\Library\Library.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.1.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/TestAssets/TestProjects/NetCoreApp11WithP2P/Library/Library.csproj b/TestAssets/TestProjects/NetCoreApp11WithP2P/Library/Library.csproj
@@ -4,8 +4,4 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.1.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <MsBuildPackagesVersion>0.1.0-preview-00028-160627</MsBuildPackagesVersion>
     <CoreSetupVersion>1.0.1-beta-000933</CoreSetupVersion>
-    <NuGetVersion>4.0.0-rtm-2259</NuGetVersion>
+    <NuGetVersion>4.0.0-rtm-2275</NuGetVersion>
   </PropertyGroup>
 
   <!-- Dependencies from test projects -->

diff --git a/build/Nuget/Microsoft.NET.Sdk.nuspec b/build/Nuget/Microsoft.NET.Sdk.nuspec
@@ -11,7 +11,7 @@
     <authors>dotnet</authors>
     <projectUrl>http://dot.net</projectUrl>
     <dependencies>
-        <dependency id="Nuget.Build.Tasks.Pack" version="4.0.0-rtm-2259" />
+        <dependency id="Nuget.Build.Tasks.Pack" version="4.0.0-rtm-2275" />
     </dependencies>
   </metadata>
   <files>

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenACompilationOptionsConverter.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenACompilationOptionsConverter.cs
@@ -40,7 +40,7 @@ public static IEnumerable<object[]> CompilerOptionsData
                             { "LangVersion", "6" },
                             { "PlatformTarget", "x64" },
                             { "AllowUnsafeBlocks", "true" },
-                            { "WarningsAsErrors", "false" },
+                            { "TreatWarningsAsErrors", "false" },
                             //{ "Optimize", "" }, Explicitly not setting Optmize
                             { "AssemblyOriginatorKeyFile", "../keyfile.snk" },
                             { "DelaySign", "" },

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/CompilationOptionsConverter.cs b/src/Tasks/Microsoft.NET.Build.Tasks/CompilationOptionsConverter.cs
@@ -21,7 +21,7 @@ public static CompilationOptions ConvertFrom(ITaskItem compilerOptionsItem)
                 compilerOptionsItem.GetMetadata("LangVersion"),
                 compilerOptionsItem.GetMetadata("PlatformTarget"),
                 compilerOptionsItem.GetBooleanMetadata("AllowUnsafeBlocks"),
-                compilerOptionsItem.GetBooleanMetadata("WarningsAsErrors"),
+                compilerOptionsItem.GetBooleanMetadata("TreatWarningsAsErrors"),
                 compilerOptionsItem.GetBooleanMetadata("Optimize"),
                 compilerOptionsItem.GetMetadata("AssemblyOriginatorKeyFile"),
                 compilerOptionsItem.GetBooleanMetadata("DelaySign"),

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs
@@ -39,12 +39,6 @@ public class GenerateRuntimeConfigurationFiles : TaskBase
 
         public string PlatformLibraryName { get; set; }
 
-        /// <summary>
-        /// The version of the shared framework that should be used.  If not specified, it will
-        /// be the package version of the <see cref="PlatformLibraryName"/> package.
-        /// </summary>
-        public string RuntimeFrameworkVersion { get; set; }
-
         public string UserRuntimeConfig { get; set; }
 
         public ITaskItem[] HostConfigurationOptions { get; set; }
@@ -99,14 +93,7 @@ private void AddFramework(RuntimeOptions runtimeOptions, ProjectContext projectC
                 {
                     RuntimeConfigFramework framework = new RuntimeConfigFramework();
                     framework.Name = platformLibrary.Name;
-                    if (!string.IsNullOrEmpty(RuntimeFrameworkVersion))
-                    {
-                        framework.Version = RuntimeFrameworkVersion;
-                    }
-                    else
-                    {
-                        framework.Version = platformLibrary.Version.ToNormalizedString();
-                    }
+                    framework.Version = platformLibrary.Version.ToNormalizedString();
 
                     runtimeOptions.Framework = framework;
                     runtimeOptions.tfm = TargetFramework;

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GetNearestTargetFramework.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GetNearestTargetFramework.cs
@@ -58,7 +58,7 @@ protected override void ExecuteCore()
             var nearestNuGetFramework = new FrameworkReducer().GetNearest(referringNuGetFramework, possibleNuGetFrameworks);
             if (nearestNuGetFramework == null)
             {
-                Log.LogError(Strings.NoCompatibleTargetFramework, ProjectFilePath, ReferringTargetFramework);
+                Log.LogError(Strings.NoCompatibleTargetFramework, ProjectFilePath, ReferringTargetFramework, string.Join("; ", possibleNuGetFrameworks));
                 return;
             }
 

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs b/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs
@@ -90,7 +90,7 @@ public static HashSet<string> GetPlatformExclusionList(
             LockFileTargetLibrary platformLibrary,
             IDictionary<string, LockFileTargetLibrary> libraryLookup)
         {
-            var exclusionList = new HashSet<string>();
+            var exclusionList = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
             exclusionList.Add(platformLibrary.Name);
             CollectDependencies(libraryLookup, platformLibrary.Dependencies, exclusionList);

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -90,6 +90,9 @@
     <None Include="buildCrossTargeting\Microsoft.NET.Sdk.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="build\Microsoft.NET.DefaultAssemblyInfo.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="build\Microsoft.NET.DefaultOutputPaths.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs
@@ -39,7 +39,7 @@ public IEnumerable<LockFileTargetLibrary> GetRuntimeLibraries(IEnumerable<string
             Dictionary<string, LockFileTargetLibrary> libraryLookup =
                 runtimeLibraries.ToDictionary(e => e.Name, StringComparer.OrdinalIgnoreCase);
 
-            HashSet<string> allExclusionList = new HashSet<string>();
+            HashSet<string> allExclusionList = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
             if (IsPortable)
             {

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Resources/Strings.resx b/src/Tasks/Microsoft.NET.Build.Tasks/Resources/Strings.resx
@@ -121,7 +121,7 @@
     <value>At least one possible target framework must be specified.</value>
   </data>
   <data name="NoCompatibleTargetFramework" xml:space="preserve">
-    <value>Project '{0}' has no target framework compatible with '{1}'.</value>
+    <value>Project '{0}' targets '{2}'. It cannot be referenced by a project that targets '{1}'.</value>
   </data>
   <data name="InvalidFrameworkName" xml:space="preserve">
     <value>Invalid framework name: '{0}'.</value>

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.DefaultAssemblyInfo.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.DefaultAssemblyInfo.targets
@@ -0,0 +1,31 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.DefaultAssemblyInfo.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved. 
+***********************************************************************************************
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Version)' == '' ">
+    <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.0.0</VersionPrefix>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors Condition=" '$(Authors)'=='' ">$(AssemblyName)</Authors>
+    <Company Condition=" '$(Company)'=='' ">$(Authors)</Company>
+    <AssemblyTitle Condition=" '$(AssemblyTitle)' == '' ">$(AssemblyName)</AssemblyTitle>
+    <Product Condition=" '$(Product)' == ''">$(AssemblyName)</Product>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.PreserveCompilationContext.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.PreserveCompilationContext.targets
@@ -28,7 +28,7 @@ Copyright (c) .NET Foundation. All rights reserved.
         <LangVersion>$(LangVersion)</LangVersion>
         <PlatformTarget>$(PlatformTarget)</PlatformTarget>
         <AllowUnsafeBlocks>$(AllowUnsafeBlocks)</AllowUnsafeBlocks>
-        <WarningsAsErrors>$(WarningsAsErrors)</WarningsAsErrors>
+        <TreatWarningsAsErrors>$(TreatWarningsAsErrors)</TreatWarningsAsErrors>
         <Optimize>$(Optimize)</Optimize>
         <AssemblyOriginatorKeyFile>$(AssemblyOriginatorKeyFile)</AssemblyOriginatorKeyFile>
         <DelaySign>$(DelaySign)</DelaySign>

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets
@@ -532,7 +532,6 @@ Copyright (c) .NET Foundation. All rights reserved.
                                        RuntimeConfigPath="$(PublishRuntimeConfigFilePath)"
                                        RuntimeIdentifier="$(RuntimeIdentifier)"
                                        PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"
-                                       RuntimeFrameworkVersion="$(RuntimeFrameworkVersion)"
                                        UserRuntimeConfig="$(UserRuntimeConfig)"
                                        HostConfigurationOptions="@(RuntimeHostConfigurationOption)" />
 
@@ -551,11 +550,6 @@ Copyright (c) .NET Foundation. All rights reserved.
           BeforeTargets="CopyFilesToPublishDirectory"
           Condition="'$(RenamePublishedHost)' == 'true'">
 
-    <PropertyGroup>
-      <_DotNetHostExecutableName>dotnet</_DotNetHostExecutableName>
-      <_DotNetHostExecutableName Condition="$(RuntimeIdentifier.StartsWith('win'))">$(_DotNetHostExecutableName).exe</_DotNetHostExecutableName>
-    </PropertyGroup>
-
     <ItemGroup>
 
       <ResolvedFileToPublish Condition="'%(ResolvedFileToPublish.RelativePath)' == '$(_DotNetHostExecutableName)'">

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.RuntimeIdentifierInference.targets
@@ -45,6 +45,21 @@ Copyright (c) .NET Foundation. All rights reserved.
     </Otherwise>
   </Choose>
 
+  <PropertyGroup>
+    <!-- AppendRuntimeIdentifierToOutputPath defaults to false since it is a breaking change to change the output path -->
+    <!-- Projects that build for multiple RIDs can set this to true to get a RID folder in their output path -->
+    <AppendRuntimeIdentifierToOutputPath Condition="'$(AppendRuntimeIdentifierToOutputPath)' == ''">false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <!--
+    Append $(RuntimeIdentifier) directory to output and intermediate paths to prevent bin clashes between
+    targets.
+   -->
+  <PropertyGroup Condition="'$(AppendRuntimeIdentifierToOutputPath)' == 'true' and '$(RuntimeIdentifier)' != ''">
+    <IntermediateOutputPath>$(IntermediateOutputPath)$(RuntimeIdentifier)\</IntermediateOutputPath>
+    <OutputPath>$(OutputPath)$(RuntimeIdentifier)\</OutputPath>
+  </PropertyGroup>
+
   <Target Name="_CheckRuntimeIdentifier" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
     <NetSdkError Condition="'$(RuntimeIdentifier)' == '' and '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(OutputType)' == 'Exe'"
                  ResourceName="RuntimeIdentifierMustBeSetForNETFramework" />

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.BeforeCommon.targets
@@ -15,6 +15,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DefaultAssemblyInfo.targets" />
+
   <!-- Set default intermediate and output paths -->
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DefaultOutputPaths.targets" />
 
@@ -64,7 +66,10 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Set PublishDir here, before Microsoft.Common.targets, to avoid a competing default there. -->
   <PropertyGroup>
     <PublishDirName Condition="'$(PublishDirName)' == ''">publish</PublishDirName>
-    <PublishDir Condition="'$(PublishDir)' == '' and '$(RuntimeIdentifier)' != ''">$(OutputPath)$(RuntimeIdentifier)\$(PublishDirName)\</PublishDir>
+    <!-- ensure the PublishDir is RID specific-->
+    <PublishDir Condition="'$(PublishDir)' == '' and
+                           '$(AppendRuntimeIdentifierToOutputPath)' != 'true' and
+                           '$(RuntimeIdentifier)' != ''">$(OutputPath)$(RuntimeIdentifier)\$(PublishDirName)\</PublishDir>
     <PublishDir Condition="'$(PublishDir)' == ''">$(OutputPath)$(PublishDirName)\</PublishDir>
   </PropertyGroup>
 

diff --git a/...asks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.BeforeCommonCrossTargeting.targets b/...asks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.BeforeCommonCrossTargeting.targets
@@ -11,6 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DefaultAssemblyInfo.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DefaultOutputPaths.targets" />
 
 </Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.Common.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.Common.targets
@@ -22,16 +22,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <MicrosoftNETBuildTasksAssembly>$(MicrosoftNETBuildTasksDirectory)Microsoft.NET.Build.Tasks.dll</MicrosoftNETBuildTasksAssembly>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.0.0</VersionPrefix>
-    <VersionSuffix Condition=" '$(VersionSuffix)' == '' "></VersionSuffix>
-    <Version Condition=" '$(Version)' == '' and '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
-    <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
-    <Authors Condition=" '$(Authors)'=='' ">$(AssemblyName)</Authors>
-    <Company Condition=" '$(Company)'=='' ">$(Authors)</Company>
-    <AssemblyTitle Condition="'$(AssemblyTitle)' == ''">$(AssemblyName)</AssemblyTitle>
-    <Product Condition="'$(Product)' == ''">$(AssemblyName)</Product>
-  </PropertyGroup>
 
   <UsingTask TaskName="GetNearestTargetFramework" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
   <UsingTask TaskName="NETSdkError" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
@@ -55,13 +45,17 @@ Copyright (c) .NET Foundation. All rights reserved.
     with the referencing project's target framework.
   ============================================================
    -->
-  <Target Name="GetTargetFrameworkProperties" Returns="TargetFramework=$(NearestTargetFramework)">
+  <Target Name="GetTargetFrameworkProperties" Returns="TargetFramework=$(NearestTargetFramework);ProjectHasSingleTargetFramework=$(_HasSingleTargetFramework)">
 
     <PropertyGroup>
       <!-- If a ReferringTargetFramework was not specified, and we only have one TargetFramework, then don't try to check compatibility -->
       <_SkipNearestTargetFrameworkResolution Condition="'$(TargetFramework)' != '' and '$(ReferringTargetFramework)' == ''">true</_SkipNearestTargetFrameworkResolution>
       <NearestTargetFramework Condition="'$(_SkipNearestTargetFrameworkResolution)' == 'true'">$(TargetFramework)</NearestTargetFramework>
-
+
+      <!-- A project can only have more than one output if the current global properties are such that the current build is a cross-targeting one. -->
+      <_HasSingleTargetFramework Condition="'$(IsCrossTargetingBuild)' != 'true'">true</_HasSingleTargetFramework>
+      <_HasSingleTargetFramework Condition="'$(_HasSingleTargetFramework)' == ''">false</_HasSingleTargetFramework>
+
       <_PossibleTargetFrameworks Condition="'$(TargetFramework)' != ''">$(TargetFramework)</_PossibleTargetFrameworks>
       <_PossibleTargetFrameworks Condition="'$(TargetFramework)' == ''">$(TargetFrameworks)</_PossibleTargetFrameworks>
     </PropertyGroup>

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.DefaultItems.props
@@ -34,7 +34,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </ItemGroup>
 
   <ItemGroup Condition=" '$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(NetCoreAppImplicitPackageVersion)" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="$(RuntimeFrameworkVersion)" IsImplicitlyDefined="true" />
   </ItemGroup>
 
 </Project>