Commit graph

1113 commits

Author SHA1 Message Date
Mihai Codoban
d20e0d74f2 LockFilePatcher should only patch when lock file has holes in it
If not, the export file is stale
2016-03-30 19:24:43 -07:00
Mihai Codoban
ded82caccd Publish can skip Build 2016-03-30 19:24:43 -07:00
Troy Dai
d2984e3cfc Minor fixes to ProjectModelServer changes 2016-03-30 19:24:43 -07:00
Troy Dai
e23f08e7ac Update projectmodel server
Reflecting the xproj reference changes in ProjectModel
2016-03-30 19:24:43 -07:00
Mihai Codoban
698c82915e Move methods back to client code 2016-03-30 19:24:43 -07:00
Mihai Codoban
b2aae7546a Add lock file patching tests 2016-03-30 19:24:43 -07:00
Mihai Codoban
90240a431b Compute msbuild project path relative to root project path 2016-03-30 19:24:43 -07:00
Mihai Codoban
ca2707292e Add MSBuildProjectDescription 2016-03-30 19:24:43 -07:00
Mihai Codoban
06ff80392e Patch Lock File with export file 2016-03-30 19:24:43 -07:00
Mihai Codoban
552ac6282f Update lock file format
project libraries can have a msbuildProject element
2016-03-30 19:24:43 -07:00
Mihai Codoban
fb2326bb50 Reuse lock file when creating a runtime context 2016-03-30 19:24:43 -07:00
Bryan
58be4c447e prep for commands we'll be shipping as tools
add cleanup step to build, remove oob commands

only clean the sdk directory

