Commit graph

1987 commits

Author SHA1 Message Date
Eric Erhardt
6cf0327875 Remove dotnet-compile-fsc.
It's new home is https://github.com/dotnet/netcorecli-fsc/
2016-10-10 11:23:46 -05:00
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
Livar Cunha
09d811fdbd Adding an OverrideRid property used in the GetRuntimeInfo task to override the rid of the CLI. This allows us to build for osx.10.11 when building on osx.10.12. 2016-10-08 11:45:19 -07:00
Bryan Thornbury
2727b191e3 Merge pull request #4310 from brthor/brthor/migrationreport
Migration Report
2016-10-07 11:01:06 -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
Livar Cunha
6242db9b14 Moving msbuild dependencies to msbuild 15. 2016-10-06 17:29:07 -07:00
Bryan Thornbury
fbaf9a679e Project Migration Report 2016-10-06 15:56: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
5c6e3a05fb Merge pull request #4305 from dotnet/sridhar-ms/migrate-p2p-fix
Fix P2P migration and migrate folders in global.json
2016-10-05 20:59:39 -07:00
Sridhar Periyasamy
c6064677db Address PR feedback 2016-10-05 17:58:42 -07:00
Bryan Thornbury
d0b28bc7ad remove lock file workaround 2016-10-05 17:02:32 -07:00
Nate McMaster
b38f644347 Merge pull request #4326 from dotnet/namc/user-secrets
Add migration rule for 'userSecretsId'
2016-10-05 16:40:38 -07:00
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
Faizan Ahmad
a8e7df848b Adding support for noBuild, output and framework. 2016-10-06 04:33:54 +05:30
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
Nate McMaster
190f0fc756 Rename to MigrateJsonPropertiesRule 2016-10-05 15:15:13 -07:00
Nate McMaster
dd7a76e6f0 Add migration rule for 'userSecretsId' 2016-10-05 15:05:19 -07:00
Fredric Silberberg
b2802cdf50
Added comment about updating in VS calls of dotnet migrate when cli args change. 2016-10-05 14:26:20 -07:00
Bryan Thornbury
50e83b9c65 Merge pull request #4320 from brthor/brthor/toolsrefmigration
dotnet cli migrate tools ref
2016-10-05 13:39:34 -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
465b32dab4 Addressing code review comments. 2016-10-05 11:51:59 -07:00
Bryan Thornbury
1232a38e51 dotnet cli migrate tools ref 2016-10-05 11:36:23 -07:00
Livar Cunha
facbef52ff Changing the code to read tools from csproj because the tools section in assets.json is no longer being populated. 2016-10-04 18:59:44 -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
Livar Cunha
12e8e8eca7 Temp 2016-10-04 18:58:38 -07:00
Livar Cunha
b4b89c7849 Switch to code to generate deps file for tools using the lock file. 2016-10-04 18:58:38 -07:00
Livar Cunha
05472919af Changing the tool resolution to fully use the NuGet file and no longer rely on the project.json file. 2016-10-04 18:58:38 -07:00
Bryan Thornbury
3149af8941 remove proejct.migrated.json 2016-10-04 16:40:20 -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
851ed78605 key 2016-10-04 15:53:14 -07:00
Bryan Thornbury
148008d733 fix key sign 2016-10-04 15:49:35 -07:00
Bryan Thornbury
7632cd3502 Merge pull request #4261 from brthor/brthor/packageref
PackageReference Migration
2016-10-04 14:42:43 -07:00
Bryan Thornbury
21c45de0b7 error preference 2016-10-04 10:45:57 -07:00
Faizan Ahmad
579df78466 - Implementation of test3 verb for single TragetFramework
- E2E test for test3 verb.
2016-10-04 15:37:36 +05:30
Bryan Thornbury
adff632929 green 2016-10-03 20:10:09 -07:00
Bryan Thornbury
bf45ab19ca PackageReference 2016-10-03 17:12:57 -07:00
Eric Erhardt
d4d2be5f8c Fix the merge of preview2 to build correctly. 2016-10-03 14:48:33 -05:00
Eric Erhardt
5055935008 Merging rel/1.0.0-preview2 into rel/1.0.0. 2016-10-03 14:47:24 -05: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
Eric Erhardt
f065a29704 Rename IsCurrentRuntimeSupported() to SupportsCurrentRuntime(). 2016-10-03 12:45:39 -05:00
Eric Erhardt
a7366f5864 Add support for publishing self-contained applications.
Fix #4204
2016-10-03 09:23:00 -05:00
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
Eric Erhardt
283bf7139e Changing the rules on when to use the CLI's BuildRid.
Use the CLI's BuildRid when the current machine is not supported by the shared framework.
2016-09-30 12:00:37 -05: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
77ada164c6 Forgot to actually invoke the method to clean PackageRefs. 2016-09-30 09:27:15 -07:00
Livar Cunha
7e16ad0388 Adding TargetFrameworks even for single TFM and cleaning up PackageRef. 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
c04f7a0cd0 Changing the migrate command to obtain the sdk package version from the PackageRef in csproj instead of project.json. 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
Eric Erhardt
ce6c29676d Adding "BuildRid" to the CLI as a fallback RID to use when inferring which RID to use when building, running, and publishing self-contained applications.
This enables users to use the CLI on newer versions of the OS that aren't fully supported yet - for example using a new OSX version that isn't listed in the runtime graph in the current NuGet packages.

