Livar
72ce357c9c
Merge pull request #9415 from dotnet/nuget.client.release-4.8.0.5244-1-1
...
Insert NuGet Build 4.8.0-preview3.5244 into cli
2018-06-04 13:08:05 -07:00
Livar Cunha
625b9d4963
Updating signing project to use new intermediate directory (int).
2018-06-04 13:06:02 -07:00
Steve Harter
f45acc5e10
Update runtimeconfig.json doc for 2.1 ( #9382 )
2018-06-04 14:46:13 -05:00
Matt Mitchell
6a39ef5c7b
Merged PR 126122: Fix alpine file ownership issues with newer docker
...
Fix alpine file ownership issues with newer docker
Upgrades to a newer docker version (18.03.1-ce) caused files created inside to be owned by root on alpine. It appears that the logic to set up the user in the container so that this doesn't happen was missing from alpine. While it's not clear why it worked before at all, the logic has been duplicated (tweaked for the alpine base image).
2018-06-04 18:41:13 +00:00
Livar
447bd91100
Merge branch 'master' into merges/release/2.1.4xx-to-master
2018-06-04 11:38:31 -07:00
Matt Mitchell
05348ce78f
Merge pull request #9416 from mmitche/fix-alpine-legs
...
Fix alpine file ownership issues with newer docker
2018-06-04 11:36:36 -07:00
Livar
77a0f99c94
Merge pull request #9392 from livarcocc/enable_2_2_runtime
...
Updating the build and tests to work with the 2.2.0 runtime.
2018-06-04 11:05:52 -07:00
Livar
36f1bc9da8
Merge pull request #9365 from kasper3/release/2.1.4xx
...
Add dotnet-tool manpages and update others
2018-06-04 10:45:12 -07:00
Livar
d36e5ce161
Merge pull request #9399 from rainersigwald/msbuild-15.8.78
...
MSBuild 15.8.78 (4xx)
2018-06-04 10:42:58 -07:00
Matt Mitchell
9ff4188d48
Fix alpine file ownership issues with newer docker
...
Upgrades to a newer docker version (18.03.1-ce) caused files created inside to be owned by root on alpine. It appears that the logic to set up the user in the container so that this doesn't happen was missing from alpine. While it's not clear why it worked before at all, the logic has been duplicated (tweaked for the alpine base image).
2018-06-04 10:36:54 -07:00
NuGet Team Bot
534ae754dd
Insert NuGet Build 4.8.0-preview3.5244 into cli
2018-06-04 09:47:36 -07:00
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