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

Commit 5c6e3a0

Browse files
Sridhar-MSSridhar-MS
authored
Merge pull request #4305 from dotnet/sridhar-ms/migrate-p2p-fix
Fix P2P migration and migrate folders in global.json
2 parents f24f8c6 + c606467 commit 5c6e3a0

File tree

41 files changed

+450
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+450
-81
lines changed

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/.noautobuild‎

Whitespace-only changes.

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
3+
4+
<PropertyGroup>
5+
<OutputType>Library</OutputType>
6+
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
7+
<TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
12+
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
13+
<None Include="project.json" />
14+
</ItemGroup>
15+
16+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
17+
</Project>

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/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 CsprojLibrary1";
13+
}
14+
}
15+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"dependencies": {},
3+
"frameworks": {
4+
"netstandard1.5": {
5+
"dependencies": {
6+
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
7+
"NETStandard.Library": "1.6.0"
8+
}
9+
}
10+
}
11+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/.noautobuild‎

Whitespace-only changes.

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
3+
4+
<PropertyGroup>
5+
<OutputType>Library</OutputType>
6+
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
7+
<TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
12+
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
13+
<None Include="project.json" />
14+
</ItemGroup>
15+
16+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
17+
</Project>

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/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 CsprojLibrary2";
13+
}
14+
}
15+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"dependencies": {},
3+
"frameworks": {
4+
"netstandard1.5": {
5+
"dependencies": {
6+
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
7+
"NETStandard.Library": "1.6.0"
8+
}
9+
}
10+
}
11+
}

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/.noautobuild‎

Whitespace-only changes.

‎TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
3+
4+
<PropertyGroup>
5+
<OutputType>Library</OutputType>
6+
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
7+
<TargetFrameworkVersion>v1.5</TargetFrameworkVersion>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
12+
<EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
13+
<None Include="project.json" />
14+
</ItemGroup>
15+
16+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
17+
</Project>

0 commit comments

Comments
 (0)