Sean Peters
be0bebdf30
updated TemplateEnd template versions. Removed old entries from BundledTemplates.props
2017-11-14 14:13:31 -08:00
seancpeters
b5b7b9b16c
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09
2017-11-14 14:06:05 -08:00
seancpeters
29a3673535
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09
2017-11-14 14:04:55 -08:00
Livar
3b4becd7c8
Merge pull request #8011 from dotnet/merges/release/15.5-to-master-20171114-080040
...
Merge release/15.5 to master
2017-11-14 12:58:56 -08:00
Livar
5955194c11
Merge pull request #8002 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25912-02 (master)
2017-11-13 12:14:46 -08:00
Livar
e5d2a67cfe
Merge pull request #7974 from singhsarab/patch-1
...
Updating the version for TestPlatform
2017-11-13 12:14:25 -08:00
dotnet-bot
36d201b4f0
Update CoreSetup to preview1-25912-02
2017-11-12 22:48:10 +00:00
Nick Guerrera
20d4d77586
Merge pull request #7998 from dotnet/release/15.5
...
Merge release/15.5 to master
2017-11-11 10:15:25 -08:00
Nick Guerrera
f64717fc31
Merge pull request #7994 from dotnet/nguerrera/update-sdk
...
Update SDK
2017-11-10 21:42:30 -08:00
seancpeters
02e82d5610
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09
2017-11-10 17:28:33 -08:00
Sean Peters
b1c7c072b6
updated the websdk version
2017-11-10 17:21:37 -08:00
Sean Peters
a49a9680ff
bumped the templating build number
2017-11-10 16:26:36 -08:00
Nick Guerrera
5d2c5f9943
Update SDK
2017-11-10 10:56:54 -08:00
Nick Guerrera
f15495cee3
Merge pull request #7987 from dotnet/merges/release/15.5-to-master-20171109-080038
...
Merge release/15.5 to master
2017-11-10 10:20:37 -08:00
Nick Guerrera
71cb608e48
Merge branch 'master' into merges/release/15.5-to-master-20171109-080038
2017-11-09 18:43:28 -08:00
Livar
10238b401f
Merge pull request #7991 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25909-03 (master)
2017-11-09 17:10:45 -08:00
Sean Peters
82718a146c
Inserting dotnet/templating rel/2.1.0-preview1 into cli master
2017-11-09 15:46:14 -08:00
dotnet-bot
dfc674fb09
Update CoreSetup to preview1-25909-03
2017-11-09 22:44:46 +00:00
Livar
8b3c80958b
Merge pull request #7971 from dotnet/merges/release/2.0.0-to-release/15.5-20171107-080033
...
Merge release/2.0.0 to release/15.5
2017-11-09 00:04:47 -08:00
John Beisner
5bc9335ff8
Merge pull request #7981 from johnbeisner/FixingPublishConditionals
...
Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB'
2017-11-08 18:16:27 -08:00
Livar
f33659b500
Merge pull request #7983 from joperezr/UpdateSDK
...
Updating the SDK and Support package on the CLI
2017-11-08 17:37:12 -08:00
Jose Perez Rodriguez
079edcd894
Updating the SDK and Support package on the CLI
2017-11-08 15:31:51 -08:00
John Beisner
e3b32e41ec
Merge pull request #7978 from johnbeisner/NugetConfigModification
...
Removing Tier 1 repos from Nuget.config
2017-11-08 14:24:20 -08:00
John Beisner
6302b34d56
per code review:
...
Putting back: https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
2017-11-08 10:33:40 -08:00
John Beisner
e1d3320376
Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string.
2017-11-08 09:26:32 -08:00
Livar
b80bfc6dfb
Merge pull request #7977 from dotnet/update_sdk
...
Update SDK to 15.5.0-preview-20171107-4
2017-11-07 21:32:00 -08:00
John Beisner
ef42a98a1c
Removing Tier 1 repos from Nuget.config; those repos are now coming from the internal 'dotnet-core' feed.
2017-11-07 16:38:39 -08:00
Livar
b6bfc84f51
Update SDK to 15.5.0-preview-20171107-4
2017-11-07 15:54:43 -08:00
Eric Erhardt
d58fc6120d
Merge pull request #7968 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25907-02 (master)
2017-11-07 14:35:44 -06:00
Nick Guerrera
1fef760409
Merge remote-tracking branch 'upstream/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171107-080033
2017-11-07 11:34:13 -08:00
Livar
fc19d9304e
Merge pull request #7970 from AndyGerlicher/MSBuild.15.5.178
...
MSBuild 15.5.178
2017-11-07 09:50:29 -08:00
dotnet-bot
fd738184c1
Update CoreSetup to preview1-25907-02
2017-11-07 17:49:55 +00:00
Nick Guerrera
4db91a217f
Merge pull request #7973 from dotnet/merges/release/15.5-to-master-20171107-080036
...
Merge release/15.5 to master
2017-11-07 06:31:45 -08:00
Sarabjot Singh
7dc7990d81
Updating the version for TestPlatform
...
Includes branding changes
2017-11-07 18:19:02 +05:30
John Beisner
ce3c935d81
Merge pull request #7967 from johnbeisner/NewTransportFeedDLL
...
Changes in the Transport feed DLL requires our response
2017-11-06 19:43:04 -08:00
Andy Gerlicher
ed916bb13e
MSBuild 15.5.178
2017-11-06 19:23:10 -08:00
John Beisner
56d94ff68c
Changes in the Transport feed DLL requires our response; change DLL version and base URL.
2017-11-06 14:57:55 -08:00
Livar
fa52a9f1ee
Merge pull request #7966 from dotnet/update_runtime
...
Update runtime version to preview1-25905-03
2017-11-06 13:57:55 -08:00
Nick Guerrera
3cd6a7802d
Merge pull request #7944 from v-zbsail/localization
...
LOC CHECKIN | dotnet/cli - release/15.5 | 20171031
2017-11-06 12:33:05 -08:00
Nick Guerrera
5fbaee6344
Merge pull request #7953 from nguerrera/crossgen-symbols
...
Generate symbols on crossgen for profiling
2017-11-06 12:15:33 -08:00
Livar
1f423ff22b
Update runtime version to preview1-25905-03
2017-11-06 09:31:45 -08:00
Livar
272311890c
Merge pull request #7962 from dotnet/merges/release/15.5-to-master-20171103-070036
...
Merge release/15.5 to master
2017-11-03 16:06:52 -07:00
Nick Guerrera
2a0569dc34
Fix build error when using SeparateSymbolsArchive=false
2017-11-03 15:22:41 -07:00
Nick Guerrera
a2d18edb91
Don't attempt to generate profiling symbols on Mac OS
2017-11-03 10:05:36 -07:00
Livar
3056f94cdf
Merge branch 'master' into merges/release/15.5-to-master-20171103-070036
2017-11-03 09:52:13 -07:00
Eric Erhardt
53cbc96d75
Merge pull request #7960 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25902-04 (master)
2017-11-03 09:47:17 -05:00
dotnet-bot
d4f92aa0f0
Update CoreSetup to preview1-25902-04
2017-11-03 00:57:00 +00:00
Nick Guerrera
4f31e3db66
Improve symbols zip archive
...
We were publishing a -debug zip with sdk code and symbols, but it was captured before
publishing was finished and had incorrect code content. Trying to use it would blow up
due to incorrect runtimeconfig.json.
Replace it with a -symbols zip that contains only symbols and that can be overlayed
over the main zip. This is just like the -langpack zip that has satellite assemblies.
Also add an option to leave the PDBs in the same directory/packages as code:
/p:SeparateSymbolsArchive=false. Setting this on local builds facilitates
debugging and profiling by removing the need to adjust symbol paths or copy PDBs
around.
2017-11-02 16:08:06 -07:00
Nick Guerrera
607907c67d
Retarget VSTest before publishing with backward compatible runtimes
2017-11-02 15:09:17 -07:00
Livar
d27effe188
Merge pull request #7952 from AndyGerlicher/MSBuild.15.5.172
...
MSBuild 15.5.172
2017-11-02 09:32:58 -07:00
