Update to latest core-setup and clean up #7530
Conversation
This reverts commit 83b92ee.
nguerrera
force-pushed
the
dotnet-bot-master-UpdateDependencies
branch
from
d811bae to
ea6b970
Compare
nguerrera
changed the title
nguerrera
force-pushed
the
dotnet-bot-master-UpdateDependencies
branch
from
64b7b81 to
497f6c5
Compare
nguerrera
changed the title
| @@ -9,7 +9,7 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <ItemGroup> | |||
| <PackageReference Include="Newtonsoft.Json" Version="5.0.0" /> | |||
| <PackageReference Include="Newtonsoft.Json" Version="5.0.1" /> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -6,6 +6,9 @@ | |||
| <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion> | |||
| <AssemblyName>Msbuild.Tests.Utilities</AssemblyName> | |||
| <AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net451+win8</AssetTargetFallback> | |||
| <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -1,3 +1,6 @@ | |||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |||
| <Import Project="build/DependencyVersions.props" /> | |||
| <PropertyGroup> | |||
| <NoPackageAnalysis>true</NoPackageAnalysis> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -24,7 +24,7 @@ | |||
| <PackageReference Include="NuGet.ProjectModel" Version="$(CLI_NuGet_Version)" /> | |||
| <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" /> | |||
| <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(CLI_MSBuild_Version)" /> | |||
| <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" /> | |||
| <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -6,7 +6,6 @@ namespace Microsoft.DotNet.Cli | |||
| /// | |||
| /// <summary>Allows control flow to be interrupted in order to display help in the console.</summary> | |||
| /// | |||
| [Obsolete("This is intended to facilitate refactoring during parser replacement and should not be used after that work is done.")] | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| <!-- Only use asset target fallback that we set (not implicit one to net461). --> | ||
| <DisableImplicitAssetTargetFallback>true</DisableImplicitAssetTargetFallback> | ||
|
|
||
| <!-- Disable asset target fallback warning globally since it does not work transitively on NoWarn of individual packages --> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" /> | ||
| <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
build/DependencyVersions.props
Outdated
| @@ -1,7 +1,7 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |||
| <PropertyGroup> | |||
| <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion> | |||
| <CLI_SharedFrameworkVersion>2.1.0-preview2-25616-02</CLI_SharedFrameworkVersion> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Resolved conflicts for #6942 (I don't have push access to that). Gets everything on latest core-setup, not just runtime. Hopefully the pump is unblocked after this.
Unpinned stage0
Retargeted to netcoreapp2.1 to fix build
Re-enabled tests that were disabled against msbuild quoting bug on netcoreapp2.1
Finally got rid of the warnings in the build. Fixes #7350
@eerhardt