Commit graph

303 commits

Author SHA1 Message Date
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
Livar Cunha
06aa54d16c Fixing a test. 2016-10-06 19:29:20 -07:00
Livar Cunha
167470b1c9 Updating the SDK version, which we need to pick up the NuGetTargetMoniker fix. 2016-10-06 18:31:15 -07:00
Rohit Agrawal
28bd507f40 update nuget and sdk to 3.6.0-rc-1954 and 1.0.0-alpha-20161006-3 (#4332) 2016-10-06 09:35:58 -07:00
Faizan Ahmad
3f271e1215 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-06 17:50:59 +05:30
Sridhar Periyasamy
1d85c241b1 Add support to migrate folders specified in global.json 2016-10-05 16:27:17 -07:00
Sridhar Periyasamy
a396630576 Fix P2P migration
Fixes #4269 by deep cloning the MsbuildTemplateProject for each P2P reference. Add test which migrates and builds P2P references.
2016-10-05 16:25:28 -07:00
Livar Cunha
bfc1f82d68 Fixing the tools item name in csproj. Nuget used a different one then was originally at the spec. 2016-10-05 15:27:30 -07:00
Livar
7a0dff8a96 Merge pull request #4300 from livarcocc/support_for_toolsref
Support for toolsref
2016-10-05 13:18:12 -07:00
Livar Cunha
1570e0fde4 Moving the ProjectToolsCommandResolver to dotnet out of Cli.Utils because of the dependency on Microsoft.Build. Also added a EndToEnd test for tools ref using the MSBuildTestApp. 2016-10-04 18:59:44 -07:00
Bryan Thornbury
49637d0fe9 pr feedback 2016-10-04 16:37:23 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -07:00
Bryan Thornbury
adff632929 green 2016-10-03 20:10:09 -07:00
Faizan Ahmad
b240b855c1 Update the new version of Microsoft.TestPlatform.cli which has fix related to testAdapterPath.
Updated the test project to reflect the same.
2016-10-04 00:17:35 +05:30
Livar Cunha
5f3da6428d Testing out a theory that setting the output path will solve this problem. 2016-09-30 15:52:22 -07:00
Livar Cunha
27b5abfc36 Trying out with the latest SDK. 2016-09-30 12:03:03 -07:00
Livar Cunha
4173d19b3c Pinning the SDK version for migrated apps. 2016-09-30 09:27:16 -07:00
Livar Cunha
29b197534c Updating to a new SDK and adding a work around to set project.lock.json for migrated projects. 2016-09-30 09:27:15 -07:00
Livar Cunha
715f1f6a10 Addressing code review comments. 2016-09-30 09:27:15 -07:00
Livar Cunha
c41b35f06f Updating tests to reflect msbuild projects running without project.json. 2016-09-30 09:25:11 -07:00
Livar Cunha
2bbef9328b Removing project.json from msbuild template and msbuild test app. 2016-09-30 09:25:11 -07:00
Sridhar Periyasamy
a50708ac5c Address PR feedback 2016-09-28 09:00:15 -07:00
Eric Erhardt
5434c7f392 Merge pull request #4237 from eerhardt/PublishCommand
Add `dotnet publish3` command
2016-09-26 11:51:19 -05:00
Sridhar Periyasamy
ec7aa87576 Add xproj tests to test migrate command. 2016-09-23 17:33:35 -07:00
Sridhar Periyasamy
46ab621422 Migrate P2P references
- Given a project migrate all the project references recursively.
- Add a boolean option '--skip-project-references' to skip migrating P2P references. By default P2P references are migrated.
- Remove the '--output' since it is not used heavily and makes migrating multiple projects easier.
- Add tests
2016-09-23 14:25:57 -07:00
Eric Erhardt
66fbd6f278 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160923-4. 2016-09-23 16:14:03 -05:00
Livar Cunha
2ffe5233bd Removed the roslyn-master-nightly feed. Web hook is being set there. For now, pushed the dependencies by hand to cli-deps. Also updated to a new package from Roslyn with a fix to a NRE that was happening on windows. 2016-09-23 10:16:44 -07:00
Livar Cunha
85d6f3ccce Updating csc to 2.0.0-beta and replace Microsoft.Net.Compilers.Targets.NetCore package with Microsoft.CodeAnalysis.Build.Tasks 2016-09-23 10:16:44 -07:00
Eric Erhardt
d4f6144355 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160921-4. 2016-09-23 12:12:55 -05:00
Eric Erhardt
5cfe3e9ff5 Merge pull request #4229 from eerhardt/NewCommands
Create a `dotnet msbuild` command and fill out the applicable command line arguments to `dotnet build3`.
2016-09-23 09:05:01 -05:00
Eric Erhardt
5bd310bbd5 Add dotnet msbuild tests. 2016-09-22 15:56:36 -05:00
Bryan Thornbury
362f71a94a Project Json mapping migration support 2016-09-20 21:18:11 -07:00
Bryan Thornbury
3a567e5957 Merge pull request #4185 from brthor/brthor/migrate-x-targetting
Migration X-Targeting
2016-09-19 16:01:04 -07:00
Bryan Thornbury
67f292947d try again 2016-09-19 11:11:01 -07:00
Faizan2304
0ce597a147 Implemented vstest verb which will run the test from given container. (#4115)
* Implemented vstest verb which will run the test from given container.

* Fixed Nitpick.

* 1) Addressed PR comment
2) Added tests for vstest verb

