* upstream/release/2.1.3xx:
Try shorter test names
Fix project type GUIDs when adding projects to solution files.
Updating the runtime to 2.1.0-preview2-26314-02
Remove runtime identifiers from the test project
Update launch settings for ApplicationUrl handling
Change command order for tools (#8862)
Update translations following merge with conflicts.
LOC CHECKIN | cli master | 20180315
Implement the --tool-path option for the list tool command.
Ensure tool package store root is a full path.
Better using facing string (#8809)
Fix list tool command tests to be localizable.
Fix#4139 - escape quoted strings for process start
Generate Microsoft.NETCoreSdk.BundledCliTools.props
* upstream/release/2.1.2xx: (31 commits)
Update SDK to 2.1.100-preview-62721-01
Updating the branding of the CLI to 2.1.103.
Updating NuGet to 4.6.1-rtm-5019
Update SDK to 2.1.200-preview-62717-01
Updating the SDK to 2.1.200-preview-62716-06.
Updating the SDK to 2.1.200-preview-62716-04
Update SDK to 2.1.200-preview-62715-08
Updating Roslyn to 2.8.0-beta2-62713-11
Updating the SDK version to 2.1.100-preview-62714-01
Updating the branding of the CLI to 2.1.102.
Remove cli-deps from sources.
Update Roslyn to 2.7.0-beta3-62707-11
add nuget-build myget feed as source
Insert NuGet Build 4.7.0-preview1.4982 into cli
Update to the 15.6 RTM version of the test SDK in templates
Update to consume aspnetcore 2.0.6-10011
Updating TestPlatform to 15.6 RTM
Updating runtime to 2.0.6.
Update AspNetCore version
Update the branding of the CLI to 2.1.101
...
* release/2.1.1xx: (21 commits)
Updating the SDK version to 2.1.100-preview-62714-01
Updating the branding of the CLI to 2.1.102.
Remove cli-deps from sources.
Update Roslyn to 2.7.0-beta3-62707-11
Update to the 15.6 RTM version of the test SDK in templates
Update to consume aspnetcore 2.0.6-10011
Updating TestPlatform to 15.6 RTM
Updating runtime to 2.0.6.
Update AspNetCore version
Update the branding of the CLI to 2.1.101
Build trigger commit.
Update to consume aspnetcore 2.0.6-10008 notimestamp build
Update to consume aspnetcore 2.0.6-10008 timestamp build
Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
Making a document only commit to trigger another build of the CLI.
Add 2.0.5 ASP.NET store to native installers.
Update to consume aspnetcore 2.0.6-10007
Fix Windows servicing builds.
Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
Update runtime and branding to 2.0.6.
...
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
* dotnet/release/2.1.3xx:
Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout changes (#8611)
"ExternalRestoreSources" needs to be set in the docker container (#8602)
Signing nupkg contents (Cli.Utils and MSBuildResolver) along with the rest of the compiled assemblies.
Use satellites from roslyn package, not cli-deps-satellites
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
Support TildeSlash expand (#8589)
Port Kernel Version telemetry to preview1
Do not create a directory with a trailing space; it cannot be deleted by conventional methods. (#8587)
Consume generic aspnetcore rpm installers
Insert NuGet Build 4.6.0-rtm-4918 into cli
Adding roslyn to automatic dependency flow through maestro.
Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools.
MSBuild 15.6.81
Update SDK to 2.1.300-preview1-62608-07
MSBuild 15.6.80
Conflicts:
build/DependencyVersions.props
test/Microsoft.DotNet.ShellShim.Tests/ShellShimMakerTests.cs
* dotnet/release/2.1.2xx:
Use satellites from roslyn package, not cli-deps-satellites
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
Conflicts:
build/DependencyVersions.props
src/redist/redist.csproj
src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
* release/2.1-MSRC:
Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
Making a document only commit to trigger another build of the CLI.
Add 2.0.5 ASP.NET store to native installers.
Update to consume aspnetcore 2.0.6-10007
Fix Windows servicing builds.
Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
Update runtime and branding to 2.0.6.
* Conflicts:
build/Branding.props
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
* release/2.1.3xx: (51 commits)
Removing all references to a static 'aspnetpatch' Nuget.Config (#8556)
Updating the MSI Installation Note message. Also had to shift components around slightly to make it fit.
Fixing recent CLI test failures around ASP.NETcore in the orchestrated build (#8553)
The BuildTasksFeedTool version and the VersionTools version should be in sync to prevent incompatabilities between these two packages.
Update to aspnetcore 2.1.0-preview1-28228
Adding the VBCSCompiler to the list of signed files due to crossgen.
Ensure ASP.NET Core is included in macos .pkg installer and update to 2.1.0-preview1-28226
Remove obsolete F# satellite package
MSBuild 15.6.76
Update F# to match dev15.6 preview 4
Excluding shared framework assemblies from the Roslyn folder in the SDK.
Insert NuGet Build 4.6.0-rtm-4880 into cli
Updating Roslyn to 2.7.0-beta3-62529-05.
Update fsharp compiler to match preview 4
Insert NuGet Build 4.6.0-rtm-4862 into cli
MSBuild 15.6.70
Insert NuGet Build 4.6.0-rtm-4859 into cli
MSBuild 15.6.69
Update package reference
update fsharp compiler to match vs2017.6 preview 3
...
Conflicts:
build/DependencyVersions.props
* release/2.1.1xx: (45 commits)
Adding the VBCSCompiler to the list of signed files due to crossgen.
Remove obsolete F# satellite package
MSBuild 15.6.76
Update F# to match dev15.6 preview 4
Excluding shared framework assemblies from the Roslyn folder in the SDK.
Insert NuGet Build 4.6.0-rtm-4880 into cli
Updating Roslyn to 2.7.0-beta3-62529-05.
Update fsharp compiler to match preview 4
Insert NuGet Build 4.6.0-rtm-4862 into cli
MSBuild 15.6.70
Insert NuGet Build 4.6.0-rtm-4859 into cli
MSBuild 15.6.69
Update package reference
update fsharp compiler to match vs2017.6 preview 3
Insert NuGet Build 4.6.0-rtm-4825 into cli
Fixing the prefercliruntime asset
Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
Updating the channel to release/2.1.1xx. We can manually update release/2.0 if necessary, but LTS is always updated every time we release.
MSBuild 15.6.54
Updates the TestPlatform to 15.6.0-preview-20180109-01
...
Conflicts:
build/BranchInfo.props
build/Branding.props
build/DependencyVersions.props
build/NugetConfigFile.targets
build/Version.props
build/package/Installer.DEB.proj
build/package/Installer.DEB.targets
build/package/Installer.RPM.targets
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
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
scripts/obtain/dotnet-install.ps1
scripts/obtain/dotnet-install.sh
src/tool_fsharp/tool_fsc.csproj
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
* release/2.1.3xx:
Infrastructure updates: CLI:master -> release/2.1.3xx (#8541)
Fixing the recent CLI test failures around ASP.NETcore in the orchestrated build: adding a 'dotnet-corefxlab' feed. (#8536)
Update BranchInfo.props
Update the branch info to be correct for 2.1
[Fixes#8511] Update ASP.NET Core certificate installation message
Excluding shared framework assemblies from the Roslyn folder in the SDK.
Updating Roslyn to 2.7.0-beta3-62529-06.
* Repairing the first pass call to 'dotnet msbuild'; CLI:master (#8488)
* '$ExtraParametersNoTargets', which is used on the first pass call to 'dotnet msbuild', currently is of type 'string' not 'List'1' as is '$ExtraParameters'. This results in the non-honoring of any parameter other than parameter one. Solution: Make a copy of '$ExtraParameters' to '$ExtraParametersNoTargets' of type 'List'1' and remove the targets from the list.
* Swallow the boolean output from '$ExtraParametersNoTargets.Remove'
* Specifically capture "/t:" or "/target:" only.
* The "${arg,,}" syntax works well on dev and Jenkins OSX machines but does not work correctly on VSO build machines [likely a lower version of bash on VSO machines]. Therefore, using 'awk' to transforming to lower case. (#8497)
* Orchestrated final publish; CLI:master (#8504)
* Orchestrated final publish: https://github.com/dotnet/core-eng/issues/2407
* Changes per code review...
* The orchestrated "PackageVersion" type variables should not be used in any of the 'proj' files of the built build tools under: "build_projects"
* release/2.1.3xx:
Updating the WebSdk DependencyVersion to support local build
Fix non-fatal null exception when no extra parameters are passed.
Separate tool package and shim file location
Updating the CLI branding and version to 2.1.300.
* Conflicts
src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommand.cs
run-build.ps1
build/Version.props
* release/2.1-MSRC:
Update to consume aspnetcore 2.0.5-155
Update to consume aspnetcore 2.0.5-152
Revert "Update to consume aspnetcore 2.0.5-152"
Update to consume aspnetcore 2.0.5-152
Commit to trigger a rebuild of the CLI because of a build in place from the Runtime.
Adding the 2.0.3 asp.net store to the native installer tests.
Update to consume aspnetcore 2.0.5-147
Update to consume aspnetcore 2.0.5-146
Updating the runtime to 2.0.5.
Update to consume aspnetcore 2.0.5-142
Fixing the expected fx-version.
Adding a separate dependency version for Microsoft.Build.Runtime.
Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5.
Conflicts:
build/DependencyVersions.props
