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

Updating the msbuild changes to handle DependencyModel coming from core-setup instead of a project dependency.

Browse source
This commit is contained in:
Livar Cunha 2016-08-08 12:19:10 -07:00
parent e900e23544
commit 0a55a7cb99
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build/test/TestPackageProjects.targets
View file

@ -197,15 +197,6 @@
<Clean>False</Clean> <Clean>False</Clean>
<Frameworks>net451;netstandard1.3</Frameworks> <Frameworks>net451;netstandard1.3</Frameworks>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.Extensions.DependencyModel">
<Name>Microsoft.Extensions.DependencyModel</Name>
<IsTool>True</IsTool>
<IsApplicable>True</IsApplicable>
<VersionPrefix>1.0.1-beta-</VersionPrefix>
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
<Clean>False</Clean>
<Frameworks>net451;netstandard1.6</Frameworks>
</BaseTestPackageProject>
<BaseTestPackageProject Include="src/Microsoft.Extensions.Testing.Abstractions"> <BaseTestPackageProject Include="src/Microsoft.Extensions.Testing.Abstractions">
<Name>Microsoft.Extensions.Testing.Abstractions</Name> <Name>Microsoft.Extensions.Testing.Abstractions</Name>
<IsTool>True</IsTool> <IsTool>True</IsTool>

6
src/Microsoft.DotNet.Core.Build.Tasks/project.json
View file

@ -5,10 +5,8 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyModel": { "NuGet.ProjectModel": "3.5.0-rc1-1697",
"target": "project" "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000914"
},
"NuGet.ProjectModel": "3.5.0-rc1-1697"
}, },
"frameworks": { "frameworks": {
"net451": { "net451": {

3
test/Microsoft.DotNet.Core.Build.Tasks.Tests/project.json
View file

@ -11,6 +11,9 @@
"Microsoft.DotNet.Core.Build.Tasks": { "Microsoft.DotNet.Core.Build.Tasks": {
"target": "project" "target": "project"
}, },
"Microsoft.DotNet.InternalAbstractions": {
"target": "project"
},
"xunit": "2.1.0", "xunit": "2.1.0",
"FluentAssertions.Json": "4.12.0", "FluentAssertions.Json": "4.12.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-192208-24"