Commit graph

3908 commits

Author SHA1 Message Date
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