Commit graph

4797 commits

Author SHA1 Message Date
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Justin Goshi
b419f25d67 Merge branch 'master' into dev/jgoshi/firstPassProps 2017-02-08 17:18:54 -08:00
Eric Erhardt
0dc62d0778 Merge pull request #5627 from eerhardt/FixSln
Fix the CLI .sln file to load and build in VS 2017.
2017-02-08 17:18:04 -06:00
Justin Goshi
50493d2dab Address PR comments 2017-02-08 14:02:29 -08:00
Justin Goshi
d51bfd1bea Merge branch 'master' into dev/jgoshi/firstPassProps 2017-02-08 11:57:58 -08:00
Piotr Puszkiewicz
a9e734050e Merge pull request #5623 from piotrpMSFT/piotrpMSFT/infra/omnisharp
Remove project.json-based omnisharp.json
2017-02-08 09:17:59 -08:00
Piotr Puszkiewicz
0f711d9aaa Merge pull request #5620 from piotrpMSFT/piotrpMSFT/infra/removeStage1
Remove Stage1 compilation
2017-02-08 09:17:26 -08:00
Eric Erhardt
8e2a7bfa12 Fix the CLI .sln file to load and build in VS 2017. 2017-02-08 10:03:06 -06:00
Piotr Puszkiewicz
4b55081428 Remove project.json-based omnisharp.json 2017-02-07 23:26:29 -08:00
Piotr Puszkiewicz
211255d6c4 Remove Stage1 compilation 2017-02-07 19:41:45 -08:00
Justin Goshi
2b15651716 Trying to fix the build breaks first 2017-02-07 17:34:41 -08:00
Eric Erhardt
33294e494c Merge pull request #5597 from eerhardt/UpdateREADME
Update the daily build table.
2017-02-07 19:20:23 -06:00
Justin Goshi
b927922b65 Address PR comments and fix build break 2017-02-07 16:52:08 -08:00
Justin Goshi
83b46ebc17 Generate host and build info and store them in .props files 2017-02-07 15:45:19 -08:00
Eric Erhardt
da15d5435f Merge pull request #5601 from eerhardt/FixMaster
A few small fixes in master
2017-02-06 15:55:07 -06:00
Eric Erhardt
8bab104956 Remove workaround for https://github.com/dotnet/standard/issues/191. 2017-02-06 14:44:51 -06:00
Eric Erhardt
e947baaa17 Update Microsoft.NETCore.App to 2.0.0-beta-001507-00.
Use the crossgen and jit that comes with Microsoft.NETCore.App so we don't have to keep a corresponding CoreCLR version around.

Remove workarounds for crossgen bug https://github.com/dotnet/coreclr/issues/9118
2017-02-06 14:37:39 -06:00
Eric Erhardt
6f666ab7af Update installer monikers.
Also removing a lingering registry key that was originally needed for the rc2 => preview1 SDK re-branding.  This is no longer necessary.
2017-02-06 13:08:44 -06:00
Eric Erhardt
ed4ea13c5d Update the daily build table.
No longer include links to the runtime installers. Add a link to core-setup for people who want to install just the runtime.

Refactor the links out of the table for easier maintenance.

Consolidate into a single column for the branch.
2017-02-06 12:37:32 -06:00
Piotr Puszkiewicz
562d519d9b Merge pull request #5411 from omajid/master
dotnet-install should identify all RHEL 7.x as RHEL
2017-02-06 00:05:39 -08:00
Eric Erhardt
796ebe1f1e Merge pull request #5566 from dotnet/eerhardt-patch-1
Update Microsoft.NETCore.App to 2.0.0-beta-001486-00
2017-02-02 19:52:11 -06:00
Eric Erhardt
c27029a020 Update Microsoft.NETCore.App to 2.0.0-beta-001486-00 2017-02-02 17:31:07 -06:00
Eric Erhardt
b4c891fc76 Merge pull request #5552 from eerhardt/MergeRel10
Merge rel/1.0.0 into master
2017-02-02 14:01:20 -06:00
Eric Erhardt
3f3443d2df Workaround "2.0" publish bug when referencing "1.1" security assemblies.
This hack downgrades the security assemblies to "1.0" versions, so the assets are excluded.  When the underlying bug is fixed (or Roslyn moves to "2.0") we can remove this hack.

