[WIP] Removes *3 verbs, making msbuild the driver (#4456)
Removes *3 verbs, making msbuild the driver
This commit is contained in:
Piotr Puszkiewicz
GitHub
parent
55c59d621e
commit
6fcbefa4f7
746 changed files with 4256 additions and 32434 deletions
|
|
@ -1 +1 @@
|
||||||
latest
|
1.0.0-preview3-003930
|
||||||
|
|
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -6,6 +6,9 @@
|
||||||
# Multicore JIT Optimization profiles
|
# Multicore JIT Optimization profiles
|
||||||
**/optimizationdata/dotnet
|
**/optimizationdata/dotnet
|
||||||
|
|
||||||
|
# Test Asset Manager files
|
||||||
|
.tam/
|
||||||
|
|
||||||
# NuGet keeps dropping
|
# NuGet keeps dropping
|
||||||
Library/
|
Library/
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"dotnet-desktop-and-portable": "1.0.0-*"
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"imports": [
|
|
||||||
"portable-net45+win8",
|
|
||||||
"dnxcore50"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"net451": {}
|
|
||||||
},
|
|
||||||
"tools": {
|
|
||||||
"dotnet-dependency-tool-invoker": {
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"imports": [
|
|
||||||
"dnxcore50",
|
|
||||||
"portable-net45+win8"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
47
TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
Normal file
47
TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="dotnet-desktop-and-portable">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NET451</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
47
TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
Normal file
47
TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.0</PackageTargetFallback>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="dotnet-desktop-and-portable">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NET451</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": false
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"dotnet-desktop-and-portable": "1.0.0-*"
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netstandard1.6": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
},
|
|
||||||
"imports": [
|
|
||||||
"portable-net45+win8",
|
|
||||||
"dnxcore50",
|
|
||||||
"netcoreapp1.0"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"net451": {}
|
|
||||||
},
|
|
||||||
"tools": {
|
|
||||||
"dotnet-dependency-tool-invoker": {
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"imports": [
|
|
||||||
"dnxcore50",
|
|
||||||
"portable-net45+win8"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem">
|
||||||
|
<Version>1.0.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"imports": "dnxcore50"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Microsoft.DotNet.ProjectModel;
|
|
||||||
using Microsoft.DotNet.Cli.Utils;
|
using Microsoft.DotNet.Cli.Utils;
|
||||||
using NuGet.Frameworks;
|
using NuGet.Frameworks;
|
||||||
|
|
||||||
|
|
@ -25,12 +24,6 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
var projectContexts =
|
|
||||||
CreateProjectContexts(dotnetParams.ProjectPath)
|
|
||||||
.Where(p => dotnetParams.Framework == null ||
|
|
||||||
dotnetParams.Framework.GetShortFolderName()
|
|
||||||
.Equals(p.TargetFramework.GetShortFolderName()));
|
|
||||||
|
|
||||||
var commandFactory =
|
var commandFactory =
|
||||||
new ProjectDependenciesCommandFactory(
|
new ProjectDependenciesCommandFactory(
|
||||||
dotnetParams.Framework,
|
dotnetParams.Framework,
|
||||||
|
|
@ -39,15 +32,7 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
|
||||||
dotnetParams.BuildBasePath,
|
dotnetParams.BuildBasePath,
|
||||||
dotnetParams.ProjectPath);
|
dotnetParams.ProjectPath);
|
||||||
|
|
||||||
var result = 0;
|
var result = InvokeDependencyToolForMSBuild(commandFactory, dotnetParams);
|
||||||
if(projectContexts.Any())
|
|
||||||
{
|
|
||||||
result = InvokeDependencyToolForProjectJson(projectContexts, commandFactory, dotnetParams);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
result = InvokeDependencyToolForMSBuild(commandFactory, dotnetParams);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
@ -61,24 +46,6 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
|
||||||
return InvokeDependencyTool(commandFactory, dotnetParams, dotnetParams.Framework);
|
return InvokeDependencyTool(commandFactory, dotnetParams, dotnetParams.Framework);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int InvokeDependencyToolForProjectJson(
|
|
||||||
IEnumerable<ProjectContext> projectContexts,
|
|
||||||
ProjectDependenciesCommandFactory commandFactory,
|
|
||||||
DotnetBaseParams dotnetParams)
|
|
||||||
{
|
|
||||||
foreach (var projectContext in projectContexts)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Invoking '{dotnetParams.Command}' for '{projectContext.TargetFramework}'.");
|
|
||||||
|
|
||||||
if (InvokeDependencyTool(commandFactory, dotnetParams, projectContext.TargetFramework) != 0)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int InvokeDependencyTool(
|
private static int InvokeDependencyTool(
|
||||||
ProjectDependenciesCommandFactory commandFactory,
|
ProjectDependenciesCommandFactory commandFactory,
|
||||||
DotnetBaseParams dotnetParams,
|
DotnetBaseParams dotnetParams,
|
||||||
|
|
@ -106,22 +73,5 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IEnumerable<ProjectContext> CreateProjectContexts(string projectPath = null)
|
|
||||||
{
|
|
||||||
projectPath = projectPath ?? Directory.GetCurrentDirectory();
|
|
||||||
|
|
||||||
if (!projectPath.EndsWith(Project.FileName))
|
|
||||||
{
|
|
||||||
projectPath = Path.Combine(projectPath, Project.FileName);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!File.Exists(projectPath))
|
|
||||||
{
|
|
||||||
return Enumerable.Empty<ProjectContext>();
|
|
||||||
}
|
|
||||||
|
|
||||||
return ProjectContext.CreateContextForEachFramework(projectPath);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,12 +17,6 @@
|
||||||
"Microsoft.DotNet.Cli.Utils": {
|
"Microsoft.DotNet.Cli.Utils": {
|
||||||
"target": "project"
|
"target": "project"
|
||||||
},
|
},
|
||||||
"Microsoft.DotNet.ProjectModel": {
|
|
||||||
"target": "project"
|
|
||||||
},
|
|
||||||
"Microsoft.DotNet.Compiler.Common": {
|
|
||||||
"target": "project"
|
|
||||||
},
|
|
||||||
"NuGet.Frameworks": "3.6.0-rc-1984"
|
"NuGet.Frameworks": "3.6.0-rc-1984"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="ToolWithOutputName">
|
||||||
|
<Version>1.0.0</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"type": "platform"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
},
|
|
||||||
"tools": {
|
|
||||||
"ToolWithOutputName": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"target": "package"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="dotnet-hello">
|
||||||
|
<Version>1.0.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-portable">
|
||||||
|
<Version>1.0.0</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": "1.0.1",
|
|
||||||
"dotnet-hello": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"target": "package"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
},
|
|
||||||
"runtimes": {
|
|
||||||
"win7-x64": {},
|
|
||||||
"win7-x86": {},
|
|
||||||
"osx.10.10-x64": {},
|
|
||||||
"osx.10.11-x64": {},
|
|
||||||
"ubuntu.14.04-x64": {},
|
|
||||||
"ubuntu.16.04-x64": {},
|
|
||||||
"centos.7-x64": {},
|
|
||||||
"rhel.7.2-x64": {},
|
|
||||||
"debian.8-x64": {},
|
|
||||||
"fedora.23-x64": {},
|
|
||||||
"opensuse.13.2-x64": {}
|
|
||||||
},
|
|
||||||
"tools": {
|
|
||||||
"dotnet-portable": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"target": "package"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
39
TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
Executable file
39
TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
Executable file
|
|
@ -0,0 +1,39 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<VersionPrefix>1.0.0</VersionPrefix>
|
||||||
|
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
|
||||||
|
<AssemblyName>AppWithDirectDep</AssemblyName>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="dotnet-hello">
|
||||||
|
<Version>1.0.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161012-3</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE;TRACE</DefineConstants>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
6
TestAssets/TestProjects/AppWithDirectDep/NuGet.Config
Normal file
6
TestAssets/TestProjects/AppWithDirectDep/NuGet.Config
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": "1.0.1",
|
|
||||||
"dotnet-hello": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"target": "package"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
},
|
|
||||||
"runtimes": {
|
|
||||||
"win7-x64": {},
|
|
||||||
"win7-x86": {},
|
|
||||||
"osx.10.10-x64": {},
|
|
||||||
"osx.10.11-x64": {},
|
|
||||||
"ubuntu.14.04-x64": {},
|
|
||||||
"ubuntu.16.04-x64": {},
|
|
||||||
"centos.7-x64": {},
|
|
||||||
"rhel.7.2-x64": {},
|
|
||||||
"debian.8-x64": {},
|
|
||||||
"fedora.23-x64": {},
|
|
||||||
"opensuse.13.2-x64": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="ToolWithOutputName">
|
||||||
|
<Version>1.0.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
|
||||||
|
<clear />
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"ToolWithOutputName": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"target": "package"
|
|
||||||
},
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"type": "platform"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
},
|
|
||||||
"tools": {
|
|
||||||
"dotnet-dependency-tool-invoker": {
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"imports": [
|
|
||||||
"dnxcore50",
|
|
||||||
"portable-net45+win8"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="dotnet-desktop-and-portable">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
34
TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
Executable file
34
TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
Executable file
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-portable">
|
||||||
|
<Version>1.0.0</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<VersionPrefix>1.0.0</VersionPrefix>
|
||||||
|
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
|
||||||
|
<AssemblyName>DependencyContextFromTool</AssemblyName>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||||
|
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161012-3</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<DotNetCliToolReference Include="dotnet-dependency-context-test">
|
||||||
|
<Version>1.0.0-*</Version>
|
||||||
|
</DotNetCliToolReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE;TRACE</DefineConstants>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
{
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"imports": [
|
|
||||||
"dnxcore50",
|
|
||||||
"portable-net45+win8"
|
|
||||||
],
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tools": {
|
|
||||||
"dotnet-dependency-context-test": {
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"imports": [
|
|
||||||
"dnxcore50"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
28
TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj
Executable file
28
TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj
Executable file
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netstandard1.5</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{
|
|
||||||
"buildOptions": {
|
|
||||||
"outputName": "MyLibrary"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netstandard1.5": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
12
TestAssets/TestProjects/PJTestAppSimple/Program.cs
Normal file
12
TestAssets/TestProjects/PJTestAppSimple/Program.cs
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace ConsoleApplication
|
||||||
|
{
|
||||||
|
public class Program
|
||||||
|
{
|
||||||
|
public static void Main(string[] args)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Hello World!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
8
TestAssets/TestProjects/AppWithToolDependency/project.json → TestAssets/TestProjects/PJTestAppSimple/project.json
Normal file → Executable file
8
TestAssets/TestProjects/AppWithToolDependency/project.json → TestAssets/TestProjects/PJTestAppSimple/project.json
Normal file → Executable file
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"buildOptions": {
|
"buildOptions": {
|
||||||
"emitEntryPoint": true
|
"emitEntryPoint": true
|
||||||
|
|
@ -9,12 +9,6 @@
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {}
|
"netcoreapp1.0": {}
|
||||||
},
|
},
|
||||||
"tools": {
|
|
||||||
"dotnet-portable": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"target": "package"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"runtimes": {
|
"runtimes": {
|
||||||
"win7-x64": {},
|
"win7-x64": {},
|
||||||
"win7-x86": {},
|
"win7-x86": {},
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
// 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 Helper
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A message</returns>
|
||||||
|
public static string GetMessage()
|
||||||
|
{
|
||||||
|
return "This string came from the test library!";
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SayHi()
|
||||||
|
{
|
||||||
|
Console.WriteLine("Hello there!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"buildOptions": {
|
"buildOptions": {
|
||||||
"nowarn": [
|
"nowarn": [
|
||||||
|
|
@ -0,0 +1,29 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../SingleTargetP1/SingleTargetP1.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"SingleTargetP1": {
|
|
||||||
"target": "project"
|
|
||||||
},
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../SingleTargetP2/SingleTargetP2.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {
|
|
||||||
"SingleTargetP2": {
|
|
||||||
"target": "project"
|
|
||||||
},
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.6</TargetFrameworks>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
|
||||||
|
<Version>1.0.4</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.6": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0",
|
|
||||||
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"runtimes": {
|
|
||||||
"win7-x64": {},
|
|
||||||
"win7-x86": {},
|
|
||||||
"osx.10.10-x64": {},
|
|
||||||
"osx.10.11-x64": {},
|
|
||||||
"ubuntu.14.04-x64": {},
|
|
||||||
"ubuntu.16.04-x64": {},
|
|
||||||
"centos.7-x64": {},
|
|
||||||
"rhel.7.2-x64": {},
|
|
||||||
"debian.8-x64": {},
|
|
||||||
"fedora.23-x64": {},
|
|
||||||
"opensuse.13.2-x64": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.6</TargetFrameworks>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../TwoTargetP1/TwoTargetP1.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
|
||||||
|
<Version>1.0.4</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"TwoTargetP1": {
|
|
||||||
"target": "project"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.6": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0",
|
|
||||||
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"runtimes": {
|
|
||||||
"win7-x64": {},
|
|
||||||
"win7-x86": {},
|
|
||||||
"osx.10.10-x64": {},
|
|
||||||
"osx.10.11-x64": {},
|
|
||||||
"ubuntu.14.04-x64": {},
|
|
||||||
"ubuntu.16.04-x64": {},
|
|
||||||
"centos.7-x64": {},
|
|
||||||
"rhel.7.2-x64": {},
|
|
||||||
"debian.8-x64": {},
|
|
||||||
"fedora.23-x64": {},
|
|
||||||
"opensuse.13.2-x64": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../TwoTargetP2/TwoTargetP2.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {
|
|
||||||
"TwoTargetP2": {
|
|
||||||
"target": "project"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.6</TargetFrameworks>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP1/TwoTargetLargeP1.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
|
||||||
|
<Version>1.0.4</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"buildOptions": {
|
|
||||||
"emitEntryPoint": true
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"TwoTargetLargeP1": {
|
|
||||||
"target": "project"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.6": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0",
|
|
||||||
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"runtimes": {
|
|
||||||
"win7-x64": {},
|
|
||||||
"win7-x86": {},
|
|
||||||
"osx.10.10-x64": {},
|
|
||||||
"osx.10.11-x64": {},
|
|
||||||
"ubuntu.14.04-x64": {},
|
|
||||||
"ubuntu.16.04-x64": {},
|
|
||||||
"centos.7-x64": {},
|
|
||||||
"rhel.7.2-x64": {},
|
|
||||||
"debian.8-x64": {},
|
|
||||||
"fedora.23-x64": {},
|
|
||||||
"opensuse.13.2-x64": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP2/TwoTargetLargeP2.csproj" />
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP4/TwoTargetLargeP4.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {
|
|
||||||
"TwoTargetLargeP2": {
|
|
||||||
"target": "project"
|
|
||||||
},
|
|
||||||
"TwoTargetLargeP4": {
|
|
||||||
"target": "project"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP3/TwoTargetLargeP3.csproj" />
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP4/TwoTargetLargeP4.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {
|
|
||||||
"TwoTargetLargeP3": {
|
|
||||||
"target": "project"
|
|
||||||
},
|
|
||||||
"TwoTargetLargeP4": {
|
|
||||||
"target": "project"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP4/TwoTargetLargeP4.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {
|
|
||||||
"TwoTargetLargeP4": {
|
|
||||||
"target": "project"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP5/TwoTargetLargeP5.csproj" />
|
||||||
|
<ProjectReference Include="../TwoTargetLargeP6/TwoTargetLargeP6.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {
|
|
||||||
"TwoTargetLargeP5": {
|
|
||||||
"target": "project"
|
|
||||||
},
|
|
||||||
"TwoTargetLargeP6": {
|
|
||||||
"target": "project"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"dependencies": {},
|
|
||||||
"frameworks": {
|
|
||||||
"netcoreapp1.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.App": {
|
|
||||||
"type": "platform",
|
|
||||||
"version": "1.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"netstandard1.5": {
|
|
||||||
"dependencies": {
|
|
||||||
"NETStandard.Library": "1.6.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
29
TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
Executable file
29
TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
Executable file
|
|
@ -0,0 +1,29 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.NETCore.App">
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETCOREAPP1_0</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="test-packages" value="../../../artifacts/testpackages" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
12
TestAssets/TestProjects/TestAppWithUnicodéPath/Program.cs
Normal file
12
TestAssets/TestProjects/TestAppWithUnicodéPath/Program.cs
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace ConsoleApplication
|
||||||
|
{
|
||||||
|
public class Program
|
||||||
|
{
|
||||||
|
public static void Main(string[] args)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Hélló Wórld!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netstandard1.5</TargetFramework>
|
||||||
|
<NoWarn>$(NoWarn);CS1591</NoWarn>
|
||||||
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
|
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
<EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Sdk">
|
||||||
|
<Version>1.0.0-alpha-20161019-1</Version>
|
||||||
|
<PrivateAssets>All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="NETStandard.Library">
|
||||||
|
<Version>1.6.0</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||||
|
<DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
<Inputs>@(CompileStageInputs)</Inputs>
|
<Inputs>@(CompileStageInputs)</Inputs>
|
||||||
<StageDirectory>$(Stage2Directory)</StageDirectory>
|
<StageDirectory>$(Stage2Directory)</StageDirectory>
|
||||||
<StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
|
<StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
|
||||||
<DotnetDir>$(Stage1Directory)</DotnetDir>
|
<DotnetDir>$(Stage0Directory)</DotnetDir>
|
||||||
</Stage>
|
</Stage>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
|
||||||
|
|
@ -188,6 +188,7 @@
|
||||||
Outputs="@(RestorePackagesInput->'%(RelativeDir)/project.lock.json')">
|
Outputs="@(RestorePackagesInput->'%(RelativeDir)/project.lock.json')">
|
||||||
|
|
||||||
<CallTarget Targets="CleanSrcToolsLockFiles" />
|
<CallTarget Targets="CleanSrcToolsLockFiles" />
|
||||||
|
|
||||||
<DotNetRestore WorkingDirectory="$(RepoRoot)/src" ToolPath="$(DotNetPath)" />
|
<DotNetRestore WorkingDirectory="$(RepoRoot)/src" ToolPath="$(DotNetPath)" />
|
||||||
<DotNetRestore WorkingDirectory="$(RepoRoot)/tools" ToolPath="$(DotNetPath)" />
|
<DotNetRestore WorkingDirectory="$(RepoRoot)/tools" ToolPath="$(DotNetPath)" />
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
EnvironmentVariables=$(RunTestEnvironmentVariables);
|
EnvironmentVariables=$(RunTestEnvironmentVariables);
|
||||||
TestProjectName=%(TestProjects.OutputName);
|
TestProjectName=%(TestProjects.OutputName);
|
||||||
TestResultXmlDir=$(TestResultXmlDir);
|
TestResultXmlDir=$(TestResultXmlDir);
|
||||||
ToolPath=$(Stage2Directory);
|
ToolPath=$(Stage0Directory);
|
||||||
WorkingDirectory=%(TestProjects.ProjectDir)
|
WorkingDirectory=%(TestProjects.ProjectDir)
|
||||||
</Properties>
|
</Properties>
|
||||||
</ProjectsToTest>
|
</ProjectsToTest>
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
DependsOnTargets="Init">
|
DependsOnTargets="Init">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TestPackageBuildVersionSuffix>$(CommitCount)</TestPackageBuildVersionSuffix>
|
<TestPackageBuildVersionSuffix>$(CommitCount)</TestPackageBuildVersionSuffix>
|
||||||
<TestOutputDir>$(BaseOutputDirectory)/tests/</TestOutputDir>
|
<TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
|
||||||
<TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
|
<TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
|
||||||
<TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
|
<TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
|
||||||
<TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
|
<TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
|
||||||
|
|
@ -72,7 +72,7 @@
|
||||||
Outputs="%(TestProjects.BuildOutput)">
|
Outputs="%(TestProjects.BuildOutput)">
|
||||||
<DotNetBuild Configuration="$(Configuration)"
|
<DotNetBuild Configuration="$(Configuration)"
|
||||||
Framework="%(TestProjects.Framework)"
|
Framework="%(TestProjects.Framework)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(Stage0Directory)"
|
||||||
WorkingDirectory="%(TestProjects.RelativeDir)" />
|
WorkingDirectory="%(TestProjects.RelativeDir)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -84,7 +84,7 @@
|
||||||
Outputs="@(RestoreTestsInputs->'%(RelativeDir)project.lock.json')">
|
Outputs="@(RestoreTestsInputs->'%(RelativeDir)project.lock.json')">
|
||||||
<CallTarget Targets="CleanTestProjectsLockFiles"/>
|
<CallTarget Targets="CleanTestProjectsLockFiles"/>
|
||||||
|
|
||||||
<DotNetRestore FallbackSource="$(TestPackagesDir)"
|
<DotNetRestoreProjectJson FallbackSource="$(TestPackagesDir)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(DotnetUnderTest)"
|
||||||
WorkingDirectory="$(TestDirectory)" />
|
WorkingDirectory="$(TestDirectory)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
@ -126,7 +126,7 @@
|
||||||
|
|
||||||
<DotNetBuild Framework="netcoreapp1.0"
|
<DotNetBuild Framework="netcoreapp1.0"
|
||||||
ProjectPath="$(RepoRoot)%(TestAssetProjects.ProjectPath)"
|
ProjectPath="$(RepoRoot)%(TestAssetProjects.ProjectPath)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(Stage0Directory)"
|
||||||
WorkingDirectory="%(TestAssetProjects.RelativeDir)" />
|
WorkingDirectory="%(TestAssetProjects.RelativeDir)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -136,7 +136,7 @@
|
||||||
Inputs="@(RestoreTestAssetProjectsInputs)"
|
Inputs="@(RestoreTestAssetProjectsInputs)"
|
||||||
Outputs="@(RestoreTestAssetProjectsInputs->'%(RelativeDir)/project.lock.json')">
|
Outputs="@(RestoreTestAssetProjectsInputs->'%(RelativeDir)/project.lock.json')">
|
||||||
|
|
||||||
<DotNetRestore FallbackSource="$(TestPackagesDir)"
|
<DotNetRestoreProjectJson FallbackSource="$(TestPackagesDir)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(DotnetUnderTest)"
|
||||||
WorkingDirectory="$(RepoRoot)TestAssets/TestProjects/" />
|
WorkingDirectory="$(RepoRoot)TestAssets/TestProjects/" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
@ -177,7 +177,7 @@
|
||||||
<DotNetBuild Configuration="$(Configuration)"
|
<DotNetBuild Configuration="$(Configuration)"
|
||||||
Framework="net46"
|
Framework="net46"
|
||||||
ProjectPath="%(BuildableDesktopTestAssetProjects.FullPath)"
|
ProjectPath="%(BuildableDesktopTestAssetProjects.FullPath)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(Stage0Directory)"
|
||||||
WorkingDirectory="%(BuildableDesktopTestAssetProjects.RelativeDir)" />
|
WorkingDirectory="%(BuildableDesktopTestAssetProjects.RelativeDir)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -188,7 +188,7 @@
|
||||||
Inputs="@(RestoreDesktopTestAssetProjectsInputs)"
|
Inputs="@(RestoreDesktopTestAssetProjectsInputs)"
|
||||||
Outputs="@(RestoreDesktopTestAssetProjectsInputs->'%(RelativeDir)/project.lock.json')">
|
Outputs="@(RestoreDesktopTestAssetProjectsInputs->'%(RelativeDir)/project.lock.json')">
|
||||||
|
|
||||||
<DotNetRestore FallbackSource="$(TestPackagesDir)"
|
<DotNetRestoreProjectJson FallbackSource="$(TestPackagesDir)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(DotnetUnderTest)"
|
||||||
WorkingDirectory="$(RepoRoot)TestAssets\DesktopTestProjects\" />
|
WorkingDirectory="$(RepoRoot)TestAssets\DesktopTestProjects\" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
@ -209,7 +209,7 @@
|
||||||
NoBuild="True"
|
NoBuild="True"
|
||||||
Output="$(TestPackagesDir)"
|
Output="$(TestPackagesDir)"
|
||||||
ProjectPath="%(TestPackageProject.FullPath)"
|
ProjectPath="%(TestPackageProject.FullPath)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(Stage0Directory)"
|
||||||
VersionSuffix="%(TestPackageProject.VersionSuffix)" />
|
VersionSuffix="%(TestPackageProject.VersionSuffix)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -222,7 +222,7 @@
|
||||||
<DotNetBuild BuildBasePath="$(TestPackagesBuildDir)"
|
<DotNetBuild BuildBasePath="$(TestPackagesBuildDir)"
|
||||||
Framework="%(TestPackageProject.Framework)"
|
Framework="%(TestPackageProject.Framework)"
|
||||||
ProjectPath="%(TestPackageProject.FullPath)"
|
ProjectPath="%(TestPackageProject.FullPath)"
|
||||||
ToolPath="$(DotnetUnderTest)"
|
ToolPath="$(Stage0Directory)"
|
||||||
WorkingDirectory="%(BuildableTestAssetProjects.RelativeDir)" />
|
WorkingDirectory="%(BuildableTestAssetProjects.RelativeDir)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -232,7 +232,7 @@
|
||||||
Inputs="@(RestoreTestAssetPackageProjectsInputs)"
|
Inputs="@(RestoreTestAssetPackageProjectsInputs)"
|
||||||
Outputs="@(RestoreTestAssetPackageProjectsInputs->'%(RelativeDir)/project.lock.json')">
|
Outputs="@(RestoreTestAssetPackageProjectsInputs->'%(RelativeDir)/project.lock.json')">
|
||||||
|
|
||||||
<DotNetRestore ToolPath="$(DotnetUnderTest)"
|
<DotNetRestoreProjectJson ToolPath="$(DotnetUnderTest)"
|
||||||
WorkingDirectory="$(RepoRoot)/TestAssets/TestPackages/" />
|
WorkingDirectory="$(RepoRoot)/TestAssets/TestPackages/" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
<UsingTask TaskName="DotNetPack" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="DotNetPack" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="DotNetPublish" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="DotNetPublish" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="DotNetRestore" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="DotNetRestore" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="DotNetRestore3" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="DotNetRestoreProjectJson" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="DotNetTest" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="DotNetTest" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="DownloadFile" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="DownloadFile" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="GenerateBuildVersionInfo" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="GenerateBuildVersionInfo" AssemblyFile="$(CLIBuildDll)" />
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
<DotNetNew ToolPath="$(Stage2Directory)"
|
<DotNetNew ToolPath="$(Stage2Directory)"
|
||||||
WorkingDirectory="$(NuGetPackagesArchiveProject)" />
|
WorkingDirectory="$(NuGetPackagesArchiveProject)" />
|
||||||
|
|
||||||
<DotNetRestore3 ToolPath="$(Stage2Directory)"
|
<DotNetRestore ToolPath="$(Stage2Directory)"
|
||||||
Packages="$(NuGetPackagesArchiveFolder)"
|
Packages="$(NuGetPackagesArchiveFolder)"
|
||||||
SkipInvalidConfigurations="True"
|
SkipInvalidConfigurations="True"
|
||||||
WorkingDirectory="$(NuGetPackagesArchiveProject)" />
|
WorkingDirectory="$(NuGetPackagesArchiveProject)" />
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<Message Text="Publishing Archiver" />
|
<Message Text="Publishing Archiver" />
|
||||||
|
|
||||||
<DotNetPublish ToolPath="$(Stage2Directory)"
|
<DotNetPublish ToolPath="$(Stage0Directory)"
|
||||||
WorkingDirectory="$(RepoRoot)/tools/Archiver"
|
WorkingDirectory="$(RepoRoot)/tools/Archiver"
|
||||||
Output="$(ToolsOutputDirectory)"
|
Output="$(ToolsOutputDirectory)"
|
||||||
Configuration="$(Configuration)" />
|
Configuration="$(Configuration)" />
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@
|
||||||
ReplacementStrings="@(DebianConfigTokenValues -> '%(ReplacementString)')" />
|
ReplacementStrings="@(DebianConfigTokenValues -> '%(ReplacementString)')" />
|
||||||
|
|
||||||
<!-- Build SDK Deb package -->
|
<!-- Build SDK Deb package -->
|
||||||
<DotNetDebTool ToolPath="$(Stage2Directory)"
|
<DotNetDebTool ToolPath="$(Stage0Directory)"
|
||||||
InputDirectory="$(LayoutDirectory)"
|
InputDirectory="$(LayoutDirectory)"
|
||||||
OutputDirectory="$(DotNetDebToolOutputDirectory)"
|
OutputDirectory="$(DotNetDebToolOutputDirectory)"
|
||||||
PackageName="$(SdkDebianPackageName)"
|
PackageName="$(SdkDebianPackageName)"
|
||||||
|
|
@ -94,7 +94,7 @@
|
||||||
<!-- Run E2E -->
|
<!-- Run E2E -->
|
||||||
<DotNetTest WorkingDirectory="$(EndToEndTestDirectory)"
|
<DotNetTest WorkingDirectory="$(EndToEndTestDirectory)"
|
||||||
EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)"
|
EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)"
|
||||||
ToolPath="$(DebianInstalledDirectory)"
|
ToolPath="$(Stage0Directory)"
|
||||||
Xml="$(DebianTestResultsXmlFile)" />
|
Xml="$(DebianTestResultsXmlFile)" />
|
||||||
|
|
||||||
<!-- Clean up Packages -->
|
<!-- Clean up Packages -->
|
||||||
|
|
@ -135,7 +135,7 @@
|
||||||
<Target Name="PrepareDotnetDebTool"
|
<Target Name="PrepareDotnetDebTool"
|
||||||
DependsOnTargets="WriteDotnetDebToolProjectJson;">
|
DependsOnTargets="WriteDotnetDebToolProjectJson;">
|
||||||
|
|
||||||
<DotNetRestore FallbackSource="$(DotnetDebToolPackageSource)"
|
<DotNetRestoreProjectJson FallbackSource="$(DotnetDebToolPackageSource)"
|
||||||
ToolPath="$(Stage2Directory)"
|
ToolPath="$(Stage2Directory)"
|
||||||
WorkingDirectory="$(DotnetDebToolDir)" />
|
WorkingDirectory="$(DotnetDebToolDir)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@
|
||||||
|
|
||||||
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
|
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
|
||||||
-InputMsi '$(SdkInstallerFile)'
|
-InputMsi '$(SdkInstallerFile)'
|
||||||
-DotnetDir '$(OutputDirectory)'" />
|
-DotnetDir '$(Stage0Directory)'" />
|
||||||
|
|
||||||
<WriteLinesToFile
|
<WriteLinesToFile
|
||||||
File="$(SdkMsiTestedSentinel)"
|
File="$(SdkMsiTestedSentinel)"
|
||||||
|
|
|
||||||
|
|
@ -15,38 +15,10 @@
|
||||||
<ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
|
<ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
<Version>$(SdkNugetVersion)</Version>
|
||||||
</ProjectsToPack>
|
</ProjectsToPack>
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common">
|
|
||||||
<ProjectName>Microsoft.DotNet.Compiler.Common</ProjectName>
|
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
|
||||||
</ProjectsToPack>
|
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files">
|
|
||||||
<ProjectName>Microsoft.DotNet.Files</ProjectName>
|
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
|
||||||
</ProjectsToPack>
|
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions">
|
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions">
|
||||||
<ProjectName>Microsoft.DotNet.InternalAbstractions</ProjectName>
|
<ProjectName>Microsoft.DotNet.InternalAbstractions</ProjectName>
|
||||||
<Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version>
|
<Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version>
|
||||||
</ProjectsToPack>
|
</ProjectsToPack>
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel">
|
|
||||||
<ProjectName>Microsoft.DotNet.ProjectModel</ProjectName>
|
|
||||||
<Version>$(ProjectModelNugetVersion)</Version>
|
|
||||||
</ProjectsToPack>
|
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader">
|
|
||||||
<ProjectName>Microsoft.DotNet.ProjectModel.Loader</ProjectName>
|
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
|
||||||
</ProjectsToPack>
|
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces">
|
|
||||||
<ProjectName>Microsoft.DotNet.ProjectModel.Workspaces</ProjectName>
|
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
|
||||||
</ProjectsToPack>
|
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions">
|
|
||||||
<ProjectName>Microsoft.Extensions.Testing.Abstractions</ProjectName>
|
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
|
||||||
</ProjectsToPack>
|
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Tools.Test">
|
|
||||||
<ProjectName>Microsoft.DotNet.Tools.Test</ProjectName>
|
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
|
||||||
</ProjectsToPack>
|
|
||||||
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectJsonMigration">
|
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectJsonMigration">
|
||||||
<ProjectName>Microsoft.DotNet.ProjectJsonMigration</ProjectName>
|
<ProjectName>Microsoft.DotNet.ProjectJsonMigration</ProjectName>
|
||||||
<Version>$(SdkNugetVersion)</Version>
|
<Version>$(SdkNugetVersion)</Version>
|
||||||
|
|
@ -71,7 +43,7 @@
|
||||||
NoBuild="True"
|
NoBuild="True"
|
||||||
Output="$(NupkgOutputDirectory)"
|
Output="$(NupkgOutputDirectory)"
|
||||||
ProjectPath="%(ProjectsToPack.Identity)"
|
ProjectPath="%(ProjectsToPack.Identity)"
|
||||||
ToolPath="$(Stage2Directory)"
|
ToolPath="$(Stage0Directory)"
|
||||||
VersionSuffix="$(NupkgVersionSuffix)"
|
VersionSuffix="$(NupkgVersionSuffix)"
|
||||||
Configuration="$(Configuration)" />
|
Configuration="$(Configuration)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
@ -82,7 +54,7 @@
|
||||||
Condition=" '$(OS)' == 'Windows_NT' ">
|
Condition=" '$(OS)' == 'Windows_NT' ">
|
||||||
<MakeDir Directories="$(PackagingBuildBasePath)" />
|
<MakeDir Directories="$(PackagingBuildBasePath)" />
|
||||||
|
|
||||||
<DotNetBuild ToolPath="$(Stage2Directory)"
|
<DotNetBuild ToolPath="$(Stage0Directory)"
|
||||||
BuildBasePath="$(PackagingBuildBasePath)"
|
BuildBasePath="$(PackagingBuildBasePath)"
|
||||||
Configuration="$(Configuration)"
|
Configuration="$(Configuration)"
|
||||||
ProjectPath="%(ProjectsToPack.Identity)" />
|
ProjectPath="%(ProjectsToPack.Identity)" />
|
||||||
|
|
|
||||||
|
|
@ -161,33 +161,6 @@
|
||||||
<Clean>False</Clean>
|
<Clean>False</Clean>
|
||||||
<Frameworks>netstandard1.5</Frameworks>
|
<Frameworks>netstandard1.5</Frameworks>
|
||||||
</BaseTestPackageProject>
|
</BaseTestPackageProject>
|
||||||
<BaseTestPackageProject Include="src/Microsoft.DotNet.ProjectModel">
|
|
||||||
<Name>Microsoft.DotNet.ProjectModel</Name>
|
|
||||||
<IsTool>True</IsTool>
|
|
||||||
<IsApplicable>True</IsApplicable>
|
|
||||||
<VersionPrefix>1.0.0-rc4-</VersionPrefix>
|
|
||||||
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
|
||||||
<Clean>False</Clean>
|
|
||||||
<Frameworks>netstandard1.3</Frameworks>
|
|
||||||
</BaseTestPackageProject>
|
|
||||||
<BaseTestPackageProject Include="src/Microsoft.DotNet.ProjectModel.Loader">
|
|
||||||
<Name>Microsoft.DotNet.ProjectModel.Loader</Name>
|
|
||||||
<IsTool>True</IsTool>
|
|
||||||
<IsApplicable>True</IsApplicable>
|
|
||||||
<VersionPrefix>1.0.0-preview3-</VersionPrefix>
|
|
||||||
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
|
||||||
<Clean>False</Clean>
|
|
||||||
<Frameworks>netstandard1.6</Frameworks>
|
|
||||||
</BaseTestPackageProject>
|
|
||||||
<BaseTestPackageProject Include="src/Microsoft.DotNet.ProjectModel.Workspaces">
|
|
||||||
<Name>Microsoft.DotNet.ProjectModel.Workspaces</Name>
|
|
||||||
<IsTool>True</IsTool>
|
|
||||||
<IsApplicable>True</IsApplicable>
|
|
||||||
<VersionPrefix>1.0.0-preview3-</VersionPrefix>
|
|
||||||
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
|
||||||
<Clean>False</Clean>
|
|
||||||
<Frameworks>netstandard1.5</Frameworks>
|
|
||||||
</BaseTestPackageProject>
|
|
||||||
<BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
|
<BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
|
||||||
<Name>Microsoft.DotNet.InternalAbstractions</Name>
|
<Name>Microsoft.DotNet.InternalAbstractions</Name>
|
||||||
<IsTool>True</IsTool>
|
<IsTool>True</IsTool>
|
||||||
|
|
@ -197,33 +170,6 @@
|
||||||
<Clean>False</Clean>
|
<Clean>False</Clean>
|
||||||
<Frameworks>netstandard1.3</Frameworks>
|
<Frameworks>netstandard1.3</Frameworks>
|
||||||
</BaseTestPackageProject>
|
</BaseTestPackageProject>
|
||||||
<BaseTestPackageProject Include="src/Microsoft.Extensions.Testing.Abstractions">
|
|
||||||
<Name>Microsoft.Extensions.Testing.Abstractions</Name>
|
|
||||||
<IsTool>True</IsTool>
|
|
||||||
<IsApplicable>True</IsApplicable>
|
|
||||||
<VersionPrefix>1.0.0-preview3-</VersionPrefix>
|
|
||||||
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
|
||||||
<Clean>False</Clean>
|
|
||||||
<Frameworks>netstandard1.3</Frameworks>
|
|
||||||
</BaseTestPackageProject>
|
|
||||||
<BaseTestPackageProject Include="src/Microsoft.DotNet.Compiler.Common">
|
|
||||||
<Name>Microsoft.DotNet.Compiler.Common</Name>
|
|
||||||
<IsTool>True</IsTool>
|
|
||||||
<IsApplicable>True</IsApplicable>
|
|
||||||
<VersionPrefix>1.0.0-preview3-</VersionPrefix>
|
|
||||||
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
|
||||||
<Clean>False</Clean>
|
|
||||||
<Frameworks>netstandard1.5</Frameworks>
|
|
||||||
</BaseTestPackageProject>
|
|
||||||
<BaseTestPackageProject Include="src/Microsoft.DotNet.Files">
|
|
||||||
<Name>Microsoft.DotNet.Files</Name>
|
|
||||||
<IsTool>True</IsTool>
|
|
||||||
<IsApplicable>True</IsApplicable>
|
|
||||||
<VersionPrefix>1.0.0-preview3-</VersionPrefix>
|
|
||||||
<VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
|
||||||
<Clean>False</Clean>
|
|
||||||
<Frameworks>netstandard1.5</Frameworks>
|
|
||||||
</BaseTestPackageProject>
|
|
||||||
|
|
||||||
<TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net45" />
|
<TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net45" />
|
||||||
<TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net451" />
|
<TestPackageProjectFrameworksExcludes Condition=" '$(IsDesktopAvailable)' != 'True' " Include="net451" />
|
||||||
|
|
|
||||||
|
|
@ -12,20 +12,20 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
|
|
||||||
protected override string Args
|
protected override string Args
|
||||||
{
|
{
|
||||||
get { return $"{GetVerbosity()} {GetFallbackSource()} {GetPackages()}"; }
|
get { return $"{GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()}"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public string FallbackSource { get; set; }
|
public string Source { get; set; }
|
||||||
|
|
||||||
public string Packages { get; set; }
|
public string Packages { get; set; }
|
||||||
|
|
||||||
public string Verbosity { get; set; }
|
public bool SkipInvalidConfigurations { get; set; }
|
||||||
|
|
||||||
private string GetFallbackSource()
|
private string GetSource()
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(FallbackSource))
|
if (!string.IsNullOrEmpty(Source))
|
||||||
{
|
{
|
||||||
return $"--fallbacksource {FallbackSource}";
|
return $"--source {Source}";
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
@ -41,11 +41,11 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetVerbosity()
|
private string GetSkipInvalidConfigurations()
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(Verbosity))
|
if (SkipInvalidConfigurations)
|
||||||
{
|
{
|
||||||
return $"--verbosity {Verbosity}";
|
return "/p:SkipInvalidConfigurations=true";
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
|
|
@ -3,29 +3,29 @@
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli.Build
|
namespace Microsoft.DotNet.Cli.Build
|
||||||
{
|
{
|
||||||
public class DotNetRestore3 : DotNetTool
|
public class DotNetRestoreProjectJson : DotNetTool
|
||||||
{
|
{
|
||||||
protected override string Command
|
protected override string Command
|
||||||
{
|
{
|
||||||
get { return "restore3"; }
|
get { return "restore-projectjson"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override string Args
|
protected override string Args
|
||||||
{
|
{
|
||||||
get { return $"{GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()}"; }
|
get { return $"{GetVerbosity()} {GetFallbackSource()} {GetPackages()}"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Source { get; set; }
|
public string FallbackSource { get; set; }
|
||||||
|
|
||||||
public string Packages { get; set; }
|
public string Packages { get; set; }
|
||||||
|
|
||||||
public bool SkipInvalidConfigurations { get; set; }
|
public string Verbosity { get; set; }
|
||||||
|
|
||||||
private string GetSource()
|
private string GetFallbackSource()
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(Source))
|
if (!string.IsNullOrEmpty(FallbackSource))
|
||||||
{
|
{
|
||||||
return $"--source {Source}";
|
return $"--fallbacksource {FallbackSource}";
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
@ -41,11 +41,11 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetSkipInvalidConfigurations()
|
private string GetVerbosity()
|
||||||
{
|
{
|
||||||
if (SkipInvalidConfigurations)
|
if (!string.IsNullOrEmpty(Verbosity))
|
||||||
{
|
{
|
||||||
return "/p:SkipInvalidConfigurations=true";
|
return $"--verbosity {Verbosity}";
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
@ -7,7 +7,6 @@ using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using Microsoft.DotNet.ProjectModel;
|
|
||||||
using NuGet.Frameworks;
|
using NuGet.Frameworks;
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli.Utils
|
namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
@ -15,7 +14,9 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
public class Command : ICommand
|
public class Command : ICommand
|
||||||
{
|
{
|
||||||
private readonly Process _process;
|
private readonly Process _process;
|
||||||
|
|
||||||
private StreamForwarder _stdOut;
|
private StreamForwarder _stdOut;
|
||||||
|
|
||||||
private StreamForwarder _stdErr;
|
private StreamForwarder _stdErr;
|
||||||
|
|
||||||
private bool _running = false;
|
private bool _running = false;
|
||||||
|
|
@ -114,39 +115,20 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
return new Command(commandSpec);
|
return new Command(commandSpec);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Command CreateForScript(
|
|
||||||
string commandName,
|
|
||||||
IEnumerable<string> args,
|
|
||||||
Project project,
|
|
||||||
string[] inferredExtensionList)
|
|
||||||
{
|
|
||||||
var commandSpec = CommandResolver.TryResolveScriptCommandSpec(commandName,
|
|
||||||
args,
|
|
||||||
project,
|
|
||||||
inferredExtensionList);
|
|
||||||
|
|
||||||
if (commandSpec == null)
|
|
||||||
{
|
|
||||||
throw new CommandUnknownException(commandName);
|
|
||||||
}
|
|
||||||
|
|
||||||
var command = new Command(commandSpec);
|
|
||||||
|
|
||||||
return command;
|
|
||||||
}
|
|
||||||
|
|
||||||
public CommandResult Execute()
|
public CommandResult Execute()
|
||||||
{
|
{
|
||||||
|
|
||||||
Reporter.Verbose.WriteLine($"Running {_process.StartInfo.FileName} {_process.StartInfo.Arguments}");
|
Reporter.Verbose.WriteLine($"Running {_process.StartInfo.FileName} {_process.StartInfo.Arguments}");
|
||||||
|
|
||||||
ThrowIfRunning();
|
ThrowIfRunning();
|
||||||
|
|
||||||
_running = true;
|
_running = true;
|
||||||
|
|
||||||
_process.EnableRaisingEvents = true;
|
_process.EnableRaisingEvents = true;
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
var sw = Stopwatch.StartNew();
|
var sw = Stopwatch.StartNew();
|
||||||
|
|
||||||
Reporter.Verbose.WriteLine($"> {FormatProcessInfo(_process.StartInfo)}".White());
|
Reporter.Verbose.WriteLine($"> {FormatProcessInfo(_process.StartInfo)}".White());
|
||||||
#endif
|
#endif
|
||||||
using (PerfTrace.Current.CaptureTiming($"{Path.GetFileNameWithoutExtension(_process.StartInfo.FileName)} {_process.StartInfo.Arguments}"))
|
using (PerfTrace.Current.CaptureTiming($"{Path.GetFileNameWithoutExtension(_process.StartInfo.FileName)} {_process.StartInfo.Arguments}"))
|
||||||
|
|
|
||||||
|
|
@ -26,5 +26,10 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
{
|
{
|
||||||
return _ansiPassThru.Value;
|
return _ansiPassThru.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void SetVerbose(bool value)
|
||||||
|
{
|
||||||
|
_verbose = new Lazy<bool>(() => value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Microsoft.DotNet.PlatformAbstractions;
|
using Microsoft.DotNet.PlatformAbstractions;
|
||||||
using Microsoft.DotNet.ProjectModel;
|
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli.Utils
|
namespace Microsoft.DotNet.Cli.Utils
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Microsoft.DotNet.ProjectModel;
|
|
||||||
using Microsoft.Extensions.DependencyModel;
|
using Microsoft.Extensions.DependencyModel;
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli.Utils
|
namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
||||||
string DepsJsonPath { get; }
|
string DepsJsonPath { get; }
|
||||||
|
|
||||||
|
string ProjectRoot { get; }
|
||||||
|
|
||||||
string RuntimeConfigJsonPath { get; }
|
string RuntimeConfigJsonPath { get; }
|
||||||
|
|
||||||
string FullOutputPath { get; }
|
string FullOutputPath { get; }
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
{
|
{
|
||||||
private Project _project;
|
private Project _project;
|
||||||
|
|
||||||
|
private string _projectRoot;
|
||||||
|
|
||||||
private string _msBuildExePath;
|
private string _msBuildExePath;
|
||||||
|
|
||||||
public string DepsJsonPath
|
public string DepsJsonPath
|
||||||
|
|
@ -50,6 +52,14 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string ProjectRoot
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return _projectRoot;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public Dictionary<string, string> EnvironmentVariables
|
public Dictionary<string, string> EnvironmentVariables
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|
@ -68,6 +78,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
string outputPath,
|
string outputPath,
|
||||||
string msBuildExePath)
|
string msBuildExePath)
|
||||||
{
|
{
|
||||||
|
_projectRoot = msBuildExePath;
|
||||||
|
|
||||||
var globalProperties = new Dictionary<string, string>()
|
var globalProperties = new Dictionary<string, string>()
|
||||||
{
|
{
|
||||||
{ "MSBuildExtensionsPath", Path.GetDirectoryName(msBuildExePath) }
|
{ "MSBuildExtensionsPath", Path.GetDirectoryName(msBuildExePath) }
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using Microsoft.DotNet.InternalAbstractions;
|
using Microsoft.DotNet.Cli.Utils;
|
||||||
using Microsoft.DotNet.ProjectModel;
|
|
||||||
using NuGet.Frameworks;
|
using NuGet.Frameworks;
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli.Utils
|
namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
@ -43,6 +42,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
string buildBasePath)
|
string buildBasePath)
|
||||||
{
|
{
|
||||||
var projectFactory = new ProjectFactory(_environment);
|
var projectFactory = new ProjectFactory(_environment);
|
||||||
|
|
||||||
var project = projectFactory.GetProject(
|
var project = projectFactory.GetProject(
|
||||||
projectDirectory,
|
projectDirectory,
|
||||||
framework,
|
framework,
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Microsoft.DotNet.ProjectModel;
|
|
||||||
using Microsoft.DotNet.Tools.Common;
|
using Microsoft.DotNet.Tools.Common;
|
||||||
using NuGet.Packaging;
|
using NuGet.Packaging;
|
||||||
using NuGet.ProjectModel;
|
using NuGet.ProjectModel;
|
||||||
|
|
@ -21,12 +20,15 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
string depsFilePath,
|
string depsFilePath,
|
||||||
string runtimeConfigPath)
|
string runtimeConfigPath)
|
||||||
{
|
{
|
||||||
|
Reporter.Verbose.WriteLine($"packagedcommandspecfactory: attempting to find command {commandName} in {toolLibrary.Name}");
|
||||||
|
|
||||||
var toolAssembly = toolLibrary?.RuntimeAssemblies
|
var toolAssembly = toolLibrary?.RuntimeAssemblies
|
||||||
.FirstOrDefault(r => Path.GetFileNameWithoutExtension(r.Path) == commandName);
|
.FirstOrDefault(r => Path.GetFileNameWithoutExtension(r.Path) == commandName);
|
||||||
|
|
||||||
if (toolAssembly == null)
|
if (toolAssembly == null)
|
||||||
{
|
{
|
||||||
|
Reporter.Verbose.WriteLine($"packagedcommandspecfactory: failed to find toolAssembly for {commandName}");
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -34,6 +36,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
|
||||||
if (!File.Exists(commandPath))
|
if (!File.Exists(commandPath))
|
||||||
{
|
{
|
||||||
|
Reporter.Verbose.WriteLine($"packagedcommandspecfactory: failed to find commandPath {commandPath}");
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
using Microsoft.DotNet.PlatformAbstractions;
|
||||||
|
|
||||||
|
namespace Microsoft.DotNet.Cli.Utils
|
||||||
|
{
|
||||||
|
public class PathCommandResolverPolicy : ICommandResolverPolicy
|
||||||
|
{
|
||||||
|
public CompositeCommandResolver CreateCommandResolver()
|
||||||
|
{
|
||||||
|
return Create();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CompositeCommandResolver Create()
|
||||||
|
{
|
||||||
|
var environment = new EnvironmentProvider();
|
||||||
|
|
||||||
|
var platformCommandSpecFactory = default(IPlatformCommandSpecFactory);
|
||||||
|
if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows)
|
||||||
|
{
|
||||||
|
platformCommandSpecFactory = new WindowsExePreferredCommandSpecFactory();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
platformCommandSpecFactory = new GenericPlatformCommandSpecFactory();
|
||||||
|
}
|
||||||
|
|
||||||
|
return CreatePathCommandResolverPolicy(
|
||||||
|
environment,
|
||||||
|
platformCommandSpecFactory);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CompositeCommandResolver CreatePathCommandResolverPolicy(
|
||||||
|
IEnvironmentProvider environment,
|
||||||
|
IPlatformCommandSpecFactory platformCommandSpecFactory)
|
||||||
|
{
|
||||||
|
var compositeCommandResolver = new CompositeCommandResolver();
|
||||||
|
|
||||||
|
compositeCommandResolver.AddCommandResolver(
|
||||||
|
new PathCommandResolver(environment, platformCommandSpecFactory));
|
||||||
|
|
||||||
|
return compositeCommandResolver;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue