Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 038fb6f

Browse files
Sridhar-MSSridhar-MS
authored
Merge pull request #4221 from dotnet/sridhar-ms/multiple-proj-migrate
Migrate P2P references
2 parents dfc5650 + ec7aa87 commit 038fb6f

File tree

24 files changed

+523
-46
lines changed

24 files changed

+523
-46
lines changed

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/.noautobuild‎

Whitespace-only changes.

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/Program.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
using System.Diagnostics;
6+
7+
namespace TestApp
8+
{
9+
public class Program
10+
{
11+
public static int Main(string[] args)
12+
{
13+
Console.WriteLine("This string came from ProjectA");
14+
return 100;
15+
}
16+
}
17+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json.1‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"version": "1.0.0-*",
3+
"buildOptions": {
4+
"emitEntryPoint": true,
5+
"preserveCompilationContext": true
6+
},
7+
"dependencies": {
8+
"ProjectB": {
9+
"target": "project",
10+
"version": "1.0.0-*"
11+
},
12+
"ProjectC": {
13+
"target": "project",
14+
"version": "1.0.0-*"
15+
},
16+
"Microsoft.NETCore.App": "1.0.1"
17+
},
18+
"frameworks": {
19+
"netcoreapp1.0": {}
20+
},
21+
"runtimes": {
22+
"win7-x64": {},
23+
"win7-x86": {},
24+
"osx.10.10-x64": {},
25+
"osx.10.11-x64": {},
26+
"ubuntu.14.04-x64": {},
27+
"ubuntu.16.04-x64": {},
28+
"centos.7-x64": {},
29+
"rhel.7.2-x64": {},
30+
"debian.8-x64": {},
31+
"fedora.23-x64": {},
32+
"opensuse.13.2-x64": {}
33+
}
34+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/.noautobuild‎

Whitespace-only changes.

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/Helper.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
6+
namespace TestLibrary
7+
{
8+
public static class ProjectB
9+
{
10+
public static string GetMessage()
11+
{
12+
return "This string came from ProjectB";
13+
}
14+
}
15+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/project.json.1‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "1.0.0-*",
3+
"buildOptions": {
4+
"nowarn": [
5+
"CS1591"
6+
],
7+
"xmlDoc": true,
8+
"additionalArguments": [
9+
"-highentropyva+"
10+
]
11+
},
12+
"dependencies": {
13+
"ProjectC": {
14+
"target": "project",
15+
"version": "1.0.0-*"
16+
},
17+
"ProjectD": {
18+
"target": "project",
19+
"version": "1.0.0-*"
20+
},
21+
"NETStandard.Library": "1.6.0"
22+
},
23+
"frameworks": {
24+
"netstandard1.5": {}
25+
}
26+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/.noautobuild‎

Whitespace-only changes.

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/Helper.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
6+
namespace TestLibrary
7+
{
8+
public static class ProjectC
9+
{
10+
public static string GetMessage()
11+
{
12+
return "This string came from ProjectC";
13+
}
14+
}
15+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/ProjectC.xproj‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>084222f1-7909-48f4-81e8-a97398b26b1c</ProjectGuid>
10+
<RootNamespace>ProjectC</RootNamespace>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">bin</OutputPath>
13+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
14+
</PropertyGroup>
15+
<PropertyGroup>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
</PropertyGroup>
18+
<ItemGroup>
19+
<ProjectReference Include="..\..\ClassLibrary1\ClassLibrary1.csproj" />
20+
<ProjectReference Include="..\..\ClassLibrary2\ClassLibrary2.csproj" />
21+
</ItemGroup>
22+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
23+
</Project>

‎TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json.1‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"version": "1.0.0-*",
3+
"buildOptions": {
4+
"nowarn": [
5+
"CS1591"
6+
],
7+
"xmlDoc": true,
8+
"additionalArguments": [
9+
"-highentropyva+"
10+
]
11+
},
12+
"dependencies": {
13+
"ProjectD": {
14+
"target": "project",
15+
"version": "1.0.0-*"
16+
},
17+
"ProjectE": {
18+
"target": "project",
19+
"version": "1.0.0-*"
20+
},
21+
"ClassLibrary1": {
22+
"target": "project"
23+
},
24+
"ClassLibrary2": {
25+
"target": "project"
26+
},
27+
"NETStandard.Library": "1.6.0"
28+
},
29+
"frameworks": {
30+
"netstandard1.5": {}
31+
}
32+
}

0 commit comments

Comments
 (0)