Commit graph

765 commits

Author SHA1 Message Date
Livar Cunha
0dc22a3b41 Revert back to the dev feed for asp.net in master and move the asp.net core version up. 2018-02-08 11:29:57 -08:00
Livar Cunha
f752dd7fc7 Merge branch 'release/2.1.3xx' into merge_release_213xx
* 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
2018-02-08 09:50:59 -08:00
dotnet-bot
7bc25a328a Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26131-06, preview2-26131-06, preview2-26131-06, beta1-62608-01, respectively 2018-02-08 01:57:49 +00:00
William Lee
f050264331
Rename to BundledNETCorePlatformsPackageVersion (#8538) 2018-02-07 14:28:13 -08:00
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
jbeisner
4ac4751b02 The BuildTasksFeedTool version and the VersionTools version should be in sync to prevent incompatabilities between these two packages. 2018-02-07 04:36:31 +00:00
Livar
38e452204c
Merge pull request #8543 from livarcocc/merge_release_213xx
Merge release/2.1.3xx
2018-02-06 12:17:13 -08:00
Livar
8de55145af
Merge pull request #8539 from natemcmaster/pkg-aspnetcore
Ensure ASP.NET Core is included in macos .pkg installer
2018-02-06 10:07:43 -08:00
Peter Huene
9c72bbd74b
Update Microsoft.DotNet.Archive version.
This commit updates Microsoft.DotNet.Archive version number to include a fix
for #8288.
2018-02-05 16:52:03 -08:00
Livar Cunha
2980fdbfa1 Merge branch 'release/2.1.3xx' into merge_release_213xx
* 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.
2018-02-05 15:55:31 -08:00
Nate McMaster
d29a9b015e Update to aspnetcore 2.1.0-preview1-28228 2018-02-05 15:52:17 -08:00
John Beisner
47da513313
Infrastructure updates: CLI:master -> release/2.1.3xx (#8541)
* 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"
2018-02-05 15:50:50 -08:00
Nate McMaster
bc486e787a 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
Pranav K
52c2f25e67 Add Microsoft.NET.Sdk.Razor to the CLI 2018-02-05 10:29:00 -08:00
Nick Guerrera
cdf3901658
Merge pull request #8498 from livarcocc/update_roslyn
Updating Roslyn to 2.7.0-beta3-62529-05.
2018-02-05 10:28:30 -08:00
Livar
5b081a2ba2
Merge pull request #8508 from dotnet/nuget.client.release-4880-1-1
Insert NuGet Build 4.6.0-rtm-4880 into cli
2018-02-05 10:17:41 -08:00
Livar
133277037e
Merge pull request #8520 from AndyGerlicher/MSBuild15.6.76
MSBuild 15.6.76
2018-02-05 10:17:16 -08:00
Nick Guerrera
d4dedc616c
Merge branch 'release/2.1.1xx' into update_roslyn 2018-02-02 14:06:05 -08:00
Nick Guerrera
ad1292bac2 Remove obsolete F# satellite package 2018-02-02 02:44:14 +01:00
Andy Gerlicher
617aa3725c MSBuild 15.6.76 2018-02-01 14:57:27 -08:00
Kevin Ransom
077b613d7e Update F# to match dev15.6 preview 4 2018-01-31 16:26:57 -08:00
Nick Guerrera
55b9d8d7a9
Insert latest dotnet/sdk 2018-01-31 15:10:13 -08:00
Peter Huene
085452eaae
Merge pull request #8510 from peterhuene/merge-3xx-master
Merge branch 'release/2.1.3xx' to master.
2018-01-31 10:28:59 -08:00
Peter Huene
d8d600d44e
Merge branch 'release/2.1.3xx' into master
* 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
2018-01-30 16:47:05 -08:00
Livar
8f9fea34d1
Merge pull request #8499 from livarcocc/update_roslyn_for_21
Updating Roslyn to 2.7.0-beta3-62529-06.
2018-01-30 16:42:57 -08:00
Livar
d0b746b882
Merge pull request #8506 from dotnet-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup to preview2-26130-06, preview2-26130-06, preview2-26130-06, respectively (master)
2018-01-30 16:42:39 -08:00
John Beisner
8649a5c6c2
Orchestrated final publish; CLI:master (#8504)
* Orchestrated final publish: https://github.com/dotnet/core-eng/issues/2407

* Changes per code review...
2018-01-30 15:22:32 -08:00
NuGet Team Bot
dc6ae8beae Insert NuGet Build 4.6.0-rtm-4880 into cli 2018-01-30 15:18:26 -08:00
dotnet-bot
0228229c1c Update CoreSetup, CoreSetup, CoreSetup to preview2-26130-06, preview2-26130-06, preview2-26130-06, respectively 2018-01-30 22:49:53 +00:00
Livar Cunha
7bee59fe14 Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools. 2018-01-30 11:23:52 -08:00
Livar Cunha
0be7da612c Updating Roslyn to 2.7.0-beta3-62529-06. 2018-01-29 14:20:16 -08:00
Livar Cunha
6fd727b646 Updating Roslyn to 2.7.0-beta3-62529-05. 2018-01-29 14:16:51 -08:00
Vijay Ramakrishnan
c20517094d Updating the WebSdk DependencyVersion to support local build 2018-01-26 18:12:54 -08:00
Livar
0055785280
Merge pull request #8476 from dotnet/nuget.client.release-4862-1-1
Insert NuGet Build 4.6.0-rtm-4862 into cli
2018-01-26 14:55:55 -08:00
Kevin Ransom
e6c8fa6cdd Update fsharp compiler to match preview 4 2018-01-25 18:13:02 -08:00
NuGet Team Bot
ef6e049f27 Insert NuGet Build 4.6.0-rtm-4862 into cli 2018-01-25 13:17:38 -08:00
Andy Gerlicher
46f55c34c6 MSBuild 15.6.70 2018-01-25 12:57:10 -08:00
NuGet Team Bot
352a99b38e Insert NuGet Build 4.6.0-rtm-4859 into cli 2018-01-24 18:06:07 -08:00
Andy Gerlicher
e55de710cb MSBuild 15.6.69 2018-01-24 09:14:40 -08:00
Kevin Ransom
d41b99205a update fsharp compiler to match vs2017.6 preview 3 2018-01-23 13:50:44 -08:00
William Lee
e317925977
Merge pull request #8435 from dotnet/nuget-insertbuild4846
Insert NuGet Build 4.7.0-preview1-4846 into cli
2018-01-19 15:25:28 -08:00
NuGet Team Bot
47758a4ec2 Insert NuGet Build 4.7.0-preview1-4846 into cli 2018-01-19 14:32:57 -08:00
Nate McMaster
67f98be680 Update to aspnetcore 2.1.0-preview1-28124 2018-01-19 13:17:54 -08:00
NuGet Team Bot
b0cfb18501 Insert NuGet Build 4.7.0-preview1-4839 into cli 2018-01-18 17:47:41 -08:00
NuGet Team Bot
d0cdc9c266 Insert NuGet Build 4.6.0-rtm-4825 into cli 2018-01-18 16:13:18 -08:00
Livar
0ca4e2c47b
Merge pull request #8355 from dotnet/nuget-insertbuild4791
Insert NuGet Build 4.6.0-rtm-4791 into cli
2018-01-18 13:51:35 -08:00
Tanner Gooding
c5cf9994e2 Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue 2018-01-18 12:15:22 -08:00
John Beisner
be6f56425f
Merge pull request #8412 from johnbeisner/OrchestratedBuild
Orchestrated build publishing; CLI:master
2018-01-17 10:22:43 -08:00
Livar
2efe8f8360
Merge pull request #8410 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26116-04 (master)
2018-01-17 09:23:43 -08:00
Andy Gerlicher
b1b70292ce MSBuild 15.6.54 2018-01-16 21:31:49 -08:00