Commit graph

9837 commits

Author SHA1 Message Date
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
Peter Huene
5e52bd6518 Merged PR 129817: Merge release/2.1.2xx into release/2.1.2xx-MSRC 2018-06-26 05:45:48 +00:00
Peter Huene
ce512c767f
Merge branch 'release/2.1.2xx' into release/2.1.2xx-MSRC
* release/2.1.2xx:
  Update Installer build to create both old and new package identities
  Bring back old package IDs
  Update VS Insertion NuGet package IDs in Installer.MSI.targets
  Update VS insertion package name for x86 package
  Update VS insertion package name for x64 package
2018-06-25 22:42:03 -07:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07: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
John Luo
816173b6ae Merged PR 129095: Update to aspnet 2.0.9-rtm-10030 2018-06-20 23:50:59 +00:00
John Luo
dc2fefdc99 Update to aspnet 2.0.9-rtm-10030 2018-06-20 16:47:45 -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
Will Godbe
07241a3fe0 Merged PR 129043: Bump runtime versions to 2.0.9 stable 2018-06-20 21:45:26 +00:00
wtgodbe
e46c410acc Bump runtime versions to 2.0.9 stable 2018-06-20 14:36:27 -07: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
Mike Lorbetske
cec0b5998e Switch back to the older version of the template package and add the templating MyGet feed 2018-06-15 15:18:30 -07:00
Mike Lorbetske
470370ab76 Bump to a newer package version built by prodcon 2018-06-15 14:44:22 -07:00