Commit graph

201 commits

Author SHA1 Message Date
Piotr Puszkiewicz
e1ba3f23ef Reference Shared Framework from Shared Host 2016-03-22 15:01:03 -07:00
Piotr Puszkiewicz
63585087f8 Install SharedHost before building shared framework 2016-03-22 15:01:03 -07:00
Piotr Puszkiewicz
fc01ea60eb Ubuntu build failed, so need to revert to an existing stage0 2016-03-22 15:01:03 -07:00
Bryan Thornbury
97a01213ac Fix debian packages 2016-03-22 15:01:01 -07:00
Sridhar Periyasamy
92b3ad0001 Merge pull request #1941 from dotnet/cli-sdk-stages
Chain the sharedfx and sharedhost MSIs into a single dotnet redist bundle.
2016-03-22 14:27:08 -07:00
Piotr Puszkiewicz
1fd72c201b Enable ReadyToRun for Roslyn 2016-03-22 00:26:26 -07:00
Sridhar Periyasamy
aeaced5b63 Chain the sharedfx and sharedhost MSIs into a single dotnet redist bundle. 2016-03-21 21:00:46 -07:00
Piotr Puszkiewicz
55ca13eee7 Merge pull request #1954 from mellinoe/crossgen-enabled
Crossgen by default, add additional dependency to shared framework
2016-03-21 20:48:40 -07:00
Eric Mellino
241ef778ea Crossgen by default, add additional dependency to shared framework
* We need a newer version of Microsoft.CodeAnalysis.CSharp than the one
  that NETCore.App depends on. When a newer version of NETCore.App is
  published with a higher dependency, we can remove this explicit
  reference.
2016-03-21 15:30:37 -07:00
Krzysztof Wicher
baaf742731 fix paths in the build 2016-03-21 12:46:31 -07:00
Krzysztof Wicher
856f6a7d96 integrate new version of install.sh with build 2016-03-21 12:46:17 -07:00
Krzysztof Wicher
b130ac8776 Update installation paths in the build scripts 2016-03-21 12:45:31 -07:00
Piotr Puszkiewicz
04adb5ef56 bootstrap 2016-03-18 02:47:52 -07:00
Piotr Puszkiewicz
aa989f1e6e Disable deb creation & publishing 2016-03-18 02:23:24 -07:00
Sridhar Periyasamy
14cc5bc5c4 Publish the correct .version file to azure. 2016-03-17 22:22:22 -07:00
Sridhar Periyasamy
4c06e3323f Update install scripts to download 'dotnet-dev' as stage0. 2016-03-17 21:45:03 -07:00
Sridhar Periyasamy
45d97bb80a Merge branch 'anurse/fix-scripts-and-readme' of https://github.com/dotnet/cli into rel/1.0.0 2016-03-17 21:21:14 -07:00
Bryan Thornbury
51dcb6063f Add Portable Test Package Asset 2016-03-17 13:44:32 -07:00
Sridhar Periyasamy
ae83a73e35 Create 'dotnet-dev' and 'dotnet' pkg.
- 'dotnet-dev' contains the sharedfx, shared host and CLI SDK.
- 'dotnet' contains the sharedfx and the shared host.
2016-03-17 13:42:10 -07:00
Sridhar Periyasamy
de8b326872 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into cli-sdk-stages 2016-03-17 11:16:43 -07:00
Sridhar Periyasamy
75d49d99f3 Bug fix to copy the hostpolicy and hostfxr binaries from the correct location. 2016-03-17 10:07:03 -07:00
Sridhar Periyasamy
9602d92634 Publish and Pkg, Deb fixes
- Publish only combined SharedFx,SharedHost and combined
  SharedFx,SharedHost,CLISDK tarballs and zips.
