Commit graph

203 commits

Author SHA1 Message Date
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
Sridhar Periyasamy
85ca7c183d Upgrade the roslyn packages to 1.3.0-beta1-20160225-02.
This version has the fix for https://github.com/dotnet/roslyn/issues/8951
2016-02-26 16:00:54 -08:00
Sridhar Periyasamy
01d2656be1 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into cli-x86-support 2016-02-26 14:34:25 -08:00
Bryan
ade5479196 Update CoreCLR & Corefx dependencies based on ldd method.
Use a hardcoded list for ubuntu and slight refactoring for cleaner targets
code.
2016-02-24 16:59:26 -08:00
Bryan Thornbury
6d8b622451 Add Conditional Target capabilities to the build scripts
Make Attribute properties immutable

PR Feedback, bugfixes

PR Feedback
2016-02-24 16:55:11 -08:00
Bryan
adc6aa7eff Fixes #832, add debian package and coreclr prereq check to the build.
PR Feedback
2016-02-24 16:55:10 -08:00
Pavel Krymets
89cf169a08 Fix run tests 2016-02-24 08:12:32 -08:00
Sridhar Periyasamy
834edfbc9c Add support for building Windows x86 version of dotnet CLI
- Changes to build scripts to produce Winx86 build artifacts like
  zip/installer.
- Change to run Nuget-xplat in the same process as dotnet.exe instead of
  spinning up a new 'corerun' process.
2016-02-23 18:04:49 -08:00
Pavel Krymets
f49fdd9197 Merge pull request #1501 from dotnet/pakrym/run-single-target
Fix run behaviour when only single target exists
2016-02-22 20:34:23 -08:00
Pavel Krymets
6ca22e4a56 Fix run behaviour when only single target exists 2016-02-22 15:11:24 -08:00
Sridhar Periyasamy
856a077bd1 Merge pull request #1487 from Sridhar-MS/cli-x86
Fixes in corehost for building x86 arch.
2016-02-19 12:06:50 -08:00
Sridhar Periyasamy
f96ac6ed92 Fixes in corehost for building x86 arch.
Set the calling convention to '__stdcall' explicitly else the default is
'_cdecl' on windows which mismatches with coreclr hosting APIs.
Use the newly built 'corehost' in stage1.
2016-02-18 18:03:26 -08:00
Eric Erhardt
aca2c8c8dd Moving the TEST_ARTIFACTS environment variable to the new C# build scripts. 2016-02-18 13:35:01 -06:00
Bryan Thornbury
c749bae962 Pipe configuration through CommandResolver
script changes to pipe configuration to test.ps1

debug commit, remove this commit

Change dotnet-test to invoke dotnet-test-xunit directly

build tests with configuration, framework, runtime in windows

Update testtargets in new build scripts

make configuration first arg to dotnet test

PR Feedback

update command factory

fix interface

