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

9130 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Guerrera
02c19ad945 Revert tests for feature that is about to be reverted by merge 
The mode switch tests are failing as they hit the 2.2.1xx branch
because we don't have a dotnet/sdk with the needed support for
it. Since the feature is reverted in release/2.1.4xx anyway, revert
the tests ahead of time to match release/2.1.4xx (modulo s/2.1/2.2/)
 2018-07-13 19:19:37 -07:00
Nick Guerrera
423b718bea Temporarily disable part of self-contained roll-forward test 2018-07-13 16:55:23 -07:00
Nick Guerrera
35496cfe41 Fix incorrect merge 2018-07-13 16:52:54 -07:00
Nick Guerrera
5fdaa4f92d Fix xlf merge 2018-06-29 15:53:35 -07:00
Nick Guerrera
1326c79a5d Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-06-29 15:25:24 -07:00
William Li
fcfcfcdaea
Merge pull request #9467 from nkolev92/restoreInteractiveFlag 
Add a restore and add pkg commands interactive flag
 2018-06-27 14:55:32 -07:00
Livar
dd0179a67c
Merge pull request #9568 from dotnet/update_sdk 
Update SDK to 2.1.400-preview-63027-01
 2018-06-26 18:36:25 -07:00
Livar
57597e8511
Update SDK to 2.1.400-preview-63027-01 2018-06-26 17:50:41 -07:00
Livar
b5de134c49
Merge pull request #9552 from AndyGerlicher/MSBuild-15.8.136 
MSBuild 15.8.138
 2018-06-26 14:24:13 -07:00
Livar
8cffe4a578
Merge pull request #9555 from halex2005/merges/release/2.1.4xx-to-master 
Add nunit project and item templates to bundle
 2018-06-26 13:50:12 -07:00
Andy Gerlicher
58a4fd0285 MSBuild 15.8.138-preview 2018-06-26 12:24:42 -07:00
akharlov
a5abacf155 add tests for dotnet new nunit 2018-06-26 12:34:13 +05:00
akharlov
dc3835df84 add nunit project and item templates to bundle 2018-06-26 12:34:13 +05:00
Livar
ec8fcf3707
Merge pull request #9554 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx 
Merge release/2.1.3xx to release/2.1.4xx
 2018-06-25 22:14:28 -07:00
William Li
de7c73016e
Merge pull request #9549 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx 
Merge release/2.1.3xx to release/2.1.4xx
 2018-06-25 17:33:53 -07:00
William Li
3af835044d
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-25 15:59:41 -07:00
Livar
2a1f1c6d30
Merge pull request #9551 from dotnet/update_asp_net_versions 
Updates asp.net versions to match prodcon
 2018-06-25 15:55:06 -07:00
Nikolche Kolev
c7cf8a55b8 Add DOTNET_HOST_PATH for dotnet nuget commands 2018-06-25 14:15:24 -07:00
Livar
2fed1c07ba Updates asp.net versions to match prodcon 
Fixes https://github.com/dotnet/cli/issues/9550
 2018-06-25 13:34:59 -07:00
Livar
b8735c396c
Merge pull request #9543 from AndyGerlicher/MSBuild-15.8.125 
MSBuild 15.8.125
 2018-06-25 12:00:29 -07:00
