diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-09-27 00:09:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 00:09:45 +0300 |
| commit | c6dbe361680efd21a20fdb8def01936b1031011c (patch) | |
| tree | 6e06e391f327b419dcd02d2075edc59a72acd5e4 /external | |
| parent | ac2e1e3509f637f0b4122d8d2fff1ee96f003e54 (diff) | |
Updating CLI to 2.0.0 version (#23751)
* Updating CLI to 2.0.0 version
* Fixing Tizen build by disabling warnings that for package downgrades due to missing RID specific packages for Tizen
Diffstat (limited to 'external')
| -rw-r--r-- | external/ILLink/illink.runtimeconfig.json | 2 | ||||
| -rw-r--r-- | external/runtime/runtime.depproj | 1 | ||||
| -rw-r--r-- | external/test-runtime/XUnit.Runtime.depproj | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/external/ILLink/illink.runtimeconfig.json b/external/ILLink/illink.runtimeconfig.json index 51d6286475..31f899f501 100644 --- a/external/ILLink/illink.runtimeconfig.json +++ b/external/ILLink/illink.runtimeconfig.json @@ -3,7 +3,7 @@ "tfm": "netcoreapp1.1", "framework": { "name": "Microsoft.NETCore.App", - "version": "2.0.0-preview1-001913-00" + "version": "2.0.0" } } } diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index 010011ee26..19f5f59ff8 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -5,6 +5,7 @@ <NugetRuntimeIdentifier>$(PackageRID)</NugetRuntimeIdentifier> <RidSpecificAssets>true</RidSpecificAssets> <CoreClrPackageVersion Condition="'$(TargetGroup)' == 'netcoreapp2.0'">2.0.0</CoreClrPackageVersion> + <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'"> <!-- Temporarily Override restore moniker since NETNative's targeting pack still uses uap10.1 moniker --> diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj index 643c7f2e51..c73ff24e18 100644 --- a/external/test-runtime/XUnit.Runtime.depproj +++ b/external/test-runtime/XUnit.Runtime.depproj @@ -15,6 +15,8 @@ <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uapaot'">netstandard2.0</NuGetTargetMonikerShort> <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'uap'">.NETStandard,Version=v2.0</NuGetTargetMoniker> <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uap'">netstandard2.0</NuGetTargetMonikerShort> + <!-- Don't warn if some dependencies were rolled forward --> + <NoWarn>$(NoWarn);NU1603</NoWarn> </PropertyGroup> <ItemGroup> <PackageReference Include="xunit.console.netcore"> |