Commit graph

9786 commits

Author SHA1 Message Date
Andy Gerlicher
88bcf0ffb3 MSBuild 15.5.160 2017-10-16 14:40:46 -07:00
dotnet-bot
1efa3f57ad Update CoreSetup to preview1-25816-02 2017-10-16 21:38:06 +00:00
John Beisner
0c4bcdcc55 Enabling the publish of CLI NuPkg to the unified Transport feed. 2017-10-16 14:33:50 -07:00
Livar
66c321c05b Merge pull request #7843 from dotnet/merges/release/2.0.0-to-release/15.5-20171016-070028
Merge release/2.0.0 to release/15.5
2017-10-16 14:02:10 -07:00
Kevin Ransom (msft)
c58612bd2c Merge pull request #7844 from dotnet/merges/release/2.0.0-to-dev/release/2.0-20171016-070029
Merge release/2.0.0 to dev/release/2.0
2017-10-16 11:37:50 -07:00
Livar
1b4b05a44d Merge pull request #3 from dotnet/livarcocc-patch-2
Update channel and version suffixes
2017-10-13 17:03:23 -07:00
Livar
57980bf4a0 Merge pull request #4 from dotnet/leave_only_the_sdk
Making this repo consume the dotnet-sdk-internal zip
2017-10-13 17:02:41 -07:00
Livar Cunha
03e37047a3 Fixing Windows build script. 2017-10-13 16:40:31 -07:00
Livar Cunha
401d349be2 Merged PR 89422: Merge release/2.0.0 to release/2.0.0-MSRC 2017-10-13 20:24:09 +00:00
Livar
d65f5b6558 Merge pull request #7832 from dotnet/merges/release/2.0.0-to-dev/release/2.0-20171013-070030
Merge release/2.0.0 to dev/release/2.0
2017-10-13 12:04:31 -07:00
Livar
04d6278a1f Merge pull request #7831 from dotnet/merges/release/2.0.0-to-release/15.5-20171013-070028
Merge release/2.0.0 to release/15.5
2017-10-13 12:01:05 -07:00
Livar Cunha
62ae014c37 Making this repo consume the dotnet-sdk-internal zip and produce a full core-sdk by using sdk-internal, runtime, lzma, templates and store. Also deleted a bunch of now, unecessary code. I am sure there is more to be deleted though. 2017-10-13 10:45:50 -07:00
John Beisner
f7899911a7 Merge pull request #7835 from johnbeisner/InstallScriptUpdate
Separating the URL construction methods for dotnet-install.sh
2017-10-13 10:23:36 -07:00
Livar
80d76f93a4 Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171013-070028 2017-10-13 10:19:11 -07:00
Livar
7ed2a559c1 Merge pull request #7826 from nguerrera/sync-satellite-ver
Use same build number for roslyn and F# satellites
2017-10-13 10:12:02 -07:00
Livar
6f9b43d1f5 Merge pull request #7827 from dotnet/livarcocc-patch-2
Updating channel to dev/release/2.0
2017-10-13 10:10:16 -07:00
Livar Cunha
27aa698710 Manually merging some changes that git merged wrong and deleted from the 15.5 branch. 2017-10-13 09:56:08 -07:00
John Beisner
3d52d24058 Separating the 'legacy' URL construction from the 'current' URL construction methods and logic. 2017-10-13 09:43:04 -07:00
Livar Cunha
1943ddc57f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171013-070028
* dotnet/release/2.0.0:
  Use temporary path for fake deps.json in test
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Keeping the branding for release/2.0.0 at 2.0.3.
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-13 09:04:58 -07:00
Livar
cea4c38789 Merge pull request #7830 from nguerrera/merge-2.0-vs
Merge release/2.0-vs into release/2.0.0
2017-10-13 09:01:17 -07:00
Harsh Jain
41d1f6ad6d Updated version of TPv2 2017-10-13 14:09:32 +05:30
Nick Guerrera
fe57933b09 Merge pull request #7829 from nguerrera/port-json-flakiness-fix
Use temporary path for fake deps.json in test
2017-10-12 20:29:28 -07:00
Livar
e9b0eefbd9 Update the version suffix to refac 2017-10-12 20:17:06 -07:00
Livar
a510cb2226 Update the channel to dev/repo-refactoring 2017-10-12 20:16:36 -07:00
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Nick Guerrera
e59fd7af46 Use temporary path for fake deps.json in test
(cherry picked from commit 796b4a06e7)
2017-10-12 16:32:12 -07:00
Livar
b6c2dbf4c6 Updating channel to dev/release/2.0 2017-10-12 16:25:30 -07:00
Nick Guerrera
7b558111ae Use same build number for roslyn and F# satellites 2017-10-12 16:22:06 -07:00
Livar Cunha
f6a07bcb39 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
2017-10-12 14:56:23 -07:00
Livar
428b2caa6b Merge pull request #7814 from AndyGerlicher/MSBuild.15.5.154
MSBuild 15.5.154
2017-10-12 13:51:38 -07:00
Livar
8c589212c8 Merge pull request #7802 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25810-02 (master)
2017-10-12 12:59:11 -07:00
Livar
278cbf6c44 Merge pull request #7819 from dotnet/livarcocc-patch-2
Updating Roslyn satellites and SDK versions
2017-10-11 23:54:09 -07:00
Livar
65caf8faab Merge pull request #7817 from dotnet/nuget-insertbuild4529
Insert NuGet Build 4.5.0-preview2-4529 into cli
2017-10-11 22:30:55 -07:00
Livar
821a413dd6 Updating Roslyn satellites and SDK versions 2017-10-11 22:29:40 -07:00
Eric Erhardt
484714df1b Exclude Desktop framework assemblies in the "Extensions" folder from crossgen.
Work around MSBuild globbing bug in a Target by just excluding the one assembly.