William Li
34fd28a3ba
Use blob feed instead of myget (#9546) 2018-06-25 10:37:19 -07:00
John Beisner
741512d065
Merge pull request #9540 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx 
Merge release/2.1.3xx to release/2.1.4xx
 2018-06-25 09:23:51 -07:00
William Li
5218c4bcf5
Pass BaseIntermediateOutputPath via xml (#9509) 
Instead of command line to avoid escaping problem.

It can support most of the character including surrogate char. It cannot
support semicolon. However, semicolon is not allow to be part of the
user name.

Port 2.1.4xx fix 0251f677ede571b61a47ca24f38df8e09038277d while keep
BaseIntermediateOutputPath instead of MsBuildProjectExtensionsPath to
minimize the change.
 2018-06-24 11:32:44 -07:00
jbeisner
befc400ba8 Merge remote-tracking branch 'origin/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-22 20:48:42 +00:00
John Beisner
dc2443ca74
Fix the CI legs; CLI:release/2.1.3xx (#9535) 
* Linux-musl command should be derived from "baseShellBuildCommand" not "buildCommand"; setting 'DropSuffix' in the environment.
 2018-06-22 13:45:53 -07:00
Andy Gerlicher
50c5a5e110 MSBuild 15.8.125-preview 2018-06-22 10:45:22 -07:00
William Li
488edfad3f
Use correct nuget version normalized format (#9525) 
* Use correct nuget version normalized format

* Change test accordingly

This matches nuget behavior
if restore with  `<PackageReference Include="global.tool.console.demo" Version="1.0.*" />` there is no warning
and if restore with `<PackageReference Include="global.tool.console.demo" Version="1.0.0" />` there is warning due to no exact 1.0.0 find
 2018-06-21 13:00:49 -07:00
John Beisner
f882376933
Adding 'NoSuffix' legs to the CI (#9502) 
* Adding 'NoSuffix' legs to the CI

* Fixing typo...

* Updates per code review...

* "openSUSE 43.2" should be "openSUSE 42.3"; fixing 'netci.groovy' command formation logic.
 2018-06-21 12:00:28 -07:00
Livar
4757e52adb
Merge pull request #9524 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx 
Merge release/2.1.3xx to release/2.1.4xx
 2018-06-21 10:53:38 -07:00
Livar
9d94a804b4
Merge pull request #9523 from livarcocc/update_readme 
Updating the branch info and readme for 2.2.1xx.
 2018-06-21 10:50:17 -07:00
Livar
2bc587a615
Merge pull request #9496 from mlorbetske/dev/mlorbe/UpdateTestTemplatesToSdk15.8.0-preview-20180610-02 
Update templates to carry test SDK 15.8.0-preview-20180610-02
 2018-06-21 10:49:32 -07:00
Livar
52ee655dbe
Merge pull request #9529 from KevinRansom/alignFSharpWithDev158 
Align f# with dev15.8
 2018-06-21 10:42:31 -07:00
William Li
7d94dbbd99
Test and automatic Update default package version and re-enable Latest package version test (#9507) 
* Add Compute UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion

* Add tests to catch DefaultNetCorePatchVersion moving

* Update LatestPatchVersionForNetCore2_0 to 2.0.9, it is in the process of shipping

* Update LatestPatchVersionForNetCore1_0 and LatestPatchVersionForNetCore1_1
 2018-06-21 10:40:44 -07:00
Kevin Ransom
f0e0e9d51e Align F# with VS2017.8 2018-06-21 00:10:41 -07:00
Daniel Plaisted
189e90e18d
Merge pull request #9505 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx 
Merge release/2.1.2xx to release/2.1.3xx
 2018-06-20 16:42:04 -07:00
Nikolche Kolev
c172433ce7 add '.' period to the command description 2018-06-20 16:40:27 -07:00
Nikolche Kolev
9cd006f591 make the interactive switch not implicit 2018-06-20 15:53:33 -07:00
Nikolche Kolev
b23c372077 fix add package parsing 2018-06-20 15:17:19 -07:00
Livar
5a3e9963f7
Merge pull request #9484 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx 
Merge release/2.1.3xx to release/2.1.4xx
 2018-06-20 15:15:30 -07:00
Livar
12a1388160
Merge pull request #9494 from dotnet/nuget.client.release-4.8.0.5278-1-1 
Insert NuGet Build 4.8.0-preview3.5278 into cli
 2018-06-20 15:14:16 -07:00
Livar
d082ff1797
Merge pull request #9521 from livarcocc/fix_sln_string 
Fix remove sln description.
 2018-06-20 15:13:06 -07:00
jbeisner
4402dfb684 Revert "Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx" 
This reverts commit 40be59f753, reversing
changes made to 734a41730a.
 2018-06-20 22:11:00 +00:00
Livar Cunha
f8e0427e0d Updating the branch info and readme for 2.2.1xx. 2018-06-20 15:03:00 -07:00
jbeisner
40be59f753 Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-06-20 22:01:12 +00:00
Livar Cunha
d6fb69a4be Fix remove sln description. 2018-06-20 10:26:43 -07:00
John Beisner
6afa092018
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-20 08:43:05 -07:00
Nikolche Kolev
dba0aa33da Update the messages per the recommendation 2018-06-19 16:33:59 -07:00
Mike Lorbetske
ad47c91c75
Merge branch 'release/2.1.4xx' into dev/mlorbe/UpdateTestTemplatesToSdk15.8.0-preview-20180610-02 2018-06-19 13:13:41 -07:00
Daniel Plaisted
d3787295e2
Merge pull request #9492 from dotnet/vramak/UpdateWebSdkVersion 
Updating the WebSdk version for release/2.1.4xx
 2018-06-18 11:37:33 -07:00
vramak
81996f47e8 Updating the websdk feed 2018-06-15 15:21:11 -07:00