Commit graph

3453 commits

Author SHA1 Message Date
Joel Verhagen
aacc30d5d8 Add "path" property the .deps.json file for libraries
Update DependencyModel and PlatformAbstractions packages to 1.0.1-beta-000917
Update dotnet-test-xunit to 1.0.0-rc2-330423-54
2016-08-18 15:57:03 -07:00
Piotr Puszkiewicz
08fe61aa00 Merge pull request #4059 from dotnet/piotrpMSFT/TestAssetManager
Migrate to Test Asset Manager
2016-08-18 17:55:02 -04:00
Piotr Puszkiewicz
3194ec1c3a Shorten test asset names 2016-08-18 13:36:36 -07:00
PiotrP
c3971fc100 Add missing build artifacts 2016-08-18 12:36:25 -07:00
Piotr Puszkiewicz
9a1d4b7ef8 Fix packagedcommandtests 2016-08-18 12:36:25 -07:00
Piotr Puszkiewicz
4e2d13a8ff Microsoft.DotNet.ProjectModel.Tests to TAM 2016-08-18 12:36:25 -07:00
Piotr Puszkiewicz
fa9c795823 Move Microsoft.Dotnet.Cli.Utils.Tests to TAM 2016-08-18 12:36:25 -07:00
Piotr Puszkiewicz
9f08302bbf Move packagedcommandtests to TAM 2016-08-18 12:36:25 -07:00
Piotr Puszkiewicz
31756737d3 dotnet-resgen.Tests
move dotnet-resgen.Tests to TAM
remove unnecessary code from dotnet-publish.Tests
add missing lock files in dotnet-compile.Tests
2016-08-18 12:36:25 -07:00
Piotr Puszkiewicz
8fbc227422 Move dotnet-pack.Tests to TestAssetsManager 2016-08-18 12:36:25 -07:00
Piotr Puszkiewicz
8c9e1fca90 TestAssetManager in CompilerTests 2016-08-18 12:36:25 -07:00
Livar
e98509dda6 Merge pull request #4064 from livarcocc/fix_system_reflection_metadata
Updating System.Reflection.Metadata in more places
2016-08-18 12:34:25 -07:00
Livar Cunha
90232486e5 Updating System.Reflection.Metadata to a newer version in some projects that I forgot to do so before. 2016-08-18 11:55:27 -07:00
Livar
309c4911df Merge pull request #4061 from livarcocc/new_pdb
Updating the System.Reflection.Metadata version
2016-08-18 08:58:37 -07:00
Livar Cunha
86f8115ee7 Updating the System.Reflection.Metadata version and changing the order of platform assemblies passed to crossgen. 2016-08-17 16:42:19 -07:00
Justin Emgarten
51ea2e6014 Adding Restore3 command for msbuild restore support. 2016-08-12 00:05:21 -07:00
Eric Erhardt
c781b0a21f Merge pull request #4040 from livarcocc/remove_azure_storage_dll
Remove azure storage dll from stage0
2016-08-11 21:03:20 -05:00
Livar Cunha
8bd9430660 Removing the hack that added Microsoft.WindowsAzure.Storage.dll to stage0 because of an issue in msbuild. 2016-08-11 16:09:06 -07:00
Eric Erhardt
150abf543b Merge pull request #4008 from eerhardt/msbuild-RemoveSdk
Remove the SDK artifacts from the CLI.
2016-08-11 17:31:47 -05:00
Eric Erhardt
6cf2167992 Update the CLI to use the new Core SDK nuget package.
No need for build3 to set Platform properties and BaseNuGetRuntimeIdentifier.  The SDK handles that.

Also, no need to set "runtimes" any more in the default project.json.
2016-08-11 12:05:28 -05:00
Eric Erhardt
109e004ee7 Merge pull request #4038 from eerhardt/msbuild-fixJenkins
Fix CI by not copying Microsoft.DotNet.PlatformAbstractions to stage0 since it is already loaded into the stage0 dotnet process.
2016-08-11 10:33:08 -05:00
Eric Erhardt
70c80bf2d3 Fix CI by not copying Microsoft.DotNet.PlatformAbstractions to stage0, since it is already loaded into the stage0 dotnet process. 2016-08-11 07:42:23 -05:00
Eric Erhardt
bc04f905db Remove Build.Tasks.Tests. 2016-08-10 20:09:15 -05:00
Eric Erhardt
f48effff61 Add System.Resources.Writer to src\dotnet\project.json 2016-08-10 20:08:54 -05:00
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
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