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
Livar
a951253e3d
Merge pull request #1845 from livarcocc/pack_additional_projects
...
Adding Files, Compiler.Common and TestFramework to projects to be packaged.
2016-03-15 12:56:49 -07:00
Andrew Stanton-Nurse
d52e0e4dde
Merge pull request #1850 from dotnet/jver/NuGetFix
...
Remove parallelism in NuGet restore to workaround issue
2016-03-15 12:55:36 -07:00
Pavel Krymets
a76558f560
Fix runtime graph reader
2016-03-15 12:51:43 -07:00
Sridhar Periyasamy
2ce679c57d
Merge pull request #1874 from Sridhar-MS/cli-layout
...
Fix bug in copying the CLI SDK layout for shared fx.
2016-03-15 12:36:50 -07:00
Piotr Puszkiewicz
2d3d2a9078
Bump NuGet to 763, --verbosity verbose, --disable-parallel
2016-03-15 12:35:23 -07:00
Bryan Thornbury
ff2d0dc462
Merge pull request #1870 from dotnet/brthor/1839
...
republish the deb file
2016-03-15 12:33:34 -07:00
Sridhar Periyasamy
236fd005b6
Fix bug in copying teh CLI SDK layout for shared fx.
2016-03-15 12:30:46 -07:00
Bryan Thornbury
2243d2876e
Merge pull request #1867 from dotnet/brthor/deb-version-file
...
Ensure .version file is added to the debian package
2016-03-15 12:13:55 -07:00
Eric Mellino
967c6bfcbb
Merge pull request #1873 from mellinoe/add-hostfxrdll-tomsi
...
Add hostfxr.dll to windows host msi
2016-03-15 12:12:56 -07:00
Eric Mellino
9fb3b8788e
Add hostfxr.dll to windows host msi
2016-03-15 12:12:28 -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
Bryan Thornbury
c9227a36d0
republish the deb file
2016-03-15 11:55:56 -07:00
Pavel Krymets
3ac2202cf9
Merge pull request #1836 from dotnet/pakrym/merge
...
Merge dependency contexts
2016-03-15 11:46:42 -07:00
Bryan Thornbury
fd1b2e9b96
Ensure .version file is added to the debian package by enabling hidden files to be picked up in the debian tool
2016-03-15 11:35:55 -07:00
Eric Mellino
b68068d5a9
Merge pull request #1857 from Sridhar-MS/cli-bundle
...
[WIP]Create dotnet bundle with CLI SDK, SharedFx MSI and Shared Host MSI.
2016-03-15 11:23:23 -07:00
Sridhar Periyasamy
dea1e3242d
Create dotnet bundle with CLI SDK, SharedFx MSI and Shared Host MSI.
2016-03-15 11:18:11 -07:00
Eric Erhardt
ce3c594880
Removing project.json dependency workarounds that were needed for CoreFX 23901 build.
2016-03-15 12:34:32 -05:00
Senthil
dec2af0b25
Merge pull request #1768 from dotnet/schellap-patch-1
...
Allow to pin a specific runtime version
2016-03-15 10:33:59 -07:00
Pavel Krymets
c10df6b6a5
Add support for loading and merging runtime deps json
2016-03-15 09:32:39 -07:00
Senthil
d95a4f0a5a
Merge pull request #1849 from mellinoe/host-policy-fxr
...
Update files copied into shared framework staging directory
2016-03-15 09:10:22 -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
Zlatko Knezevic
5473ada1a0
Merge pull request #1861 from dotnet/blackdwarf-patch-3
...
Update known-issues.md
2016-03-15 08:12:02 -07:00
Zlatko Knezevic
28dfeb026c
Update known-issues.md
...
Removed the El Capitan section. Not needed anymore.
skip ci please
Fixes #1815
2016-03-15 08:11:31 -07:00
Senthil
ec6cbad55b
Merge pull request #1792 from schellap/deps-json2
...
Shared FX and Portable Support for Unified Host
2016-03-15 02:47:03 -07: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
Sridhar Periyasamy
6bd9d80fed
Add the target attribute.
2016-03-14 18:46:56 -07:00
Bryan Thornbury
3e765e35b1
Merge pull request #1856 from dotnet/brthor/gen-deps-json-for-tools
...
copy the deps json for packaged commands
2016-03-14 18:43:12 -07:00
Bryan Thornbury
1c44d2566e
copy the deps json for packaged commands
2016-03-14 18:41:08 -07:00
Eric Mellino
58a8a10d41
Merge pull request #1852 from mellinoe/publish-sharedframework
...
Publish shared framework and host zips to azure
2016-03-14 16:51:16 -07:00
Eric Mellino
55db51a14b
Publish shared framework and host zips to azure
2016-03-14 16:50:13 -07:00
Bryan Thornbury
c8617c97e8
remove resgen as a top level command
2016-03-14 16:49:38 -07:00
Piotr Puszkiewicz
00be1e5c16
Merge pull request #1660 from Peter-Schneider/fix/issue-1656
...
Fix for issue #1656
2016-03-14 16:26:47 -07:00
Eric Erhardt
605cc54930
Merge pull request #1843 from eerhardt/FixSilentExec
...
Log StdErr StdOut when a failed command is executed in "silent" mode
2016-03-14 18:05:35 -05:00
Eric Erhardt
2378a34401
Workaround Microsoft.Win32.Registry problem on unix in the tests that reference the dotnet project.
2016-03-14 17:59:13 -05:00
Eric Erhardt
3bfd86b254
Remove crossgenning mscorlib on Unix platforms, since the CoreCLR nuget package now carries the crossgenned mscorlib on non-Windows platforms.
2016-03-14 17:58:14 -05: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
ee5d5ef6f1
Overwrite hostpolicy file from nuget with local-built one
2016-03-14 15:40:19 -07:00
Eric Mellino
05ebf6f842
Update files copied into shared framework staging directory
...
We need additional files from the corehost directory
2016-03-14 15:00:59 -07:00
Eric Mellino
622cb17d7c
Merge pull request #1842 from mellinoe/use-netcore.app
...
Use Microsoft.NETCore.App for sharedframework publish, pull local corehost for sharedhost
2016-03-14 14:56:54 -07: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
Livar Cunha
657efa2339
Adding Files and Compiler.Common to projects to be packaged.
2016-03-14 14:17:28 -07:00
Eric Erhardt
9a4936ae0d
When a failed command is executed in "silent" mode, it is not easy to figure out why it failed in the build logs.
...
Fix: Add Standard Output and Error to the BuildFailureException message thrown by CommandResult.EnsureSuccessful.
2016-03-14 15:20:35 -05:00
Andrew Stanton-Nurse
569c728731
Merge pull request #1841 from dotnet/anurse/native-in-deps
...
Add native stuff to deps.json
2016-03-14 13:17:08 -07:00
Andrew Stanton-Nurse
008a1ad0fa
put 'native' section in to runtime targets for deps file
2016-03-14 12:57:34 -07:00