Incorporate PR Feedback
2016-03-30 19:23:42 -07:00
Pavel Krymets
2753cc9982 Move appdep project to tools directory which is restored with rid inference 2016-03-30 18:51:58 -07:00
Senthil
2ce0a934a3 Revert "Merge pull request #2111 from dotnet/revnupkg"
This reverts commit ac4c6702d5, reversing
changes made to 4bb7c1a6d4.
2016-03-30 17:59:16 -07:00
Pavel Krymets
a21e0ea6b4 Merge pull request #2148 from dotnet/pakrym/remove-inference
Remove rid inference
2016-03-30 17:36:45 -07:00
Pavel Krymets
9b9725ac38 Remove rid inference 2016-03-30 16:58:02 -07:00
Eric Erhardt
8816664062 Merge pull request #2136 from eerhardt/UpdateDependencies20160330021008
Updating CoreFX from rc2-23929 to rc2-23930
2016-03-30 18:32:17 -05:00
Pavel Krymets
dc4bec0307 Merge pull request #2118 from dotnet/pakrym/no-csv-deps
Remove csv deps file generation
2016-03-30 16:09:34 -07:00
Pavel Krymets
d3289d916f Merge pull request #2137 from dotnet/pakrym/redirects
Handle duplicated assemblies in binding redirects
2016-03-30 15:35:15 -07:00
Senthil
92b344a1a9 Merge pull request #2128 from schellap/pakrym
Get Executable name properly
2016-03-30 15:25:34 -07:00
Peter Marcu
2a915f4e8c Merge pull request #2133 from dotnet/Petermarcu-patch-1
Update new template to remove imports
2016-03-30 14:48:03 -07:00
Pavel Krymets
c8a632bac1 Remove csv deps 2016-03-30 14:39:36 -07:00
Senthil
085dbd413e Expand LoadLibrary search paths 2016-03-30 14:26:57 -07:00
Livar Cunha
f9bbdca531 Adding a runtimeconfig.dev.json containing the additionalProbePaths when doing dotnet build. 2016-03-30 12:36:48 -07:00
Senthil
863d3d9766 Add clarifying message on exception 2016-03-30 10:46:17 -07:00
eerhardt
ea984c50c7 Updating dependencies from last known good builds 2016-03-30 11:49:37 -05:00
Pavel Krymets
e844355d7a Handle duplicated assemblies in binding redirects 2016-03-30 09:34:31 -07:00
Peter Marcu
0ef189c07a Update new template to remove imports 2016-03-29 23:02:58 -07:00
Senthil
626642808a Get Executable name properly 2016-03-29 18:30:23 -07:00
Eric Erhardt
ad5b01d1c2 Merge pull request #2114 from eerhardt/UpdateDependencies20160329035919
Updating dependencies from last known good builds
2016-03-29 14:29:14 -05:00
Pavel Krymets
9497ee8f66 Add more overloads for assembly resolution in dependency model 2016-03-29 10:03:25 -07:00
eerhardt
7eb9d07fb5 Updating dependencies from last known good builds 2016-03-29 15:59:19 +00:00
schellap
a30078c691 Revert "Merge pull request #2080 from schellap/nupkg2"
This reverts commit a6bf3b416b, reversing
changes made to b0e457559d.
2016-03-29 01:58:51 -07:00
Piotr Puszkiewicz
84c435d21f Merge pull request #2101 from nattress/linkerscript
Add dotnet-compile-native linker script for Linux / OSX
2016-03-28 22:30:06 -07:00
Stephen Toub
dc41c9b026 Merge pull request #2096 from stephentoub/indexof_ordinal
Use StringComparison.Ordinal with IndexOf in AnsiConsole
2016-03-28 23:37:15 -04:00
Pavel Krymets
e06a479748 Merge pull request #2036 from dotnet/pakrym/portable-cli
Make dotnet cli sdk portable
2016-03-28 20:35:22 -07:00
Andrew Stanton-Nurse
cf193ad301 Merge pull request #2097 from dotnet/anurse/publish-trimming
add trimming of published output based on sharedfx
2016-03-28 20:27:01 -07:00
Piotr Puszkiewicz
5572326e0a Merge pull request #2087 from dotnet/piotrpMSFT/Issue2020/DesktopCommands
Enable execution of Target-specific commands
2016-03-28 20:07:09 -07:00
Senthil
a6bf3b416b Merge pull request #2080 from schellap/nupkg2
Packaging work for corehost
2016-03-28 20:01:14 -07:00
Pavel Krymets
18436e325e Make dotnet cli portable 2016-03-28 19:16:02 -07:00
Livar
b0e457559d Merge pull request #1847 from cdmihai/cdmihai/recompileWhenCLIChanged
Trigger rebuild when the CLI changed
2016-03-28 19:02:06 -07:00
Andrew Stanton-Nurse
62b7740c95 add trimming of published output based on sharedfx
Any dependencies which **exactly** match the version requested in the
graph originating at the `type: platform` dependency (if any) are
trimmed from the publish output
2016-03-28 18:50:17 -07:00
Senthil
a12dcfe696 Update scripts from CoreFX 2016-03-28 18:47:35 -07:00
nattress
5a6de52383 Add dotnet-compile-native linker script for Linux / OSX
Add CoreRT SDK linkerscript to linker options if the file is present. It
is used for controlling section merging for multi-file compilation.
2016-03-28 17:28:44 -07:00
piotrp
0f21184bf6 Cleanup 2016-03-28 17:25:52 -07:00
piotrp
6f37e87a42 Feature complete 2016-03-28 17:25:52 -07:00
piotrp
d85e516c23 Test Infra 2016-03-28 17:25:52 -07:00
Eric Erhardt
930908e29c Merge pull request #2092 from eerhardt/UpdateDependencies20160328052754
Updating dependencies from last known good builds
2016-03-28 18:37:09 -05:00
stephentoub
272d4c9126 Use StringComparison.Ordinal with IndexOf in AnsiConsole 2016-03-28 16:09:51 -04:00
Livar
105536dc38 Making the dotnet test images relative paths.
skip CI please

Otherwise, it will only work in our branch.

