Commit graph

4229 commits

Author SHA1 Message Date
Livar
4aa1c1bfb4 Merge pull request #4499 from eerhardt/FixRun3Project
Fix dotnet run3 --project to pass the project to msbuild.
2016-10-26 10:57:06 -07:00
Faizan Ahmad
679ea57acf Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 21:46:55 +05:30
Faizan Ahmad
aea25b1fc5 Addressed PR comment 2016-10-26 16:53:34 +05:30
Livar
7149c722b1 Merge pull request #4496 from livarcocc/issue_4486
Merging metadata with different values
2016-10-25 22:26:21 -07:00
Livar
8befd890d8 Merge pull request #4494 from livarcocc/migrate_target_package
When determining the P2P dependencies, only use dependencies of type project
2016-10-25 22:25:28 -07:00
Eric Erhardt
33ec55aee3 Fix dotnet run3 --project to pass the project to msbuild.
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301.
2016-10-26 00:04:40 -05:00
Livar
4a30335540 Merge pull request #4006 from svick/patch-4
Update issue filling guide
2016-10-25 17:04:29 -07:00
Chris Rummel
007cfc1f9b Switch to using new bootstrap script to initialize buildtools. (#4349)
* Switch to using new bootstrap script to initialize buildtools.

* Set up the version-specific shared runtime symlink in run-build so buildtools doesn't have to care about it.

* Address code review feedback.

* Addressed code review feedback.

* Change to using bootstrap script for Linux build as well.

* Change to using latest for CLI.
2016-10-25 16:51:41 -07:00
Livar Cunha
71aa93b164 Merging metadata with different values by setting the metadata values to be string joined and semi-column separated. This fixes the problem of having multiple mappings for the same file in a include/mappings. 2016-10-25 15:26:04 -07:00
Livar Cunha
175eaeb5c1 When determining the P2P dependencies, only use dependencies of type project. This prevents us from migrating a package dependency as a project dependency because of a project with the same name being present. 2016-10-25 13:09:06 -07:00
Faizan Ahmad
763e6bc946 nitpick 2016-10-26 00:10:25 +05:30
Faizan Ahmad
cb42c594ab Test fix 2016-10-25 22:22:00 +05:30
Faizan Ahmad
8379feacdf Updated test to handle configuration. 2016-10-25 20:57:59 +05:30
Faizan Ahmad
33caa408a1 1) Added support to run test from test3 verb for the project targeting multiple TFM
2) Added test to address above change
3) Crossgen were creating problem for full CLR built assemblies. Removed All those assembly from Crossgen list.
4) Removed the line of code which were deleting Extensions folder under sdk folder as this folder contain trx logger dlls
2016-10-25 20:10:18 +05:30
Livar
967957698e Merge pull request #4482 from livarcocc/preview3_installer
Updating the branding in the installers to preview3.
2016-10-24 23:42:18 -07:00
Livar
2cc007520d Merge pull request #4479 from livarcocc/projectdependencies_full_framework
Making OutputPathCommandResolver work with MSBuild.
2016-10-24 16:18:15 -07:00
Livar Cunha
1506bf3bf2 Changing the IProject OutputPath property to FullOutputPath. 2016-10-24 14:47:05 -07:00
Livar Cunha
de46aae96c Updating the branding in the installers to preview3. 2016-10-24 13:40:06 -07:00
Livar
f68670e13c Merge pull request #4438 from jeffkl/restore
Reduce MSBuild verbosity for restore
2016-10-24 12:49:07 -07:00
Livar Cunha
d61ebd3087 Making OutputPathCommandResolver work with MSBuild. 2016-10-24 12:41:27 -07:00
Livar
a0ee0f6d94 Merge pull request #4474 from livarcocc/project_dependencies_conditioned
Fixing project dependencies migration so that they are not condition
2016-10-24 08:28:01 -07:00
Livar
cde0e8e7e8 Merge pull request #4448 from jgalar/patch-1
Removed workaround for https://github.com/docker/docker/issues/20818
2016-10-21 19:49:36 -07:00
Livar Cunha
be419e3b70 Fixing project dependencies migration so that they are only conditioned when they where under a TFM in the project.json to begin with. 2016-10-21 18:00:17 -07:00
Livar
caf072daeb Merge pull request #4463 from brthor/brthor/imports
Turn on tests
2016-10-21 14:22:21 -07:00
Livar
d8bf015d7c Merge pull request #4459 from livarcocc/package_files
Package files
2016-10-20 21:01:02 -07:00
Bryan Thornbury
5301f08423 turn on signing test (#4460)
* turn on signing test

* fix the test

* test with xplat AssemblyOriginatorKeyFile

* tweak signassembly condition
2016-10-20 20:15:42 -07:00
Bryan Thornbury
eeb4ec52bd remove desktop from multi target test asset 2016-10-20 17:39:51 -07:00
Livar Cunha
883eb2e82f Removing a test that is not necessary. 2016-10-20 15:53:31 -07:00
Bryan Thornbury
16ff3734a3 fix the multi tfm test to not build net20 2016-10-20 15:33:47 -07:00
Bryan Thornbury
1c1f4c462f turn on multi tfm test 2016-10-20 15:19:35 -07:00
Bryan Thornbury
481aebd18a turn on the web test 2016-10-20 15:04:53 -07:00
Livar Cunha
095105f2ec Addressing code review comments. 2016-10-20 14:35:45 -07:00
Livar Cunha
dc0d87c826 Adding an additional test to validate mappings to the root of the package. 2016-10-20 11:56:30 -07:00
Livar Cunha
ddef1fc424 Adding pack files migration. 2016-10-20 11:56:07 -07:00
Bryan Thornbury
ecbc45098d Add support for Migration defaults (#4242)
* Add support for sdk props/targets defaults to Migration.

* fix the transform applicator

* remove transform applicator dependency on insertion order for item merges

* defaults constructor msbuild version change
2016-10-20 11:00:41 -07:00
Livar
6373cdde60 Merge pull request #4442 from dotnet/mellinoe/update-dotnet-install.sh-1
Add support for fedora.24 and alpine.3.4.3 in dotnet-install.sh
2016-10-19 20:56:01 -07:00
Livar
501d575aeb Merge pull request #4455 from livarcocc/update_sdk
Updating the SDK version to the latest.
2016-10-19 20:55:43 -07:00
Livar Cunha
368d7a19af Updating the SDK version to the latest. 2016-10-19 16:21:54 -07:00
Livar
4b0c2f5ebe Merge pull request #4451 from livarcocc/update_msbuild
Updating msbuild to 15.1.319-preview5
2016-10-19 15:50:02 -07:00
Livar Cunha
22bc479927 Updating msbuild to 15.1.319-preview5 2016-10-19 12:43:21 -07:00
Livar
b7ac730a7f Merge pull request #4444 from livarcocc/update_templates
Updating the msbuild templates in the CLI to use TargetFramework
2016-10-18 17:39:03 -07:00
Jérémie Galarneau
adde6255a9 Removed workaround for https://github.com/docker/docker/issues/20818
This workaround is not needed since the release of Docker 1.11.0 which addresses the underlying issue.
2016-10-18 19:51:43 -04:00
Livar Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07:00
Livar
7da6ee0325 Merge pull request #4439 from livarcocc/fix_4081
Removing -t msbuild, now that the default template is msbuild.
2016-10-18 11:51:06 -07:00
Eric Mellino
d2bbe1faa2 Add support for fedora.24 and alpine.3.4.3 in dotnet-install.sh
I've also included the string we attempted to match against if the installation fails.
2016-10-18 11:21:38 -07:00
Livar Cunha
440871bad0 Removing -t msbuild, now that the default template is msbuild. 2016-10-18 10:35:04 -07:00
Jeff Kluge
c98b6cc412 Reduce MSBuild verbosity for restore
Remove the MSBuild logo
Set verbosity to minimal
2016-10-18 09:10:26 -07:00
Eric Erhardt
c62433a3e6 Merge pull request #4403 from eerhardt/Run3MultiTFM
Run3 multi tfm
2016-10-18 08:11:55 -05:00
Livar
e8b565158c Merge pull request #4435 from dotnet/update_docs_for_sierra
Update docs for sierra
2016-10-17 19:39:06 -07:00
Eric Erhardt
1b6502848e Respond to PR feedback. 2016-10-17 21:03:09 -05:00