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
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
Rohit Agrawal
4c55fb6211
update nuget and sdk rtm-2241 ( #5447 )
...
* update nuget and sdk rtm-2241
* Applying the no packagereference workaround.
* Fix merge issue
* add comments for restore related workarounds added in test assets
2017-01-27 19:12:35 -08:00
Krzysztof Wicher
d6d39a5c9d
fix 5466: explicity including a file causes a build break ( #5475 )
...
* fix 5466: explicity including a file causes a build break
* fix failing unit tests
* Add unit tests and apply fix also to includeFiles
* apply review feedback
2017-01-27 18:39:44 -08:00
Piotr Puszkiewicz
ba69c88c79
Work around build test.sln
race condition until fixed ( #5490 )
...
* Remove GenerateRuntimeConfigurationFiles from this library
* Disable parallel build of test.sln
* PR feedback
2017-01-27 17:13:04 -08:00
Zlatko Knezevic
c9a227d164
Update THIRD-PARTY-NOTICES ( #5481 )
...
Adding Nuget.Client notices.
2017-01-27 16:09:07 -08:00
Piotr Puszkiewicz
e20fb33cb8
Merge pull request #5482 from piotrpMSFT/piotrpMSFT/infra/outception
...
Prevent Stage0 Environment Variables from leaking into Stage2 during execution in MSBuild
2017-01-27 13:33:39 -08:00
Piotr Puszkiewicz
e121f4cbf3
Merge branch 'rel/1.0.0' into piotrpMSFT/infra/outception
2017-01-27 12:59:20 -08:00
Piotr Puszkiewicz
c740fa8f43
Merge pull request #5488 from piotrpMSFT/piotrpMSFT/issue/InstallationOrder
...
Reverse installation order of shared frameworks
2017-01-27 12:40:37 -08:00
Piotr Puszkiewicz
31a6da880f
Reverse installation order of shared frameworks
2017-01-27 11:49:54 -08:00
Piotr Puszkiewicz
188c5d1022
Merge branch 'rel/1.0.0' into piotrpMSFT/infra/outception
2017-01-27 11:20:02 -08:00
Livar
7bdfb21c0d
Merge pull request #5446 from eerhardt/PortChange
...
Port stage0 change
2017-01-27 10:37:57 -08:00
Piotr Puszkiewicz
d4aec7c197
Update run-build.sh
2017-01-27 02:14:05 -08:00
Piotr Puszkiewicz
c83d8797bc
Update run-build.ps1
2017-01-27 02:12:44 -08:00
Piotr Puszkiewicz
bbf14163a4
Merge branch 'rel/1.0.0' into PortChange
2017-01-27 02:08:49 -08:00
Piotr Puszkiewicz
bbac129c04
Account for Windows slashes
2017-01-27 01:45:31 -08:00
Piotr Puszkiewicz
0ab87924b2
Add DOTNET_RUNTIME_ID to kept environment variables
2017-01-27 01:18:50 -08:00
Piotr Puszkiewicz
401a2dd2ce
pr feedback
2017-01-27 00:56:51 -08:00
Piotr Puszkiewicz
c4e928a18d
Cleanup
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
d70aeb950b
Success!
2017-01-27 00:46:09 -08:00
PiotrP
a473c2bad7
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
94e74d846a
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
c25abfb7c7
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
19ed5a558b
WiP
2017-01-27 00:46:09 -08:00