See https://github.com/Microsoft/msbuild/issues/2631
2017-10-11 22:31:27 -05:00
NuGet Team Bot
15ee853d49 Insert NuGet Build 4.5.0-preview2-4529 into cli 2017-10-11 18:44:34 -07:00
Livar
95a56ffcfe Merge pull request #7811 from seancpeters/15.5_separate_aspnet_templates
Added a property to DependencyVersions.props for asp.net template version
2017-10-11 18:40:24 -07:00
Livar
58bbbe8c1a Merge branch 'release/15.5' into MSBuild.15.5.154 2017-10-11 18:37:03 -07:00
Livar
9d0d22a0e0 Merge pull request #7813 from AndyGerlicher/MSBuild.15.5.153
MSBuild 15.5.153 (No Double Evaluation Fix)
2017-10-11 18:36:34 -07:00
Andy Gerlicher
d15d448332 Update NuGet to 4529 (signed) 2017-10-11 18:30:57 -07:00
Andy Gerlicher
97f4a01869 MSBuild 15.5.154 2017-10-11 17:27:36 -07:00
Andy Gerlicher
3b09db3f9e MSBuild 15.5.153 2017-10-11 17:26:43 -07:00
Livar
94eeedfc4c Merge pull request #1 from dotnet/update_readme
Quick update to the readme page
2017-10-11 17:09:21 -07:00
seancpeters
2d6314e78f removed commented out config I'd meant to remove 2017-10-11 16:37:49 -07:00
seancpeters
c6139adcc9 added a way to specify the asp.net template versions 2017-10-11 16:22:03 -07:00
John Beisner
cc8fe368f8 Merge pull request #7809 from johnbeisner/NugetMasterConfigRemove
'NuGet.master.config' does not appear to be used.
2017-10-11 11:52:58 -07:00
John Beisner
336998f946 Merge pull request #7810 from johnbeisner/MoveScript
Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
2017-10-11 11:52:48 -07:00
John Beisner
cbede56d08 Merge pull request #7807 from janvorli/update-centos-6-docker-image
Update CentOS 6 base docker image
2017-10-11 11:17:48 -07:00
John Beisner
282de2bfe2 Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0 2017-10-11 10:53:53 -07:00
John Beisner
903001c51c 'NuGet.master.config' does not appear to be used. 2017-10-11 10:25:55 -07:00