* 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.1xx: (25 commits)
Use satellites from roslyn package, not cli-deps-satellites
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
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
MSBuild 15.6.80
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
...
This updates the CLI to consume our latest 2.0 build. Is this the correct branch to merge in? Build definitions need to be updated to ingest the packages at msrc-2-0-aspnet blob store container; this will be the last time we update the build definition and we'll keep using this container in the future. @<licavalc@microsoft.com> there's also a change required to build with the new runtime store due to transitive dependencies. You will need to now install 2.0.0, 2.0.3 and 2.0.5 runtime stores before being able to install the new 2.0.6 runtime store.
Fix Windows servicing builds.
The Windows servicing builds require a unique package source name in the
NuGet configuration file when passing in multiple package sources.
