Commit graph

2517 commits

Author SHA1 Message Date
jbeisner
1bd879bb18 Add back: "PUBLISH_NUPKG_TO_BLOB_FEED" to manage the no-suffix builds in 2.1 2018-08-13 23:15:29 +00:00
Livar
2c6fb386d4
Merge pull request #9814 from dotnet/updating_branding_4xx
Update CLI branding to 2.1.402
2018-08-13 11:22:23 -07:00
dotnet-maestro-bot
7d37fb3c14 Update coresetup, coresetup to preview1-26813-02, preview1-26813-02, respectively 2018-08-13 17:50:20 +00:00
Livar
ae24082470
Merge pull request #9820 from dotnet/livarcocc-patch-1
Adding the 2.1.3 runtime blob feed as a feed for the CLI
2018-08-11 18:12:33 -07:00
Livar
5f1d5dabd4
Adding the 2.1.3 runtime blob feed as a feed for the CLI
This unblocks the prodcon build for 2.1.4
2018-08-10 17:28:50 -07:00
Christopher Costa
1a0b8eb33a PR feedback, refactor classes into separate files, fix missing paren 2018-08-10 14:27:17 -07:00
Christopher Costa
74e619e704 Enable ability to write a fake package name with version to dotnet/versions 2018-08-10 13:33:53 -07:00
Livar
a19e2ed102
Update CLI branding to 2.1.402 2018-08-10 10:43:31 -07:00
Vagisha Nidhi
ea47700f75 TestPlatform 15.9.0-preview Insertion 2018-08-10 14:32:29 +05:30
Nick Guerrera
6242595613 Fix warnings-as-errors in Linux packaging 2018-08-06 17:55:06 -07:00
jbeisner
1262aac3b5 Update Toolset version to 3.0.100-alpha1-009349 2018-08-06 22:29:19 +00:00
Nick Guerrera
d63625c02b Fix build warning and treat msbuild warnings as errors 2018-08-05 15:29:14 -07:00
Mike Lorbetske
faeaa401c0
Update version of 2.2 templates package 2018-08-03 12:01:43 -07:00
Mike Lorbetske
f994743d36
Use the 2.2 common template package instead of 2.1 2018-08-03 10:45:31 -07:00
Nick Guerrera
b2ceb7e81f Update BranchInfo to release/2.1.5xx 2018-08-02 15:47:31 -07:00
Nick Guerrera
5752a708ec Updating branding to 2.1.500 2018-08-02 15:46:15 -07:00
Livar Cunha
817e321895 Keeping branch info as 2.1.4xx. 2018-08-02 09:02:57 -07:00
Daniel Plaisted
cc2a2998e3 Clean up dependency versions that aren't needed after repo refactoring 2018-07-31 18:31:02 -07:00
Peter Huene
7db00ca232
Merge branch 'release/2.1.4xx' into release/2.2.1xx
* release/2.1.4xx:
  Fix dotnet sln add for multitargeted C# and VB projects.
2018-07-31 13:53:34 -07:00
Nick Guerrera
60fd63aa41
Merge pull request #9771 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-31 11:08:57 -07:00
Nick Guerrera
d6d0130942 Fix test issues 2018-07-30 17:49:02 -07:00
Nick Guerrera
d6a733c76b Add CLI side of "latest patch for 2.1" in roll-forward logic
Also adjust comment with real reason for skipping test, pointing
to dotnet/sdk bug.
2018-07-30 17:46:02 -07:00
Nick Guerrera
2c46d9d042 Update toolset and align stage0 version 2018-07-30 17:09:14 -07:00
Nick Guerrera
bbb8d01ef8 Set branch and channel name to master 2018-07-30 17:09:14 -07:00
Nick Guerrera
46f0cbfd76 Fix merge error 2018-07-30 17:09:14 -07:00
Peter Huene
96c9dc375a
Fix dotnet sln add for multitargeted C# and VB projects.
This commit integrates a fix from the SDK repo that sets
`DefaultProjectTypeGuid` for VB and C# projects when the projects are
multitargeting.  This property is used by `dotnet sln add` to determine the
project type guid to map in the solution file.

Adding additional tests that cover the multitargeting scenario for `dotnet sln
add`.

