Commit graph

915 commits

Author SHA1 Message Date
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
Eric Erhardt
0faa7936ac Merge pull request #1899 from eerhardt/RevertXProjChange
Revert "Update the .xproj files to reference the "DotNet" targets and props instead of "DNX"."
2016-03-16 12:43:44 -05: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
Enrico Sada
5728330a2f use response files by default 2016-03-16 16:32:42 +01:00
Enrico Sada
b6fcbbdd86 compile-fsc fix and features
Support project.json compilationOptions:

- nowarn
- warningsAsErrors
- keyFile
- delaySign

Use env var to configure compile-fsc behaviour:

- DOTNET_FSC_PATH the fsc path. Default the bundled fsc.exe
- DOTNET_COMPILEFSC_USE_RESPONSE_FILE if '1' then pass a response file
  to fsc instead of all arguments. Default pass all arguments
- DOTNET_FSC_EXEC configure how to run the fsc. Values:
   - RUN run fsc passing fsc args
   - COREHOST run corehost passing fsc and fsc args. The default

Use the same order of fsproj msbuild task for fsc arguments to make it easier
compare fsproj build and .net cli build

Fix --resource with path and name

Enable --debug (-g) if pdb

The generated assembly info file must be in the last - 1 position
in source files list.

1. the generated assembly info file must be in the last possibile position to
   override the attributes
2. The last file is the source file with main
2016-03-16 16:29:23 +01:00
Pavel Krymets
77e511c4d4 Generate runtime graph when building runtime 2016-03-16 08:27:55 -07:00
Enrico Sada
c2afaa265f bump f# compiler and FSharp.Core 2016-03-16 16:19:28 +01:00
Enrico Sada
8739803778 netcore frameworks 2016-03-16 03:01:05 +01:00
Livar
1c9803d980 Merge pull request #1786 from livarcocc/tests_as_client
Modifying the reporting channels to make the AdapterChannel a client
2016-03-15 16:37:26 -07:00
Senthil
4253c8c904 Merge pull request #1878 from schellap/deps-json2
Update iterator properly and merge rid/non-rid assets
2016-03-15 15:21:16 -07:00
Andrew Stanton-Nurse
cc00d9d839 update project templates for portable app
also fix dotnet run
2016-03-15 15:18:48 -07:00
Livar Cunha
8d39adbdbf Modifying the reporting channels to make the AdapterChannel a client and leave the TestRunnerChannel a server. This will prevent port conflicts between dotnet test and the Adapter (VS) due to race conditions.
Added E2E tests for dotnet test interactions with an adapter (design time).
2016-03-15 15:13:54 -07:00
Senthil
967fc370a0 Update iterator and merge rid/non-rid assets 2016-03-15 14:05:47 -07:00
Pavel Krymets
ffedcb315f Merge pull request #1875 from dotnet/pakrym/graph-reader
Fix runtime graph reader
2016-03-15 14:05:42 -07:00
Bryan Thornbury
63772ccda1 Merge branch 'rel/1.0.0' into brthor/1702 2016-03-15 13:30:42 -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
Pavel Krymets
a76558f560 Fix runtime graph reader 2016-03-15 12:51:43 -07:00
Piotr Puszkiewicz
2d3d2a9078 Bump NuGet to 763, --verbosity verbose, --disable-parallel 2016-03-15 12:35:23 -07:00
Andrew Stanton-Nurse
e1a7044b45 add manual merge of RID fallback graph for Windows 2016-03-15 12:02:39 -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
Eric Erhardt
3714cc25e9 Merge pull request #1865 from eerhardt/RemoveWorkarounds
Removing project.json dependency workarounds that were needed for CoreFX 23901 build.
2016-03-15 13:58:21 -05:00
Eric Erhardt
ce3c594880 Removing project.json dependency workarounds that were needed for CoreFX 23901 build. 2016-03-15 12:34:32 -05:00
Pavel Krymets
c10df6b6a5 Add support for loading and merging runtime deps json 2016-03-15 09:32:39 -07:00
Eric Erhardt
9b0892c399 Merge pull request #1825 from eerhardt/NewCoreFx
Updating dependencies from last known good builds
2016-03-15 10:50:40 -05:00
Senthil
f615f74a39 Shared FX and Portable Support for Unified Host
- Add Casablanca CPP Rest SDK to corehost
    - Correct understanding of portable runtimeTargets section
    - Fix minor issues and automation for RID
    - CLI Build Integration
    - Add API to consume deps files
    - Unix doesn't like major as a variable name
    - Define NOMINMAX for Windows.h
    - Support APP_CONTEXT_DEPS_FILES
    - mscorlib.ni can come from native
    - Append Dotnet.dll to sdk path
    - Muxer vs standalone distinction based on own name.dll
