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

Fix P2P migration

Browse source 
Fixes #4269 by deep cloning the MsbuildTemplateProject for each P2P reference. Add test which migrates and builds P2P references.
This commit is contained in:
Sridhar Periyasamy 2016-10-03 10:58:32 -07:00
parent 09e8877bd4
commit a396630576
27 changed files with 201 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

0
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/.noautobuild Normal file
View file

17
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj Normal file
View file

@ -0,0 +1,17 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
<None Include="project.json" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/Helper.cs → TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/Helper.cs
View file

@ -5,11 +5,11 @@ using System;
namespace TestLibrary
{
public static class ProjectE
public static class ProjectC
{
public static string GetMessage()
{
return "This string came from ProjectF";
return "This string came from CsprojLibrary1";
}
}
}

11
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json Normal file
View file

@ -0,0 +1,11 @@
{
"dependencies": {},
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
"NETStandard.Library": "1.6.0"
}
}
}
}

0
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/.noautobuild Normal file
View file

17
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj Normal file
View file

@ -0,0 +1,17 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
<None Include="project.json" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

15
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/Helper.cs Normal file
View file

@ -0,0 +1,15 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace TestLibrary
{
public static class ProjectC
{
public static string GetMessage()
{
return "This string came from CsprojLibrary2";
}
}
}

11
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json Normal file
View file

@ -0,0 +1,11 @@
{
"dependencies": {},
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
"NETStandard.Library": "1.6.0"
}
}
}
}

0
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/.noautobuild Normal file
View file

17
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj Normal file
View file

@ -0,0 +1,17 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
<None Include="project.json" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

15
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/Helper.cs Normal file
View file

@ -0,0 +1,15 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
namespace TestLibrary
{
public static class ProjectC
{
public static string GetMessage()
{
return "This string came from CsprojLibrary3";
}
}
}

11
TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json Normal file
View file

@ -0,0 +1,11 @@
{
"dependencies": {},
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
"NETStandard.Library": "1.6.0"
}
}
}
}

2
TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/Program.cs
View file

@ -11,7 +11,7 @@ namespace TestApp
public static int Main(string[] args)
{
Console.WriteLine("This string came from ProjectA");
return 100;
return 0;
}
}
}

0
TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json
View file

0
TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/project.json
View file

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/ProjectC.xproj
View file

@ -16,8 +16,8 @@
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\ClassLibrary1\ClassLibrary1.csproj" />
<ProjectReference Include="..\..\ClassLibrary2\ClassLibrary2.csproj" />
<ProjectReference Include="..\CsprojLibrary1\CsprojLibrary1.csproj" />
<ProjectReference Include="..\CsprojLibrary2\CsprojLibrary2.csproj" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json
View file

@ -18,10 +18,10 @@
"target": "project",
"version": "1.0.0-*"
},
"ClassLibrary1": {
"CsprojLibrary1": {
"target": "project"
},
"ClassLibrary2": {
"CsprojLibrary2": {
"target": "project"
},
"NETStandard.Library": "1.6.0"

0
TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/project.json
View file

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/ProjectE.xproj
View file

@ -16,8 +16,8 @@
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\ClassLibrary2\ClassLibrary2.csproj" />
<ProjectReference Include="..\..\ClassLibrary3\ClassLibrary3.csproj" />
<ProjectReference Include="..\CsprojLibrary2\CsprojLibrary2.csproj" />
<ProjectReference Include="..\CsprojLibrary3\CsprojLibrary3.csproj" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

4
TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/project.json
View file

@ -10,10 +10,10 @@
]
},
"dependencies": {
"ClassLibrary2": {
"CsprojLibrary2": {
"target": "project"
},
"ClassLibrary3": {
"CsprojLibrary3": {
"target": "project"
},
"NETStandard.Library": "1.6.0"

19
TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/Program.cs Normal file
View file

@ -0,0 +1,19 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Diagnostics;
namespace TestApp
{
public class Program
{
public static int Main(string[] args)
{
Console.WriteLine("This string came from ProjectF");
string helperStr = TestLibrary.ProjectG.GetMessage();
Console.WriteLine(helperStr);
return 0;
}
}
}

16
TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json
View file

@ -1,22 +1,20 @@
{
"version": "1.0.0-*",
"buildOptions": {
"nowarn": [
"CS1591"
],
"xmlDoc": true,
"additionalArguments": [
"-highentropyva+"
]
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"dependencies": {
"ProjectG": {
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.6.0"
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
}
},
"frameworks": {
"netstandard1.5": {}
"netcoreapp1.0": {}
}
}

2
TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/Helper.cs
View file

@ -5,7 +5,7 @@ using System;
namespace TestLibrary
{
public static class ProjectE
public static class ProjectG
{
public static string GetMessage()
{

0
TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/project.json.1 → TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/project.json
View file