This is a documentation only change.
2016-03-28 11:14:50 -07:00
eerhardt
cefed77ca9 Updating dependencies from last known good builds 2016-03-28 17:27:54 +00:00
Livar
1ff15e35bc Merge pull request #2078 from livarcocc/dotnet_test_help
Added a Help property to DotnetTestParams that indicates when the par…
2016-03-28 09:31:09 -07:00
Piotr Puszkiewicz
99423b1bb4 Merge pull request #2086 from enricosada/fix_missing_default_win32manifest
fix F# build, missing default.win32manifest
2016-03-28 00:54:01 -07:00
Senthil
a8eaa9c787 Package corehost 2016-03-28 00:21:27 -07:00
Enrico Sada
88273b7751 fix missing default.win32manifest 2016-03-27 22:43:22 +02:00
Senthil
4f16db1fc3 Exec mode deps file resolve hostpolicy 2016-03-27 10:52:19 -07:00
Livar
7397d20549 Merge pull request #2079 from livarcocc/dotnet_help_test
Added tests to the general help message.
2016-03-26 10:40:03 -07:00
Livar Cunha
d745484b1c Added tests to the general help message. 2016-03-25 21:13:22 -07:00
Livar Cunha
d07a1091a8 Added a Help property to DotnetTestParams that indicates when the parsed arguments included the help param. The TestCommand then uses this property of the params to decide whether to continue with the execution or just return. Also added unit tests around this as well as introduced a DotnetTestRunnerFactory to make these unit tests possible and also push the responsibility to figure out which runner to use to the factory. 2016-03-25 20:17:15 -07:00
Piotr Puszkiewicz
d4d49ae0e3 Merge pull request #2076 from enricosada/tell_fsc_about_portablepdb
compile-fsc, support debugType and fix
2016-03-25 19:19:24 -07:00
Justin Emgarten
895c4e0221 Merge pull request #2074 from dotnet/emgarten/nuget1083
Updating nuget to 3.5.0.1083
2016-03-25 18:52:52 -07:00
Livar
47241189b2 Merge pull request #2069 from dotnet/dotnet_test_documentation
Added a dotnet test, adapters and runners document
2016-03-25 17:43:57 -07:00
Justin Emgarten
86ee8a561b Updating nuget to 3.5.0.1083 2016-03-25 16:37:12 -07:00
Livar
369fb4803e Added links to each payload of the messages. 2016-03-25 16:33:41 -07:00
Enrico Sada
ac05fde9bd fsc, always pass --nocopyfsharpcore to disable copy of FSharp.Core to output directory 2016-03-26 00:27:43 +01:00
Livar
4753b5df27 Added a dotnet test, adapters and runners document
It details the interactions between dotnet test, adapters and runners by describing the communication protocol between these pieces and the parameters that they support.
2016-03-25 15:51:17 -07:00
Eric Erhardt
77f4d9955c Merge pull request #2067 from eerhardt/UpdateDependencies23925
Updating CoreFX to rc2-23925
2016-03-25 17:21:14 -05:00
Senthil
a15988be14 Merge pull request #2064 from schellap/app-local
RID specific and app local loads
2016-03-25 14:52:06 -07:00
eerhardt
ed887d183a Updating dependencies from last known good builds 2016-03-25 16:48:25 -05:00
Andrew Stanton-Nurse
21782dd8fb Merge pull request #2060 from dotnet/anurse/fix-osx-build
fix OSX issue in VSO build
2016-03-25 14:19:23 -07:00
Senthil
b82c998614 Probe app dir relative asset rel path 2016-03-25 13:50:16 -07:00
Livar
3fe46df8b4 Merge pull request #2051 from livarcocc/portable_pdb
Support portable pdbs in Testing.Abstractions
2016-03-25 13:08:33 -07:00
Andrew Stanton-Nurse
9f3727d1a7 fix OSX issue in VSO build
also, make it possible to have more verbose build runs when needed
2016-03-25 12:49:53 -07:00
Senthil
01dda26a6f RID specific and app local loads 2016-03-25 12:04:52 -07:00
Enrico Sada
c39678d3cb support project.json compilationOptions.debugType in fsc
it's used only if set, default is old behaviour (debug enabled only on win)
2016-03-25 19:53:01 +01:00
Livar Cunha
85884c5e9a Removed the DIA classes and the cod associated with it. Introduced a PdbReaderFactory that decides with PdbReader to use (full or portable). Introduced a PdbReader interface that abstracts the differences between full pdb (Uses ISymUnmanaged classes to read the pdb) and portable pdb (uses Reflection MetadataReader). 2016-03-25 10:58:05 -07:00
Enrico Sada
b6d5315b47 fix use latest version of fsc
This reverts to use latest version of fsc, downgraded by  43512b8973
2016-03-25 16:48:00 +01:00
Senthil
f1303bd289 Merge pull request #2049 from schellap/app-local
App local wins for portable apps as well
2016-03-24 20:45:30 -07:00
Senthil
d935937174 Call unload on the libraries opened 2016-03-24 19:20:49 -07:00
Eric Erhardt
30346443fb Merge pull request #2035 from eerhardt/Version
Changing --version in the CLI
2016-03-24 21:15:09 -05:00
Senthil
a1fc588316 App local wins for portable apps as well 2016-03-24 18:43:54 -07:00
Andrew Stanton-Nurse
4e8569d57f herp derp netstandard 2016-03-24 16:07:17 -07:00
Andrew Stanton-Nurse
9414e8d8ad fix DependencyModel project.json 2016-03-24 15:31:47 -07:00
Mihai Codoban
f14b4cbd3d Trigger rebuild when the CLI changed
- Stamp each project with the CLI version it was last compiled with
- Rebuild those projects with a local version file that does not match the one of the current CLI that is building it
2016-03-24 15:17:49 -07:00
Andrew Stanton-Nurse
5090f3bbb5 change dependency model to netstandard 1.5 2016-03-24 15:11:54 -07:00
Andrew Stanton-Nurse
f7188ddb20 fix issue in LibraryExporter with placeholders 2016-03-24 16:05:25 -05:00
Eric Erhardt
1febe48d71 Updating CoreFX version to rc2-23924 2016-03-24 16:05:24 -05:00
Eric Erhardt
95ad1ee461 Removing Microsoft.CodeAnalysis.CSharp from the sharedframework dependency since Microsoft.NETCore.App now has the correct version. 2016-03-24 16:04:37 -05:00
Eric Erhardt
a5813791d5 Updating CoreFX version to rc2-23923 2016-03-24 16:04:37 -05:00
Eric Erhardt
c07115f52c Add System.Net.Requests dependency to dotnet to hoist the out of date version brought in by FSharp.Compiler. 2016-03-24 16:03:22 -05:00
Eric Erhardt
3186432ebd Fix up the project.json files for CoreFX build rc2-23922.
- ProjectModel uses AssemblyLoadContext which is only available in netstandard1.5. Moving ProjectModel and all its dependencies up to netstandard1.5.
- Work around our dependencies still being on old CoreFX builds by hoisting System.Runtime.Serialization.Primitives, System.Private.DataContractSerialization, System.Linq.Expressions, and System.Xml.XmlSerializer references to the current version.
2016-03-24 16:03:19 -05:00
eerhardt
9bc478660a Updating dependencies from last known good builds 2016-03-24 16:02:33 -05:00
Pavel Krymets
7a82a98e4c Merge pull request #2016 from dotnet/pakrym/signature
Add runtime signature into deps.json
2016-03-24 13:57:40 -07:00
Eric Erhardt
c560e9af3c Changing --version in the CLI
`dotnet --version` returns just the version number. This helps tools get this information without having to parse the full info.
Introduce a new argument `--info` that returns the current "long form". With this, we also change the long form to say "RID" instead of "Runtime ID" simply because that would avoid any future localization issues and thus make the parsing easier.

