Commit graph

2142 commits

Author SHA1 Message Date
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
Pavel Krymets
6bd374a4ec Merge pull request #2153 from dotnet/pakrym/infer-scripts
Infer rids for build script restore
2016-03-30 19:20:51 -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
Pavel Krymets
58299db161 Infer rids for build script restore 2016-03-30 18:39:57 -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
c617ee1d80 Merge pull request #2144 from schellap/dll-load
Expand LoadLibrary search paths
2016-03-30 14:28:29 -07:00
Senthil
085dbd413e Expand LoadLibrary search paths 2016-03-30 14:26:57 -07:00
Livar
e6e2db88e8 Merge pull request #2130 from livarcocc/runtime_config_options
Adding a runtimeconfig.dev.json containing the additionalProbePaths when doing dotnet build.
2016-03-30 13:13:54 -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
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
Livar
8ea93db89d Merge pull request #2131 from livarcocc/update_xunit
Updating dotnet-test-xunit to the lastest version in hopes that it wi…
2016-03-30 09:30:59 -07:00
Peter Marcu
0ef189c07a Update new template to remove imports 2016-03-29 23:02:58 -07:00
Livar Cunha
c1189925df Updating dotnet-test-xunit to the lastest version in hopes that it will fix the inconsistent build break we are seeing in Jenkins and VSO. 2016-03-29 21:50:29 -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
5f6c939c7b Merge pull request #2117 from dotnet/pakrym/dc-more-overloads
Add more overloads for assembly resolution in dependency model
2016-03-29 11:19:54 -07: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
Senthil
ac4c6702d5 Merge pull request #2111 from dotnet/revnupkg
Revert "Merge pull request #2080 from schellap/nupkg2"
2016-03-29 02:33:29 -07: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
4bb7c1a6d4 Merge pull request #2105 from dotnet/anurse/fix-build
no longer need to crossgen the CLI
2016-03-29 00:06:05 -07:00
Troy Dai
f32076a0b4 Merge branch 'troy/omnisharp' into rel/1.0.0 2016-03-28 23:04:22 -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
Piotr Puszkiewicz
e07e0c12ed Merge pull request #2102 from Sridhar-MS/version_badges
Fix version badges to display Nuget Version of cli.
2016-03-28 22:28:52 -07:00
Andrew Stanton-Nurse
794be31af3 herp de derp 2016-03-28 21:43:43 -07:00
Andrew Stanton-Nurse
bca338801a no longer need to crossgen the CLI
thank you shared framework!
2016-03-28 21:42:04 -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
Piotr Puszkiewicz
19e707448d Update NETCore.App version for new projects 2016-03-28 18:18:38 -07:00
Sridhar Periyasamy
8bb35349f9 Fix version badges to display Nuget Version of cli.
We started using the nuget version in rest of our build scripts.
Fixes - #2099
2016-03-28 17:51:36 -07:00