Commit graph

7879 commits

Author SHA1 Message Date
John Beisner
e3b78f8ea5 Moving the 'MicrosoftBuildPackageVersion' forward. 2017-12-06 14:59:38 -08:00
John Beisner
d61eb5de92 Fixing "RuntimeFrameworkVersion" 2017-12-06 12:48:45 -08:00
John Beisner
e09cbe0043 Updating version naming convention. 2017-12-06 12:41:08 -08:00
Livar Cunha
cd86a4cac4 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171206-080037
* dotnet/release/2.0.0:
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn/tool_roslyn.csproj
2017-12-06 12:18:28 -08:00
John Beisner
5cea436e8f
Merge pull request #8170 from johnbeisner/AddNugetFeed
Adding a 'nuget-build' feed.
2017-12-05 16:16:51 -08:00
John Beisner
873f0791fb Fixing a typo... 2017-12-05 14:14:02 -08:00
John Beisner
174c9ff60e
Merge pull request #8152 from johnbeisner/ConfigNuget
Dependency Uptake: CLI - part 2
2017-12-05 11:14:18 -08:00
John Beisner
73e8ea9c1c Adding a 'nuget-build' feed; fixing the feed line-up: 'dotnet-core' and 'AspNetMaster'. 2017-12-05 10:33:36 -08:00
Livar
f2463fe2a5
Merge pull request #8164 from seancpeters/templating_build_315_insertion
Update template engine to build 315
2017-12-05 09:34:36 -08:00
Livar
f140bb4d01
Merge pull request #8167 from dotnet/merges/release/2.0.0-to-release/15.5-20171205-080034
Merge release/2.0.0 to release/15.5
2017-12-05 09:34:14 -08:00
Livar
c77452b9e2
Merge pull request #8158 from dotnet/merges/release/15.5-to-master-20171204-080035
Merge release/15.5 to master
2017-12-05 09:34:02 -08:00
John Beisner
fba1ad7287 Fixed a typo... 2017-12-05 09:19:22 -08:00
Livar
b3d8bfca35
Merge pull request #8163 from dotnet/nguerrera/update-sdk
Update to latest dotnet/sdk
2017-12-04 16:27:28 -08:00
Vijay Ramakrishnan
11d9413b49 Updating the websdk version to 2.0.0-rel-20171110-671 2017-12-04 16:02:40 -08:00
John Beisner
1c5b49baee Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop 2017-12-04 14:32:56 -08:00
William Lee
55f62d9d64
Add install tool command (#8132)
* compose all the parts

* Fix on obtain and shim maker for better end to end experience
  * Fix error when there is space in the middle of path of nuget config
  * Fix path in profile.d is the tmp home path during install
  * better handle of ~home
  * remove profile.d file in uninstall script
  * Fix test since it looks up current directory
  * folder structure inside nupkg to tools/TFM/RID/mytool.dll
  * Add check for config file existence
  * Rename name space to Microsoft.DotNet.ShellShim
  * Rename name space to Microsoft.DotNet.ToolPackage
2017-12-04 14:13:24 -08:00
Nick Guerrera
e0931a7b36 Update xlf 2017-12-04 13:37:55 -08:00
John Beisner
2cdb5a9f7e
Merge pull request #8119 from natemcmaster/install-script
Add parameter to dotnet-install to support pulling from private blob feeds
2017-12-04 13:28:08 -08:00
John Beisner
f7947a13d3
Merge pull request #8120 from natemcmaster/install-script2
Pipe ldconfig stderr to /dev/null
2017-12-04 13:27:52 -08:00
John Beisner
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -08:00
Nick Guerrera
100a334e70 Merge branch 'master' into v-zbsail-localization 2017-12-04 13:19:38 -08:00
Sean Peters
e2ea046082 Update template engine to build 315 2017-12-04 13:09:05 -08:00
Mihai Codoban
ea74bf1614 Bump MSbuild to 15.6.0-preview-000012-1193158 (#8161)
Includes https://github.com/Microsoft/msbuild/pull/2716
2017-12-04 13:08:18 -08:00
Nick Guerrera
1fe2fb3003
Update to latest dotnet/sdk 2017-12-04 13:06:42 -08:00
Livar
0886e94071
Merge pull request #8135 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26001-02 (master)
2017-12-04 12:18:15 -08:00
Livar
0ca9728098
Merge branch 'master' into merges/release/15.5-to-master-20171204-080035 2017-12-04 11:20:08 -08:00
John Beisner
3cb1cca44d Third pass clean-up of package names. 2017-12-04 09:44:51 -08:00
John Beisner
4d694d2c56 Second pass clean-up of package names; resequencing download. 2017-12-04 09:31:28 -08:00
William Lee
bf6b5b3773
Use rhel docker image with sudo built in (#8151)
So we do not need to download sudo from the internet everytime we build
2017-12-03 10:15:44 -08:00
John Beisner
f0abfb6b12 Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props 2017-12-01 20:07:48 -08:00
dotnet-bot
667f27cac8 Update CoreSetup to preview1-26001-02 2017-12-01 22:20:50 +00:00
John Beisner
1362c6c4f1 The access key is already resolved: 'CoreSetupBlobAccessTokenParam' 2017-12-01 14:06:06 -08:00
John Beisner
5607d1f68c Fixed another typo... 2017-12-01 14:01:07 -08:00
John Beisner
0f7783f72b Fixed typo... 2017-12-01 13:59:25 -08:00
John Beisner
36e47bf417
Merge pull request #8140 from johnbeisner/ConfigNuget
Dependency Uptake: CLI - part 1
2017-12-01 13:31:39 -08:00
John Beisner
165f7c4575 The first pass will need the extra args [same as run-build.ps1]. 2017-12-01 12:40:40 -08:00
John Beisner
c54911b788 Dependency Uptake: download and import a package version props file. 2017-12-01 12:39:51 -08:00
Livar
b98ab1c89b
Merge pull request #8143 from dotnet/merges/release/2.0.0-to-release/15.5-20171201-080033
Merge release/2.0.0 to release/15.5
2017-12-01 11:59:06 -08:00
Livar
a0ca411ca5
Merge pull request #8150 from dotnet/johluo/2.0.4-lzma-2
Consume 2.0.4 LZMA attempt 2
2017-12-01 11:56:56 -08:00
Livar
2d8fbc25fe
Merge pull request #8068 from dotnet/merges/release/15.5-to-master-20171120-080035
Merge release/15.5 to master
2017-12-01 11:22:56 -08:00
John Luo
9d391355f8 Consume 2.0.4 LZMA attempt 2 2017-12-01 10:54:49 -08:00
John Beisner
4adabde4c9 Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties. 2017-12-01 09:56:11 -08:00
John Beisner
b092ad0141 Changes per code review... 2017-12-01 08:05:33 -08:00
Zbyněk Sailer
1853e24a9a LOC CHECKIN | dotnet/cli-master | 20171201 2017-12-01 09:30:43 +01:00
Livar
555ea4592a
Merge pull request #8141 from dotnet/johluo/2.0.4-lzma
Consume 2.0.4 LZMA
2017-11-30 17:57:26 -08:00
John Luo
6e41f29b38 Consume 2.0.4 LZMA 2017-11-30 16:43:20 -08:00
Parallels
83ddef69d6 Fixing the store consumption merge. 2017-11-30 14:15:38 -08:00
Livar Cunha
50ffb6bf72 Removing installing the 2.0.0 asp.net runtime store. We don't it anymore either. In master, just the preview one should be enough. 2017-11-30 12:55:23 -08:00
John Beisner
3d39772fe9 The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container. 2017-11-30 12:09:27 -08:00
Livar Cunha
d613ec5758 Making the cli-test-env shell script runnable and removing test workaround for preview runtimes. It is not needed in master. 2017-11-30 11:50:37 -08:00