2016-03-15 01:03:52 -07:00
Bryan Thornbury
1c44d2566e copy the deps json for packaged commands 2016-03-14 18:41:08 -07:00
Bryan Thornbury
c8617c97e8 remove resgen as a top level command 2016-03-14 16:49:38 -07:00
Eric Erhardt
0de7a4c934 Workaround F# requiring Win32.Registry, which doesn't restore on Unix machines, by excluding it from compile. 2016-03-14 17:58:14 -05:00
Eric Erhardt
457e842c76 Add workaround for System.Reflection.TypeExtensions. Roslyn is still referencing the old version, which is now incompatible with the latest System.Reflection nupkg. 2016-03-14 17:58:14 -05:00
eerhardt
8953400eee Updating dependencies from last known good builds 2016-03-14 17:58:13 -05:00
Eric Mellino
09c8e298ed Switch sharedframework project.json to Microsoft.NETCore.App
Use local-build corehost.exe

This is staying in the repo, so we can copy the local-built version.

Copy deps and deps.json, make sure corehost temp dir exists

Add additional runtimes to the sharedframework's project.json

Delete an unused file, modify crossgen target condition

* sharedhost\project.json is unused. It is copied from the local build.
* the crossgen target was conditioned on an environment variable, but the
  variable could be set to anything. Instead, make sure it is either
  "true" or "1".

Use stage2 instead of stage0 for shared framework restore
2016-03-14 14:43:31 -07:00
Andrew Stanton-Nurse
008a1ad0fa put 'native' section in to runtime targets for deps file 2016-03-14 12:57:34 -07:00
Livar
78778b883f Merge pull request #1795 from mellinoe/wip-build-stuff-rebased
Add installer scripts for the shared framework/host, incorporate into build
2016-03-14 09:59:12 -07:00
Andrew Stanton-Nurse
d08e83d5db add support for portable application layout 2016-03-12 11:52:29 -08:00
Jan Vorlicek
cef64895c8 Merge pull request #1814 from janvorli/fix-pthread
Fix pthread library option
2016-03-12 01:46:05 +01:00
Troy Dai
9df3a986d8 Fix incorrect reference assembly path 2016-03-11 11:53:22 -08:00
Troy Dai
429625061d Merge branch 'troy/531' into rel/1.0.0 2016-03-11 09:53:18 -08:00
Jan Vorlicek
72ad7aa4db Fix pthread library option
While building CoreRT on OSX, I have noticed a warning:
clang: warning: argument unused during compilation: `-pthread`
The issue is that the options should be `-lpthread` instead.
2016-03-11 12:24:36 +01:00
Senthil
c5320732c4 Merge branch 'rel/1.0.0' into hostpfiles 2016-03-11 01:13:40 -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
Pavel Krymets
5a121215cd Merge pull request #1801 from dotnet/pakrym/deps-rids-paths
Fix issue with paths in deps.json not being normalized to have `/`
2016-03-10 15:20:36 -08:00
Troy Dai
37544303cb Merge branch 'troy/1762' into rel/1.0.0 2016-03-10 14:24:23 -08:00
Pavel Krymets
5214d176cd Fix issue with paths in deps.json not being normalized to have /, also moves rid graph section to root leve instead of being inside arget subsection 2016-03-10 13:45:06 -08:00
Troy Dai
a50a5a9d73 Retry when lock file is occupied by other process 2016-03-10 11:46:52 -08:00
Pavel Krymets
dceefd05c3 Fix issue preventing MVC gate to take a new dotnet cli 2016-03-10 11:33:39 -08:00
Matt Ellis
4df5ed39d5 Crossgen Shared Framework managed assemblies
- Use Crossgen's Ready To Run mode on all of the managed assemblies
  that make up the shared framework.
