Commit graph

9837 commits

Author SHA1 Message Date
Matt Mitchell
9db1b6d3b9
Merge pull request #9406 from mmitche/upgradeable-installers
Remove -upgrade suffix from installer inputs
2018-06-03 20:25:44 -07:00
Livar
7f6c09bad1
Merge pull request #9374 from dotnet/johluo/default-aspnetcore-versions
Set Default aspnetcore metapackage versions
2018-06-03 14:37:19 -07:00
Matt Mitchell
c078dda8c7 Remove -upgrade suffix from installer inputs 2018-06-03 08:45:34 -07:00
Livar Cunha
78c7f5af5b Shortening the path to the intermediate folder by renaming it to int. 2018-06-01 15:46:22 -07:00
Maira Wenzel
7ce47778b4 fix typo (#9364)
* fix typo

* add loc files
2018-06-01 14:16:41 -07:00
Livar Cunha
33c3a26880 Updating asp.net to 2.2.0 as well. 2018-06-01 13:31:03 -07:00
William Li
42cd5fd055
Merge pull request #9402 from wli3/port-2.1.3-Add-retry-when-Directory.Move
Port 2.1.3xx add retry when directory.move
2018-06-01 12:44:01 -07:00
Nate McMaster
e9a1bd434a
Ensure default aspnetcore metapackage versions doesn't jump when/if we ever get to version 2.1.10 2018-06-01 12:01:42 -07:00
William Li
ea539c7f63 Add retry when Directory.Move (#9313) 2018-06-01 11:22:03 -07:00
Peter Huene
780ca149a5
Merge pull request #9394 from peterhuene/revert-property-fix
Revert "Fix MSBuild invocation to quote property option values."
2018-06-01 10:43:19 -07:00
Livar Cunha
a75367aa4e Merged PR 125797: Cherry picking change to not use -upgrade packages for asp.net 2018-06-01 16:48:20 +00:00
Rainer Sigwald
2db872e25d MSBuild 15.8.78 2018-06-01 09:31:48 -05:00
Peter Huene
98dd811aa8
Revert "Fix MSBuild invocation to quote property option values."
This reverts commit f9b939fe89.

That fix caused a regression that prevented a single `/property` option to
define multiple properties using the `/property:First=foo;Second=bar` syntax.

Users that want literal semicolons in the property values should use escaped
quotes around the property value, e.g. `/property:Prop='"foo;bar;baz"'`.

Fixes #9369.
2018-05-31 21:34:05 -07:00
Daniel Plaisted
c9d457a6b9
Merge pull request #9350 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-31 20:09:06 -07:00
Nate McMaster
4eaf45ba85 Fix mismatch of dotnet-watch with package variable name 2018-05-31 19:31:34 -07:00
Nate McMaster
74d81ad253 Set package versions for bundled aspnet tools separately from the metapackage version 2018-05-31 19:31:28 -07:00
Nate McMaster
aad98ed7ff Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable 2018-05-31 19:31:23 -07:00
Nate McMaster
e00b935e07 Fixup myget feed for aspnetcore 2018-05-31 19:31:17 -07:00
Nate McMaster
79e5822e32 Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change 2018-05-31 19:31:09 -07:00
Livar
9e9fe6d5ee
Merge pull request #9380 from natemcmaster/cleanup
Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
2018-05-31 19:21:29 -07:00
Livar Cunha
2f0f270a73 Updating the build and tests to work with the 2.2.0 runtime. 2018-05-31 19:14:24 -07:00
Daniel Plaisted
da77c12682
Merge pull request #9386 from dsplaisted/clear-disabled-package-sources
Clear disabled package sources in generated NuGet.config
2018-05-31 16:55:52 -07:00
Livar
6a5f20f3d9
Merge pull request #9354 from dasMulli/feature/config-captialization
Change configuration completion suggestion to standard capitalization
2018-05-31 16:11:50 -07:00
Livar
a352935114
Merge pull request #9373 from AndyGerlicher/MSBuild-15.8.78
MSBuild 15.8.78
2018-05-31 16:05:35 -07:00
Nate McMaster
1386aa28e1
Fix mismatch of dotnet-watch with package variable name 2018-05-31 14:44:29 -07:00
Nate McMaster
276045d957
Set package versions for bundled aspnet tools separately from the metapackage version 2018-05-31 12:39:56 -07:00
Daniel Plaisted
0bb66a5e28 Clear disabled package sources in generated NuGet.config
This will help prevent the repo being broken if you have the same feeds set up in your global NuGet.config but have them disabled
2018-05-31 12:04:23 -07:00
Nick Guerrera
81c7f9a3e9
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-31 11:59:29 -07:00
Nate McMaster
a997650cb4
Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable 2018-05-31 11:54:12 -07:00
Livar Cunha
348a6a7428 Merged PR 125617: Updated the CLI branding to 2.1.302
Updated the CLI branding to 2.1.302
2018-05-31 18:27:22 +00:00
Livar Cunha
8a315605e1 Updated Version.props 2018-05-31 18:18:43 +00:00
Nate McMaster
0fa8657fb1
Fixup myget feed for aspnetcore 2018-05-31 11:07:55 -07:00
Nate McMaster
538aa557b0
Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change 2018-05-31 10:34:02 -07:00
Livar
80d542b8f4
Merge pull request #9332 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-31 10:22:00 -07:00
Andy Gerlicher
29def94d78 MSBuild 15.8.78 2018-05-30 19:59:32 -07:00
John Luo
f388933ebb Set Default aspnetcore metapackage versions 2018-05-30 17:45:17 -07:00
Petr Onderka
139fc86dbc
Simplified combining dictionaries in Telemetry 2018-05-31 01:03:27 +02:00
kasper3
5f93685491 Add dotnet-tool manpages and update others 2018-05-30 15:52:55 +00:00
John Beisner
dae5099ffb
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362) 2018-05-29 13:46:07 -07:00
Sebastian Karasek
c01e7c3e42 Fix extraction of folders (#9335) 2018-05-29 11:02:26 -07:00
Simon Cropp
ca8fefb1be
Update Sha256Hasher.cs 2018-05-29 23:00:23 +10:00
dasMulli
0b1509da5c
Change completion suggestion to standard capitalization. 2018-05-27 14:50:54 +02:00
Livar
d250d075be
Merge pull request #9348 from livarcocc/update_dependencies
Update dependencies and branding
2018-05-25 14:51:18 -07:00
Livar Cunha
99462b9e7a Updating branding to 2.1.301. 2018-05-25 12:12:22 -07:00
Livar Cunha
aeae506fa8 Updating dependency versions to match prodcon. 2018-05-25 12:11:39 -07:00
Livar
de407deff0
Merge pull request #9347 from dsplaisted/update-sdk
Insert updated SDK from 2.1.4xx branch
2018-05-24 21:21:41 -07:00
William Li
983612b95b
Fix relative path tool path (#9330)
Pass full path to Path.GetRelativePath
2018-05-24 18:15:23 -07:00
Daniel Plaisted
d17b088022 Insert updated SDK from 2.1.4xx branch 2018-05-24 16:29:10 -07:00
Livar
35a2c5d032
Merge pull request #9344 from rainersigwald/msbuild-15.8.74
MSBuild 15.8.60
2018-05-24 11:02:23 -07:00
Rainer Sigwald
48eab9c572 MSBuild 15.8.60 2018-05-24 12:05:52 -05:00