2016-03-16 18:16:51 -07:00
Sridhar Periyasamy
5150bae60c Fix Package targets to respect the new CLI SDK layout. 2016-03-16 17:54:44 -07:00
Andrew Stanton-Nurse
e2d8d6e31e make install and build scripts use new package 2016-03-16 16:16:38 -07:00
Sridhar Periyasamy
4d19e4d866 Layout CLI SDK, Shared Fx and Muxer in stage1 and stage2. 2016-03-16 15:54:02 -07:00
Nate Amundson
c7abe91773 Merge pull request #1824 from naamunds/AddDockerHubTriggers
Trigger automated DockerHub builds
2016-03-16 17:15:29 -05:00
Nate Amundson
cd2b638b18 Trigger automated DockerHub builds
This change triggers automated DockerHub builds for successful
official Ubuntu builds of rel.1.0.0. The DockerHub repo for this is
https://hub.docker.com/r/microsoft/dotnet-preview/.

The variables DOCKER_HUB_REPO and DOCKER_HUB_TRIGGER_TOKEN are set in
the "DotNet-CLI-CI (Ubuntu) [rel.1.0.0]" VSTS build definition.

This change also allows the Environment TargetConditionAttribute to be
used to require that an environment variable is set, in addition to the
existing functionality of being able to be used to require that an
environment variable is equal to one of a set of specified values.
2016-03-16 14:39:02 -07:00
Sridhar Periyasamy
52f4ad2b91 Merge pull request #1902 from Sridhar-MS/corehost-fixes
Make corehost pick pre-release SDK version when no production releases.
2016-03-16 13:39:21 -07:00
Sridhar Periyasamy
d4bbdaa37a Update PackageTargets.cs
Fix to create CLI SDK tarballs on unix.
2016-03-16 11:30:56 -07:00
Sridhar Periyasamy
897f669ec0 Remove the hack to layout CLI SDK into a production version path.
Go back to using a nuget version path.
2016-03-16 11:12:45 -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
Andrew Stanton-Nurse
0c971d8d4c Merge pull request #1892 from mellinoe/combined-zip
Create combined zip/tar for framework-host-sdk and framework-host
2016-03-16 10:42:29 -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
Pavel Krymets
77e511c4d4 Generate runtime graph when building runtime 2016-03-16 08:27:55 -07:00
Eric Mellino
d9dfaf1328 Publish the combined-zip/tar files to azure 2016-03-15 17:41:42 -07:00
Eric Mellino
4fcabc47cc Create combined zip/tar for framework-host-sdk and framework-host 2016-03-15 17:36:32 -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
Eric Mellino
711e9a8e53 Merge pull request #1880 from Sridhar-MS/vso-package-fix
Fix the VSO signing builds
2016-03-15 15:30:39 -07:00
Sridhar Periyasamy
252fc761e4 Merge pull request #1885 from Sridhar-MS/cli-layout-hack
Layout the CLI SDK in the "1.0.0" instead of "1.0.0-beta-001793"
2016-03-15 15:20:45 -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
Sridhar Periyasamy
3ec1f4f54b Layout the CLI SDK in the "1.0.0" instead of "1.0.0-beta-001793"
dotnet host muxer does not support pre-release CLI SDK when no global.json
file is present. So fixing the CLI layout to be in production version
layout. THIS IS A TEMP HACK.
2016-03-15 15:07:47 -07:00
Sridhar Periyasamy
a75746cbd8 Fix the VSO signing builds
As a part of Package init create all the SharedFx, SharedHost and CLI SDK
layouts. This way all other package targets can take a dependency only on
InitPackage.
2016-03-15 14:21:20 -07:00
Eric Mellino
23e024c463 Add a directory-delete helper.
This seems to be needed on Windows to delete temporary staging files correctly.
2016-03-15 14:09:06 -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
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
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
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
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
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
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
Eric Mellino
55db51a14b Publish shared framework and host zips to azure 2016-03-14 16:50:13 -07: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
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
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
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
PiotrP
94ca41874d FragileNonVersionable 2016-03-11 12:20:04 -08:00
Sridhar Periyasamy
dc3c00d660 Do not cache version badges in the blob storage. 2016-03-10 16:03:43 -08:00
Eric Mellino
ce118f9d07 Add warning if shared framework is not going to be crossgen'd because mscorlib.ni.dll does not exist 2016-03-10 15:23:26 -08:00
Eric Mellino
d77fad4e68 Bring the OSX installer 'title' in line with Windows
It now includes the shared framework 'name' (NuGet package name) in the installer. In this case, the installer is called '.NET Core Shared Framework (NETStandard.Library 1.0.0-*)'
2016-03-10 15:19:54 -08:00
Eric Mellino
edbbc64b03 Fill out pkg installer targets
This causes three pkg files to be produced:

