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

PR Feedback

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-08-09 14:49:13 -07:00
parent 3a55a4182f
commit b3f5174f00
18 changed files with 22 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build/Microsoft.DotNet.Cli.Compile.targets
View file

@ -5,7 +5,7 @@
<PropertyGroup>
<BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
<CoreSDKDir>$(RepoRoot)/resources/core-sdk</CoreSDKDir>
<CoreSDKDir>$(RepoRoot)/resources/MSBuildImports</CoreSDKDir>
</PropertyGroup>
<ItemGroup>
@ -80,10 +80,10 @@
<SharedFramework Remove="*" />
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
<BinariesToRemove Remove="*" />
<BinariesToRemove Include="csc" />
<BinariesToRemove Include="vbc" />
<BinariesToRemove Include="MSBuild" />
<AssetsToRemoveFromDeps Remove="*" />
<AssetsToRemoveFromDeps Include="csc" />
<AssetsToRemoveFromDeps Include="vbc" />
<AssetsToRemoveFromDeps Include="MSBuild" />
</ItemGroup>
<Delete Files="@(BinObj)" />
@ -131,7 +131,7 @@
<RemoveAssetFromDepsPackages DepsFile="$(SdkOutputDirectory)/redist.deps.json"
SectionName="runtimeTargets"
AssetPath="$(BinaryToCorehostifyRelDir)/%(BinariesToRemove.Identity).exe" />
AssetPath="$(BinaryToCorehostifyRelDir)/%(AssetsToRemoveFromDeps.Identity).exe" />
<Copy SourceFiles="$(SdkOutputDirectory)/%(FilesToMove.Identity)"
DestinationFiles="$(SdkOutputDirectory)/%(FilesToMove.Filename).dll" />
@ -212,6 +212,11 @@
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
<!-- Temporary workaround for MSBuild placing their .props files in the old 14.1 directory -->
<Move SourceFiles="$(SdkOutputDirectory)/14.1/Microsoft.Common.props"
DestinationFolder="$(SdkOutputDirectory)/15.0" />
<RemoveDir Directories="$(SdkOutputDirectory)/14.1" />
<ItemGroup>
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
</ItemGroup>

0
resources/core-sdk/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props → resources/MSBuildImports/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
View file

0
resources/core-sdk/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props → resources/MSBuildImports/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
View file

0
resources/core-sdk/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets → resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
View file

0
resources/core-sdk/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets → resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
View file

0
resources/core-sdk/Microsoft.DotNet.Core.Sdk.props → resources/MSBuildImports/Microsoft.DotNet.Core.Sdk.props
View file

0
resources/core-sdk/Microsoft.DotNet.Core.Sdk.targets → resources/MSBuildImports/Microsoft.DotNet.Core.Sdk.targets
View file

17
resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
View file

@ -1,17 +0,0 @@
<!--
***********************************************************************************************
Microsoft.NETCore.ImportBefore.props
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NETCoreProps Condition="'$(NETCoreProps)'==''">$(MSBuildExtensionsPath)\Microsoft.DotNet.Core.Sdk.props</NETCoreProps>
</PropertyGroup>
<Import Condition="Exists('$(NETCoreProps)')" Project="$(NETCoreProps)" />
</Project>

17
resources/core-sdk/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
View file

@ -1,17 +0,0 @@
<!--
***********************************************************************************************
Microsoft.NuGet.ImportBefore.props
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NuGetProps Condition="'$(NuGetProps)'==''">$(MSBuildExtensionsPath)\Microsoft.NuGet.props</NuGetProps>
</PropertyGroup>
<Import Condition="Exists('$(NuGetProps)')" Project="$(NuGetProps)" />
</Project>

17
resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
View file

@ -1,17 +0,0 @@
<!--
***********************************************************************************************
Microsoft.NETCore.ImportAfter.targets
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NETCoreTargets Condition="'$(NETCoreTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.DotNet.Core.Sdk.targets</NETCoreTargets>
</PropertyGroup>
<Import Condition="Exists('$(NETCoreTargets)')" Project="$(NETCoreTargets)" />
</Project>

17
resources/core-sdk/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
View file

@ -1,17 +0,0 @@
<!--
***********************************************************************************************
Microsoft.NuGet.ImportAfter.targets
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NuGetTargets Condition="'$(NuGetTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.NuGet.targets</NuGetTargets>
</PropertyGroup>
<Import Condition="Exists('$(NuGetTargets)')" Project="$(NuGetTargets)" />
</Project>

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

@ -8,7 +8,7 @@
"Microsoft.Extensions.DependencyModel": {
"target": "project"
},
"NuGet.ProjectModel": "3.5.0-rc1-1653"
"NuGet.ProjectModel": "3.5.0-rc1-1697"
},
"frameworks": {
"net451": {

11
src/csc/Program.cs
View file

@ -1,11 +0,0 @@
using System;
namespace ConsoleApplication
{
public class Program
{
public static void Main(string[] args)
{
}
}
}

10
src/dotnet/commands/dotnet-build3/MSBuildForwardingApp.cs
View file

@ -52,16 +52,6 @@ namespace Microsoft.DotNet.Cli
return new Muxer().MuxerPath;
}
private static string GetRuntimeConfig()
{
return Path.Combine(AppContext.BaseDirectory, "msbuild.runtimeconfig.json");
}
private static string GetDepsFile()
{
return Path.Combine(AppContext.BaseDirectory, "msbuild.deps.json");
}
private static string GetMSBuildExePath()
{
return Path.Combine(

5
src/dotnet/commands/dotnet-restore/NuGetForwardingApp.cs
View file

@ -29,11 +29,6 @@ namespace Microsoft.DotNet.Tools.Restore
return _forwardingApp.Execute();
}
private static string GetHostPath()
{
return new Muxer().MuxerPath;
}
private static string GetNuGetExePath()
{
return Path.Combine(

13
src/redist/project.json
View file

@ -8,10 +8,17 @@
"type": "platform",
"version": "1.0.0"
},
"csc": "1.0.0-featmsbuild-*",
"tool_csc": "1.0.0-featmsbuild-*",
"dotnet": "1.0.0-featmsbuild-*",
"nuget": "1.0.0-featmsbuild-*",
"tool_msbuild": "1.0.0-featmsbuild-*"
"tool_nuget": "1.0.0-featmsbuild-*",
"tool_msbuild": "1.0.0-featmsbuild-*",
"MSBuild": "0.1.0-preview-00029-160805",
"Microsoft.Build.Framework": "0.1.0-preview-00029-160805",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805",
"Microsoft.Build.Targets": "0.1.0-preview-00029-160805",
"Microsoft.Build": "0.1.0-preview-00029-160805"
},
"frameworks": {
"netcoreapp1.0": {

0
src/csc/project.json → src/tool_csc/project.json
View file

10
src/nuget/project.json → src/tool_nuget/project.json
View file

@ -8,20 +8,10 @@
"type": "platform",
"version": "1.0.0"
},
"NuGet.Commands": {
"version": "3.5.0-rc1-1697",
"exclude": "compile"
},
"NuGet.CommandLine.XPlat": "3.5.0-rc1-1697"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"netstandardapp1.5",
"portable-net45+win8",
"portable-net45+wp80+win8+wpa81+dnxcore50"
]
}
}
}