- Upgrade the version of the shared framework to match what is used
  in the rest of CLI (see the comment in SharedFrameworkTargets.cs to
  understand why this is needed).
- Remove the IL mscorlib.dll image, since the Crossgen'd image is
  already published.

Fixes dotnet/corefx#6753
2016-03-10 04:38:15 -08:00
Matt Ellis
e6bcfee4a4 Add SharedFramework MSI Authoring 2016-03-10 03:37:41 -08:00
Matt Ellis
04d21e6693 Add Shared Host MSI Authoring
Ideally in the project.json for the shared host we would just list the
actual package that holds the shared host, instead of all of
NetStandard.Library, but doing some leads to compliation errors, since
publish wants to include a compile step that has a generated
AssemblyAttributes file which references types like System.String.
2016-03-10 03:37:41 -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
Troy Dai
628f54c77c Send an empty error message after global error is cleared 2016-03-09 08:15:18 -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
Senthil
7789a42766 Merge branch 'rel/1.0.0' into hostpfiles 2016-03-08 02:20:54 -08:00
Bryan Thornbury
2b90a2f831 Merge pull request #1692 from dotnet/brthor/refactor-resolvers
Refactor Command Resolvers, Add Tests, and Fix #1649
2016-03-07 16:50:14 -08:00
Bryan Thornbury
9f58651b6c PR Feedback and nearly full test coverage for resolvers
fix

resolve rebase issues
2016-03-07 14:45:16 -08:00
N. Taylor Mullen
2f2b3df35b Merge pull request #1738 from dotnet/nimullen/createloadcontextfix
Add ability to specify `outputPath` when creating a `ProjectContext`s `AssemblyLoadContext`.
2016-03-07 14:38:35 -08:00
Bryan Thornbury
b813e2b849 Fixes #1649
make things work again

fix

Tests Passing

cleanup

fix

fix
2016-03-07 14:35:41 -08:00
Bryan
42cc39252e Refactor CommandResolver into individual CommandResolver Implementation
classes.

Write Unit Tests covering Composite DefaultCommandResolver and
ScriptCommandResolver.

baseline

Baseline2
2016-03-07 14:34:23 -08:00
Livar
1fccdbd6ec Merge pull request #1697 from livarcocc/tests_to_run_in_message
Modified the protocol to send a the list of tests to run in a message
2016-03-07 14:01:45 -08:00
N. Taylor Mullen
2ea26645e6 Add ability to specify outputPath when creating a ProjectContexts AssemblyLoadContext.
- Prior to this change `outputPath` would always default to `null` which didn't work well with `VisualStudio` tooling. The tooling enables the user to specify a project's `outputPath` but more importantly defaults the project's `outputPath` to the root directory (instead of the project directory).
2016-03-07 12:01:07 -08:00
Pavel Krymets
781678de92 Merge pull request #1703 from dotnet/pakrym/deps-json
Add support for new `deps.json` format without some features.
2016-03-07 11:32:32 -08:00
Livar Cunha
e498f1dc9d Modified the protocol to send a the list of tests to run and to invoke the test runner with the wait command flag so that the runner waits for this list.
Modified the reporting channel factory to have a create for the adapter and a create for the runner channel. Also added an event to the create runner channel that people can listen and be notified when a test runner channel was created. I use this event to give the message handler access to the runner channel.

Added the new message handler to DotnetTest.
2016-03-04 17:14:56 -08:00
Jared Parsons
fa143c4d1c Revert to full PDB on Windows as a default
The change to default to Portable PDB by default has broken a number of downstream consumers.  Moving back to full PDBs by default on Windows.

This leaves the option for portable PDB in place.  Hence you can still enable it via the following entry in project.json:

``` json
"compilationOptions": {
    "debugType": "portable"
}
```
2016-03-04 15:33:06 -08:00
Pavel Krymets
1658a40806 Fix tests 2016-03-04 15:05:29 -08:00
Pavel Krymets
1d7cff48d4 PR 2016-03-04 14:12:16 -08:00
Pavel Krymets
304127ec0d Fix wrapped project export 2016-03-04 12:16:23 -08:00
Bryan Thornbury
42a17b5d98 Merge pull request #1684 from dotnet/brthor/fix-bold-bleed
fix bold bleed
2016-03-04 11:10:43 -08:00
Pavel Krymets
25d70c07c3 PR 2016-03-04 11:06:12 -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
Pavel Krymets
3f4c263670 Add support for json deps file 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
Livar
049bd17ed2 Merge pull request #1696 from livarcocc/test_abstractions_tests_in_message
Adding a new SendWaitingCommand message to the test sinks
2016-03-03 21:31:30 -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
Livar Cunha
59033ba1e7 Adding a new SendWaitingCommand message to the test sinks so that they can tell dotnet test that the runner is ready to receive commands. 2016-03-03 19:53:33 -08:00
Senthil
5cf680d2f0 Merge pull request #1678 from schellap/master
Fix host case comparison
2016-03-03 18:01:47 -08:00
Jared Parsons
d7cabe152f Merge pull request #1392 from jaredpar/pdb
Make Portable PDB the default on Windows
2016-03-03 17:14:51 -08: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
Troy Dai
81baacd641 Fix issue 1665: prevent sending null error message 2016-03-03 13:13:06 -08:00
Livar
d918d527bd Merge pull request #1676 from livarcocc/unbound_test_collection
TestMessagesCollection with unbound BlockingQueue
2016-03-03 12:36:43 -08:00
Bryan
5cb1703a76 fix bold bleed 2016-03-03 12:15:16 -08:00
Pavel Krymets
d701e54d8c Merge pull request #1671 from dotnet/pakrym/package-cache
Search for package cache hash file in right directory
2016-03-03 11:37:13 -08:00
schellap
58822cc37b Fix host case comparison 2016-03-03 01:52:17 -08:00
Livar Cunha
db218ab11c This fixes a race condition where if the runner takes to long to execute and we get two messages before the runner quits, we hit a blocking piece of code when trying to add new messages to the queue, which leads to a deadlock, where we need to finish the runner to process new messages but the runner won't quit because it is waiting for us to accept is other messages. 2016-03-03 00:11:13 -08:00
Livar Cunha
03b6b8ada0 We had a bug where the framework for design time runs of dotnet test was hard coded into dnxcore50. Moved some things around so that we will pack the target framework from the project context. 2016-03-02 22:15:02 -08:00
Pavel Krymets
30992babaf Search for package cache hash file in right directory 2016-03-02 20:04:26 -08:00
Jared Parsons
2d25d1232a Emit isn't on the CSharpCompilationOptions 2016-03-02 18:22:14 -08:00
Jared Parsons
b378fb0419 fixes 2016-03-02 16:24:54 -08:00
Jared Parsons
2deb9d343a Plumbde through the option 2016-03-02 15:53:59 -08:00
Livar
5b1ad5fe3e Merge pull request #1652 from livarcocc/test_output_param
Added output param to dotnet test
2016-03-02 14:09:40 -08:00
Jared Parsons
e56858b4b3 Make Portable PDB the default on Windows
VS 2015 Update 2 CTP has been released which has support for debugging portable PDBs.  Now is a good time to make the transition so a) we can root out any remaining issues with portable PDBs and b) have larger dogfooding of the VS debugging experience here.

closes #704
2016-03-02 09:58:41 -08:00