Fix #1607 #1882
2016-03-24 15:44:25 -05:00
Pavel Krymets
f75481f731 Add runtime signature into deps.json 2016-03-24 12:00:01 -07:00
Andrew Stanton-Nurse
0a369aa6d5 update to new nuget and turn inference on 2016-03-24 11:43:37 -07:00
Eric Erhardt
f0fd9ae901 Merge pull request #2021 from schellap/erhardt
Logging and case format fix
2016-03-24 13:05:27 -05:00
Senthil
cee93b6cc2 Logging and case format fix 2016-03-24 01:47:57 -07:00
Andrew Stanton-Nurse
43512b8973 add support for type: platform
also some refactoring of DependencyContext to properly handle
placeholders in 'runtimeTargets'.
2016-03-23 21:53:14 -07:00
Bryan
07f3d60355 fixes #1858 2016-03-23 16:19:48 -07:00
schellap
43e25ae571 Add support for runtime config
-- Remove GC Server Default
2016-03-23 00:04:50 -07:00
Piotr Puszkiewicz
3a63972af1 Merge pull request #1898 from enricosada/bump_fsharp_and_fix
Bump fsharp and fix
2016-03-22 19:51:19 -07:00
Bryan Thornbury
9040a9094f Merge pull request #1851 from dotnet/brthor/run-arg
Change dotnet run to call the muxer
2016-03-22 18:09:07 -07:00
Senthil
61a47dade4 Merge pull request #1984 from schellap/fxr-move2
Make corehost shim thinner
2016-03-22 11:19:20 -07:00
Krzysztof Wicher
30b5d7a952 Merge pull request #1991 from Peter-Schneider/AnsiConsoleColorHandling
AnsiConsole color handling
2016-03-22 10:57:53 -07:00
Peter Schneider
d80218ab42 Color Handling in AnsiConsole 2016-03-22 16:49:08 +01:00
Piotr Puszkiewicz
3616378130 Merge pull request #1946 from jamesqo/md-typos
Fix a couple of typos in the .md/doc files
2016-03-22 08:39:54 -07:00
schellap
10ed8d6162 Move logic from corehost to hostfxr
- Also change probe for hostfxr in host/fxr/x.y.z
2016-03-22 00:51:01 -07:00
James Ko
4a26cde880 Fix typo in CompileCommand class name 2016-03-22 00:11:37 -04:00
James Ko
c7f980d77d Fix a couple of typos in the .md/doc files 2016-03-22 00:11:19 -04:00
Eric Mellino
241ef778ea Crossgen by default, add additional dependency to shared framework
* We need a newer version of Microsoft.CodeAnalysis.CSharp than the one
  that NETCore.App depends on. When a newer version of NETCore.App is
  published with a higher dependency, we can remove this explicit
  reference.
