Commit graph

3719 commits

Author SHA1 Message Date
Eric Erhardt
94223a7009 Tell dotnet restore to install nuget.props and nuget.targets files using an environment variable, so the SDK .targets are installed into the user's project. 2016-08-10 20:08:17 -05:00
Eric Erhardt
736652fe71 Remove the SDK artifacts from the CLI.
These are now contained in github.com/dotnet/sdk.
2016-08-10 20:08:17 -05:00
Livar
a0244b9946 Merge pull request #4017 from livarcocc/remove_dependency_model
Remove dependency model
2016-08-10 14:17:05 -07:00
Livar Cunha
75524b0c6a Disabling the net451 discovery tests. 2016-08-10 13:40:27 -07:00
Livar Cunha
8bb7e01f0f Fixing a version conflict in Testing.Abstractions and bumping InternalsAbstractions version to 2.0.0, since I removed some public APIs from it. 2016-08-10 13:40:27 -07:00
Livar Cunha
d8e7d37616 Addressing code review comments 2016-08-10 13:40:27 -07:00
Livar Cunha
8fa2d35291 Updating dotnet new test so that it does not use project dependencies and honors package dependencies. 2016-08-10 13:40:27 -07:00
Livar Cunha
7b94fa7df2 Updating the xunit version to match the new version of dotnet-test-xunit. 2016-08-10 13:40:27 -07:00
Livar Cunha
dc7f1fdf84 Updating the xunit version to one that does not depend on internalabstractions. 2016-08-10 13:40:13 -07:00
Livar Cunha
b7b90175f4 Removing the public types from InternalAbstractions. 2016-08-10 13:39:49 -07:00
Livar Cunha
5c4785e662 Removing dependency model from one of the packaged projects in the CLI. 2016-08-10 13:39:49 -07:00
Livar Cunha
0a55a7cb99 Updating the msbuild changes to handle DependencyModel coming from core-setup instead of a project dependency. 2016-08-10 13:39:49 -07:00
Livar Cunha
e900e23544 Updating dependencies to use the new dependencymodel and platformabstractions. Also updated the xunit template to add internalabstractions.
Conflicts:
	src/Microsoft.DotNet.Cli.Utils/project.json
	test/dotnet-build.Tests/BuildOutputTests.cs
2016-08-10 13:39:49 -07:00
Livar Cunha
ee1474c161 Removing dependency model from CLI repo.
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/PackageTargets.cs
	build_projects/dotnet-cli-build/TestPackageProjects.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	src/Microsoft.Extensions.DependencyModel/CompilationLibrary.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContext.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextLoader.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/PackageCacheCompilationAssemblyResolver.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs
	src/Microsoft.Extensions.DependencyModel/project.json
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs
	test/Microsoft.Extensions.DependencyModel.Tests/FunctionalTests.cs
	test/Microsoft.Extensions.DependencyModel.Tests/PackageCacheResolverTest.cs
	test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs
2016-08-10 13:39:49 -07:00
Piotr Puszkiewicz
66dd155160 Merge pull request #4031 from dotnet/piotrpMSFT/remove_dotnet-build.tests
remove dotnet-build.tests
2016-08-10 15:52:51 -04:00
PiotrP
a7d594049b Remove dotnet-build.tests
This capability is being replaced by MSBuild, and the project.json tests are very long running.
2016-08-10 11:55:56 -07:00
Eric Erhardt
ec2cd254f1 Merge pull request #4027 from eerhardt/msbuild-reenableBuild3Tests
Fix and re-enable build3 tests for windows and OSX
2016-08-10 11:13:39 -05:00
Eric Erhardt
2b741bca27 Fix and re-enable build3 tests. 2016-08-10 09:21:43 -05:00
Eric Erhardt
49527d3ea6 Merge pull request #4000 from MichaelSimons/nanoInstaller
Modified dotnet-install.ps1 to support Nano Server
2016-08-09 21:09:51 -05:00
Eric Erhardt
2708a364b4 Merge pull request #4013 from dotnet/blackdwarf-patch-1
Update HelpCommand.cs
2016-08-09 21:08:08 -05:00
Piotr Puszkiewicz
6b04136c31 Merge pull request #4024 from dotnet/piotrpMSFT/redistProj
src/redist/project.json
2016-08-09 18:19:12 -04:00
Piotr Puszkiewicz
b3f5174f00 PR Feedback 2016-08-09 14:49:13 -07:00
Piotr Puszkiewicz
3a55a4182f src/redist/project.json 2016-08-09 13:22:22 -07:00
Piotr Puszkiewicz
912a47f672 Merge pull request #4020 from dotnet/piotrpMSFT/msbuild872
Move CLI Build to MSBuild 00024-160610
2016-08-09 13:10:50 -04:00
Eric Erhardt
e6ed1bd32f Completely remove buildtools from our build. 2016-08-09 10:28:51 -05:00
Eric Erhardt
2bea6bac83 Move 14.1 to 15.0 now that MSBuild is version 15.0. 2016-08-09 10:28:50 -05:00
Eric Erhardt
38d18eab4d Fix dotnet-install.ps1.
Allow directories named "publish" in .gitignore.
Add files to the .sln.
2016-08-09 08:28:53 -05:00
Eric Erhardt
d5179f9168 Temporarily copy the dotnet/buildtools tasks we use into dotnet/cli to allow us to move up to a newer MSBuild. 2016-08-09 08:28:23 -05:00
Piotr Puszkiewicz
16692fc75c Remove CDN caching from version files 2016-08-09 02:41:12 -07:00
Piotr Puszkiewicz
5f60c2cf37 Move CLI Build to MSBuild 00024-160610 2016-08-09 01:12:29 -07:00
Piotr Puszkiewicz
6a8c8b2dda Merge pull request #4019 from dotnet/piotrpMSFT/msbuild872
Fix for #4018
2016-08-09 04:11:41 -04:00
Piotr Puszkiewicz
f09903d5c6 Copy MSBuild.exe into root dir to work around MSBUILD #872 2016-08-09 00:28:41 -07:00
Piotr Puszkiewicz
9009c6512c Merge pull request #4018 from dotnet/piotrpMSFT/msbuildUpdate
Update MSBUILD
2016-08-08 18:34:28 -04:00
PiotrP
359f274626 Workaround for msbuild #872 2016-08-08 14:35:09 -07:00
PiotrP
f277103831 Make GivenThatICopyLibraryAssets repeatable 2016-08-08 13:44:44 -07:00
Michael Simons (VISUAL STUDIO)
b53e254fbd Updated Add-Type logic to account for Powershell Core Edition 2016-08-08 15:03:36 -05:00
Zlatko Knezevic
3abada74d4 Update HelpCommand.cs
Changing the text from "Common Commands" to just "Commands" to indicate that these are in the box, so to speak.
2016-08-07 07:31:28 -07:00
Piotr Puszkiewicz
79648f9ccb Update stage0 msbuild 2016-08-07 01:51:47 -07:00
Tomáš Matoušek
8f00e03c43 Merge pull request #3989 from tmat/AnyDebugType
Pass debugType thru to the command line compiler
2016-08-04 13:14:42 -07:00
Michael Simons (VISUAL STUDIO)
a34e93c340 Modified dotnet-install.ps1 to support Nano Server 2016-08-04 15:04:26 -05:00
Eric Erhardt
8cf16ce1eb Merge pull request #3960 from jplebre/dotnet-new-nunit
Adds dotnet-new for nunit, similar to the xunit template
2016-08-04 08:14:33 -05:00
Tomas Matousek
dfbea3df34 Pass debugType thru to the command line compiler 2016-08-03 18:08:14 -07:00
jplebre
db17fb6889 xunit and nunit template tests cannot run in parallel 2016-08-03 22:06:17 +01:00
jplebre
e5dad7e451 Cleaned up unused bits 2016-08-03 22:06:17 +01:00
jplebre
408d083525 eeeek! (sorry, wrong dependency version edited) 2016-08-03 22:06:17 +01:00
jplebre
4508884c42 clean up and added nunit command to README 2016-08-03 22:06:17 +01:00
jplebre
09d37fe3ec removed the -* from version numbers in xunit and nunit templates 2016-08-03 22:06:17 +01:00
jplebre
06d7a84c08 Added tests as a project to the solution 2016-08-03 22:06:17 +01:00
jplebre
82bf84f46b projec.json should be the same as nunit's template 2016-08-03 22:06:17 +01:00
jplebre
b889e97a88 fixed trailing commas 2016-08-03 22:06:17 +01:00