mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2354 commits 41 branches 190 tags 95 MiB
Commit graph

1113 commits

Author SHA1 Message Date
Pavel Krymets
567d1fa19d Alow type platform to be in target dependencies 2016-04-06 10:46:52 -07:00
Wes Haggard
3ab4a30eb8 Add support for pkgprojs in cli repp 
- Move src\corehost\packaging to pkg\ directory.
- Renamed PackageCoreHost to PackagePkgProjects and removed blocker
- Updated copy of packages in PackagePkgProjects target to override (because there is no proper clean)
- Update dir.props to match the package version for the runtime.json
- Moved all CoreHost packages under  Microsoft.NETCore.DotNetHost directory
- Add the license files to the packages

Add support for building Microsoft.NETCore.App meta-package
- VersionNumber will be of form 1.0.0-rc2-<NETSTandard.Library build#>-<CLIbuild#>
EX: 1.0.0-rc2-23931-002203
 2016-04-06 10:34:23 -07:00
Jan Kotas
722cd3b681 Merge pull request #2240 from jkotas/remove-r2r-workaround 
Remove ReadyToRun workaround
 2016-04-05 21:30:35 -10:00
Sridhar Periyasamy
1db2c08fb5 Execute project dependency command from output directory for Desktop. 
Created a new command resolver called OutputPathCommandResolver which
reolves a command from the project build output directory.

Made changes ProjectDependenciesCommandFactory to use
OutputPathCommandResolver if the target framework is Desktop.

Fixes - #2126

Still need to add tests.
 2016-04-05 20:13:06 -07:00
Eric Erhardt
965547bd8a Merge pull request #2145 from dotnet/lakshanf/issue2066/telemetry 
Lakshanf/issue2066/telemetry
 2016-04-05 19:37:58 -05:00
Eric Erhardt
5e617bbb43 Merge pull request #2283 from eerhardt/NewNuGet 
Update NuGet to 3.5.0-beta-1130
 2016-04-05 15:29:10 -05:00
Eric Erhardt
ed82fd2e66 Update NuGet to 3.5.0-beta-1130 2016-04-05 13:42:16 -05:00
Livar Cunha
40cd8650ce Removing linq from projectmodel net45 dependencies. It got there accidently. 2016-04-05 11:14:36 -07:00
Troy Dai
cb14076b38 Merge pull request #2249 from dotnet/troy/2200 
Use default version for unresolved MSBuild reference
 2016-04-05 09:05:18 -07:00
Troy Dai
e63c0f82c9 Use default version for unresolved MSBuild reference 2016-04-05 08:32:58 -07:00
Pavel Krymets
8831bb4a8b Do not trim refs 2016-04-05 08:06:17 -07:00
Dan Quirk
0d067be964 Use static member 2016-04-04 18:58:22 -07:00
Dan Quirk
b5e1042d06 Use InternalsVisibleTo for testing 2016-04-04 17:33:09 -07:00
Dan Quirk
3e4edf1688 CR feedback part 1 2016-04-04 16:18:47 -07:00
Lakshan Fernando
25745d9d4e Implemented Telemetry class via an interface for test ease 2016-04-04 15:26:06 -07:00
Lakshan Fernando
d9e169e77a Stopped collecting command arguments due to PII concerns 2016-04-04 15:26:06 -07:00
Lakshan Fernando
e9a6c4350a added comment to the instrumentation key field 2016-04-04 15:26:06 -07:00
Lakshan Fernando
689a72ffb5 incorporate CR feedback for the first PR 2016-04-04 15:26:06 -07:00
Lakshan Fernando
6b84a10e57 Telemetry PR 2016-04-04 15:26:06 -07:00
Peter Marcu
d8858e4d6b Update project.json template to be netcoreapp1.0 
It should be time, now that RID inference is off, to update dotnet new to finally use netcoreapp1.0.
 2016-04-04 14:43:50 -07:00
Livar Cunha
7b209e5603 Moved ProjectModel to json.net for GlobalSettings and Project.json. Kept LockFileReader using the old API as I don't have the cycles to add the tests for it at the moment. 
Added unit tests covering parsing of Json for all the pieces of the project.json

Added a RawRuntimeOptions to Project and made Executable deserialize that into the runtimeOptions of runtimeconfig.json

Added tests to cover copying runtimeoptions during dotnet build.
 2016-04-04 12:11:27 -07:00
Jan Kotas
5673647064 Remove ReadyToRun workaround 2016-04-03 09:01:59 -07:00
Justin Emgarten
9c31501deb Updating nuget to beta-1123 2016-04-01 21:09:05 -07:00
schellap
f5411abdf0 Support runtimeconfig.dev json 2016-04-01 19:32:02 -07:00
Bryan Thornbury
8370effbb0 Add imports to the fsharp dotnet new template 2016-04-01 15:35:12 -07:00
Eric Erhardt
47530fce56 Merge pull request #2188 from eerhardt/UpdateRoslyn 
Updating Roslyn packages to 1.3.0-beta1-20160329-01.
 2016-04-01 09:37:01 -05:00
Senthil
be1c55f061 Merge pull request #2186 from schellap/bom 
Strip BOM from JSON file streams
 2016-04-01 06:32:44 -07:00
Senthil
23e3adb1a3 Strip BOM from JSON file streams 2016-04-01 05:30:23 -07:00
Senthil
29b567db3f Merge pull request #2156 from schellap/shared-paths2 
Probe shared locations
 2016-04-01 00:03:09 -07:00
Eric Erhardt
a2a776ac7b Updating Roslyn packages to 1.3.0-beta1-20160329-01. 2016-04-01 01:24:45 -05:00
Justin Emgarten
219a0539b0 Updating to NuGet 1105 2016-03-31 18:13:25 -07:00
Troy Dai
9f23b7adf5 Merge branch 'troy/xp' into rel/1.0.0 2016-03-31 17:16:41 -07:00
schellap
3d691eb928 Probe shared locations 2016-03-31 16:58:17 -07:00
Pavel Krymets
e4cdc250e9 Merge pull request #2177 from dotnet/pakrym/disable-json-message 
Do not write json error message to stderr
 2016-03-31 16:31:07 -07:00
Pavel Krymets
8d1ddcdf2d Do not write json error message to stderr 2016-03-31 14:39:33 -07:00
Bryan
0fd81e0a2d Extract dotnet-compile-fsc into a standalone command 
Add basic Tests for dotnet-compile-fsc

Package Targets execute before TestTargets. Use Generated Nuget Packages in TestTargets. Generate Nuget packages on all platforms, and in C#

Fix bug in dotnet-restore, change fsharp new template, add support for native assets in DependencyContextCsvReader

copy fsc.exe to temp directory instead of package cache

fix rebase error

fix issue

fixes

fixes

fix

temporarily disable debian package e2e testing

fixes

bump fsc version

update fsc version

fix rebase errors

WIP update fsc tool

WIP, rebased and working again, need to solve issues with System.CommandLine

Working state for packaged, command, fsc.exe bugging out with dlopen(, 1): no suitable image found.

execute fsc like a unpublished standalone app

fixup after rebase

working? internet is out

working

cleanup

More cleanup, and run the debian package tests during the Test phase of the build.

update FSharp Test Projects NetStandard Library Version

Update Version Suffix when packing TestPackages. This will enable packing with the right dependency versions on Windows.

update dotnet-test version

Undo the reordering of the build

fix test package project pathsj

ignore net451 build failures for test packages which we need to build on non-windows

update dependency of desktop test app

add dotnetcli feed to nuget config for fsharp dotnet new

update deps after rebase

update dependency of dotnet-compile-fsc

pass args before commandPath when using muxer for tools

adjust testpackage cleaning not to clean packages which are also generated as part of the product from the nuget cache.

undo

Pass projectJson to pack instead of using WorkingDirectory

fix path separators using depsjsoncommandresolver on windows, fix building only specific frameworks for testpackages on non-windows.

PR Feedback

rebase

overwrite fsc runtimeconfig
 2016-03-31 14:01:08 -07:00
Troy Dai
e176c1d3b9 Remove fragment file's involvement in design time scenarios 2016-03-31 13:57:36 -07:00
Pavel Krymets
429eb93cd9 Merge pull request #2160 from dotnet/pakrym/no-arg-net451 
Pass no additional arguments to net451 app in dotnet run
 2016-03-31 11:23:31 -07:00
Pavel Krymets
7e73e5c379 Pass no additional arguments to net451 app 2016-03-31 10:35:42 -07:00
eerhardt
3afd85068a Updating dependencies from last known good builds 2016-03-31 11:57:21 -05:00
Senthil
1428eb81cf Merge pull request #2139 from schellap/master 
Add clarifying message on JSON exception
 2016-03-31 01:05:42 -07:00
Bryan Thornbury
164a235a20 Merge pull request #2151 from dotnet/brthor/remove-oob-commands 
Remove OOB Commands and Pdbs from stage2
 2016-03-30 21:28:27 -07:00
Senthil
9c67627b43 Merge pull request #2150 from schellap/simple 
Disable corehost packaging in VSO
 2016-03-30 20:33:10 -07:00
Mihai Codoban
4c84e686d0 Avoid duplicate messages 2016-03-30 19:24:43 -07:00
Troy Dai
8a3ddc9c8a Remove MSBuildProjectPath property 2016-03-30 19:24:43 -07:00
Mihai Codoban
b7ca1d14bd Distinguish between the msbuild project path and csproj file path 2016-03-30 19:24:43 -07:00
Mihai Codoban
2e78b9ae60 Revert "MSBuildProjectDescriptions has dedicated property for the csproj path" 
This reverts commit a95e20d96480dac3010c8403e04bd716fba2cc5b.
 2016-03-30 19:24:43 -07:00
Mihai Codoban
54278c294e Transform lock file reader exceptions into diagnostics 2016-03-30 19:24:43 -07:00
Mihai Codoban
9cc3d088f0 MSBuildProjectDescriptions has dedicated property for the csproj path 2016-03-30 19:24:43 -07:00
Mihai Codoban
829fab595e Fix extract method code 
The VS code generator is too opinionated on CLR types :)
 2016-03-30 19:24:43 -07:00
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