Nick Guerrera
b38b69b351
Merge pull request #7137 from akoeplinger/2.0-dotnet-symlink-fix
...
2.0: MSBuildSdkResolver: resolve symlink for 'dotnet' binary
2017-07-13 10:51:18 -07:00
Livar Cunha
201577259c
Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170713-070025
...
* dotnet/rel/1.1.0:
Update the SDK to 1.1.0-alpha-20170713-1
MSBuild 15.3.406
2017-07-13 10:33:30 -07:00
dotnet-bot
7d6ed58265
Update CoreSetup to preview3-25513-02
2017-07-13 17:26:22 +00:00
Livar
24082f17c6
Merge pull request #7149 from dotnet-bot/release/2.0.0-UpdateDependencies
...
Update CoreSetup to preview3-25513-01 (release/2.0.0)
2017-07-13 10:08:40 -07:00
Steve Sanderson
780427ae11
Update SPA templates package to 1.0.0-preview-000403
2017-07-13 18:00:52 +01:00
dotnet-bot
eaa6eacc1a
Update CoreSetup to preview3-25513-01
2017-07-13 16:24:08 +00:00
Livar
e94b45aa6f
Merge pull request #7138 from rainersigwald/msbuild-406-for-1.1
...
MSBuild 15.3.406
2017-07-12 21:21:52 -07:00
Livar
1c007c8dcb
Merge pull request #7140 from dotnet/livarcocc-patch-1
...
Update the SDK to 1.1.0-alpha-20170713-1
2017-07-12 21:07:04 -07:00
Livar
a666297881
Merge pull request #7131 from dotnet/merges/release/2.0.0-to-master-20170712-070028
...
Merge release/2.0.0 to master
2017-07-12 17:30:01 -07:00
Livar
f84e41a7d3
Merge pull request #7139 from rainersigwald/msbuild-406-for-2.0
...
MSBuild 15.3.406
2017-07-12 17:01:06 -07:00
Livar
50fa4461d1
Update the SDK to 1.1.0-alpha-20170713-1
...
This carries the version cap for the 1.1 SDK.
It has already been approved for insertion into VS.
2017-07-12 17:00:24 -07:00
Rainer Sigwald
82dc7fdebb
MSBuild 15.3.406
2017-07-12 17:26:01 -05:00
Rainer Sigwald
eb640dee84
MSBuild 15.3.406
2017-07-12 17:23:13 -05:00
Livar
a04273474e
Merge branch 'master' into merges/release/2.0.0-to-master-20170712-070028
2017-07-12 14:28:17 -07:00
Livar
562a672526
Merge pull request #7136 from mlorbetske/dev/mlorbe/UpdateToCoherence26239
...
Update to Coherence 26239
2017-07-12 13:16:49 -07:00
Alexander Köplinger
4d0e8b5892
MSBuildSdkResolver: resolve symlink for 'dotnet' binary
...
On Linux the dotnet installed by the dotnet packages is a
symlink (/usr/bin/dotnet -> ../share/dotnet/dotnet).
We need to resolve the symlink so we're passing the path to
the actual .NET Core installation to libhostfxr.
Fixes https://github.com/dotnet/cli/issues/7125
2017-07-12 21:44:03 +02:00
Livar
aacd49f514
Merge pull request #7126 from akoeplinger/fix-linux-dotnet-symlink
...
MSBuildSdkResolver: resolve symlink for 'dotnet' binary
2017-07-12 12:26:31 -07:00
Livar
ad19b4441f
Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToCoherence26239
2017-07-12 12:25:45 -07:00
Livar
2a2f7ee92b
Merge pull request #7135 from dotnet-bot/release/2.0.0-UpdateDependencies
...
Update CoreSetup to preview3-25512-01 (release/2.0.0)
2017-07-12 12:24:41 -07:00
Mike Lorbetske
88c14cb40d
Update to Coherence 26239
...
Updates store and archive acquisition for the change that no longer has a different number for the SetupCrossgen build
2017-07-12 10:54:53 -07:00
dotnet-bot
b783f0c328
Update CoreSetup to preview3-25512-01
2017-07-12 17:18:01 +00:00
Alexander Köplinger
600946c58b
MSBuildSdkResolver: clarify comment in Interop.NETStandard.cs
...
The .NET Standard build ships with Mono/msbuild.
2017-07-12 16:37:02 +02:00
Alexander Köplinger
747e9fd6ad
MSBuildSdkResolver: resolve symlink for 'dotnet' binary
...
On Linux the dotnet installed by the dotnet packages is a
symlink (/usr/bin/dotnet -> ../share/dotnet/dotnet).
We need to resolve the symlink so we're passing the path to
the actual .NET Core installation to libhostfxr.
Fixes https://github.com/dotnet/cli/issues/7125
2017-07-12 16:37:02 +02:00
Livar
49dfa8e96b
Merge pull request #7130 from dotnet-bot/release/2.0.0-UpdateDependencies
...
Update CoreSetup to preview3-25511-03 (release/2.0.0)
2017-07-11 21:02:20 -07:00
William Lee
24c3c2015c
Merge pull request #7129 from wli3/sync-windows-installer-change
...
Sync windows installer change
2017-07-11 15:45:12 -07:00
dotnet-bot
c5c6e22de4
Update CoreSetup to preview3-25511-03
2017-07-11 22:20:37 +00:00
William Li
9162230e85
sync windows installer change to rpm and deb
2017-07-11 14:16:28 -07:00
William Li
1147b6c2fe
Sync with windows installer experience for mac
2017-07-11 14:16:20 -07:00
jbeisner
10009e7a11
Merge pull request #7127 from johnbeisner/ReadmeUpdate
...
Updating the VSO build IDs
2017-07-11 13:39:16 -07:00
John Beisner
5378b074d9
Updating the VSO build IDs.
2017-07-11 11:51:03 -07:00
Livar
da3ff8fb7c
Merge pull request #7121 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen277Coherence26182
...
Update to SetupCrossgen 277 - Coherence 26182
2017-07-10 20:52:09 -07:00
Mike Lorbetske
ea467db3af
Update test to pass --no-restore to templates
2017-07-10 16:27:54 -07:00
jbeisner
82015e79f3
Merge pull request #7101 from johnbeisner/ReadmeUpdate
...
Updating the Readme.md; adding references to 'coherent' builds.
2017-07-10 16:14:28 -07:00
Mike Lorbetske
5aec446657
Update to SetupCrossgen 277 - Coherence 26182
...
Enable loc for dotnet new
2017-07-10 15:20:35 -07:00
John Beisner
1d49d0753a
Update
2017-07-10 15:18:15 -07:00
John Beisner
4aef6c7754
Update
2017-07-10 15:15:54 -07:00
John Beisner
4518d1846b
Update.
2017-07-10 15:13:40 -07:00
John Beisner
9e743d8730
Updates per code review.
2017-07-10 15:11:19 -07:00
John Beisner
b1e7bc0e8b
Updates per code review.
2017-07-10 14:14:10 -07:00
Livar
a1bbdcdacb
Merge pull request #7111 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170710-070025
...
Merge rel/1.1.0 to release/2.0.0
2017-07-10 13:29:11 -07:00
jbeisner
096b2f4e0c
Merge pull request #7118 from johnbeisner/LinuxPortableFix
...
Linux portable should not try to publish to the Debian repo.
2017-07-10 11:13:25 -07:00
Livar Cunha
9a1e39f083
Fix wrong number of parameters passed to test when doing the merge.
2017-07-10 10:57:28 -07:00
John Beisner
d9cfe3344b
Linux portable should not try to publish to the Debian repo.
2017-07-10 10:06:23 -07:00
Livar Cunha
8c45238a1f
Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170710-070025
...
* dotnet/rel/1.1.0:
Enable VB dotnet new test cases
Fix fedora.23 dockerfile
Updating the ReadMe: "rel-1.0.1" to "rel-1.1.0"
Update Roslyn to 2.3.0-beta4-61830-03
update nuget to 4.3.0-preview4-4258
2017-07-10 09:52:28 -07:00
Livar
e41d1c8200
Merge pull request #7110 from dotnet-bot/release/2.0.0-UpdateDependencies
...
Update CoreSetup to preview3-25510-01 (release/2.0.0)
2017-07-10 09:39:44 -07:00
Tom Meschter
5a37290f24
Merge pull request #7112 from dotnet/merges/release/2.0.0-to-master-20170710-070027
...
Merge release/2.0.0 to master
2017-07-10 08:54:29 -07:00
jbeisner
f00d34a1cf
Merge pull request #7103 from johnbeisner/rel/1.1.0
...
Updating the ReadMe: "rel-1.0.1" to "rel-1.1.0"
2017-07-09 20:12:32 -07:00
jbeisner
6b1462dba7
Merge branch 'rel/1.1.0' into rel/1.1.0
2017-07-09 18:08:19 -07:00
dotnet-bot
e04b35fbbf
Update CoreSetup to preview3-25510-01
2017-07-10 00:28:50 +00:00
Livar
7eb6e6d86e
Merge pull request #7104 from dotnet/dev/wul/fix-fedoradockerfile
...
Fix fedora.23 dockerfile
2017-07-09 16:34:56 -07:00