Commit graph

340 commits

Author SHA1 Message Date
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
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
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
moozzyk
ce6ce3c49b Folding ProjectFile.Name to compiler options 2016-03-21 12:42:33 -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
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
Bryan Thornbury
f0c2cb2c18 product changes to support portable tools 2016-03-17 13:44:32 -07:00
Eric Erhardt
964318b291 Revert "Update the .xproj files to reference the "DotNet" targets and props instead of "DNX"."
This reverts commit 4304ca9848.
2016-03-16 11:44:09 -05:00
Andrew Stanton-Nurse
cc00d9d839 update project templates for portable app
also fix dotnet run
2016-03-15 15:18:48 -07:00
Eric Erhardt
dc699729a4 Merge pull request #1871 from eerhardt/FixProjFiles
Update the .xproj files to reference the "DotNet" targets and props instead of "DNX".
2016-03-15 15:23:47 -05:00
Piotr Puszkiewicz
2d3d2a9078 Bump NuGet to 763, --verbosity verbose, --disable-parallel 2016-03-15 12:35:23 -07:00
Eric Erhardt
4304ca9848 Update the .xproj files to reference the "DotNet" targets and props instead of "DNX". 2016-03-15 13:59:00 -05:00
Pavel Krymets
c10df6b6a5 Add support for loading and merging runtime deps json 2016-03-15 09:32:39 -07:00
eerhardt
8953400eee Updating dependencies from last known good builds 2016-03-14 17:58:13 -05:00
Andrew Stanton-Nurse
008a1ad0fa put 'native' section in to runtime targets for deps file 2016-03-14 12:57:34 -07:00
Andrew Stanton-Nurse
d08e83d5db add support for portable application layout 2016-03-12 11:52:29 -08:00
Troy Dai
78257e7388 Update DotNEtReferenceAssembliesPathResolver 2016-03-10 16:57:57 -08:00
Troy Dai
dc7bab9e28 Probe for .NET reference assemblies path 2016-03-10 16:01:11 -08:00
Troy Dai
a50a5a9d73 Retry when lock file is occupied by other process 2016-03-10 11:46:52 -08:00
Andrew Stanton-Nurse
e1be00ecb3 take NuGet with OSX fix 2016-03-09 15:59:41 -08:00
Pavel Krymets
9631ba8927 Generate actual deps.json file 2016-03-09 14:11:43 -08:00
Pavel Krymets
85b7336529 Merge pull request #1750 from dotnet/pakrym/deps-duplication-fix
Fix dependency context builder regression
2016-03-09 13:43:53 -08:00
Pavel Krymets
dd3c0f50db Add reference assemblies and runtime targets support to dependency context builder. 2016-03-08 12:03:10 -08:00
Andrew Stanton-Nurse
7cc90d9ad1 Update dotnet-build to produce portable layout
dotnet-build will produce a deps file for portable builds, and will now
create "runnable" outputs for RID-less targets

the outputs won't actually be runnable today because we need corehost
changes and to generate a deps.json file for corehost to use.
2016-03-08 11:46:15 -08:00
Andrew Stanton-Nurse
444e4f9fd7 update version of nuget 2016-03-08 09:53:06 -08:00
Pavel Krymets
a0db5086f6 Fix dependency context builder regression 2016-03-08 09:22:17 -08:00
Pavel Krymets
304127ec0d Fix wrapped project export 2016-03-04 12:16:23 -08:00
Pavel Krymets
7df754be36 Finish builder tests 2016-03-04 11:01:15 -08:00
Pavel Krymets
0a0c4a830e Even more tests 2016-03-04 11:01:15 -08:00
Pavel Krymets
dcaea8c7ca More work and tests 2016-03-04 11:01:15 -08:00
Pavel Krymets
9bd9ca1512 Add more tests and some reading logic 2016-03-04 11:01:15 -08:00
David Fowler
3ed9361763 Merge pull request #1699 from dotnet/davidfowl/error-handling
Tweak error handling a little bit
2016-03-04 07:54:19 -08:00
David Fowler
25b5ce9c77 Tweak error handling a little bit
- Handle unresolved projects better in build
- Move unresolved package marking to the resolver
- Added ToString to LibraryKey for easy diagnosis of errors
2016-03-04 01:17:37 -08:00
Eric Erhardt
a709f772f1 Merge pull request #1645 from eerhardt/NewCorefx
Move to CoreFX build rc2-23901
2016-03-03 23:21:52 -06:00
Eric Erhardt
6468b14e1d Move to CoreFX build rc2-23901
Update .exe's project.json Target Framework from dnxcore50 to netstandardapp1.5.
Update .dll's project.json Target Framework from dnxcore50 to netstandard1.3.

Adding workaround for DataContractSerialization to src\dotnet\project.json to fix crossgen issue.
Build 23901 has a dependency issue that doesn't allow the runtime.any.System.Private.DataContractSerialization
package to be restored. When we move to a new build of CoreFX we should take this workaround out.
2016-03-03 16:41:55 -06:00
Jared Parsons
2deb9d343a Plumbde through the option 2016-03-02 15:53:59 -08:00
Troy Dai
b63705198c Merge branch 'troy/1569' into rel/1.0.0 2016-03-02 09:31:36 -08:00
Troy Dai
4dff646f5d Update ProjectManager error message 2016-03-01 19:45:45 -08:00
Livar Cunha
4108920510 Updating tests to use the latest version of dotnet-test-xunit, which supports debugging from VS. Also updating our xproj files so that we can build the CLI from VS using the CLI. 2016-03-01 16:28:10 -08:00
Troy Dai
9f8906fdac Update dotnet projectmodel tests 2016-03-01 12:58:30 -08:00
Troy Dai
268dd603cc Ensure Microsoft.CSharp reference is not duplicated 2016-02-26 15:06:39 -08:00
Pavel Krymets
6aeed1f52d Merge pull request #1563 from dotnet/pakrym/wrapped-project
Fix wrapped project path resolution
2016-02-24 18:21:14 -08:00
Pavel Krymets
1bfd7725b0 Fix wrapped project paht resolution 2016-02-24 16:40:22 -08:00
Pavel Krymets
a074101b1d Add better messages for run scenarios 2016-02-24 10:49:00 -08:00
David Fowler
a049eee253 Updated NuGet pacakge reference 2016-02-23 10:32:15 -08:00
Pavel Krymets
a71112ce8f Asset refactoring and content files 2016-02-23 08:34:38 -08:00