Merge pull request #4288 from livarcocc/msbuild15
Moving msbuild dependencies to msbuild 15.
This commit is contained in:
commit
77e526396c
9 changed files with 31 additions and 55 deletions
|
@ -17,7 +17,7 @@
|
|||
<Version>1.0.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.NETCore.Sdk">
|
||||
<Version>1.0.0-alpha-20161006-3</Version>
|
||||
<Version>1.0.0-alpha-20161007-1</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -4,9 +4,8 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Library</OutputType>
|
||||
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
|
||||
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
|
||||
<OutputPath>bin\$(Configuration)\netcoreapp1.0</OutputPath>
|
||||
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
|
||||
<OutputPath>bin\$(Configuration)</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -14,12 +13,27 @@
|
|||
<None Include="project.json" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.NETCore.Sdk">
|
||||
<Version>1.0.0-alpha-20161007-1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MSTest.TestAdapter">
|
||||
<Version>1.0.3-preview</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MSTest.TestFramework">
|
||||
<Version>1.0.4-preview</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft.CSharp.targets" />
|
||||
<Target Name="AfterBuild">
|
||||
<Copy SourceFiles="$(NuGetPackageRoot)\mstest.testadapter\1.0.3-preview\build\_common\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
|
||||
<Copy SourceFiles="$(NuGetPackageRoot)\mstest.testadapter\1.0.3-preview\build\dotnet\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
|
||||
<Copy SourceFiles="$(NuGetPackageRoot)\mstest.testadapter\1.0.3-preview\build\_common\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
|
||||
<Copy SourceFiles="$(NuGetPackageRoot)\mstest.testframework\1.0.1-preview\lib\dotnet\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
|
||||
<Copy SourceFiles="$(NuGetPackageRoot)\mstest.testframework\1.0.1-preview\lib\dotnet\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
|
||||
<Copy SourceFiles="$(NuGetPackageRoot)\mstest.testframework\1.0.4-preview\lib\dotnet\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
|
||||
<Copy SourceFiles="$(NuGetPackageRoot)\mstest.testframework\1.0.4-preview\lib\dotnet\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"/>
|
||||
</Target>
|
||||
</Project>
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"MSTest.TestAdapter": "1.0.3-preview",
|
||||
"MSTest.TestFramework": "1.0.1-preview"
|
||||
},
|
||||
"frameworks": {
|
||||
"netcoreapp1.0": {
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.Sdk": "1.0.0-alpha-20161006-3",
|
||||
"Microsoft.NETCore.App": {
|
||||
"version": "1.0.1",
|
||||
"type": "platform"
|
||||
}
|
||||
},
|
||||
"imports": [
|
||||
"dnxcore50",
|
||||
"portable-net45+win8"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
|
||||
<FilesToMove Include="$(BinaryToCorehostifyRelDir)/csc.exe;$(BinaryToCorehostifyRelDir)/MSBuild.exe;" />
|
||||
<FilesToMove Include="$(BinaryToCorehostifyRelDir)/csc.exe;" />
|
||||
<BundledTools Include="csc;MSBuild;NuGet.CommandLine.XPlat;dotnet" />
|
||||
<MSBuildImportsContent Include="$(MSBuildImportsDir)/**/*" />
|
||||
</ItemGroup>
|
||||
|
@ -216,12 +216,6 @@
|
|||
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
|
||||
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
|
||||
<!--
|
||||
MSBuild's nupkg puts Microsoft.Common.props in an "Extensions" folder. Take that folder out of the hierarchy, since
|
||||
the CLI sets $(MSBuildExtensionsPath) to be the $(SdkOutputDirectory).
|
||||
-->
|
||||
<Move SourceFiles="$(SdkOutputDirectory)/Extensions/15.0/Microsoft.Common.props"
|
||||
DestinationFolder="$(SdkOutputDirectory)/15.0" />
|
||||
<RemoveDir Directories="$(SdkOutputDirectory)/Extensions" />
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -239,15 +233,5 @@
|
|||
DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
|
||||
<Delete Files="@(PdbsToClean)" />
|
||||
|
||||
<!-- workaround for https://github.com/Microsoft/msbuild/issues/872 -->
|
||||
<Copy SourceFiles="$(MSBuildTargetsDirectory)/MSBuild.exe"
|
||||
DestinationFiles="$(SdkOutputDirectory)/MSBuild.exe" />
|
||||
|
||||
<Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
|
||||
DestinationFiles="$(SdkOutputDirectory)/MSBuild.exe.config" />
|
||||
|
||||
<Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
|
||||
DestinationFiles="$(MSBuildTargetsDirectory)/MSBuild.exe.config" />
|
||||
</Target>
|
||||
</Project>
|
|
@ -17,7 +17,7 @@
|
|||
<Version>1.0.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.NETCore.Sdk">
|
||||
<Version>1.0.0-alpha-20161006-3</Version>
|
||||
<Version>1.0.0-alpha-20161007-1</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@
|
|||
"exclude": "compile"
|
||||
},
|
||||
|
||||
"Microsoft.Build": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build": "15.1.298-preview5",
|
||||
|
||||
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933"
|
||||
},
|
||||
|
|
|
@ -19,12 +19,7 @@
|
|||
"tool_nuget": "1.0.0-preview3-*",
|
||||
"tool_msbuild": "1.0.0-preview3-*",
|
||||
|
||||
"MSBuild": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build.Framework": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build.Targets": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build.Runtime": "15.1.298-preview5",
|
||||
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",
|
||||
"System.Runtime.Serialization.Xml": "4.1.1",
|
||||
"NuGet.Build.Tasks": "3.6.0-rc-1954",
|
||||
|
|
|
@ -8,12 +8,10 @@
|
|||
"type": "platform",
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"MSBuild": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build.Targets": "0.1.0-preview-00043-160929",
|
||||
"Microsoft.Build.Runtime": "15.1.298-preview5",
|
||||
"Microsoft.Net.Compilers.netcore": "2.0.0-beta6-60922-08",
|
||||
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",
|
||||
"Microsoft.Cci": "4.0.0-rc3-24128-00",
|
||||
"Microsoft.NuGet.Build.Tasks": "1.0.0-alpha-000004",
|
||||
"Microsoft.Composition": "1.0.30"
|
||||
},
|
||||
"frameworks": {
|
||||
|
|
|
@ -22,6 +22,12 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
|
|||
|
||||
string testProjectDirectory = testInstance.TestRoot;
|
||||
|
||||
new Restore3Command()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
.Execute()
|
||||
.Should()
|
||||
.Pass();
|
||||
|
||||
// Build project DotNetCoreTestProject
|
||||
new Build3Command()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue