Commit graph

8383 commits

Author SHA1 Message Date
Peter Huene
28d929a6d5
Merge pull request #8285 from peterhuene/sln-add-map-project-configurations
Map solution configurations to existing project configurations on add.
2018-01-08 14:18:42 -08:00
dotnet-bot
73b55ecd42 Update CoreSetup to preview1-26108-03 2018-01-08 22:18:39 +00:00
Livar
863787be75
Merge pull request #8335 from mlorbetske/dev/mlorbe/UpdateTemplatePackageVersionsFor21
Update template package versions for 2.1 class, console, test and item templates
2018-01-08 14:12:29 -08:00
Eric Erhardt
0959a99656
Merge pull request #8339 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26105-02 (master)
2018-01-08 13:09:42 -06:00
jbeisner
c873c55945 Produce one debian distro agnostic installer package. 2018-01-08 17:45:37 +00:00
Nate McMaster
95064f46db Update runtest.targets to skip file checks from azure if the filename variables are undefined 2018-01-06 13:02:41 -08:00
Nate McMaster
81296ff684 Skip downloading aspnetcore sharedfx installer if it is undefined 2018-01-06 12:30:47 -08:00
Nate McMaster
c46f603dbb Update to aspnetcore 2.1.0-preview1-28006 2018-01-06 12:08:05 -08:00
Nate McMaster
6e1fae8ee8 Update OSX and MSI branding to include the "ASP.NET Core Runtime" 2018-01-05 19:31:24 -08:00
Nate McMaster
8de1dea7c9 Remove unnecessary aspnetcore myget feeds 2018-01-05 19:31:24 -08:00
Nate McMaster
fb2df937fe Replace aspnetcore-store with the aspnetcore-runtime
Update downloaded installers and wixlib to pull the ASP.NET Core Runtime (aka shared framework)
2018-01-05 19:31:24 -08:00
Nate McMaster
e914370606 Update templates package version 2018-01-05 19:29:55 -08:00
Nate McMaster
b6b53f1e55 Update dev-certs version 2018-01-05 19:29:55 -08:00
Peter Huene
f7009106d8
Map solution configurations to existing project configurations on add.
This commit implements solution configuration to project configuration mapping.

Previously, when a project was added to the solution with the `sln add`
command, solution configurations would be mapped to a project configuration and
platform of the same name, regardless of whether or not the project had a
configuration or platform of that name.  This caused the solution to appear
dirty when opened in Visual Studio if the configuration or platform did not
exist at the project level because Visual Studio would attempt to correct the
mapping.

The fix is to check what configurations and platforms are supported by the
project and only map to what is present.  If a solution configuration can't be
mapped, the first configuration/platform supported by the project is chosen;
this is consistent with how Visual Studio does the fallback mapping.