Fix #4238
2016-09-29 22:39:00 -05:00
Livar Cunha
e91b2f6011 Updating ToolpathCalculator to use asset.json now that we updated to a new NuGet. 2016-09-29 14:06:45 -07:00
Livar Cunha
082a90035d Bumping nuget to 3.6.0-beta.1.msbuild.17 2016-09-29 12:16:41 -07:00
Sridhar Periyasamy
98231a6628 Merge pull request #4254 from dotnet/sridhar-ms/migrate-directory
Add support to migrate a directory.
2016-09-29 10:13:55 -07:00
Eric Erhardt
04869b9997 Updating msbuild to 0.1.0-preview-00043-160929. 2016-09-29 10:26:55 -05:00
Bryan Thornbury
f5b17e63ce fixup 2016-09-28 15:40:38 -07:00
Bryan Thornbury
8c563a58f8 Fix tools with trailing backslashes in additionalProbingPath 2016-09-28 14:21:52 -07:00
Sridhar Periyasamy
a50708ac5c Address PR feedback 2016-09-28 09:00:15 -07:00
Nick Guerrera
936692acf1 Update msbuild to latest 2016-09-28 04:37:39 -07:00
Livar
464024252f Merge pull request #4267 from livarcocc/fix_run_csc_cmd
Double quoting the path to the host and to csc.dll in RunCsc.cmd
2016-09-27 17:52:28 -07:00
Livar Cunha
9150596c92 Double quoting the path to the host and to csc.dll in RunCsc.cmd so that it works when the CLI is in a path with spaces. 2016-09-27 16:17:06 -07:00
Eric Erhardt
3da55881b5 Merge pull request #4264 from nguerrera/update-msbuild
Update msbuild to latest
2016-09-27 18:08:12 -05:00
Nick Guerrera
6bc099e5e0 Update msbuild to latest 2016-09-27 15:16:13 -07:00
Livar Cunha
d7e00907e0 Fixing windows test breaks. It was because of how the NuGet API is putting Directory Separators in the lock file. They always normalize them to forward slash. 2016-09-27 13:08:45 -07:00
Livar Cunha
2ea227e388 Fixing a build break on windows. 2016-09-27 10:53:23 -07:00
Livar Cunha
2acd4474de Fixing a migration test where migration was not failing for a unresolved dependency because we were not classifing unresolved dependencies correctly. 2016-09-27 10:53:23 -07:00
Livar Cunha
f0a50c92ac Fixing issues small issues found during build and tests. 2016-09-27 10:53:22 -07:00
Livar Cunha
6527cbc592 Replacing the LockFile APIs from the one in ProjectModel to the one in NuGet.ProjectModel. 2016-09-27 10:53:21 -07:00
Rohit Agrawal
cfe76534ca bump nuget to 3.6.0-beta.1.msbuild.16 2016-09-26 16:47:20 -07:00
Sridhar Periyasamy
7ee2bd1f26 Add support to migrate a directory.
- Given a directory migrate all the project.jsons in it recursively.
- Remove '-p/--project' option. Instead directly pass a directory or project.json as argument.
- Add tests.
2016-09-26 14:16:17 -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
038fb6fbae Merge pull request #4221 from dotnet/sridhar-ms/multiple-proj-migrate
Migrate P2P references
2016-09-23 22:30:58 -07:00
Sridhar Periyasamy
ec7aa87576 Add xproj tests to test migrate command. 2016-09-23 17:33:35 -07:00
Rohit Agrawal
dfc5650db8 bump nuget version to 3.6.0-beta.1.msbuild.15 (#4241) 2016-09-23 17:14:32 -07:00
Sridhar Periyasamy
d43ade9629 Address PR Feedback 2016-09-23 15:31:15 -07:00
Eric Erhardt
fce4b9044a Respond to PR feedback. 2016-09-23 16:53:57 -05:00
Bryan Thornbury
b0565e6498 fix projectdependnecy finder 2016-09-23 14:25:57 -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
f11e555480 Adding framework as an option to the run3 verb. 2016-09-23 11:16:52 -07:00
Livar Cunha
bd2e66fca6 Switching to a new API to detect platform. 2016-09-23 10:40:25 -07:00
Livar Cunha
d1cea1bef2 Addressing code review comments. 2016-09-23 10:16:44 -07: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
9542d61224 Adding a RunCsc.cmd. 2016-09-23 10:16:44 -07:00
Livar Cunha
4019fdca16 Removing DotnetHostPath and setting CscToolExe to determine which script to use to run csc.exe using dotnet. Need to add the script counterpart for windows still. Doing that next. 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
eed29be806 Add dotnet publish3 command. 2016-09-23 12:12:55 -05: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
Bryan Thornbury
a04194c0f7 Merge pull request #4224 from brthor/brthor/remove-nuget
Migration: Remove dependency on lock file and dotnet restore
2016-09-22 18:47:58 -07:00
Livar
85819d562b Merge pull request #4232 from jamesqo/patch-1
Remove whitespace from dotnet-new C# library template
2016-09-22 17:57:48 -07:00
Livar
a0aa51777f Merge pull request #4233 from livarcocc/migrate_packOptions
Adding migrate PackOptions capabilities.
2016-09-22 17:57:08 -07:00
Bryan Thornbury
b4a0cc245a Clean up ProjectDependencyFinder API to be self contained 2016-09-22 17:44:34 -07:00
Eric Erhardt
65218848e8 Respond to PR feedback. 2016-09-22 19:11:08 -05:00
Livar Cunha
768e289f0c Adding migrate PackOptions capabilities. 2016-09-22 16:14:27 -07:00
James Ko
5397cac939 Remove whitespace from dotnet-new C# library template 2016-09-22 17:50:33 -04:00
Bryan Thornbury
fe8f440ed6 cleanup usings and headers 2016-09-22 14:35:31 -07:00
Bryan Thornbury
95e0ed3713 fix errors, enable tests 2016-09-22 14:30:56 -07:00
Nick Guerrera
2c0acebd3d Update S.R.Serialization.Xml ref to 4.1.1 2016-09-22 13:31:36 -07:00
Nick Guerrera
4807c8b0b0 Update msbuild to latest 2016-09-22 12:52:09 -07:00
Bryan Thornbury
3e6e1ddcd0 add support for conditioned csproj references, add tests 2016-09-22 12:51:23 -07:00
Eric Erhardt
d6adea1af0 Create a dotnet msbuild command and fill out the applicable command line arguments to dotnet build3.
Fix #4203
2016-09-22 14:47:50 -05:00
Bryan Thornbury
a688885f21 remove nuget dependency in tests 2016-09-21 21:23:50 -07:00
Bryan Thornbury
8a420de736 Remove nuget dependency 2016-09-21 21:14:48 -07:00
Bryan Thornbury
5dd1c3f92c fix todo 2016-09-21 17:29:22 -07:00
Bryan Thornbury
5d2f0579d2 Migrate xproj to csproj dependencies 2016-09-21 17:27:02 -07:00
Rohit Agrawal
bf8b588e8b add includesymbols and includesource to pack3 command as symbols package is not created by default (#4193) 2016-09-21 16:39:59 -07:00
Bryan Thornbury
2dd99ce015 improve finding encompassed items in a configuration 2016-09-21 14:41:16 -07:00
Bryan Thornbury
eaf245fd75 trace on config exit 2016-09-21 11:34:36 -07:00
Bryan Thornbury
c6908595cd fill out trace messages more 2016-09-21 11:33:12 -07:00
Bryan Thornbury
875d91629e case insensitive msbuild metadata findng 2016-09-21 11:31:30 -07: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
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
e8df0e712e only emit TargetFrameworks for multitfm 2016-09-19 10:10:36 -07:00
Bryan Thornbury
fe20698d81 PR Feedback 2016-09-16 16:37:48 -07:00
Justin Emgarten
1626cf2e62 Restore3 support for PackageReference
Fixes https://github.com/NuGet/Home/issues/3453
2016-09-16 13:40:10 -07:00
Bryan Thornbury
1198b30031 output TFI, TFV for now 2016-09-16 03:26:36 -07:00
Bryan Thornbury
944eb1e787 Migration X-Targeting 2016-09-15 15:54:10 -07:00
Nick Guerrera
e59b2f3e6d Update msbuild 2016-09-15 10:59:03 -07:00
Eric Erhardt
95def6b243 Merge pull request #4178 from kotovaleksandr/rel/1.0.0
fix #4090
2016-09-15 10:57:56 -05:00
Eric Erhardt
656f65866c Merge pull request #4174 from eerhardt/NewRunInfo
Update the CLI to the new Run static properties from the SDK.
2016-09-15 09:53:04 -05:00
Eric Erhardt
3026eb9d35 Add a better error message for 'dotnet run3' when it is unable to find a RunCommand property. 2016-09-14 16:27:52 -05:00
Bryan Thornbury
fb49229ddf internals visible to 2016-09-14 13:40:41 -07:00
Bryan Thornbury
c30fc56fcc Update project.json
Strong name sign migration library
2016-09-14 13:32:38 -07:00
Eric Erhardt
f9953c1e68 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160914-1. 2016-09-14 14:55:17 -05:00
kotov.a
8a93af528b fix #4090 2016-09-14 16:35:37 +03:00
Eric Erhardt
a8c804cba7 Update the CLI to the new Run static properties from the SDK.
See https://github.com/dotnet/sdk/issues/98
2016-09-13 20:47:22 -05:00
Rohit Agrawal
194a850c71 update nuget and sdk to include msbuild pack target 2016-09-12 17:10:31 -07:00
Eric Erhardt
18456af5ca Merge pull request #4162 from eerhardt/NewMSBuild
Update MSBuild to 0.1.0-preview-00034-160909.
2016-09-12 14:47:03 -05:00
Eric Erhardt
5035746370 Merge pull request #4152 from livarcocc/bring_back_project_model_server
Adding dotnet-projectmodel-server back
2016-09-12 14:39:38 -05:00
Eric Erhardt
0ecb3b7538 Update MSBuild to 0.1.0-preview-00034-160909. 2016-09-12 12:14:17 -05:00
Eric Erhardt
f084032af6 Ensure the project is built in dotnet run3. 2016-09-09 08:53:57 -05:00
Livar Cunha
72a053fa0e Adding the projectmodel-server command back to the list of built-in commands. 2016-09-07 18:32:34 -07:00
Livar Cunha
55c57608f8 Adding dotnet-projectmodel-server back because ASP.NET needs it to unblock themselves from start migrating to msbuild. We need to remove this as soon as ASP.NET can migrate all their projects to csproj and the tooling is in place. 2016-09-07 14:14:41 -07: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
8d7dd3992f Merge pull request #4145 from livarcocc/merge_preview2_to_rel100
Merge preview2 to rel100
2016-09-06 21:13:41 -07:00
Livar
a2b861e4c8 Merge pull request #4137 from tmat/EmbeddedPdbSupportRel
Implement support for Embedded PDB
2016-09-02 17:15:50 -07: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
bb130ce71f Merge pull request #4134 from eerhardt/NewSDK
Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1
2016-09-01 16:13:38 -05:00
Tomas Matousek
b5cfb9d660 Implement support for Embedded PDB 2016-09-01 14:02:03 -07:00
Eric Erhardt
0e4044b8bd Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1 2016-09-01 11:08:34 -05:00
Bryan Thornbury
7b5ca2da34 Add Scripts environment variable support 2016-08-31 15:30:23 -07:00
Ryan Nowak
5e173f38e9 Update versions of EF and scaffolding tools 2016-08-31 14:42:29 -07:00
Ryan Nowak
6bd5bfc3e5 Update Kestrel to 1.0.1 2016-08-31 13:53:02 -07:00
Ryan Nowak
6a1b41fac6 Update version of routing to 1.0.1
This is needed because MVC still references 1.0.0.
2016-08-31 13:42:05 -07:00
cartermp
07b581f091 Add missing comma to F# lib project.json 2016-08-31 12:13:31 -07:00
Ryan Nowak
9646db0cc8 Update cshtml wildcard in publishOptions
Updating the publishOptions wildcard that used to publish everything in
the views folder to now publish all .cshtml files. The problem was that
the old wildcard only included the Views folder and didn't include
anything in the Areas/*/Views folders (used by views inside areas).

This change makes things much simpler, all .csthml files are published.
2016-08-31 11:31:10 -07:00
cartermp
5d8aedebf3 Don't print arguments in F# console app 2016-08-31 11:27:18 -07:00
cartermp
0c10baa40d Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
This updates the F# templates for dotnet-new to be compatible with Preview 2.
2016-08-31 11:26:41 -07:00
Ryan Nowak
01caa0fb4f Update MVC version to 1.0.1
We're shipping a new patch of all MVC packages in 1.0.1. This bumps up the
version number of the MVC metapackage so that projects created with
`dotnet new` get the latest version.
2016-08-31 11:22:43 -07: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
Livar Cunha
0c60dc7c2e Fixing the version back to preview3 and the channel to rel-1.0.0 2016-08-30 21:32:45 -07:00
PiotrP
a6ee3df5b2 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 14:10:47 -07:00
Piotr Puszkiewicz
74a9a533bd Merge pull request #4121 from dotnet/piotrpMSFT/revmsbuild
Update msbuild version to latest
2016-08-30 14:03:18 -07:00
Bryan Thornbury
b0554d3ff3 PR Feedback 2016-08-30 12:00:56 -07:00
Bryan Thornbury
b900f0b327 Solution and project cleanup 2016-08-30 12:00:08 -07:00
Bryan Thornbury
d8556d1ed7 Include context fixes to include the default files even when buildoptions is empty, so we have less custom logic in the migration library 2016-08-30 11:56:56 -07:00
Bryan Thornbury
611e4ccfde dotnet-migrate built in command for cli 2016-08-30 11:56:53 -07:00
Bryan Thornbury
46818ff3fa Microsoft.DotNet.ProjectJsonMigration core library 2016-08-30 11:56:03 -07:00
PiotrP
c74370b636 Update MSBuild version 2016-08-30 11:18:40 -07:00
PiotrP
ec23abadec Update MSBuild version 2016-08-30 10:31:04 -07:00
PiotrP
3cdd15a145 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 10:30:45 -07:00
Livar
be8428cb6c Merge pull request #4102 from livarcocc/test_without_pj
Adding the capability to run tests against a published dll
2016-08-29 21:58:13 -07:00
Piotr Puszkiewicz
eff2beeb7d Clean up dead code 2016-08-29 10:27:53 -07:00
Livar Cunha
7d60d66a86 Addressing more code review comments. 2016-08-29 09:46:12 -07:00
Piotr Puszkiewicz
8eecff0112 Address build issues 2016-08-27 15:57:14 -07:00
Piotr Puszkiewicz
ab1797cb29 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-26 22:39:40 -07:00
Piotr Puszkiewicz
1ce482a8d1 Merge remote-tracking branch 'refs/remotes/origin/rel/1.0.0'
Conflicts:
	scripts/obtain/dotnet-install.ps1
	src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template
2016-08-26 22:39:14 -07:00
PiotrP
ae4a690724 Fix tests
Missing namespace
Re-enable dotnet-nuget unit tests
2016-08-26 18:14:04 -07:00
PiotrP
336ecc0e89 Merge Nuget changes
Fix pack
Move dotnet-nuget to NuGetForwardingApp [tests will need to be fixed]
2016-08-26 17:23:33 -07:00
Livar Cunha
9f2a0169fc Addressing code review comments. 2016-08-26 11:23:47 -07:00
Livar Cunha
b09a6c6350 Adding dotnet-test-console to the list of generated nupkgs and fixing some namespace for the new command resolvers. 2016-08-25 23:14:25 -07:00
Livar Cunha
e8f2dabcdb Fixing broken tests after my changes to the CommandResolvers. 2016-08-25 22:53:04 -07:00
Livar Cunha
55c00a7e45 Adding a resolution chain to the command resolution chain that works based on a directory, more specifically, the publish directory. 2016-08-25 16:01:32 -07:00
Simon de Lang
8f92f0d74b Update xunit dependencies for CSharp_xunittest template 2016-08-25 15:02:52 +02:00
Livar Cunha
7e556e37d2 Adding a separate runner for project.json and for assembly. 2016-08-24 15:24:30 -07:00
Nick Guerrera
2accc15543 Add missing msbuild dependency
This is a workaround until the msbuild .nupkg manifests
the dependency correctly
2016-08-24 10:29:53 -07:00
Nick Guerrera
c702957730 Update to new msbuild 2016-08-24 10:10:20 -07:00
Eric Erhardt
a543050c62 Update the Sdk version to the latest build. 2016-08-23 13:44:07 -05:00
Livar Cunha
dddfb6bb45 Adding new unit tests to cover TestRunner in DotnetTestParams. 2016-08-23 11:26:37 -07:00
Livar Cunha
0667e84069 Added an ITestRunnerResolverFactory that decides on which resolver to use based on the set of parameters received. 2016-08-22 21:29:14 -07:00
Livar Cunha
8e432e567a Adding TestRunner resolvers that will be able to find a test runner based on different criteria.
Moving dotnet test command to its own library that can be shared between dotnet test and the test target in the SDK folder.
2016-08-22 15:45:13 -07:00
Adam Baxter
feb6a1484d Rename Microsoft.DotNet.Compiler.Common.xproj to match the casing in the .sln
Allows nuget restore to run (but fail) on case sensitive filesystems/platforms
2016-08-22 22:30:48 +10:00
Piotr Puszkiewicz
578adf072c Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	src/dotnet/Program.cs
2016-08-18 18:08:45 -07:00
Piotr Puszkiewicz
c5cc9feb6d Update xunit template 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
e92c9603c8 Test reliability and format cleanups 2016-08-18 17:10:20 -07:00
Rohit Agrawal
e08da40a1f added pack3 command for dotnet (#4058) 2016-08-18 16:53:55 -07: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
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
Piotr Puszkiewicz
2db1997bc0 Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/DebTargets.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	scripts/package/package-debian.sh
	src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
	src/dotnet/commands/dotnet-new/Program.cs
	src/dotnet/commands/dotnet-pack/PackageGenerator.cs
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
2016-08-16 18:30:52 -07:00
drewgil
11b666acee Add nuget command to dotnet cli 2016-08-16 09:27:55 -07:00
Justin Emgarten
51ea2e6014 Adding Restore3 command for msbuild restore support. 2016-08-12 00:05:21 -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
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 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
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
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
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
Eric Erhardt
2bea6bac83 Move 14.1 to 15.0 now that MSBuild is version 15.0. 2016-08-09 10:28:50 -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
Tomas Matousek
dfbea3df34 Pass debugType thru to the command line compiler 2016-08-03 18:08:14 -07: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
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
jplebre
069a351971 adding nunit test to the list of commands 2016-08-03 22:06:17 +01:00
Bryan Thornbury
308f49c32e Merge pull request #3983 from brthor/brthor/runtimeoptions
Add support for user runtimeconfig
2016-08-03 10:51:33 -07:00
Bryan Thornbury
931e8fdf96 Add support for user runtimeconfig 2016-08-02 16:18:19 -07:00
Livar
32d273580f Merge pull request #3981 from livarcocc/dependency_model_change_from_rel100
Merge the JsonTextReader change from rel/1.0.0 to feature/msbuild
2016-08-02 14:23:43 -07:00
Pavel Krymets
ee6063b12b Use JsonTextReader in DependencyContextJsonReader (#3972)
Using low level JsonTextReader in DependencyContextJsonReader class for performance reasons
2016-08-02 13:16:44 -07:00
Eric Erhardt
ddb6a877af Add netstandard1.3 TFM to DependencyModel so the MSBuild task can target netstandard1.3 and still use it to write the .deps.json file. 2016-08-02 14:53:19 -05:00
Pavel Krymets
b7075b857b Use JsonTextReader in DependencyContextJsonReader (#3972)
Using low level JsonTextReader in DependencyContextJsonReader class for performance reasons
2016-08-02 10:02:30 -07:00
Eric Erhardt
df3fea3736 Merge pull request #3962 from eerhardt/msbuild-GenerateDepsFile
Implement GenerateDepsFile MSBuild Task
2016-08-01 20:17:05 -05:00
Eric Erhardt
b5d312e7fa PR feedback. 2016-08-01 19:06:46 -05:00
Eric Erhardt
10cfa744e5 PR feedback.
Implement VersionPrefix and VersionSuffix MSBuild properties.

Use FluentAssertions in the test.
2016-08-01 15:02:22 -05:00
Eric Erhardt
b3e69b139e Update NuGet to 3.5.0-rc1-1697 2016-08-01 13:58:04 -05:00
Eric Erhardt
a4aa0a99cd Implement GenerateDepsFile MSBuild Task 2016-07-29 20:46:34 -05:00
Livar Cunha
b05b0e6dc5 After NuGet started lower casing the packages, we started hitting issues where we failed to locate dependencies under our list of libraries due to different casing in the libraries names. The fix here is to compare the library names ignoring casing. 2016-07-28 21:17:32 -07:00
Eric Erhardt
eca827e0d4 Merge pull request #3922 from blackdwarf/templatesfix
Remove namespace and public from console app
2016-07-27 07:53:23 -05:00
Eric Erhardt
104ca5219d Ensure additional probing paths don't have a trailing slash.
Workaround for https://github.com/dotnet/core-setup/issues/228.
2016-07-26 22:27:25 -05:00
Eric Erhardt
ba0f71f5a5 Use object serialization to write the runtime config files. 2016-07-26 21:56:47 -05:00
Eric Erhardt
efc0efe4f9 Workaround native deps resolver not lower casing the file paths into the NuGet cache.
This is needed until https://github.com/dotnet/core-setup/pull/64 is merged.
2016-07-26 21:00:14 -05:00
Eric Erhardt
a48def9ade Fix package code for new NuGet.
The new NuGet uses tolower paths, and we need to react to it.

Port https://github.com/dotnet/cli/pull/2722
Port https://github.com/dotnet/cli/pull/3554
2016-07-26 20:53:20 -05:00
Eric Erhardt
2ac8ca0e07 Update Microsoft.NuGet.Build.Tasks to 1.0.0-alpha-000002, which has the casing fix for Microsoft.Net.Compilers.netcore dependency. 2016-07-26 20:53:19 -05:00
Eric Erhardt
369a6894dd Fix the casing of Microsoft.Net.Compilers.netcore since the latest NuGet cares about this now. 2016-07-26 20:53:18 -05:00
Eric Erhardt
6eabeb9be0 Generate runtimeconfig.json and runtimeconfig.dev.json from MSBuild
Moves generating the runtimeconfig files to a separate MSBuild target which is only dependent on project.lock.json.

Also, moving up our NuGet dependency to 3.5.0-rc1-1653, since that brings in the LockFile.PackageFolders property, which is needed for runtimeconfig.dev.json.
2016-07-26 20:53:17 -05:00
Piotr Puszkiewicz
dd43ccb688 Piotrp msft/merge2msbuild (#3941)
* Add Test for removing readonly flag when copying readonly library assets

* change namespace

* PR Feedback

* Fix newlines in the first run experience message

The newlines in the first run experience were missing which made the text
look a little squashed.

Fixes #3909

* Update README.md (#3904)

* Update README.md

* Responding to PR feedback

* Responding to PR feedback
2016-07-26 19:22:12 -04:00
Bryan Thornbury
7c71af8db5 get Eric's change 2016-07-25 14:06:46 -07:00
Bryan Thornbury
5d96412b14 change feature-msbuild branch versions 2016-07-25 14:05:41 -07:00
Zlatko Knezevic
6766017ffb Responding to PR feedback 2016-07-22 12:11:01 -07:00
Zlatko Knezevic
252be27100 Remove namespace and public from console app
Fixes #745, #3531
2016-07-22 11:56:05 -07:00
Eric Erhardt
c317c92691 Correcting the casing of Microsoft.Common.targets directory 2016-07-22 07:04:24 -05:00