See https://github.com/dotnet/standard/issues/191.
2017-02-02 10:25:03 -06:00
Eric Erhardt
68015b6bec fix file permissions on run-build.sh 2017-02-01 20:55:22 -06:00
Eric Erhardt
0281fde7d1 Merge branch 'master' into MergeRel10 2017-02-01 18:45:05 -06:00
Eric Erhardt
208776ed69 Merge master into local branch. 2017-02-01 18:39:32 -06:00
Livar
51788928f2 Merge pull request #5550 from mairaw/typos
fixed typos
2017-02-01 16:39:27 -08:00
Eric Erhardt
a2c1a39d07 Fix projects and tests after merge of rel/1.0.0. 2017-02-01 18:35:52 -06:00
Maira Wenzel
b605381165 fixed typos 2017-02-01 15:30:35 -08:00
Eric Erhardt
70443d5544 Merge pull request #5535 from dotnet/eerhardt-patch-1
Update Microsoft.NETCore.App to 2.0.0-beta-001450-00
2017-02-01 16:45:12 -06:00
Eric Erhardt
9404dd2f98 Update MSBuild to 15.2.0-preview-000002-01.
This contains the fix for https://github.com/Microsoft/msbuild/issues/1634
2017-02-01 15:59:35 -06:00
Eric Erhardt
7543551602 Disable EnsureStageSeparation test until we can get a new stage0 with a new MSBuild that has the appropriate fixes. 2017-02-01 15:46:24 -06:00
Eric Erhardt
9f0bb778a1 Merge rel/1.0.0 into master. 2017-02-01 14:32:59 -06:00
Eric Erhardt
f6a5dd1146 Fix crossgen error on netcoreapp1.0 assemblies. 2017-01-31 15:24:10 -06:00
Eric Erhardt
7324aa45d0 Update Microsoft.NETCore.App to 2.0.0-beta-001450-00 2017-01-31 13:11:22 -06:00
Eric Erhardt
41330f072f Merge pull request #5529 from piotrpMSFT/piotrpMSFT/merge/1.0.0-rc3
Merge 1.0.0-rc3
2017-01-31 07:45:43 -06:00
Piotr Puszkiewicz
d2035ff036 Merge remote-tracking branch 'refs/remotes/dotnet/rel/1.0.0-rc3'
Conflicts:
	build/Microsoft.DotNet.Cli.DependencyVersions.props
2017-01-30 23:27:48 -08:00
Piotr Puszkiewicz
f2cb146f1d Merge branch 'master' into master 2017-01-30 23:05:05 -08:00
Faizan2304
3eee54e4f9 Inserting localize testplatform (#5510) 2017-01-30 21:05:16 -08:00
Ryan Stelly
87e2a56393 use correct description string for dotnet build -h: -c (#5507) 2017-01-30 17:15:44 -08:00
Justin Goshi
1c80899909 dotnet migrate uses the correct TreatWarningsAsErrors property (#5492) 2017-01-30 16:34:19 -08:00
Jon Sequeira
e8c5d23c29 display CommandParsingException gracefully (#5493)
* display CommandParsing gracefully

This set of changes handles CommandParsingException gracefuly (so as not to show the user a stack trace) and generalizes graceful exception display somewhat away from being type-specific.

* fix compile error by inlining constant

* remove unused test logging
2017-01-30 14:36:44 -08:00
Eric Erhardt
a4f5f42b74 Merge pull request #5495 from eerhardt/UpdateTemplates20
Update dotnet new to generate a "2.0" project.
2017-01-30 16:07:18 -06:00
Eric Erhardt
cc8e179bf5 Update "new -t lib" to netstandard2.0 2017-01-29 09:46:46 -06:00
Eric Erhardt
fd65cb03b6 Update dotnet new to generate a "2.0" project. 2017-01-29 09:46:46 -06:00
Justin Goshi
5aded80a7b Migration: excluded files need to be removed (#5485)
* WIP

* Implement Remove attribute

* Enable tests

* Fix test

* Try a shorter test name

* Try more shortened test names

* Shorten some more

* Merge issues

* Try shortinging names more

* Fix test errors related to test asset renaming
2017-01-28 17:14:17 -08:00
Eric Erhardt
23207df2ae Merge pull request #5503 from eerhardt/FixCrossgen
Fix crossgen executable permissions
2017-01-28 14:09:04 -06:00
Eric Erhardt
ef35dbc768 Fix crossgen executable permissions
Workaround https://github.com/NuGet/Home/issues/4424
2017-01-28 13:21:16 -06:00
Livar
e38bc4950c Migrating Microsoft.NetCore.App and NETStandard.Library to RuntimeFrameworkVersion and NetStandardImplicitPackageVersion, respectively. (#5478) 2017-01-27 19:47:57 -08:00