Commit graph

2489 commits

Author SHA1 Message Date
Livar Cunha
b3ad7d3c8b Updating branding to 401. 2018-06-26 17:10:42 -07:00
Parallels
4d9b015f8f Fixing a merge issue and crossgen issues. 2018-06-26 14:44:55 -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
Andy Gerlicher
58a4fd0285 MSBuild 15.8.138-preview 2018-06-26 12:24:42 -07:00
akharlov
dc3835df84 add nunit project and item templates to bundle 2018-06-26 12:34:13 +05: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
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
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
Andy Gerlicher
50c5a5e110 MSBuild 15.8.125-preview 2018-06-22 10:45:22 -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
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
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 Cunha
f8e0427e0d Updating the branch info and readme for 2.2.1xx. 2018-06-20 15:03:00 -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
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
William Li
f3f43a7db4
Update SDK to 2.1.400-preview-63014-01 (#9498) 2018-06-15 10:36:47 -07:00
William Li
f66dc4e08b
Merge pull request #9460 from peterhuene/fx-dep-apphost
Implement `mode` option for `dotnet publish`.
2018-06-15 09:40:19 -07:00
Livar
3818426392
Merge pull request #9475 from AndyGerlicher/MSBuild-15.8.101
MSBuild 15.8.101
2018-06-15 09:24:55 -07:00
John Beisner
f97e9e82e9 Merged PR 128197: Recent fixes; merge release/2.1.3xx into release/2.1.3xx-MSRC
Including in this merge:

https://github.com/dotnet/cli/pull/9495
The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended].
Impact: package failure for Linux-x64, Linux-arm, and Linux-arm64

https://github.com/dotnet/cli/pull/9491
The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'
Impact: RazorApp test failure in all legs except for Linux-arm and Linux-arm64
2018-06-15 00:47:08 +00:00
John Beisner
734a41730a
Fix the 'Microsoft.AspNet.Core.Mvc' versioning (#9491)
* The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'

* Changing "MicrosoftAspNetCoreMvcVersion" to "MicrosoftAspNetCoreMvcPackageVersion" in order to be compatable with ProdCon.
2018-06-14 17:32:24 -07:00
jbeisner
c0c445be04 Updating the 'NoWarn' comments. 2018-06-14 21:12:46 +00:00
Mike Lorbetske
d396c8bf4e Update templates to carry test SDK 15.8.0-preview-20180610-02 2018-06-14 13:41:15 -07:00
jbeisner
4050c6374f The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended]. 2018-06-14 20:31:09 +00:00
NuGet Team Bot
bf473ad46c Insert NuGet Build 4.8.0-preview3.5278 into cli 2018-06-14 12:57:21 -07:00
vramak
b9a8667dbf Updating the WebSdk version for release/2.1.4xx 2018-06-14 10:43:41 -07:00
John Beisner
89c1500501
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-13 17:15:24 -07:00
Livar Cunha
f643067869 Merge branch 'release/2.1.3xx' into merge_release_213xx
* release/2.1.3xx:
  Update SDK/WebSDK dependencies to 2.1.1
  Revert undesired changes
  Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively
  Correct the 'Channel' and 'BranchName' to "release/2.1.3xx"
2018-06-13 14:31:26 -07:00
Livar
769f81938e
Merge pull request #9474 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively (release/2.1.3xx)
2018-06-13 14:18:49 -07:00
Matt Mitchell
7f29a90635
Update SDK/WebSDK dependencies to 2.1.1 2018-06-13 13:24:47 -07:00
jbeisner
fddf38656a Resolve conflicts: merge 'release/2.1.3xx' to 'release/2.1.4xx' 2018-06-13 17:30:42 +00:00
Matt Mitchell
7f0765eb33
Revert undesired changes 2018-06-12 20:34:32 -07:00
Andy Gerlicher
0a5861d8b2 MSBuild 15.8.101-preview 2018-06-12 19:52:57 -07:00
dotnet-maestro-bot
e45766ca1e Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively 2018-06-13 02:47:33 +00:00
jbeisner
af6b9ab12e Correct the 'Channel' and 'BranchName' to "release/2.1.3xx" 2018-06-12 22:15:53 +00:00
Peter Huene
c0eff4fa56
Merge branch 'release/2.1.3xx' into release/2.1.3xx-MSRC
* release/2.1.3xx:
  Updating the CLI stage0 to 2.1.300 and fixing some build failures.
  Update Microsoft.NETCore.App Package Version
  Formatting...
  Drop the LZMA archive for every build.
2018-06-12 10:31:56 -07:00
Peter Huene
bc96902c61
Implement mode option for dotnet publish.
This commit implements a `mode` option that can control how an application is
published with the `dotnet publish` command.

There are three supported modes:

* self-contained: publishes a self-contained application (same as
--self-contained).
* fx-dependent: publishes a framework-dependent application (with an
application host when a runtime is specified).
* fx-dependent-no-exe: publishes a framework-dependent application without an
application host.

The default when publishing without a runtime specified is
`fx-dependent-no-exe`.

The default when publishing with a runtime specified is `self-contained`.

`fx-dependent` requires netcoreapp2.1 or later when a runtime is specified.

The `--self-contained` option is still supported, but is now hidden so that
users will be encouraged to move to the `--mode` option.