2016-03-21 15:30:37 -07:00
Pawel Kadluczka
ca74a9b177 Merge pull request #1877 from dotnet/pawelka/outname_new
Enable specifying output assembly name in compiler options
2016-03-21 14:29:23 -07:00
moozzyk
ce6ce3c49b Folding ProjectFile.Name to compiler options 2016-03-21 12:42:33 -07:00
moozzyk
621d8376c3 Fixing publish to create executable with the outputName if specified 2016-03-21 12:42:32 -07:00
moozzyk
03f5379165 Adding support for output file name for apps. 2016-03-21 12:42:31 -07:00
moozzyk
856fb8d6d9 Enable specifying output assembly name in compiler options
Addresses #1797
2016-03-21 12:42:31 -07:00
Sridhar Periyasamy
11538d2d3d Fix 'version' to display commit sha.
Fixes #1958
2016-03-21 11:42:09 -07:00
Livar
14d5dd80b0 Merge pull request #1853 from livarcocc/more_test_params
Added remaining params from https://github.com/dotnet/cli/issues/1376 and build before tests
2016-03-19 10:01:28 -07:00
Senthil
d05abb8c0b Merge pull request #1942 from dotnet/schellap-bsymbolic
Add bsymbolic flags to linux linker
2016-03-18 15:26:53 -07:00
Senthil
faaea62b46 Merge pull request #1747 from mylibero/arm
Support cross-build in corehost
2016-03-18 09:35:56 -07:00
Dongyun Jin
2ef70fc16d Support cross-build in corehost
- Add ability to specify `cross` and `C++ Cross Compiler`
when building corehost for ARM.
- Add usage print in the corehost build script
- Fix bugs found on the cross compiler

Signed-off-by: Dongyun Jin <dongyun.jin@samsung.com>
2016-03-18 20:55:27 +09:00
Senthil
062e538657 Merge pull request #1554 from schellap/hostpfiles
Fix program files probe and HOME dir
2016-03-18 01:46:37 -07:00
Senthil
cbde132974 Merge pull request #1938 from dotnet/stat-isdir
Check stat mode in addition to dirent type
2016-03-17 18:34:21 -07:00
Senthil
d35d0cc543 Merge branch 'rel/1.0.0' into hostpfiles 2016-03-17 18:32:55 -07:00
Senthil
8c486908a8 Add bsymbolic flags to linux linker
The problem with not having these flags are:

`libhostfxr.so` and `libhostpolicy.so` would still keep using common functions that are defined in `dotnet.exe` effectively void a servicing override. Of course, servicing of common code would service both `dotnet.exe` and `libhostpolicy.so`, but this is needed to match Windows for consistency and is easier to reason about.
2016-03-17 18:25:02 -07:00
Bryan Thornbury
2afe032280 Add tests and change to call exec 2016-03-17 18:20:52 -07:00
Bryan Thornbury
863f1cd91d add the additional probing path to dotnet run
remove colon
2016-03-17 18:20:52 -07:00
Senthil
9093b18ac2 Check stat mode in addition to dirent type 2016-03-17 17:13:53 -07:00
Bryan Thornbury
861b7494d3 Add hacky abstraction for quickly parsing RuntimeConfig.json and determining if it's a portable app 2016-03-17 16:39:48 -07:00
Livar Cunha
8358ccb5e8 Added build before running the tests and the no-build option to opt out of it.
Added new tests to ProjectDependencyCommandResolver and new E2E tests for dotnet test.
2016-03-17 15:17:18 -07:00
Bryan Thornbury
873310f8f4 fix commandPath ordering for corehost 2016-03-17 14:06:15 -07:00
Bryan Thornbury
98b0c03444 Merge branch 'brthor/nuget-tools-on-shared-fx', remote-tracking branch 'origin' into cli-sdk-stages 2016-03-17 13:56:51 -07:00
Bryan Thornbury
937141c6a5 Cleanup 2016-03-17 13:44:32 -07:00
Bryan Thornbury
f0c2cb2c18 product changes to support portable tools 2016-03-17 13:44:32 -07:00
Bryan Thornbury
b59c4333ea Remove tool restore from dotnet restore, use nuget tool restore 2016-03-17 13:44:32 -07:00
Livar Cunha
45abe6d52b Added extra params (base-build-path, runtime, framework) and refactored parameter parsing into its own class with tests.
Changed program.cs to use the new dotnettestparams.

Hooked up the new parameters to the ProjectDependencyCommandResolver
2016-03-17 13:29:16 -07:00
Pavel Krymets
f5330cdd1f Merge pull request #1918 from dotnet/pakrym/deps-nulls
Remove DependencyModel csv reader, add lots of null checks everywhere
2016-03-17 11:35:20 -07:00
Senthil
a766bc173e Relax error case if runtime config is not present 2016-03-17 11:32:46 -07:00
Senthil
b93b915cc6 Fix error check and verbose 2016-03-17 11:05:49 -07:00
Pavel Krymets
6970a75746 Remove csv reader 2016-03-17 10:03:26 -07:00
schellap
ee27b1ff11 Enable logging and fix xunit runtimeconfig 2016-03-17 01:53:52 -07:00
Senthil
6fec9ad1fa Merge pull request #1921 from schellap/deps-fmt
Return empty entries instead of creating empty ones
2016-03-17 00:30:56 -07:00
Senthil
8ff5f9df6f Return empty entries instead of creating empty ones 2016-03-16 20:50:32 -07:00
Senthil
adda6fcdfc Merge pull request #1915 from schellap/deps-fmt
Revert merging relpaths and relax erroring
2016-03-16 20:46:34 -07:00
Senthil Chellappan
00905c3faf Revert merging relpaths and relax erroring 2016-03-16 19:03:21 -07:00
Pavel Krymets
665dc9bcce Add null checks everywhere in dependency model 2016-03-16 16:53:59 -07:00
Pavel Krymets
28d5f6125c Merge pull request #1906 from dotnet/pakrym/legacy-deps
Generate embedded deps file that previos versions of DependencyModel can use
2016-03-16 15:59:17 -07:00
Senthil
0a5d95d2ad Fix casing of shared and add DT_DIR to readdir 2016-03-16 14:09:48 -07:00
Pavel Krymets
1cbec5a494 Generate embedded deps file that previos versions of DependencyModel can use 2016-03-16 12:43:41 -07:00
Sridhar Periyasamy
570e348edf Make corehost pick pre-release SDK version when no production releases.
Also fix STL crash.
2016-03-16 10:59:17 -07:00