test update
2016-02-18 09:57:30 -08:00
David Fowler
8645031db8 Merge pull request #1471 from dotnet/davidfowl/fix-versions
Fixing versions
2016-02-18 02:42:31 -08:00
Senthil
e1d8a0505c Update appdep 2016-02-18 01:22:54 -08:00
David Fowler
69b5e3f815 Fixing versions
- Added --version-suffix to build and publish
- Support reading DOTNET_* version variables everywhere versions can be read
- Show the commit sha in dotnet --version
- Added tests that check the assembly output version
- Set DOTNET_BUILD_VERSION when producing the CLI app itself so that it has the version information stamped in for help.
2016-02-18 01:10:07 -08:00
Troy Dai
ffb782594a Merge branch 'troy/add.test' into rel/1.0.0 2016-02-17 22:16:26 -08:00
David Fowler
c980d0a8ed Fixed priting of test project 2016-02-17 21:20:18 -08:00
Piotr Puszkiewicz
fc2ff2cc57 Test targets now clean up dotnet-hello from nuget cache 2016-02-17 18:19:27 -08:00
Troy Dai
c2e5b0f24d Add a ProjectModel test 2016-02-17 16:29:28 -08:00
Sridhar Periyasamy
b7c4d51d0a Add the 'CONFIGURATION' env var to Publish targets. 2016-02-17 10:40:34 -08:00
Bryan Thornbury
23907bc924 Merge pull request #1434 from dotnet/brthor/1280/resgen-spaces
Fix Resgen with Spaces in Path
2016-02-17 09:35:26 -08:00
Piotr Puszkiewicz
43fdc13b51 Add fallback source to test project restore 2016-02-16 23:51:56 -08:00
Piotr Puszkiewicz
0b8b226c61 break test package build from test project build 2016-02-16 23:36:50 -08:00
Piotr Puszkiewicz
8ed8b5112a Remove deprecated Packaged Command Tests 2016-02-16 22:28:37 -08:00
Piotr Puszkiewicz
d9b54cecac Merge branch 'PackagedCommands' of https://github.com/eerhardt/cli into eerhardt-PackagedCommands 2016-02-16 21:20:57 -08:00
Sridhar Periyasamy
735b4beb7c Merge pull request #1340 from Sridhar-MS/test-fx
[WIP]: TestFramework with support for managing test projects.
2016-02-16 16:09:09 -08:00
Andrew Stanton-Nurse
c4010e6aa5 Merge pull request #1443 from dotnet/anurse/fix-version-numbers
fix version number padding
2016-02-16 15:58:00 -08:00
Bryan Thornbury
e486fb2020 Add Resgen Test Project, Add test to build project with resource with a space in the path. 2016-02-16 15:18:50 -08:00
David Fowler
ec0b004d4c Merge pull request #1438 from dotnet/davidfowl/remove-runtime
Remove the shared runtime folder from the CLI
2016-02-16 14:54:12 -08:00
Pavel Krymets
7754e8c710 Merge pull request #1362 from dotnet/pakrym/dc-tests
Refactor DependencyModel, add unit tests, add EnvironmentAbstraction library
2016-02-16 14:51:47 -08:00
Piotr Puszkiewicz
953fd210db Merge pull request #1441 from dotnet/anurse/emit-packaged-commands-test-output
forward packaged commands test outputs to console
2016-02-16 14:42:04 -08:00
Pavel Krymets
8a94e66384 Merge pull request #1439 from dotnet/pakrym/pack-output
Fix pack output location
2016-02-16 14:29:19 -08:00
Andrew Stanton-Nurse
0d55878a45 fix version number padding 2016-02-16 14:02:50 -08:00
Pavel Krymets
4d4f5ad895 Fix pack output location 2016-02-16 13:56:07 -08:00
Andrew Stanton-Nurse
d526b08a8e forward packaged commands test outputs to console 2016-02-16 13:37:19 -08:00
Sridhar Periyasamy
1ddec816cb Update CompileTargets.cs
Use `configuration` instead of hard coding `Debug`.
2016-02-16 12:59:25 -08:00
David Fowler
528b32ddc5 Remove the shared runtime folder from the CLI 2016-02-16 12:57:01 -08:00
Andrew Stanton-Nurse
8fedd2ada3 restore the NoPackage switch for VSO signing build 2016-02-16 11:39:17 -08:00
Sridhar Periyasamy
9ec8556d24 Rebase with the latest sources and fix the tests. 2016-02-16 11:26:40 -08:00
Pavel Krymets
39e1e26f0e Refactor DependencyModel, make it ready for tests 2016-02-16 09:56:19 -08:00
Piotr Puszkiewicz
811f892cf5 Fixes issue #1415 2016-02-15 23:45:31 -08:00
Piotr Puszkiewicz
9185f5772a Improved VSO build logging during VS Environment Variable collection. 2016-02-15 20:20:53 -08:00
David Fowler
50e7a8b71a Remove setting of DOTNET_HOME during compile 2016-02-15 10:22:47 -08:00
David Fowler
c7e9139fa6 More build cleanup and tweaks
- Added generic Get<T> to build context
2016-02-15 10:07:39 -08:00
David Fowler
078d6a8d5f Build and project cleanup 2016-02-15 09:43:18 -08:00
David Fowler
77dfbd8e43 Fixed the build
- csc kept crashing on stage 2 and it turned out to be a version mismatch with System.Reflection.Metadata.
- Silenced crossgen
- Made omnisharp see all of the projects
2016-02-15 09:03:40 -08:00
Senthil
ef00f0331e Include project.json dependencies for native 2016-02-14 17:20:23 -08:00
Andrew Stanton-Nurse
ba57e4bfe9 swap .version file 2016-02-12 17:16:28 -08:00
Andrew Stanton-Nurse
d524732bbb working on build scripts 2016-02-12 15:26:35 -08:00
Andrew Stanton-Nurse
531173db57 why not crossgen? 2016-02-12 10:11:30 -08:00