mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9718 commits 41 branches 190 tags 95 MiB
Commit graph

9718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Huene
0461d619af Merged PR 126571: Merge from public upstream release/2.1.2xx 
Merge from public upstream release/2.1.2xx
 2018-06-06 17:32:48 +00:00
Peter Huene
e7b77268f5
Merge branch 'release/2.1.2xx' into release/2.1.2xx-MSRC 
* release/2.1.2xx:
  Updating netci.groovy to archive test results on failure.
  Fix version number
  Consume 15.7.2 compiler
  Updating the CLI branding to 201.
  MSBuild 15.7.179
 2018-06-06 10:26:51 -07:00
Livar
62d968050a
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-06 09:19:05 -07:00
Livar
2cdef32206
Merge pull request #9424 from singhsarab/TP-Prev-20180605-02 
Testplatform 15.8.0-preview-20180605-02
 2018-06-06 09:16:18 -07:00
Sarabjot Singh
d99a367db0 Inserting Testplatform 15.8.0-preview-20180605-02 package in dotnet cli 2018-06-06 15:56:55 +05:30
Livar
0e346aa5ba
Merge pull request #9360 from SimonCropp/patch-1 
Update Sha256Hasher.cs
 2018-06-05 22:46:18 -07:00
Livar
670dcedba2
Merge pull request #9381 from dotnet/merges/release/2.1.4xx-to-master 
Merge release/2.1.4xx to master
 2018-06-05 22:45:53 -07:00
Livar
83fa5538bc
Merge pull request #9418 from kasper3/release/2.1.4xx 
Remove obsolete manpages
 2018-06-05 22:45:39 -07:00
Matt Mitchell
27ae13af80 Merged PR 126473: Port Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421 
Porting Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421 from GitHub
 2018-06-06 00:35:05 +00:00
Matt Mitchell
41d2418bfb Update expected versions to 2.1.2 2018-06-05 17:32:01 -07:00
jbeisner
2e7e6950e2 Disable NewProjectRestoresCorrectPackageVersion "console" test for now. 2018-06-05 17:30:44 -07:00
jbeisner
5541529bbe Update the version for 'microsoft.netcore.app' to "2.1.1*" 2018-06-05 17:30:34 -07:00
jbeisner
fec5f38b93 Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*" 2018-06-05 17:28:32 -07:00
Livar
59524873d6
Merge pull request #9421 from johnbeisner/FixProdConIssues 
Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests
 2018-06-05 14:26:41 -07:00
jbeisner
79b4809559 Disable NewProjectRestoresCorrectPackageVersion "console" test for now. 2018-06-05 18:25:07 +00:00
jbeisner
74a7d63e43 Update the version for 'microsoft.netcore.app' to "2.1.1*" 2018-06-05 17:51:19 +00:00
jbeisner
0015821db6 Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*" 2018-06-05 16:51:32 +00:00
Livar
49f4a0bf5b
Merge pull request #9417 from livarcocc/fix_signing 
Updating signing project to use new intermediate directory (int).
 2018-06-04 15:02:27 -07:00
William Li
48ee97fb42
Merge pull request #9371 from svick/patch-4 
Simplified combining dictionaries in Telemetry
 2018-06-04 13:43:13 -07:00
kasper
711ff3bb25 Remove obsolete manpages 2018-06-04 20:35:32 +00:00
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