Nate McMaster
281caedada
Merged PR 130942: Update to ASP.NET Core 2.0.9 build 10031
...
Includes [this fix](1895502c48
), which should ensure NETStandard.Library 2.0.3 is present in the offline cache.
2018-07-03 04:21:23 +00:00
Nate McMaster
3b69038bc4
Update to ASP.NET Core 2.0.9 build 10031
2018-07-03 04:19:14 +00:00
Matt Mitchell
9048955601
Merged PR 130771: Updates asp.net versions to match prodcon
...
- If this PR should not run tests please add text "skip[REMOVE_THIS]ci[REMOVE_THIS]please" (remove the marked text, no quotes).
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
2018-07-02 16:18:23 +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
502ed82cc5
Merge pull request #9590 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-06-29 19:36:07 -04:00
Nick Guerrera
5fdaa4f92d
Fix xlf merge
2018-06-29 15:53:35 -07:00
Nick Guerrera
1326c79a5d
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx
2018-06-29 15:25:24 -07:00
Nick Guerrera
9c29a7d08f
Fix broken samples link in README ( #9595 )
...
Looks like a branch search and replace mistake.
2018-06-29 18:08:26 -04: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
John Beisner
fce129fa9f
Merge pull request #9592 from johnbeisner/FixProdConTestFailures
...
Fixing recent ProdCon test failures.
2018-06-29 21:43:06 +00: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
ce5493b7d6
Fixing recent ProCon test failures.
2018-06-29 20:10:19 +00:00
John Beisner
dbca58f8b7
Merge pull request #9588 from johnbeisner/UpdateMicrosoftDotNetArchiveVersion
...
Update the 'Microsoft.DotNet.Archive' version.
2018-06-29 18:43:07 +00:00
jbeisner
1bcb4f8865
Update the 'Microsoft.DotNet.Archive' version.
2018-06-29 17:11:07 +00:00
Livar
9c13bb4ea0
Merge pull request #15 from dotnet/fix_all_linux_distros
...
Replacing Compile with ComposeSdk in the build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets
2018-06-28 16:48:08 -07:00
Livar
1fc378dad3
Merge pull request #17 from dotnet/add_download_table
...
Adding a download table to core-sdk README.
2018-06-28 16:09:20 -07: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
46e0313f04
Add a work around to downloading an updated install script while it gets updated on the website.
2018-06-28 15:24:47 -07:00
Livar Cunha
2034aab2b9
Adding a download table to core-sdk README.
2018-06-28 15:19:51 -07:00
Livar Cunha
3408f785e8
Adding curl to a couple of linux distros that were missing it.
2018-06-27 22:40:58 -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
William Li
fcfcfcdaea
Merge pull request #9467 from nkolev92/restoreInteractiveFlag
...
Add a restore and add pkg commands interactive flag
2018-06-27 14:55:32 -07:00
Livar
dd0179a67c
Merge pull request #9568 from dotnet/update_sdk
...
Update SDK to 2.1.400-preview-63027-01
2018-06-26 18:36:25 -07:00
Livar
b29e49e26e
Merge pull request #9567 from livarcocc/update_branding
...
Updating branding to 401.
2018-06-26 17:51:07 -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
Peter Huene
92507184bd
Log a verbose message when DOTNET_CLI_HOME is being used.
...
This commit logs a diagnostic message when the `DOTNET_CLI_HOME` variable is
used. This enables users to determine where first-run-experience and global
tool files are being written to.
Fixes #9510 .
2018-06-26 16:34:00 -07:00
Livar
47776ad0c6
Merge pull request #14 from dotnet/merge_master_cli
...
Merge master of the cli into dev/repo-refactoring
2018-06-26 15:21:59 -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
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