dotnet-installer/build/package
Livar Cunha 8408322652 Merge branch 'release/2.1.1xx' into merge_release_211xx
* 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
2018-02-07 12:30:22 -08:00
..
dotnet-deb-tool-consumer Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171206-080040 2017-12-07 09:55:12 -08:00
Archive.targets Merge pull request #7019 from livarcocc/framework_downlevel_msi 2017-06-29 20:07:13 -07:00
CopySandBoxPackageOut.targets Use one build definition to produce all Linux distro specific packages (#7615) 2017-09-14 13:33:46 -07:00
Installer.DEB.proj Disabling native installer tests whenever CLIBUILD_SKIP_TESTS is set to true. 2018-01-12 10:11:44 -08:00
Installer.DEB.targets Merge branch 'release/2.1.1xx' into merge_release_211xx 2018-02-07 12:30:22 -08:00
Installer.MSI.targets Merge branch 'release/2.1.1xx' into merge_release_211xx 2018-02-07 12:30:22 -08:00
Installer.PKG.targets More fixes that were missing from the merge. 2017-12-07 13:23:27 -08:00
Installer.RPM.props Updating the native installers to use a fully qualified path to dotnet.dll and execute it with dotnet exec, so that the first run experience to populate the offline cache will trigger for the SDK being installed, instead of for the latest one in the box. 2017-07-26 23:10:48 -07:00
Installer.RPM.targets Disabling native installer tests whenever CLIBUILD_SKIP_TESTS is set to true. 2018-01-12 10:11:44 -08:00
Layout.targets Ensure ASP.NET Core is included in macos .pkg installer and update to 2.1.0-preview1-28226 2018-02-05 11:34:52 -08:00
Nupkg.targets Rename Stage0 build variables to PreviousStage 2017-08-24 17:16:11 -07:00