Fixes #9477.
2018-07-30 13:05:31 -07:00
Nick Guerrera
3e9d29bdf7
Merge pull request #9731 from dotnet-maestro-bot/release/2.1.401-UpdateDependencies
Update coresetup, sdk to preview1-26216-03, servicing-63124-04, respectively (release/2.1.401)
2018-07-30 12:48:22 -07:00
John Beisner
24b487abfa
Merge pull request #9763 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-30 12:32:37 -07:00
John Beisner
4f6ad7b282
Merge pull request #9764 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-30 12:32:33 -07:00
jbeisner
8780bab54e NuGetSdkResolverPackageVersion should be MicrosoftBuildNuGetSdkResolverPackageVersion 2018-07-30 14:52:06 +00:00
Nick Guerrera
a4a12840f4
Merge branch 'release/2.1.401' into release/2.1.401-UpdateDependencies 2018-07-29 18:38:00 -07:00
Nick Guerrera
4c944018e7
Merge branch 'release/2.1.4xx' into updateCompilersTo.10.2.3 2018-07-28 09:00:34 -07:00
Kevin Ransom
a666fa777b UPDate FSharp Compiler to 10.2.3 2018-07-27 16:52:56 -07:00
Nick Guerrera
29d3640768 Merge remote-tracking branch 'cli/release/2.2.1xx' into merge-cli/release/2.2.1xx-to-core-sdk/master 2018-07-27 14:47:38 -07:00
dotnet-maestro-bot
a9b8ade6aa Update roslyn to beta8-63127-03 2018-07-27 21:05:46 +00:00
Nick Guerrera
eaa5700266
Merge branch 'release/2.1.401' into merges/release/2.1.4xx-to-release/2.1.401 2018-07-27 12:55:02 -07:00
Nick Guerrera
f42505d8cd
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-27 12:54:08 -07:00
Nick Guerrera
175c421c14
Update dotnet/sdk with latest nuget inserted 2018-07-26 15:43:26 -07:00
jbeisner
ba08432b35 Temporarily disable tests: 'GivenNewCommandItDisplaysCompletions', 'TestSdkRpm', and 'TestSdkDeb' 2018-07-26 21:48:10 +00:00
NuGet Team Bot
53eb71801b Insert NuGet Build 4.8.0-rtm.5362 into cli 2018-07-26 10:59:33 -07:00
dotnet-maestro-bot
3adf70de81 Update coresetup, sdk to preview1-26216-03, servicing-63124-04, respectively 2018-07-25 03:22:18 +00:00
dotnet-maestro-bot
e63a8b5a52 Update coresetup, sdk to preview1-26216-03, servicing-63122-02, respectively 2018-07-23 23:25:16 +00:00
Nick Guerrera
63747aaba1
Merge pull request #9720 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-22 18:27:13 -07:00
Nick Guerrera
b9987d2442
Merge pull request #9719 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-22 18:26:42 -07:00
Nick Guerrera
fb7a22a989
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-22 08:02:02 -07:00
Nick Guerrera
d4d996d771
Merge pull request #9714 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-22 08:01:09 -07:00
Andy Gerlicher
b47915414b MSBuild 15.8.166 2018-07-21 22:10:36 -07:00
Brett V. Forsgren
cc7e978bd6 update F# to 10.2.2-rtm-180720-0 2018-07-20 13:52:35 -07:00
Nick Guerrera
e424b949e0
Merge pull request #9703 from dotnet-maestro-bot/release/2.1.4xx-UpdateDependencies
Update roslyn to beta8-63119-10 (release/2.1.4xx)
2018-07-20 12:54:02 -07:00
Nick Guerrera
4a5ca22662
Merge pull request #9707 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-20 11:33:28 -07:00
Nick Guerrera
c6931b75f7
Insert roslyn 2.9.0-beta8-63119-10 2018-07-20 10:21:38 -07:00
Nick Guerrera
13d264a275
Merge pull request #9708 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-20 09:58:35 -07:00
Peter Huene
656147725f
Update the .NET SDK version.
Bump the .NET SDK version following the NuGet insertion.
2018-07-19 18:34:25 -07:00
Nick Guerrera
b305c20871
Merge pull request #9694 from dotnet/nuget.client.release-4.8.0.5348-2-1
Insert NuGet Build 4.8.0-rtm.5348 into cli
2018-07-19 16:03:21 -07:00
dotnet-maestro-bot
3e86b9fb76 Update roslyn to beta8-63119-12 2018-07-19 20:54:13 +00:00
Nick Guerrera
0304b4ec0d
Merge pull request #9697 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-19 10:21:56 -07:00
Nick Guerrera
9d07296cd3
Merge pull request #9704 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-19 10:21:12 -07:00
Nick Guerrera
c45905a1c9
Merge pull request #9695 from johnbeisner/FixRPMInstallErrors
Fix RPM install errors; CLI:release/2.2.1xx
2018-07-18 21:56:36 -07:00
Nick Guerrera
d71eb98fde
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-18 21:52:01 -07:00
William Li
96636458e5
Passing _NETCoreAppPackageVersion as BundledNETCoreAppPackageVersion(#9702) 2018-07-18 21:18:27 -07:00
Kevin Ransom (msft)
7df8a5654f Update FSharp Compiler (#9689) 2018-07-18 17:28:02 -07:00
jbeisner
2fc95c3efa Use "SharedFxRpmPackageFileVersion" for the SharedFxRpmPackageName 2018-07-18 22:52:57 +00:00
NuGet Team Bot
fec9b448b6 Insert NuGet Build 4.8.0-rtm.5348 into cli 2018-07-18 15:07:01 -07:00
jbeisner
99f83a8053 Use the full version as the RPM package names for the runtime and ASP.NET runtime. 2018-07-18 22:02:00 +00:00
Nick Guerrera
2f40e6dc83
Merge pull request #9685 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-18 14:06:45 -07:00
Nick Guerrera
5180269487 Insert latest 15.8 Roslyn build that is also in VS (2.9.0-beta8-63115-02) 2018-07-18 13:12:58 -07:00
Nick Guerrera
3a19d2212e
Merge pull request #9673 from mlorbetske/dev/mlorbe/InsertTestPlatformFor158
Perform test platform insertion for 15.8
2018-07-18 10:03:50 -07:00
Nick Guerrera
a9e44a399a Update dotnet/sdk 2018-07-17 20:16:17 -07:00
Nick Guerrera
ceffacfef8 Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-17 18:17:04 -07:00
Nick Guerrera
ce2c412a18
Update dotnet/sdk 2018-07-17 18:07:31 -07:00
Nick Guerrera
cdffcec1f1
Merge pull request #9681 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-17 18:01:04 -07:00
John Beisner
ae08a294c9
Merge pull request #31 from johnbeisner/FixSDKVersions
Updating the SDK version directory: Core-SDK
2018-07-17 13:28:03 -07:00
Nick Guerrera
bae3a775c3
Remove LKG download left over from cross-repo merges (#25)
core-sdk does not need to download an LKG to run tests as it is the
top repo that builds the entire SDK. This file was left over from
cli and causing problems for source build.
2018-07-17 10:47:32 -07:00
Satya Madala
a88a82734f Add tests for Code coverage with dotnet test (#9355)
Add tests for dotnet test --collect "Code Coverage" scenario.

Fixes Microsoft/vstest#981.
2018-07-17 09:54:10 -07:00
jbeisner
d88a7ce337 The SDK-version directory under the SDK directory should match the advertised SDK version. 2018-07-17 16:40:52 +00:00
Peter Huene
96140a756d
Merge 'release/2.1.4xx' into release/2.1.401
* release/2.1.4xx: (23 commits)
  Revert version change for ASP.NET bundled templates.
  Update dependency versions to 2.1.2.
  Update to ASP.NET Core 2.0.9 build 10031
  Updates asp.net versions to match prodcon
  Update to aspnet 2.0.9-rtm-10030
  Bump runtime versions to 2.0.9 stable
  Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
  Updated the expected implicit NETStandard.Library to 2.0.3
  Update to aspnet 2.0.9-rtm-10029
  Update the runtime branding to 2.0.9.
  Update runtime versions in 2.0.0
  Update CLI branding to 2.1.202.
  Update expected versions to 2.1.2
  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*"
  Merged PR 126122: Fix alpine file ownership issues with newer docker
  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
  ...
2018-07-17 00:30:18 -07:00
Peter Huene
df6f316da5
Merge branch 'release/2.1.3xx' into release/2.1.4xx
* release/2.1.3xx:
  Revert version change for ASP.NET bundled templates.
  Update to ASP.NET Core 2.0.9 build 10031
  Update to aspnet 2.0.9-rtm-10030
  Bump runtime versions to 2.0.9 stable
  Updated the expected implicit NETStandard.Library to 2.0.3
  Update to aspnet 2.0.9-rtm-10029
  Update the runtime branding to 2.0.9.
  Update runtime versions in 2.0.0
  Update CLI branding to 2.1.202.
2018-07-16 17:04:27 -07:00
jbeisner
67abf5c634 'Warn and Continue' on the DEB removal errors. 2018-07-16 23:35:41 +00:00
Mike Lorbetske
5fd34dd629 Perform test platform insertion for 15.8 2018-07-16 16:16:40 -07:00
jbeisner
d8735024f9 Use the full version as the DEB package names for the runtime and ASP.NET runtime. 2018-07-16 22:52:41 +00:00
jbeisner
782c4401d4 Back to "sudo dpkg -r" with ContinueOnError="WarnAndContinue" 2018-07-16 20:51:02 +00:00
jbeisner
f378070c25 Replace the "sudo dpkg -r” command with a more encompassing: “sudo apt-get purge -y”. 2018-07-16 19:52:12 +00:00
John Beisner
85d732a5a1
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-07-16 08:17:58 -07:00
John Beisner
d46cddd64d
Merge pull request #9666 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-16 08:15:39 -07:00
dotnet-maestro-bot
ed629af9a6 Update coresetup, sdk to preview1-26216-03, servicing-63108-01, respectively (#9635) 2018-07-13 18:48:13 -07:00
Nick Guerrera
7a1d28d5ec
Merge pull request #9662 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-13 18:46:17 -07:00
Daniel Plaisted
999e1d1382 Insert updated .NET Core SDK
Completes the round-trip of the 4.8.0-preview5.5328 NuGet insertion
2018-07-13 18:11:34 -07:00
Nick Guerrera
6a9870a1bd
Merge pull request #9625 from AndyGerlicher/MSBuild-15.8.155
MSBuild 15.8.160-preview
2018-07-13 15:01:20 -07:00
Nick Guerrera
bce49a0686
Merge pull request #9645 from abhishkk/testplatfrominsertion15.8rtm1
Test platform insertion 15.8 RTM
2018-07-13 15:00:21 -07:00
Daniel Plaisted
46524ae70a
Merge pull request #9630 from dotnet/nuget.client.release-4.8.0.5328-1-1
Insert NuGet Build 4.8.0-preview5.5328 into cli
2018-07-13 13:33:42 -07:00
John Beisner
56d34499f4
Update ASP.NET version; Core-SDK (#30)
* Add an 'AllLinux' build and package CI leg.
* Update ASP.NET version.
* Remove the 'patch' number for the parameter: "sudo dpkg --ignore-depends=dotnet-runtime-X.X"
* Update variable name.
* Update coresetup, coresetup, coresetup, roslyn versions.
* Use "CONFIGURATION" not "BuildConfiguration"; "CONFIGURATION" has a "debug" default.
* 'AllLinux' CI legs and build only; no tests.
2018-07-12 16:20:39 -07:00
Peter Huene
789423b469
Merge branch 'release/2.1.4xx' into release/2.1.401
* release/2.1.4xx:
  Add XSLT Transform for apphost (#9609)
  Update date test according to MicrosoftNETSdkPackageVersion update
  Update MicrosoftNETCoreAppPackageVersion
  Update SDK to 2.1.400-preview-63110-09
  Revert implementation of the --mode option for the publish command.
  Updating the WebSdk from aspnet/websdk/2.1.4xx
  Removing 'Locked-file' test; CLI:release/2.1.3xx (#9604)
  Log a verbose message when DOTNET_CLI_HOME is being used.
2018-07-12 10:32:16 -07:00
Daniel Plaisted
7f841e0bc6 Update version numbers to 3.0, fix branch info 2018-07-11 18:28:19 -07:00
Daniel Plaisted
53c37522fc
Merge branch 'master' into Updates 2018-07-11 17:53:57 -07:00
Daniel Plaisted
cf4a81a583 Temporarily disable creating Debian packages
https://github.com/dotnet/core-sdk/issues/27
2018-07-11 17:27:46 -07:00
Daniel Plaisted
73ec338775 Remove -upgrade suffix from deb and rpm installer filenames 2018-07-11 14:37:39 -07:00
jbeisner
f2039c9139 Update 'CLI' and 'Toolset' versions; update 'Toolset' blob location; update build tools package references. 2018-07-11 18:46:24 +00:00
Peter Huene
bf3e772075
Revert version change for ASP.NET bundled templates.
The bundled ASP.NET templates should match the ASP.NET version.

Confusion over versions and missing packages caused a previous commit
to keep the bundled template versions the same while reving the ASP.NET version
from the private branch.

This commit reverts those changes.
2018-07-11 11:17:02 -07:00
Abhishek Kumawat
887f04cfe8
Added myget feed 2018-07-11 19:29:20 +05:30
abhishkk
8f624131f4 test platform insertion 15.8 rtm 2018-07-11 17:08:03 +05:30
Daniel Plaisted
b44a2bb723 Insert ASP.NET Core 3.0 2018-07-11 02:13:06 -07:00
Peter Huene
0134d4b661
Update dependency versions to 2.1.2.
This also refactors the ASP.NET SDKs to have independent versions from the
ASP.NET version.
2018-07-10 16:42:01 -07:00
William Li
0ef0b3296b
Add XSLT Transform for apphost (#9609)
To avoid sign check whitelist apphost.exe name changes very build. Sign check uses File Id in MSI as whitelist name. Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file path, and file path has version number). Use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
2018-07-10 16:24:50 -07:00
William Li
461fd82844 Update MicrosoftNETCoreAppPackageVersion 2018-07-10 14:13:29 -07:00
Andy Gerlicher
50365dec4f MSBuild 15.8.160-preview 2018-07-10 13:37:59 -07:00
William Li
eadd6ead8c Update SDK to 2.1.400-preview-63110-09 2018-07-10 12:53:09 -07:00
Peter Huene
6c411e824b
Merge branch 'release/2.1.3xx-MSRC' into release/2.1.3xx
* release/2.1.3xx-MSRC:
  Updates asp.net versions to match prodcon
  Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
  Update expected versions to 2.1.2
  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*"
  Merged PR 126122: Fix alpine file ownership issues with newer docker
  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
  Updated Version.props
2018-07-10 10:43:47 -07:00
NuGet Team Bot
db54427525 Insert NuGet Build 4.8.0-preview5.5328 into cli 2018-07-10 09:36:38 -07:00
Peter Huene
74c4e279e9
Merge pull request #9608 from peterhuene/fx-dep-apphost
Revert implementation of the --mode option for the publish command.
2018-07-09 16:29:37 -07:00
Daniel Plaisted
905d4d442d Address code review feedback 2018-07-09 14:12:11 -07:00
Daniel Plaisted
c431d58b72 Set maximum .NET Core version to 3.0 in BundledVersions.props 2018-07-09 13:46:04 -07:00
Daniel Plaisted
ec9914424c Refactor tests to use CliTargetFramework variable instead of hard-coding target framework 2018-07-09 13:46:04 -07:00
Daniel Plaisted
c6925a5388 Add dotnet-buildtools feed for Microsoft.DotNet.VersionTools 2018-07-09 13:46:03 -07:00
Daniel Plaisted
3e2a16d5db Insert .NET Core 3.0 runtime builds 2018-07-09 13:46:03 -07:00
Peter Huene
d9e8947ff4
Revert implementation of the --mode option for the publish command.
This commit reverts the implementation of the `--mode` option for the `dotnet
publish` command.  A bug in the apphost prevents this feature from working
properly in some cases and there currently is not a mechanism to service it
with this feature.

The team has decided to move this feature to 2.2.1xx for the .NET Core SDK.

Fixes dotnet/sdk#2380.
2018-07-09 12:46:13 -07:00
vramak
85e29304a6 Updating the WebSdk from aspnet/websdk/2.1.4xx 2018-07-05 18:22:54 -07:00
jbeisner
692987b919 Disabling publishing for all 'MSBuildExtensions' artifacts. 2018-07-03 22:58:40 +00:00
jbeisner
9ead28cb25 "Microsoft.DotNet.MSBuildSdkResolver" and "Microsoft.DotNet.Cli.Utils" are delivered/published via 'CLI' not 'Core-SDK'; use 'dotnet-install.sh' from 'dot.net' 2018-07-03 18:43:33 +00:00
jbeisner
c42e66d6ed The target "ComposeSdk" needs "Prepare" to have been run - make it dependent so we can run the single "ComposeSdk" target. 2018-07-03 15:38:10 +00:00
Livar
dd83b0c2b3 Updates asp.net versions to match prodcon
Fixes https://github.com/dotnet/cli/issues/9550
2018-07-02 09:16:55 -07:00
Nick Guerrera
a75f825aec
Merge pull request #9598 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-06-29 20:19:24 -04: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
Nick Guerrera
b2c39bc524
Merge pull request #9574 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-06-29 17:45:00 -04:00
Nick Guerrera
21014a5060
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-29 17:41:11 -04:00
jbeisner
1bcb4f8865 Update the 'Microsoft.DotNet.Archive' version. 2018-06-29 17:11:07 +00:00
Livar Cunha
dea40e45b2 Adding knowledge of linux-musl rid to core-sdk. It was lost in the merge from the CLI. 2018-06-28 15:54:22 -07:00
Livar Cunha
4d93f3a7a8 Replacing Compile with ComposeSdk in the build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets. Compile no longer exists and ComposeSdk is the new target that puts the Sdk together. 2018-06-27 16:05:37 -07:00
Livar
57597e8511
Update SDK to 2.1.400-preview-63027-01 2018-06-26 17:50:41 -07:00
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