* dotnet/release/2.1.5xx:
MSBuild 15.9.8-preview
MSBuild SDK Resolver Improvements (#9547)
Remove fallback folder
Remove redundent call, ensure no apt list
Update links in the readme to release/2.1.5xx
MSBuild 15.9.0-preview-000006
Use prebuild image
Revert "Disabled MSBuildTreatWarningsAsErrors"
Disabled MSBuildTreatWarningsAsErrors
Add back: "PUBLISH_NUPKG_TO_BLOB_FEED" to manage the no-suffix builds in 2.1
Adding the 2.1.3 runtime blob feed as a feed for the CLI
Update CLI branding to 2.1.402
Updated test
TestPlatform 15.9.0-preview Insertion
Update CLI branding to 2.1.203.
Fix warnings-as-errors in Linux packaging
Don't let crossgen warnings become msbuild warnings-as-errors
Fix build warning and treat msbuild warnings as errors
Conflicts:
README.md
build/DependencyVersions.props
build/package/Installer.DEB.proj
* '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
...
* 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
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.
* 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
* Creating and publishing '*.symbols.nuget' to the blob feed.
* Reverting 'generatenupkg' methodology.
* Fixing formatting...
* Overwrite should = 'false'
* Second draft - Creating and publishing '*.symbols.nuget' to the blob feed.
* Fixing a VS auto-update.
* Removing the 'Microsoft.SymbolUploader.Build.Task' modifications; need to make a PR just for this.
* Change "sdk.*.Microsoft.DotNet.SDK.*.symbols.nupkg" to "runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg"; removing the 'DotNetRestore' on the Symbols.csproj
* Removing a 'todo' comment...
* Putting back the 'dotnet restore'
* Fixing a typo...
* Logical separation of the 'nupkg' from the 'symbols.nupkg' enumeration; fixed 'swr' pattern.
* Add "BLOBFEED_STORAGE_CONTAINER"
This change is to add Sdk.props and Sdk.targets of Microsoft.Docker.Sdk
into CLI. This unblocks the scenario where a VS solution contains a few
.NET Core projects as well as a docker-compose.dcproj project and people
want to build the solution from command line with .NET Core CLI. With
the Sdk.props and Sdk.targets being present in CLI, building
docker-compose.dcproj becomes no-op so it won't block building the other
.NET Core projects.