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

880 commits

Author SHA1 Message Date
Senthil
d35d0cc543 Merge branch 'rel/1.0.0' into hostpfiles 2016-03-17 18:32:55 -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
873310f8f4 fix commandPath ordering for corehost 2016-03-17 14:06:15 -07:00
Bryan Thornbury
98b0c03444 Merge branch 'brthor/nuget-tools-on-shared-fx', remote-tracking branch 'origin' into cli-sdk-stages 2016-03-17 13:56:51 -07:00
Bryan Thornbury
937141c6a5 Cleanup 2016-03-17 13:44:32 -07:00
Bryan Thornbury
f0c2cb2c18 product changes to support portable tools 2016-03-17 13:44:32 -07:00
Bryan Thornbury
b59c4333ea Remove tool restore from dotnet restore, use nuget tool restore 2016-03-17 13:44:32 -07:00
Pavel Krymets
f5330cdd1f Merge pull request #1918 from dotnet/pakrym/deps-nulls 
Remove DependencyModel csv reader, add lots of null checks everywhere
 2016-03-17 11:35:20 -07:00
Senthil
a766bc173e Relax error case if runtime config is not present 2016-03-17 11:32:46 -07:00
Senthil
b93b915cc6 Fix error check and verbose 2016-03-17 11:05:49 -07:00
Pavel Krymets
6970a75746 Remove csv reader 2016-03-17 10:03:26 -07:00
schellap
ee27b1ff11 Enable logging and fix xunit runtimeconfig 2016-03-17 01:53:52 -07:00
Senthil
6fec9ad1fa Merge pull request #1921 from schellap/deps-fmt 
Return empty entries instead of creating empty ones
 2016-03-17 00:30:56 -07:00
Senthil
8ff5f9df6f Return empty entries instead of creating empty ones 2016-03-16 20:50:32 -07:00
Senthil
adda6fcdfc Merge pull request #1915 from schellap/deps-fmt 
Revert merging relpaths and relax erroring
 2016-03-16 20:46:34 -07:00
Senthil Chellappan
00905c3faf Revert merging relpaths and relax erroring 2016-03-16 19:03:21 -07:00
Pavel Krymets
665dc9bcce Add null checks everywhere in dependency model 2016-03-16 16:53:59 -07:00
Pavel Krymets
28d5f6125c Merge pull request #1906 from dotnet/pakrym/legacy-deps 
Generate embedded deps file that previos versions of DependencyModel can use
 2016-03-16 15:59:17 -07:00
Senthil
0a5d95d2ad Fix casing of shared and add DT_DIR to readdir 2016-03-16 14:09:48 -07:00
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
Pavel Krymets
77e511c4d4 Generate runtime graph when building runtime 2016-03-16 08:27:55 -07: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