* Using specific version of Microsoft.TestPlatform.

* Address PR comments.

Modified help text for the vstest command.
Removed unused function.

* Fixed package related issue.
--Taking reference of microsoft.testplatform.cli nuget package which has contentFolder in it so that sub folder of this nuget can also be added in cli package.
-- Removing vstest.console, vshost and datacollector from Bundletools as we dont want *.deps.json to be override

* Nitpick

* Making vstest.console arguments compatible for non windows platform

* Fix tests to run on linux machine

* Updated the microsoft.testplatform.cli nuget package version. This version has fix related to non windows machine.

* changed dapter path from bin/debug to bin/Debug

* updated nuget version of package Microsoft.TestPlatform.CLI.

* Revert "updated nuget version of package Microsoft.TestPlatform.CLI."

This reverts commit bcc26c21d11c2bd2e5259a74f9890b0fd75962c7.

* Updated version of nuget package Microsoft.TestPlatform.CLI
Added Test project in solution file

* Addressed PR comment.

* Removed unnecessary --platform argument from test
2016-09-19 10:59:26 -07:00
Bryan Thornbury
f295e16732 fix Script tests: 2016-09-16 16:12:11 -07:00
Eric Erhardt
f9953c1e68 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160914-1. 2016-09-14 14:55:17 -05:00
Rohit Agrawal
194a850c71 update nuget and sdk to include msbuild pack target 2016-09-12 17:10:31 -07:00
Eric Erhardt
f084032af6 Ensure the project is built in dotnet run3. 2016-09-09 08:53:57 -05:00
Eric Erhardt
ab8e1b707b Merge pull request #4143 from eerhardt/NewSDK
Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160907-1
2016-09-07 15:44:23 -05:00
Eric Erhardt
8000c98103 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160907-1 2016-09-07 14:49:18 -05:00
Livar Cunha
1767385aa1 Updating versions in a few places that did not exist in the preview2 branch. 2016-09-02 15:01:59 -07:00
Livar Cunha
27bc1c4f91 Merge branch 'rel/1.0.0-preview2' into merge_preview2_to_rel100
* rel/1.0.0-preview2:
  Update versions of EF and scaffolding tools
  Update Kestrel to 1.0.1
  Update version of routing to 1.0.1
  Add missing comma to F# lib project.json
  Update cshtml wildcard in publishOptions
  Don't print arguments in F# console app
  Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
  Update MVC version to 1.0.1
  Upgrade Corefx and coreclr references
  fix typo in dotnet-install file
  Remove the VS2012 CRT dependency from docs (#3632)
  Fix README to use hostfxr download links (#3622)
  Fix Oracle Linux version in README.md
  Use NugetCache Sentinel for Telemetry setting.
  Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.
  Remove showing firsttime eula for non verbs.
  Adding Oracle Linux and Linux Mint to the titles
  Moving Ubuntu 16.04 to be next to Ubuntu 14.04
  Update README.md
2016-09-02 14:53:16 -07:00
Joel Verhagen
3619b7d767 Set the "hashPath" when building the .deps.json file
Update Microsoft.Extensions.DependencyModel to 1.0.1-beta-000933
Update Microsoft.DotNet.PlatformAbstraction to 1.0.1-beta-000933
Update NuGet to 3.6.0-beta.1.msbuild.4
Update dotnet-test-xunit to 1.0.0-rc2-350904-49
2016-09-02 10:02:54 -07:00
Eric Erhardt
0e4044b8bd Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1 2016-09-01 11:08:34 -05:00
Sridhar Periyasamy
8fcfc2af05 Upgrade Corefx and coreclr references
Microsoft.NetCore.App 1.0.0 => 1.0.1
Microsoft.NETCore.Runtime.CoreCLR 1.0.2 => 1.0.4
CLI Branding "Microsoft .NET Core 1.0.0 - SDK Preview" => "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-003122"

List of changes
- all project.jsons
- dotnet new templates
- and build projects files
   - shared-build-targets-utils\DependencyVersions.cs
   - CliDependencyVersions.cs
2016-08-31 10:41:47 -07:00
Bryan Thornbury
b0554d3ff3 PR Feedback 2016-08-30 12:00:56 -07:00
Bryan Thornbury
47cf8fbda6 Additional TestAssets 2016-08-30 12:00:11 -07:00
Bryan Thornbury
b900f0b327 Solution and project cleanup 2016-08-30 12:00:08 -07:00
Eric Erhardt
a543050c62 Update the Sdk version to the latest build. 2016-08-23 13:44:07 -05:00
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
3194ec1c3a Shorten test asset names 2016-08-18 13:36:36 -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
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
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
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
Eric Erhardt
e908ffec91 Fix build3 tests. 2016-07-21 18:29:35 -05:00
Eric Erhardt
72c59c4d05 Add test for MSBuild End to End. 2016-07-21 16:02:57 -05:00
Eric Erhardt
0eeb58f4eb Clean up the temporary TestAsset changes. 2016-07-21 12:23:51 -05:00
Eric Erhardt
b068687413 Implement 'run3' command which will execute the MSBuild project.
Also create a 'dotnet new -t msbuild' template.
2016-07-21 11:57:20 -05:00
Eric Erhardt
30712966cc Prototype round #1 of .NET Core MSBuild .props and .targets. 2016-07-21 11:57:18 -05:00
Eric Erhardt
d2db776d87 Merge rel/1.0.0 into feature/msbuild. 2016-07-18 14:44:06 -05:00
Ajay Bhargav Baaskaran
dbf7435c3c [Fixes #3502] Fix: publishOptions: [...] not respected 2016-07-13 15:09:22 -07:00
Ajay Bhargav Baaskaran
c748c81a4a [Fixes #3856] Allow mapping of the same file to multiple target paths 2016-07-13 14:56:22 -07:00
Bryan Thornbury
400e1db3b9 dotnet-build3 Adding msbuild execution command to cli 2016-06-23 13:57:33 -07:00
Bryan Thornbury
9e97d0400c dotnet-compile-fsc bump to latest 2016-06-14 03:31:22 -07:00
Bryan Thornbury
9b1415d860 Update FSharp Test Assets to preview2 2016-06-14 02:19:32 -07:00
Eric Erhardt
f25f047376 Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. 2016-06-14 03:14:53 -05:00
eerhardt
2aa3dd0843 Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively 2016-06-11 04:29:58 +00:00
eerhardt
7b51f28c7f Updating CoreFx, CoreClr, CoreSetup to rc3-24210-06, rc3-24210-01, rc3-3004449-00 respectively 2016-06-10 15:05:30 +00:00
Eric Erhardt
ef4a8e85ef Updating CoreSetup to rc3-004443-00. 2016-06-10 01:09:46 -05:00
eerhardt
cd9bcd40b3 Updating CoreFx, CoreClr, CoreSetup to rc3-24209-08, rc3-24208-04, rc3-3004442-00 respectively 2016-06-09 21:14:15 -05:00
Eric Erhardt
f43aad780c Updating CoreFx, CoreClr, Roslyn, CoreSetup, DiaSymReader to rc3-24208-04, rc3-24208-04, beta1-20160608-03, rc3-004425, rc2-60608-04 respectively 2016-06-08 22:56:25 -05:00
Eric Erhardt
d2f1fa0300 Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively. 2016-06-07 18:24:30 -05:00
Eric Erhardt
334b079995 Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively. 2016-06-06 18:56:24 -05:00
Andrew Stanton-Nurse
dd51836aac fix #2289 by integrating EF's version of project load context (#3402) 2016-06-06 15:08:46 -07:00
Eric Erhardt
42938f180f Updating CoreSetup to rc3-004406 2016-06-06 11:15:07 -05:00
eerhardt
354b1d38d5 Updating CoreFx, CoreSetup to rc3-24206-00, rc3-004404 respectively 2016-06-06 14:24:51 +00:00
eerhardt
ea8ae8d1c7 Updating CoreFx, CoreSetup to rc3-24204-00, rc3-004400 respectively 2016-06-04 18:32:34 +00:00
Eric Erhardt
4f95bc0010 Update CoreSetup to rc3-004397 2016-06-04 00:00:28 -05:00
Eric Erhardt
9ffe91f367 Move dependency from Microsoft.NETCore.Runtime to Microsoft.NETCore.Runtime.CoreCLR. 2016-06-03 16:35:00 -05:00
Eric Erhardt
8162f89996 Fixing PortableAppWithRuntimeTargetsIsPublishedCorrectly now that libuv is contained in the Shared Framework. 2016-06-03 11:16:52 -05:00
Eric Erhardt
f16f2e64eb Updating CoreFx, CoreSetup, Roslyn to rc3-24201-00, rc3-004391, beta1-20160602-01 2016-06-03 07:27:42 -05:00
Eric Erhardt
351255dda1 Updating CoreSetup to rc3-004373 2016-06-02 14:45:00 -05:00
Livar Cunha
5c1f20b6e8 Adding the new OSes RIDs to a couple of test projects that were missed before. 2016-05-31 17:13:17 -07:00
Livar Cunha
7652335195 Addressing code review comments and adding opensuse 13.2 2016-05-31 15:15:57 -07:00
Livar Cunha
7963018d3d Small changes that I noticed when diffing the files 2016-05-31 15:15:08 -07:00
Livar Cunha
e634fedae8 Adding Fedora 23 2016-05-31 15:15:08 -07:00
Livar Cunha
84d1b60ffe Adding docker files, modifying scripts and code to handle ubuntu 16.04 2016-05-31 15:15:08 -07:00
eerhardt
657c03b625 Updating CoreFx, CoreSetup to rc3-24131-00, rc3-004363 respectively 2016-05-31 20:27:46 +00:00
Eric Erhardt
d50068a5e4 Updating CoreFx, CoreSetup to rc3-24128-00, rc3-004338 respectively 2016-05-31 12:55:36 -05:00
Eric Erhardt
fad7477ea5 Microsoft.NETCore.App no longer supports netstandard
Any project that references Microsoft.NETCore.App must target netcoreapp1.0.

Moving app projects to netcoreapp1.0; moving library projects to reference NETStandard.Library.
2016-05-31 09:54:28 -05:00
eerhardt
a087de2f87 Updating CoreFx, CoreSetup to rc3-24127-01, rc3-004336 respectively 2016-05-28 00:48:49 +00:00
Pavel Krymets
0f573ed04b Merge pull request #3256 from dotnet/pakrym/filter-fullcrl-deps
Filter build dependencies from fullclr embedded deps file
2016-05-27 14:53:17 -07:00
eerhardt
80820a638b Updating CoreFx, CoreSetup to rc3-24127-00, rc3-004324 respectively 2016-05-27 18:12:45 +00:00
eerhardt
ef76efa02c Updating CoreFx, CoreSetup to rc3-24126-01, rc3-004322 respectively 2016-05-27 08:05:08 +00:00
Pavel Krymets
928283d531 Filter build dependencies from fullclr embedded deps file 2016-05-26 14:27:51 -07:00
Eric Erhardt
08a3ffe3aa Move to netstandard1.6
This is needed because DependencyModel uses the AppContext.GetData API, which is only available in netstandard1.6 as of CoreFX build rc3-24126.
2016-05-26 15:42:30 -05:00