* '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
...
* 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
...
* First draft enablement of Win-arm and Linux-arm builds for the CLI.
* Fixing a typo
* Disable tests for arm; enable badges and FinalizeBuild for arm.
* Remove the 'Win-arm' leg.
* Update the README
* Update the README [2]
* Update netci.groovy
* Fixing a hard-coded Architecture: 'linux-x64'; removing the LZMA for 'arm'.
* 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
* 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
* dotnet/release/15.5: (21 commits)
Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
Use temporary path for fake deps.json in test
Use same build number for roslyn and F# satellites
Updating Roslyn satellites and SDK versions
Insert NuGet Build 4.5.0-preview2-4529 into cli
Update NuGet to 4529 (signed)
MSBuild 15.5.154
MSBuild 15.5.153
removed commented out config I'd meant to remove
added a way to specify the asp.net template versions
Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
'NuGet.master.config' does not appear to be used.
Fixed tests
Update branch info to release/15.5
Updating the websdk version to 2.0.0-rel-20171010-665
Insert NuGet Build 4.5.0-preview1-4526 into cli
Update DependencyVersions.props
Updated version of TestPlatform to 15.5.0-preview-20170923-02
MSBuild 15.4.8
...
- Removed all the links to downloads pages as they point to assets being produced by the CLI.
- Updated some of wording to match the concept of the core-sdk repo
- I need a small(ish) change so that I can trigger CI.
* release/2.0-vs: (22 commits)
Insert SDK 2.0.2-vspre-20170921-5
Insert SDK 2.0.2-vspre-20170915-1
MSBuild 15.4.7
Updating the websdk version to 2.0.0-rel-20170908-653
Insert NuGet Build 4.4.0-preview3-4475 into cli
Remove out of support ubuntu1610
Removing extra line feeds...
Turning on the NuPkg publishing from Win x86
The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
Trivial change to start a VSO build
Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
Remove EOL openSuSE 42.1
Trigger build
Trigger build
Sign additional files
Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1
Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1
Insert NuGet Build 4.4.0-preview1-4434 into cli
Update to SDK build which includes NuGet 4.4.0-preview1-4365
Insert NuGet Build 4.4.0-preview1-4365 into cli
...
