mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

moving dependecymodel and platformabstraction to preview1-001960

Browse source
This commit is contained in:
Rama Krishnan Raghupathy 2017-04-11 13:17:33 -07:00
parent b3e02565ab
commit 2f5673f953
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
View file

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework> <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
</PropertyGroup> </PropertyGroup>

4
build/DependencyVersions.props
View file

@ -14,8 +14,8 @@
<TemplateEngineVersion>1.0.0-beta2-20170410-189</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta2-20170410-189</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170410-189</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta2-20170410-189</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170410-189</TemplateEngineTemplate2_0Version> <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170410-189</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>1.0.3</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.0.0-preview1-001960</PlatformAbstractionsVersion>
<DependencyModelVersion>1.0.3</DependencyModelVersion> <DependencyModelVersion>2.0.0-preview1-001960</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
</PropertyGroup> </PropertyGroup>

2
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
View file

@ -27,7 +27,7 @@
<!-- This dependency was added due to an issue in restore where a lower version of this package coming from nuget.commandline.xplat <!-- This dependency was added due to an issue in restore where a lower version of this package coming from nuget.commandline.xplat
led to an error. This is tracked as NuGet issue : https://github.com/NuGet/Home/issues/4213 --> led to an error. This is tracked as NuGet issue : https://github.com/NuGet/Home/issues/4213 -->
<PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" /> <PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" /> <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="1.0.3" />
<PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" /> <PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/dotnet-store.Tests/GivenDotnetStoresAndPublishesProjects.cs
View file

@ -101,7 +101,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
new DotnetCommand() new DotnetCommand()
.ExecuteWithCapturedOutput(outputDll) .ExecuteWithCapturedOutput(outputDll)
.Should().Fail() .Should().Fail()
.And.HaveStdErrContaining("assembly specified in the dependencies manifest was not found -- package: 'newtonsoft.json',"); .And.HaveStdErrContaining("assembly specified in the dependencies manifest was not found -- package: 'Newtonsoft.Json',");
} }
[Fact] [Fact]