Commit graph

8374 commits

Author SHA1 Message Date
Nick Guerrera
c1834366ea
Merge pull request #8526 from v-zbsail/loc_20180129_master
LOC CHECKIN | cli master | 20180202
2018-02-08 16:52:22 -08:00
Livar
adfc2037db
Merge branch 'master' into master 2018-02-08 16:39:20 -08:00
Nick Guerrera
6677d8f0b6 Merge branch 'master' into loc_20180129_master 2018-02-08 15:48:10 -08:00
Nick Guerrera
a82d52183f Fix unit test with hard-coded English message expectation 2018-02-08 15:24:40 -08:00
Livar
60614db20c
Merge pull request #8571 from dotnet/update_sdk
Update SDK to 2.1.300-preview1-62608-06
2018-02-08 13:17:11 -08:00
Livar
6ef587dbc0
Merge pull request #8570 from dotnet/sign_whitelist
Adding a baseline with files to be excluded from sign check.
2018-02-08 13:13:46 -08:00
Livar
5a5a245658
Merge pull request #8568 from livarcocc/merge_release_213xx
Merge release/2.1.3xx into master
2018-02-08 12:42:23 -08:00
Livar
73dbe8f45e Update SDK to 2.1.300-preview1-62608-07 2018-02-08 12:36:34 -08:00
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
b9e6906cc2 Adding a baseline with files to be excluded from sign check. 2018-02-08 10:13:22 -08:00
Livar
dd7664e74f
Merge pull request #8565 from AndyGerlicher/MSBuild15.6.80
MSBuild 15.6.80
2018-02-08 10:10:31 -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
Livar
8d8e196fc0
Merge pull request #8560 from livarcocc/merge_release_211xx
Merge release/2.1.1xx into release/2.1.3xx
2018-02-07 21:06:33 -08:00
Livar
b0122c8122
Merge pull request #8515 from dotnet-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26131-06, preview2-26131-06, preview2-26131-06, beta1-62608-01, respectively (master)
2018-02-07 20:53:00 -08:00
Andy Gerlicher
e0d138e0df MSBuild 15.6.80 2018-02-07 19:24:28 -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
John Beisner
be228a492f
Removing all references to a static 'aspnetpatch' Nuget.Config (#8556) 2018-02-07 14:58:09 -08:00
William Lee
f050264331
Rename to BundledNETCorePlatformsPackageVersion (#8538) 2018-02-07 14:28:13 -08:00
Livar
36cde15e4e
Merge pull request #8557 from livarcocc/update_msi_message
Updating the MSI Installation Note message.
2018-02-07 14:15:27 -08:00
Livar Cunha
b69d9bda40 Updating the MSI Installation Note message. Also had to shift components around slightly to make it fit. 2018-02-07 13:01:50 -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
John Beisner
d3263aafb8
Fixing recent CLI test failures around ASP.NETcore in the orchestrated build (#8553)
* Fixing recent CLI test failures around ASP.NETcore in the orchestrated build.

* Put back the dotnet-migrate test's 'tempaspnetpatch' Nuget.config

* Fixing typos...
2018-02-07 09:59:13 -08:00
Matt Mitchell
e9b6381dcb
Merge pull request #8552 from johnbeisner/FixManifestCall
Update VersionTools version; CLI:release/2.1.3xx
2018-02-07 08:29:14 -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
William Lee
5fa558a2ed
Atomic install tool (#8518)
* Make dotnet install tool atomic

Apply TransactionScope to tool install. It can handle the correct timing
of roll back and commit.

Convert existing ToolPackageObtainer and ShellShimMaker by passing logic
via lambda to an object that has IEnlistmentNotification interface. It
turns out the very clean.

Use .stage as staging place to verify of package content, and shim. It
should roll back when something is wrong. When there is ctrl-c, there
will be garbage in .stage folder but not the root of the package folder.
2018-02-06 13:38:06 -08: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
Livar
74fb82e714
Merge pull request #8544 from peterhuene/update-archiver-version
Update Microsoft.DotNet.Archive version.
2018-02-06 10:05:40 -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
c9cfa933c8 Reverting the channel and branchname to master. 2018-02-05 15:57:49 -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
Pranav K
f0b60ed02c
Merge pull request #8537 from dotnet/prkrishn/razor-sdk
Add Microsoft.NET.Sdk.Razor to the CLI
2018-02-05 15:00:21 -08:00
Livar
fb75d6a28d
Merge pull request #8542 from livarcocc/add_vbcscompiler_for_signing
Adding the VBCSCompiler to the list of signed files due to crossgen.
2018-02-05 14:58:54 -08:00
Livar Cunha
5ea7f68d59 Adding the VBCSCompiler to the list of signed files due to crossgen. 2018-02-05 14:26:08 -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
John Beisner
e260e79229
Fixing the recent CLI test failures around ASP.NETcore in the orchestrated build: adding a 'dotnet-corefxlab' feed. (#8536) 2018-02-05 10:38:53 -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
Peter Huene
c22f7e29a0
Merge pull request #8486 from peterhuene/install-tool-visibility
Add verbosity option to `install tool` command.
2018-02-02 15:37:11 -08:00
Nick Guerrera
d4dedc616c
Merge branch 'release/2.1.1xx' into update_roslyn 2018-02-02 14:06:05 -08:00
Matt Mitchell
7f39cc3040
Merge pull request #8527 from dotnet/mmitche-patch-2
Update the branch info to be correct for 2.1
2018-02-02 13:21:12 -08:00
Nick Guerrera
fef1e5c7a9
Merge pull request #8517 from KevinRansom/updateFSharp
Update F# to match dev15.6 preview 4
2018-02-02 10:55:34 -08:00
Matt Mitchell
cecc2331d6
Update BranchInfo.props 2018-02-02 09:07:11 -08:00
Matt Mitchell
494c61f864
Update the branch info to be correct for 2.1 2018-02-02 08:56:12 -08:00
Zbyněk Sailer
f0be5cc1ef LOC CHECKIN | cli master | 20180202 2018-02-02 12:31:06 +01:00
Livar
89898c5a45
Merge pull request #8512 from javiercn/javiercn/update-message
Update ASP.NET Core certificate installation message
2018-02-01 19:07:20 -08:00