* A component pkg for the shared framework.
* A component pkg for the shared host.
* A product archive which includes the above two components.

The product archive also needs a distribution.xml file which contains
metadata about the package (name, title, images, etc.).

The installer for the "SDK" itself is still using logic implemented in
package-osx.sh. We should move this logic into the build target as well,
but we may want to wait until the CLI is using the shared framework to do so.
2016-03-10 10:31:45 -08:00
Sridhar Periyasamy
0dad10253b Set the correct content type for version badges in blob storage.
This is needed to display the version badges as images in external
websites like github.
2016-03-10 10:23:52 -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
56e5a99c54 Add Shared Host Debian Package 2016-03-10 03:42:45 -08:00
Matt Ellis
696f4dc167 Add Shared Framework debian packaging 2016-03-10 03:42:45 -08:00
Matt Ellis
5cf35e4f38 Use explicit object directory for sdk deb pacakge
As we add more deb packages, we should keep everything tidy by given
each one it's on individual object root.
2016-03-10 03:42:43 -08:00
Matt Ellis
7e7995274a Add stub targets for shared framework and host 2016-03-10 03:37:43 -08:00
Matt Ellis
92e520bf7c Generate tars for SharedHost and SharedFramework 2016-03-10 03:37:43 -08:00
Matt Ellis
92edb36e5b Generate zips for SharedHost and SharedFramework 2016-03-10 03:37:42 -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
Matt Ellis
29bc612565 Refactor SDK Build Steps
Prefix the SDK build stuff with "Sdk" to make it easier to add other
sorts of packages (e.g. the shared host and the shared framework).
2016-03-10 03:37:40 -08:00
Jeremy Meng
ee4bbb43ff Add support for building dotnet CLI on Debian. 2016-03-09 23:05:02 +00:00
Sridhar Periyasamy
53dd5f4a23 Address more PR feedback
- Add libssl-dev dependency to DockerFile, because the package upgrade test still depend on this. It can be removed once a newer package without libssl-dev dependency is uploaded.
- Check pre-reqs in the package script.
2016-03-09 20:15:06 +00:00
Sridhar Periyasamy
3edcab8eab Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into build-refactor1
Conflicts:
	scripts/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs
	scripts/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs
2016-03-08 23:42:15 +00:00
Sridhar Periyasamy
015bda2137 Debian package and publish changes
- Use parameters instead of env vars to create debian packages.
- Target to publish the deb package to the debian repo.
2016-03-08 23:33:18 +00:00
Sridhar Periyasamy
ae041c8f61 Address some PR feedback.
- Make the MSI scripts to use parameters instead of environment variables.
2016-03-08 23:31:14 +00: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
Sridhar Periyasamy
c4cb1f2d53 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rhel
Conflicts:
	TestAssets/TestProjects/OutputStandardOutputAndError/project.json
2016-03-07 19:30:35 -05:00
Sridhar Periyasamy
d4a3190bfc Refactor the build scripts
- Bifurcate Package and Publish targets to enable signing.
- Move publish from bash/ps into c#.
- Create multiple targets to create MSIs and Bundles.
2016-03-07 12:20:50 -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
Sridhar Periyasamy
3a4ce0a86b Add support for building dotnet CLI on RHEL. 2016-03-02 15:47:46 -08:00
Troy Dai
b63705198c Merge branch 'troy/1569' into rel/1.0.0 2016-03-02 09:31:36 -08:00
Livar
66a4554290 Merge pull request #1640 from livarcocc/update_xunit_runner
Updating tests to use the latest version of dotnet-test-xunit
2016-03-01 22:47:37 -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
7582649f88 Merge branch 'troy/add.test.wip' into rel/1.0.0 2016-02-29 22:32:19 -08:00
Troy Dai
f7e4714dc5 Integrate ProjectModel server tests 2016-02-29 20:40:04 -08:00