Fixes #6221.
2018-01-05 18:40:26 -08:00
Livar
5770dbc1b1
Merge branch 'master' into master-UpdateDependencies 2018-01-05 18:19:01 -08:00
Livar
d6c6e9af8a
Merge branch 'master' into master-UpdateDependencies 2018-01-05 18:17:49 -08:00
Livar
ac06ffcf2d
Merge pull request #8336 from johnbeisner/RuntimeBreakingChange
Reacting to core-setup changes for 'DEB' distro agnostic installers
2018-01-05 18:17:05 -08:00
jbeisner
8d95d05f1a Uninstall the 'dotnet-host' before 'dotnet-runtime-deps' 2018-01-06 00:49:43 +00:00
Nate McMaster
db361c6c55 fixup! Update dotnet-install scripts to support installing the ASP.NET Core runtime 2018-01-05 16:38:57 -08:00
jbeisner
eb2565719b Fixing the install and uninstall of the 'RuntimeDepsPackage' 2018-01-06 00:14:57 +00:00
Livar Cunha
e329e0694f Fixing redist to use the new way to consume roslyn. I merged it wrong before. 2018-01-05 15:56:15 -08:00
jbeisner
002ddd6374 Fixing a typo... 2018-01-05 23:23:15 +00:00
jbeisner
ed8d9c6390 Download the 'dotnet-runtime-deps' installer file to address the 'BuildSDKDeb' errors. 2018-01-05 23:11:47 +00:00
dotnet-bot
a5c35aeadb Update CoreSetup to preview1-26105-02 2018-01-05 22:45:37 +00:00
jbeisner
68c2b1d060 Update 'DEB' filenames for downloads of the 'host' and 'hostfxr'. 2018-01-05 21:35:48 +00:00
Livar
ee4e7049eb
Merge pull request #8284 from v-zbsail/loc_20171213
LOC CHECKIN | dotnet/cli – master | 20171222
2018-01-05 12:54:49 -08:00
Livar Cunha
80933404d0 Fix tool_roslyn_satellite by making it use the new dependency version properties. 2018-01-05 12:53:03 -08:00
jbeisner
c6ccdb29fd Reacting to core-setup changes for 'DEB' distro agnostic installers; example: 'dotnet-runtime-2.1.0-preview1-26104-06-x64.deb'
Plus: Update CoreSetup to preview1-26105-01
2018-01-05 20:51:50 +00:00
Mike Lorbetske
b70fcc4ec6 Update template package versions for 2.1 class, console, test and item templates 2018-01-05 12:36:19 -08:00
Nate McMaster
296e0ae57f Update dotnet-install scripts to support installing the ASP.NET Core runtime 2018-01-05 09:24:10 -08:00
Livar
a99154ed46
Merge pull request #8324 from steveharter/AddListRuntimesSdksToHelp
Add help for list-sdks and list-runtimes
2018-01-04 11:00:50 -08:00
Zbyněk Sailer
7ff9ac9a36 LOC CHECKIN | dotnet/cli – master | 20170104 | update 2018-01-04 15:03:49 +01:00
Livar
7fec5c4a6a
Merge pull request #8323 from dotnet/nuget-insertbuild4782
Insert NuGet Build 4.6.0-rtm-4782 into cli
2018-01-03 16:18:05 -08:00
Livar Cunha
3d92e52234 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/2.1-20180103-080038
* dotnet/release/2.0.0: (32 commits)
  Update wix version (#8313)
  Use explict and non-preview versions for the build DLL
  Fixing a typo...
  The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1
  Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container.
  No passwords should be in the open as environmental variables.
  ...

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_roslyn/tool_roslyn.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
2018-01-03 16:16:41 -08:00
Livar
4acb93c392
Merge pull request #8320 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26103-03 (master)
2018-01-03 16:05:39 -08:00
Steve Harter
01b8e02100 Add help for list-sdks and list-runtimes 2018-01-03 17:34:08 -06:00
NuGet Team Bot
b5b105b47e Insert NuGet Build 4.6.0-rtm-4782 into cli 2018-01-03 15:20:05 -08:00
dotnet-bot
1661e8bace Update CoreSetup to preview1-26103-03 2018-01-03 22:19:42 +00:00
Peter Huene
b456668193
Fix test environment script to enable sourcing from other shells.
The `cli-test-env.sh` script has a `==` comparison operator, which is a
non-POSIX extension.

This commit replaces it with the `=` POSIX operator, enabling it to be sourced
from a wider variety of shells (namely zsh for this commit's author).
2018-01-03 13:24:11 -08:00
John Beisner
b9457c0f16
Merge pull request #8315 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26102-03 (master)
2018-01-02 16:53:09 -08:00
John Beisner
ecdaa669eb
Merge pull request #8314 from kasper3/patch-1
Check if tput command exists before using it
2018-01-02 14:20:40 -08:00
dotnet-bot
6d4078429c Update CoreSetup to preview1-26102-03 2018-01-02 22:15:32 +00:00
kasper3
a30c6a45fb
Remove ncurses dependency 2018-01-02 23:13:54 +02:00
kasper3
b1c14cb5ee
Check if tput command exists before using it
Fix #8311

@eerhardt
2018-01-02 23:04:56 +02:00
William Lee
860de6339c
Update wix version (#8313) 2018-01-02 12:37:00 -08:00
Livar
5be3d62b82
Merge pull request #8292 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26102-01 (master)
2018-01-02 11:17:54 -08:00
dotnet-bot
c9e884e355 Update CoreSetup to preview1-26102-01 2018-01-02 18:10:45 +00:00
John Beisner
00bf9f9f6d
Merge pull request #8289 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26023-01 (master)
2017-12-23 11:15:45 -08:00
dotnet-bot
93073360c7 Update CoreSetup to preview1-26023-01 2017-12-23 18:33:34 +00:00
Nick Guerrera
4f47ca1e75 Update xlf 2017-12-22 16:55:48 -08:00