Fixes #6237.
2018-06-11 15:43:55 -07:00
Livar
9ab03e695e
Merge pull request #9446 from livarcocc/update_stage0
Updating the CLI stage0 to 2.1.300 and fixing some build failures.
2018-06-09 17:09:08 -07:00
dotnet-maestro-bot
9a313bcb64 Update coresetup, coresetup, coresetup to preview1-26609-02, preview1-26609-02, preview1-26609-02, respectively 2018-06-09 17:42:16 +00:00
dotnet-maestro-bot
22f885492b Update coresetup, coresetup, coresetup, roslyn to preview1-26609-01, preview1-26609-01, preview1-26609-01, beta6-62923-07, respectively 2018-06-09 05:44:50 +00:00
Livar Cunha
15e6928b02 Updating the CLI stage0 to 2.1.300 and fixing some build failures. 2018-06-08 16:03:24 -07:00
jbeisner
6e550e5c25 Update Microsoft.NETCore.App Package Version 2018-06-08 19:12:51 +00:00
Andy Gerlicher
767f569ac3 MSBuild 15.8.86 2018-06-07 10:22:03 -07:00
jbeisner
7f5ab825be Formatting... 2018-06-06 23:15:52 +00:00
jbeisner
7a0d2c8f0c Drop the LZMA archive for every build. 2018-06-06 23:08:38 +00:00
John Beisner
548ba179f4
Merge pull request #9393 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-06 11:52:14 -07:00
Peter Huene
90bcdff150
Merge branch 'release/2.1.3xx' into release/2.1.3xx-MSRC
* release/2.1.3xx:
  Disable NewProjectRestoresCorrectPackageVersion "console" test for now.
  Update the version for 'microsoft.netcore.app' to "2.1.1*"
  Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
  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).
  Remove -upgrade suffix from installer inputs
  Ensure default aspnetcore metapackage versions doesn't jump when/if we ever get to version `2.1.10`
  Add retry when Directory.Move (#9313)
  Fix mismatch of dotnet-watch with package variable name
  Set package versions for bundled aspnet tools separately from the metapackage version
  Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable
  Fixup myget feed for aspnetcore
  Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
  Set Default aspnetcore metapackage versions
2018-06-06 11:12:05 -07:00
Livar
62d968050a
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-06 09:19:05 -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
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
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
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 Cunha
625b9d4963 Updating signing project to use new intermediate directory (int). 2018-06-04 13:06:02 -07:00
Livar
447bd91100
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-04 11:38:31 -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
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
Livar Cunha
33c3a26880 Updating asp.net to 2.2.0 as well. 2018-06-01 13:31:03 -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
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
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
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 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
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
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
John Beisner
dae5099ffb
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362) 2018-05-29 13:46:07 -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
Daniel Plaisted
d17b088022 Insert updated SDK from 2.1.4xx branch 2018-05-24 16:29:10 -07:00
Rainer Sigwald
48eab9c572 MSBuild 15.8.60 2018-05-24 12:05:52 -05:00
John Beisner
468116f9f2
Merge pull request #9331 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-24 09:30:28 -07:00
Livar Cunha
6dfa6af7d6 Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true. 2018-05-22 10:45:11 -07:00
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
6bed6e1943 MSBuild 15.8.61 2018-05-21 15:29:37 -07:00
John Beisner
6f185432d4
Merge pull request #9317 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-21 09:24:20 -07:00
Livar
7adbeb3928
Merge pull request #9259 from dotnet/nuget.client.release-4.8.0.5196-1-1
Insert NuGet Build 4.8.0-preview1.5196 into cli
2018-05-19 08:59:59 -07:00
John Beisner
da34f7eaab
Merge pull request #9312 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 20:25:26 -07:00
Livar
c921ea92b8
Merge pull request #9309 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 15:17:50 -07:00
Livar
a45bba7eb9
Merge pull request #9308 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 15:17:08 -07:00
Livar
e338e46e10
Merge pull request #9306 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 13:41:23 -07:00
Livar
d57435bfcd
Merge pull request #9305 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 11:53:21 -07:00
Livar
8829b9690e
Maintain MSBuild version at 15.7.179 2018-05-17 11:51:36 -07:00
Livar
ded465c666
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-05-17 10:37:00 -07:00
Livar
f23377b19f
Merge pull request #9299 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 10:35:31 -07:00
Livar
484a1f6743
Merge pull request #9298 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-17 10:34:38 -07:00
Livar Cunha
491ec16307 Add the NoWarn option when producing Cli.Utils for full framework as well. 2018-05-16 15:33:19 -07:00
John Beisner
508f902ed0
Merge pull request #9296 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 14:52:29 -07:00
John Beisner
d7892663ea
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-16 14:50:13 -07:00
Livar Cunha
2531e3a136 Add NoWarn for the stable package depending on non-stable package when packaging Cli.Utils for tests. 2018-05-16 12:44:23 -07:00
Jared Parsons
4d3b649efc
Fix version number 2018-05-16 11:04:16 -07:00
John Beisner
b78d591c97
Merge pull request #9284 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-16 09:04:53 -07:00
John Beisner
baeb21728d
Merge pull request #9285 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 09:00:04 -07:00
dotnet-maestro-bot
be606951b1 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to rtm-62915-03, rtm-62915-03, rtm-26515-03, rtm-26515-03, rtm-26515-03, rtm-180515-0, 15.7.177, beta6-62915-07, rtm-62915-10, beta3-20180515-1688254, beta3-20180515-1688254, beta3-20180515-1688254, rtm-20180515-1688249, respectively 2018-05-15 23:49:42 +00:00
Jared Parsons
4e6171401c
Consume 15.7.2 compiler 2018-05-15 12:51:40 -07:00
John Beisner
08b20ef268
Merge pull request #9275 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-15 09:17:36 -07:00
Livar
f55724c348
Merge pull request #9276 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively (release/2.1.3xx)
2018-05-14 21:25:46 -07:00
Matt Mitchell
1aae04f316 Accept DropSuffix as a boolean 2018-05-14 13:43:09 -07:00
Livar
69062dda4e
Merge pull request #9266 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-14 09:47:53 -07:00
Livar
8096889442
Merge pull request #9262 from rainersigwald/msbuild-15.7.179-3xx
MSBuild 15.7.179
2018-05-14 09:47:06 -07:00
dotnet-maestro-bot
1fd2a6aa90 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively 2018-05-14 15:46:02 +00:00
Livar Cunha
fb41e73046 Updating the CLI branding to 201. 2018-05-11 12:33:12 -07:00
Rainer Sigwald
85aba00741 MSBuild 15.7.179 2018-05-11 13:30:58 -05:00
Rainer Sigwald
98fa02ade4 MSBuild 15.7.179 2018-05-11 13:15:30 -05:00
NuGet Team Bot
f6be1b1669 Insert NuGet Build 4.8.0-preview1.5196 into cli 2018-05-11 10:36:28 -07:00
Livar
11f2843f7b
Merge pull request #9252 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-11 10:16:04 -07:00
abhishkk
b18efcea85 15.8.0-preview-20180510-03 testplatform insertion 2018-05-11 16:11:54 +05:30
Livar
4919ee2484
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-05-09 15:42:26 -07:00
Parallels
6b1b89a006 Using ~ versions for dependencies of deb packages, so that we do the right thing when comparing release/pre-release package versions. 2018-05-09 14:24:47 -07:00
jbeisner
e1ec232c47 Merge remote-tracking branch 'origin/release/2.1.4xx' into merges/release/2.1.4xx-to-master 2018-05-09 21:12:09 +00:00
John Beisner
da7da0b018
Merge pull request #9227 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-09 14:06:02 -07:00
Parallels
e9d0b154a4 Fixing deb native installer tests by installing packages using the package name instead of the file name. 2018-05-09 12:33:25 -07:00
Livar Cunha
e7cf325682 Using Major.Minor.Patch versions for rpm packages dependencies. 2018-05-09 11:52:26 -07:00
Parallels
a3879f8eb9 Updating the deb package of the SDK to specify a version range for the runtime and asp.net dependencies. 2018-05-08 18:42:57 -07:00
Parallels
3bbab5edbf Updating tests to depend on -upgrade packages and also updating the versions of the runtime and asp.net to versions that have support for upgradable linux packages. 2018-05-08 18:11:54 -07:00
Parallels
4de0043f90 Updating the RPM dependency version of asp.net core to the full version, when it gets written to the metadata file. 2018-05-08 18:10:17 -07:00
Livar Cunha
e60d0a79e5 Making the CLI package name be only major.minor version and updating the version of the runtime packages that we depend on. 2018-05-08 18:10:17 -07:00
dotnet-maestro-bot
1a8ba89a7f Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, sdk, templating, templating, templating, websdk to rtm-62908-03, alpha-62908-03, rtm-26508-02, rtm-26508-02, rtm-26508-02, rtm-180508-0, rtm-62908-02, beta3-20180508-1667431, beta3-20180508-1667431, beta3-20180508-1667431, rtm-20180508-1667423, respectively 2018-05-09 00:31:48 +00:00
Livar
5325210939
Merge pull request #9193 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62905-02, alpha-62905-02, rtm-26505-04, rtm-26505-04, rtm-26505-04, rtm-180505-0, beta6-62904-04, rtm-62905-02, beta3-20180505-1661716, beta3-20180505-1661716, beta3-20180505-1661716, rtm-20180505-1661707, respectively (release/2.1.3xx)
2018-05-08 12:41:28 -07:00
John Beisner
7373d4d309
Fixing CI build breaks for new CI legs; CLI:release/2.1.3xx (#9202)
* Fedora 27, openSUSE 43.2, and Ubuntu 18.04 should not build native installer packages nor
"IncludeSharedFrameworksForBackwardsCompatibilityTests"

* Formatting...

* Skip test: 'ItRollsForwardToTheLatestVersion'
2018-05-08 10:05:21 -07:00
Tanner Gooding
f2f5c1b12b Merge remote-tracking branch 'dotnet/release/2.1.4xx' into merges/release/2.1.4xx-to-master 2018-05-07 10:55:14 -07:00
Tanner Gooding
6d6bf64f28 Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-07 08:20:23 -07:00
dotnet-maestro-bot
a2f3fb835d Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62905-02, alpha-62905-02, rtm-26505-04, rtm-26505-04, rtm-26505-04, rtm-180505-0, beta6-62904-04, rtm-62905-02, beta3-20180505-1661716, beta3-20180505-1661716, beta3-20180505-1661716, rtm-20180505-1661707, respectively 2018-05-05 20:42:19 +00:00
Tanner Gooding
481e4a19b3
Merge pull request #9013 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-04 11:00:39 -07:00
NuGet Team Bot
817870e977 Insert NuGet Build 4.8.0-preview1.5158 into cli 2018-05-04 10:58:07 -07:00
Tanner Gooding
a8856ddccc Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-03 15:24:39 -07:00
Livar
b48939b697
Merge pull request #9187 from dagood/always-externalrestoresources
Allow ExternalRestoreSources in offline build (remove source-build patch 0003)
2018-05-03 10:51:42 -07:00
Livar Cunha
8c2160b6a0 Removing some patches for source build. 2018-05-02 11:59:01 -07:00
Davis Goodin
0f44059740 Allow ExternalRestoreSources in offline build
Allow the caller to provide ExternalRestoreSources while DotnetBuildOffline = true. Any logic to block passing ExternalRestoreSources belongs in the caller.

Fixes source-build offline build: it passes in filesystem NuGet sources for prebuilt and source-built packages.
2018-05-02 13:43:27 -05:00
Livar
f87c6e7d11
Merge pull request #9178 from natemcmaster/namc/disable-aspnet
Add a property to disable bundling ASP.NET Core tools and runtimes
2018-05-01 15:56:32 -07:00
Livar
e3fb6280ee
Merge pull request #9125 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to alpha-62823-01, alpha-62823-01, rc1-26423-06, rc1-26423-06, rtm-180422-0, beta4-62827-02, rc1-62823-01, beta3-20180422-1618305, beta3-20180422-1618305, beta3-20180422-1618305, rc1-20180422-1618307, respectively (release/2.1.3xx)
2018-05-01 15:31:56 -07:00
Nate McMaster
ba68037ee6
Do not disable bundled aspnet templates
See https://github.com/dotnet/source-build/issues/456#issuecomment-385677818
2018-05-01 08:49:54 -07:00
Nate McMaster
b0c5fddc04
Add a property to disable bundling ASP.NET Core tools, templates, and runtimes 2018-04-30 17:49:09 -07:00
Livar
d17f4ec94e
Merge pull request #9123 from johnbeisner/FixNupkgSigning
Mark both CLI NuPkgs as "NonShipping=true"
2018-04-30 15:26:16 -07:00
Livar
78bd1cffb9
Merge pull request #9163 from dotnet/namc/aspnet-linux-arm
Include aspnetcore in the linux-arm build,
2018-04-30 14:47:07 -07:00
Livar
d65b6b0d06
Update version to rtm 2018-04-30 12:00:51 -07:00
Livar
b1b35e4226
Update SDK to latest from 2.1.300
Updating to 1.0.0-rc1-62827-06. There is a bug in the SDK where we are producing packages with the wrong version.
2018-04-27 16:33:52 -07:00
jbeisner
6fcea14b78 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-27 22:05:24 +00:00
Nate McMaster
16cc6141d6
Use AspNetCoreSharedFxArchiveRid instead of AspNetCoreSharedFxInstallerRid 2018-04-27 14:14:14 -07:00
Livar
70994ee6dd
Update SDK to 2.1.200-preview-62827-05 2018-04-27 14:06:19 -07:00
Nate McMaster
2b9f00f361
Include aspnetcore in the linux-arm build, but not linux-arm64 or windows arm 2018-04-27 10:33:58 -07:00
dotnet-maestro-bot
4009912a6e Update clicommandlineparser, climigrate, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to alpha-62823-01, alpha-62823-01, rc1-26423-06, rc1-26423-06, rtm-180422-0, beta4-62827-02, rc1-62823-01, beta3-20180422-1618305, beta3-20180422-1618305, beta3-20180422-1618305, rc1-20180422-1618307, respectively 2018-04-27 15:48:19 +00:00
jbeisner
55535c0f41 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-26 22:51:04 +00:00
Livar
fc577e6b05
Update SDK to 2.1.200-preview-62826-08 2018-04-26 14:12:42 -07:00
Livar
20574d2e7b
Merge pull request #9147 from AndyGerlicher/MSBuild-15.7.177-2xx
MSBuild 15.7.177 (2xx)
2018-04-26 13:21:31 -07:00
Livar
af62bffb45
Merge pull request #9133 from dotnet/nuget.client.release-5148-1-1
Insert NuGet Build 4.7.0-rtm.5148 into cli
2018-04-26 13:21:04 -07:00
Andy Gerlicher
a4cc9fa5e0 MSBuild 15.7.177 2018-04-25 20:39:14 -07:00
Matt Mitchell
535cac7f55 Explicitly note whether the package version props is being overridden
It's difficult to tell today whether the package version props is correctly passed and used in some scenarios.  Make it more explicit.
2018-04-25 17:11:09 -07:00
jbeisner
8ff0797b10 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-25 18:34:16 +00:00
Livar
a711c264f1
Update Roslyn to 2.8.0-beta4-62824-10 2018-04-24 16:00:33 -07:00
NuGet Team Bot
458ad92d49 Insert NuGet Build 4.7.0-rtm.5148 into cli 2018-04-24 14:50:13 -07:00
Livar
355b08befd
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-04-24 14:20:28 -07:00
jbeisner
247937665f Fix a release/2.1.3xx baseline error:
error NU1605: Detected package downgrade: Microsoft.NETCore.App from 2.1.0-rc1-26423-06 to 2.1.0-rc1-26420-08
2018-04-24 20:57:42 +00:00
John Beisner
754a68524a
Merge branch 'release/2.1.3xx' into FixLinuxMusl 2018-04-24 13:31:46 -07:00
jbeisner
bb15fa8c61 Formatting... 2018-04-24 20:22:35 +00:00
jbeisner
70e3f1d30d Updating the AspNetCore version to a drop that has a 'linux-musl' asset 2018-04-24 19:51:04 +00:00
jbeisner
96674333e3 Fixing typo... 2018-04-24 19:07:33 +00:00
jbeisner
74ee6b6070 Download 'linux-musl-x64' shared framework assets when building 'linux-musl-x64' 2018-04-24 18:48:18 +00:00
jbeisner
36d7cdf8c1 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-24 17:51:56 +00:00
jbeisner
6a26200b46 Merge remote-tracking branch 'upstream/release/2.1.3xx' into FixNupkgSigning 2018-04-24 16:06:28 +00:00
Nate McMaster
0b885eee23
Update to ASP.NET Core 2.0.8 build 10026 2018-04-23 20:02:08 -07:00
jbeisner
4dc5eb7320 Do not sign the CLI NuPkgs - they do not ship. 2018-04-23 22:03:55 +00:00
jbeisner
6d353a5963 Mark both NuPkgs as "NonShipping=true" 2018-04-23 21:56:00 +00:00
John Luo
441a470f54 Add bundled aspnetcore runtime framework versions
- Add integration test for implicit Microsoft.AspNetCore.App versions
2018-04-23 00:33:33 -07:00
Nate McMaster
68add55652
Update to ASP.NET Core 2.0.8 build 10024 2018-04-20 16:52:01 -07:00
Livar
53068bb65e
Merge pull request #9115 from dotnet/nuget.client.release-5122-1-1
Insert NuGet Build 4.7.0-rtm.5122 into cli
2018-04-20 16:27:19 -07:00
Livar
6d9a4f1c65
Update SDK to 2.1.200-preview-62820-08 2018-04-20 15:21:46 -07:00
Livar
dc088918f9
Merge pull request #9106 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-20 15:12:18 -07:00
Wes Haggard
1e30cf3b5f Add temporary feed to boot-strap linux-musl build 2018-04-20 14:11:06 -07:00
Wes Haggard
65d5730631 Replace alpine with linux-musl builds
We still build linux-musl on the alpine OS but we no longer
produce a alpine installer/tar file instead we just have the
linux-musl version.
2018-04-20 13:23:00 -07:00
NuGet Team Bot
205f58496f Insert NuGet Build 4.7.0-rtm.5122 into cli 2018-04-20 13:09:19 -07:00
Livar
2f3f672a15
Merge pull request #9100 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62819-01, alpha-62819-01, rc1-26419-02, rc1-26419-02, rc1-26419-02, rtm-180418-0, preview-000169, preview1.5116, dev-62819-05, preview3-62819-01, beta3-20180418-1607235, beta3-20180418-1607235, beta3-20180418-1607235, rc1-20180418-1607241, respectively (release/2.1.3xx)
2018-04-20 11:36:32 -07:00
Livar
c60ca4c76a
Merge pull request #9093 from dotnet/update_roslyn
Update Roslyn to 2.8.0-dev-62817-01
2018-04-19 13:32:49 -07:00
Livar
04c02b0200
Merge pull request #9019 from mlorbetske/dev/mlorbe/UpdateTestTemplatesFor20To157RTW
Update test templates to use the 15.7.0 test SDK
2018-04-19 12:56:21 -07:00
Livar
3070750a5b
Updating CLI branding to RC1 2018-04-19 12:46:56 -07:00
dotnet-maestro-bot
8317c6f0da Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62819-01, alpha-62819-01, rc1-26419-02, rc1-26419-02, rc1-26419-02, rtm-180418-0, preview-000169, preview1.5116, dev-62819-05, preview3-62819-01, beta3-20180418-1607235, beta3-20180418-1607235, beta3-20180418-1607235, rc1-20180418-1607241, respectively 2018-04-19 19:40:52 +00:00
Nate McMaster
f729fad293
Fix the aspnetcore dependency on .rpm and .deb installers 2018-04-18 22:49:21 -07:00
Nate McMaster
2d008aa4f7
Add tests that assert the dependencies of the dotnet-sdk rpm and deb files 2018-04-18 22:49:21 -07:00
Livar
3c344c2f83
Update Roslyn to 2.8.0-dev-62817-01 2018-04-18 12:03:42 -07:00
Steve MacLean
8c937a0db0 [Arm64] Add crosscomponent crossgen (#9011) 2018-04-17 16:54:01 -07:00
John Beisner
7d375481bc
Sign the 'nupkg' files; CLI:release/2.1.3xx (#9086)
* Sign the 'nupkg' files.
* Sign 'NuPkg' files with the 'NuGet' cert.
* Use "Microsoft402"
2018-04-17 16:53:03 -07:00
Livar Cunha
8c3967a36b Updating README and branchinfo to 2.1.4xx. 2018-04-17 16:49:06 -07:00
Livar
373f189ad2 Updating branding to 2.1.4xx 2018-04-17 16:38:01 -07:00
Daniel Plaisted
617551d065 Update latest patch versions of .NET Core runtime 2018-04-16 22:57:39 -07:00
Daniel Plaisted
665daa07fc Update latest patch versions of .NET Core runtime 2018-04-16 17:07:57 -07:00
Livar Cunha
1e2c8bed24 Update the branding of the SDK to 2.2.100-preview1. 2018-04-16 12:04:00 -07:00
Livar
83d150e87b
Update SDK to 2.1.200-preview-62816-05 2018-04-16 10:38:21 -07:00
NuGet Team Bot
6a3419cedd Insert NuGet Build 4.7.0-rtm.5104 into cli 2018-04-13 14:03:00 -07:00
NuGet Team Bot
0ed1ffb8dd Insert NuGet Build 4.7.0-rtm.5096 into cli 2018-04-13 10:44:27 -07:00
jbeisner
da0ac9ab85 Add back 'nuget-build' feed for: NuGet.Versioning 4.7.0-rtm.5081 2018-04-13 16:59:06 +00:00
jbeisner
93928eb4c5 Merge remote-tracking branch 'upstream/master' into NugetFeeds 2018-04-13 16:47:09 +00:00
Livar
fef4ae58af
Update SDK to 2.1.200-preview-62812-03 2018-04-11 22:23:35 -07:00
Daniel Plaisted
c01e4f07b8
Merge pull request #9053 from dsplaisted/update-nuget
Insert NuGet Build 4.7.0-rtm.5081 into cli
2018-04-11 16:48:20 -07:00
jbeisner
c12e47278e Merge remote-tracking branch 'upstream/master' into NugetFeeds 2018-04-11 22:31:51 +00:00
John Beisner
0ea6fdaeee
Merge pull request #9047 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-04-11 15:27:35 -07:00
jbeisner
7f2554ced5 Slight re-ordering... 2018-04-11 21:33:50 +00:00
jbeisner
3d7ff40017 Add back 'Roslyn' feed for: Microsoft.NETCore.Compilers 2.8.0-beta4-62811-05 2018-04-11 21:28:53 +00:00
jbeisner
ea90e58ce9 Trim back the 'unnecessary' nuget feeds. 2018-04-11 21:19:06 +00:00
NuGet Team Bot
a86d529687 Insert NuGet Build 4.7.0-rtm.5081 into cli 2018-04-11 13:58:39 -07:00
John Beisner
07a15f9420
Terminate the 'StartsWith' string in the badge existence check. (#9049)
* Terminate the 'StartsWith' string in the badge existence check.

* Replace "string.Concat"
2018-04-11 12:09:16 -07:00
Livar
7cd9176ac0
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-11 12:05:59 -07:00
Livar
f31e8d26d6
Merge pull request #9045 from AndyGerlicher/MSBUild-15.7.163
MSBuild 15.7.163
2018-04-11 12:03:53 -07:00
dotnet-maestro-bot
98e8857f1f Update coresetup, coresetup, coresetup, roslyn to preview3-26411-06, preview3-26411-06, preview3-26411-06, beta4-62811-05, respectively 2018-04-11 17:46:24 +00:00
John Beisner
11eace08b9
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-11 09:30:34 -07:00
John Beisner
a543dd3084
Merge pull request #9034 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-11 09:27:10 -07:00
Livar
1581af4503
Merge pull request #9040 from dotnet/nuget.client.release-5081-1-1
Insert NuGet Build 4.7.0-rtm.5081 into cli
2018-04-10 16:35:08 -07:00
Andy Gerlicher
51214d02b1 MSBuild 15.7.163 2018-04-10 15:59:50 -07:00
NuGet Team Bot
d43718d444 Insert NuGet Build 4.7.0-rtm.5081 into cli 2018-04-10 08:49:48 -07:00
jbeisner
23f2d2782c Fixing typos... 2018-04-09 22:20:05 +00:00
dotnet-maestro-bot
1135ea6869 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to alpha-62806-05, alpha-62806-04, preview2-26406-04, preview2-26406-04, preview2-26406-04, rtm-180406-0, preview-000145, beta4-62806-08, preview2-62806-04, beta3-20180406-1563557, beta3-20180406-1563557, beta3-20180406-1563557, preview2-20180406-1563552, respectively 2018-04-09 20:17:41 +00:00
Nate McMaster
1860d43323
Update to ASP.NET Core 2.0.7 build 231 2018-04-09 12:14:47 -07:00
Eric Erhardt
fbd5154ba4 Fix merge to only update core-setup and Roslyn versions. 2018-04-09 10:40:14 -05:00
Eric Erhardt
47bda58a23
Merge branch 'master' into master-UpdateDependencies 2018-04-09 10:30:10 -05:00
Mike Lorbetske
8370f24850 Update test templates to use the 15.7.0 test SDK 2018-04-08 11:57:30 -07:00
dotnet-maestro-bot
936cc73ef2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26406-06, preview3-26406-06, preview3-26406-06, beta4-62806-08, respectively 2018-04-06 17:53:37 +00:00
Kevin Ransom
8fa1c8230b Align dotnetcli with VS2017.4 compiler 2018-04-06 10:52:34 -07:00
Livar
7cb7535bae
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-06 09:05:57 -07:00
Eric Erhardt
a6cf823b9c
Merge pull request #9000 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively (master)
2018-04-06 09:18:59 -05:00
Nick Guerrera
4956bfea8c
Merge pull request #8996 from nguerrera/publish-no-build
Implement `dotnet publish --no-build`
2018-04-05 23:43:02 -07:00
Livar
d8eed7963e
Merge branch 'master' into master-UpdateDependencies 2018-04-05 15:32:36 -07:00
Livar
6179a01514
Merge pull request #9006 from dotnet/update_sdk
Updating SDK to 2.1.200-preview-62805-05
2018-04-05 15:30:46 -07:00
Livar
94a69a95b8
Merge pull request #8933 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-04-05 13:27:53 -07:00
Livar
c43ea1458e
Merge pull request #9005 from livarcocc/merge_1xx_into_2xx
Merge release/2.1.1xx into release/2.1.2xx
2018-04-05 13:26:10 -07:00
Livar
c3a1fecd99
Merge pull request #9001 from livarcocc/automatic_build_numbers_installers
Automatic build numbers flow into installers
2018-04-05 10:50:33 -07:00
dotnet-maestro-bot
921c3849e2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively 2018-04-05 17:40:43 +00:00
Livar
e545b4c7a6
Merge pull request #8991 from mayankbansal018/testPlatformRTM
Insert Testplatform 15.7 RTM
2018-04-05 09:43:51 -07:00
Livar
d0aca6fb7b
Updating SDK to 2.1.200-preview-62805-05 2018-04-05 09:43:20 -07:00
Livar Cunha
2e2a8d6179 Merge branch 'release/2.1.1xx' into merge_1xx_into_2xx
* release/2.1.1xx:
  Fixing another typo in that is breaking RHEL.
  Fix a typo in the rpm.targets when testing the rpm generated packages.
  Update to aspnet 2.0.7 build 230
  Producing an empty commit to trigger a rebuild of the CLI
  Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
  Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0.
  Reverse the order in which old runtime stores are listed
  Update to ASP.NET Core 2.0.7 build 228
  Moving the opensuse 43.2 docker file to the right folder.
  Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7.
  Updating the runtime to 2.0.7 and the CLI branding to 2.1.104.
  Update SDK to 2.1.100-preview-62730-07
  Add msbuild myget.org feed
  MSBuild 15.6.84

 Conflicts:
	build/Branding.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Version.props
	packaging/osx/clisdk/resources/cs.lproj/conclusion.html
	packaging/osx/clisdk/resources/de.lproj/conclusion.html
	packaging/osx/clisdk/resources/en.lproj/conclusion.html
	packaging/osx/clisdk/resources/es.lproj/conclusion.html
	packaging/osx/clisdk/resources/fr.lproj/conclusion.html
	packaging/osx/clisdk/resources/it.lproj/conclusion.html
	packaging/osx/clisdk/resources/ja.lproj/conclusion.html
	packaging/osx/clisdk/resources/ko.lproj/conclusion.html
	packaging/osx/clisdk/resources/pl.lproj/conclusion.html
	packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
	packaging/osx/clisdk/resources/ru.lproj/conclusion.html
	packaging/osx/clisdk/resources/tr.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
	packaging/windows/clisdk/bundle.wxl
2018-04-05 09:40:35 -07:00
Livar
4c948fefcc
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-05 09:09:45 -07:00
Livar Cunha
364ee996bf Fixing another typo in that is breaking RHEL. 2018-04-04 22:43:37 -07:00
Livar Cunha
d26719d8de Modifying branding.props to no longer have the version there manually updated. With this last change, updating the CLI version should require changes only in the Version.props file. 2018-04-04 21:21:10 -07:00
Livar Cunha
b09b6bff26 Generating the conclusion.html files dynamically so that we don't need to set the version in them everytime our branding changes. 2018-04-04 20:57:45 -07:00
Nick Guerrera
2d3b35f2f4
Merge pull request #8993 from nguerrera/fix-build-warning
Fix build warning about duplicate msbuild import
2018-04-04 15:37:47 -07:00
Nick Guerrera
b6174af511 Implement dotnet publish --no-build 2018-04-04 15:03:29 -07:00
dotnet-maestro-bot
69c380765c Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62803-03, alpha-62803-04, preview2-26403-06, preview2-26403-06, preview2-26403-06, rtm-180403-0, preview-000144, preview4.5065, beta4-62803-03, preview2-62803-07, beta3-20180403-1549505, beta3-20180403-1549505, beta3-20180403-1549505, preview2-20180403-1549509, respectively 2018-04-04 21:31:25 +00:00
Livar Cunha
9fb0f9a35b Fix a typo in the rpm.targets when testing the rpm generated packages. 2018-04-04 13:14:13 -07:00
Nick Guerrera
1fc07e5748 Fix build warning about duplicate msbuild import 2018-04-04 13:02:30 -07:00
dotnet-maestro-bot
ffc1d286a1 Update Roslyn to beta4-62804-05 2018-04-04 19:47:16 +00:00
Livar Cunha
f496a9bb18 Updating windows msi code to use variables for the SDK and Runtime brandings. 2018-04-04 10:37:38 -07:00
Livar
334ac4f4f3
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-04-04 10:18:12 -07:00
Livar
a7bfaacf99
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-04 10:16:22 -07:00
Livar
721c068376
Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx 2018-04-04 10:15:45 -07:00
Mayank Bansal
674f64c4c7 Insert Testplatform 15.7 RTM package in dotnet SDK 2018-04-04 14:08:12 +05:30
dotnet-maestro-bot
bcbfd02312 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26404-01, preview3-26404-01, preview3-26404-01, beta4-62802-07, respectively 2018-04-04 05:31:27 +00:00
Nate McMaster
21529f350d
Update to aspnet 2.0.7 build 230 2018-04-03 17:21:31 -07:00
Livar
3f05bb71ab
Updating SDK to 2.1.200-preview-62803-04
This contains a matching NuGet version to the one in the CLI.
2018-04-02 21:51:23 -07:00
William Li
e70f07178a
Apphost shim (#8893)
* Publish app host to folder under SDK

* Use carried apphost as shim

* Remove full framework launcher

* Fix test run command issue

* Use latest release/2.1 build

* Test with 32 bit env

* Add missing return

* Update to latest prodcon build

* Add xlfs
2018-04-02 12:37:25 -07:00
Livar
beea8c2e9b Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
CoreSetupBlobRootUrl determines from which blob storage the CLI consumes bits. That's the right URL to use for consuming asp.net bits as well.
2018-04-02 11:09:22 -07:00
NuGet Team Bot
15c631b022 Insert NuGet Build 4.7.0-preview3.5059 into cli 2018-04-02 10:36:26 -07:00
Livar
12acb315d9
Merge pull request #8951 from natemcmaster/aspnet-2.0.7
Update to ASP.NET Core 2.0.7 build 228
2018-04-02 10:32:24 -07:00
Livar Cunha
c9059f20be Updated SDK version to 2.1.300-preview2-62731-04. 2018-03-31 21:08:32 -07:00
dotnet-maestro-bot
ea773d6321 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to alpha-62730-03, alpha-62730-04, preview2-26330-03, preview2-26330-03, preview2-26330-03, rtm-180330-0, preview-000143, beta4-62730-07, preview2-62730-09, beta3-20180330-1538568, beta3-20180330-1538568, beta3-20180330-1538568, preview2-20180330-1538569, respectively 2018-03-31 18:45:57 +00:00
Nate McMaster
c20f79e8e3
Reverse the order in which old runtime stores are listed 2018-03-30 17:51:08 -07:00
Nate McMaster
c5f3e09520
Update to ASP.NET Core 2.0.7 build 228
- Remove unused myget feeds
- Refactor how we keep track of all previous versions of the runtime store
2018-03-30 15:36:48 -07:00
Daniel Plaisted
42e45e13a7 Update Microsoft.NET.Sdk package 2018-03-30 14:38:39 -07:00
Livar Cunha
caff97a3ee Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7. 2018-03-30 13:17:14 -07:00
Livar Cunha
5b8949e66b Updating the runtime to 2.0.7 and the CLI branding to 2.1.104. 2018-03-30 13:17:14 -07:00
Livar
48ec687460
Merge pull request #8953 from dotnet/update_sdk_1xx
Update SDK to 2.1.100-preview-62730-07
2018-03-30 13:03:16 -07:00
Daniel Plaisted
8b1b153651 Add latest patch versions to BundledVersions.props, and tests to make sure that they are up to date 2018-03-30 11:32:36 -07:00
Livar
fdcc478420
Merge pull request #8948 from AndyGerlicher/MSBuild15.6.84
MSBuild 15.6.84
2018-03-30 10:41:19 -07:00
Livar
27435ea589
Update SDK to 2.1.100-preview-62730-07
Contains a matching NuGet version to the one in the CLI.
2018-03-30 10:21:43 -07:00
Andy Gerlicher
d3a78f7d3f Add msbuild myget.org feed 2018-03-30 09:10:10 -07:00
Andy Gerlicher
b84a0eb8b2 MSBuild 15.6.84 2018-03-29 23:11:58 -07:00
Livar Cunha
9ba1de58de Revert the runtime to 2.0.6 because we need to service the SDK with a new NuGet. 2018-03-29 22:29:46 -07:00
Livar
820ea7c54f
Updating SDK to 2.1.200-preview-62730-02
This brings back an SDK with a matching version of NuGet.
2018-03-29 21:59:27 -07:00
Livar Cunha
1e42b63860 Updating the branding of the CLI to 2.1.104. 2018-03-29 21:33:27 -07:00
Livar
a0bb417c9f
Merge pull request #8926 from dotnet/nuget.client.release-5055-1-1
Insert NuGet Build 4.6.2-rtm-5055 into cli
2018-03-29 21:19:50 -07:00
Matt Mitchell
19267bd9f1 Remove unused Dia package
Extend CLI dependency updating
Extend CLI's dependency updating to include all repos.  At this time, only ASPNet won't work with this, as in prodcon it isn't specifying a branch in the manifest, which means no Latest_Packages.txt gets set.  Once this is fixed all upstream repos in CLI should be handled.
This will be combined with changes to the versions repo to update the subscriptions for 2.1.3xx CLI.
2018-03-29 15:58:33 -07:00
Livar Cunha
c4f42d3e6c Adding a step to shutdown the vbcscompiler after test execution. 2018-03-29 11:52:16 -07:00
NuGet Team Bot
c271df6f6a Insert NuGet Build 4.6.2-rtm-5055 into cli 2018-03-28 22:41:18 -07:00
NuGet Team Bot
32ac8d897b Insert NuGet Build 4.7.0-preview3.5052 into cli 2018-03-28 22:39:07 -07:00
Livar
6c3a714b5d
Merge pull request #8852 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-03-28 10:26:17 -07:00
Livar
f72e6926ca
Merge pull request #8897 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-28 10:11:24 -07:00