Commit graph

1753 commits

Author SHA1 Message Date
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
William Lee
05052c0541
Use rich mock to test InstallCommand (#8402)
To ensure the mock has the same behavior the component has, run mock under the same tests the adapter has.
It is a common problem that moq has -- "everything is mocked out, you are not test anything"
2018-01-24 10:16:27 -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
jbeisner
338bdfb47c Revert "If 'OrchestratedPackageVersionsProps.props' is present, do not re-download the file every time 'Run-Build' or 'Build' is called."
This reverts commit d3e905997c.
2018-01-23 17:46:09 +00:00
jbeisner
94fc976ea5 Revert "If the Nuget.config has already been generated, do not re-generate the file every time 'Run-Build' or 'Build' is called."
This reverts commit 9d5bd8637e.
2018-01-23 17:45:14 +00:00
Livar
8b0d66468c
Merge pull request #8446 from livarcocc/update_master_branding
Updating the branding to 2.1.3-preview2.
2018-01-22 14:16:16 -08:00
Livar Cunha
df2bbb81b2 Updating the branding to 2.1.3-preview2. 2018-01-22 13:32:51 -08:00
Livar Cunha
6695936718 Updating the CLI branding and version to 2.1.300. 2018-01-22 13:26:57 -08:00
jbeisner
d3e905997c If 'OrchestratedPackageVersionsProps.props' is present, do not re-download the file every time 'Run-Build' or 'Build' is called. 2018-01-22 20:49:23 +00:00
jbeisner
9d5bd8637e If the Nuget.config has already been generated, do not re-generate the file every time 'Run-Build' or 'Build' is called. 2018-01-22 20:37:35 +00:00
Davis Goodin
0e6586de49 Fix "dotnet" typo in donetclichecksums 2018-01-22 09:42:32 -06:00
William Lee
02a98d4e63
[tools] Integrate NuGet (#8414)
* Integrate NuGet ask

* Update NuGet version. Rely on NuGet to filter TFM. And use asset.json to find entrypoint

* Update XML file to per TFM

* Add extra property to the fake project according to nuget

* Treat nuget fallback folder as offline cache for tool

* Require -g to install global tool

* Copy test asset during test project build

* Address code review on LockFileMatchChecker

* Get NETCorePlatformsImplicitPackageVersion from PackageDefinitions

* Edit and add missing loc

* Change LockFileMatchChecker to local function

* Adding comment

* Add to content instead of copy

* Download platform package instead

* disable SDK side implicit NuGetFallbackFolder

* merge loc

* Revert extra line

* use a prerelease platforms version that supports alpine
2018-01-19 17:15:34 -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
edc6697cc5
Merge pull request #8380 from johnbeisner/ScriptFixes
Run-Build.sh/ps1 does not behave correctly when passing in a target.
2018-01-17 13:31:55 -08:00
Matt Mitchell
632e9e762b
Merge pull request #8417 from johnbeisner/OrchestratedBuild
Orchestrated build publishing; CLI:master [follow-up]
2018-01-17 12:44:54 -08:00
jbeisner
96410974b9 Reintroducing: 'BlobStoragePartialRelativePath' as orchetrated build needs a prepended "assets" to the partial relative path. 2018-01-17 20:08:12 +00:00
Yanchen Wu
5b5d69c95d Adds Microsoft.Docker.Sdk to CLI
This change is to add Sdk.props and Sdk.targets of Microsoft.Docker.Sdk
into CLI. This unblocks the scenario where a VS solution contains a few
.NET Core projects as well as a docker-compose.dcproj project and people
want to build the solution from command line with .NET Core CLI. With
the Sdk.props and Sdk.targets being present in CLI, building
docker-compose.dcproj becomes no-op so it won't block building the other
.NET Core projects.
2018-01-17 11:12:19 -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
Nick Guerrera
840acee074
Defend against forthcoming breaking change in SDK (#8409) 2018-01-17 10:13:41 -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
jbeisner
4f2ac3eae5 Setting 'IsNotOrchestratedPublish' explictly to false; conditional clean-up. 2018-01-17 17:17:08 +00:00
jbeisner
60b1795d90 Adding publish URL in a comment. 2018-01-17 16:46:30 +00:00
jbeisner
cd4b06c30d Adding ManifestArtifactData; changes per code review... 2018-01-17 16:37:33 +00:00
Andy Gerlicher
b1b70292ce MSBuild 15.6.54 2018-01-16 21:31:49 -08:00
Livar
1a3460575e
Merge pull request #8407 from wli3/update-sdk-version-011618
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62516-03
2018-01-16 21:26:26 -08:00
jbeisner
0c754d92fa Formatting only... 2018-01-17 02:58:01 +00:00
jbeisner
d04e8c84e1 Don't use 'ParseBlobUrl'; use the original values. 2018-01-17 02:52:59 +00:00
jbeisner
3386db7bed Create a manifest if performing an orchestrated build publish. 2018-01-17 02:36:50 +00:00
dotnet-bot
fef6d9bcd5 Update CoreSetup to preview1-26116-04 2018-01-16 22:56:00 +00:00
William Li
6d73caa31a Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62516-03 2018-01-16 14:28:17 -08:00
jbeisner
1acb93f15a Merge remote-tracking branch 'upstream/master' into OrchestratedBuild 2018-01-16 22:19:58 +00:00
jbeisner
9dc9f4c87b Use "PushToBlobFeed" instead of "UploadToAzure" 2018-01-16 22:16:56 +00:00
Livar
9881b8d745
Merge pull request #8396 from AndyGerlicher/MSBuild15.6.54
MSBuild 15.6.54
2018-01-16 12:13:57 -08:00
Livar
596f489414
Merge pull request #8390 from dotnet/livarcocc-patch-1
Updates the TestPlatform to 15.6.0-preview-20180109-01
2018-01-16 12:12:30 -08:00
John Beisner
501e11d928
Merge pull request #8406 from johnbeisner/OrchestratedBuild
Ensure that the 'SetAzureProps' target runs before 'BlobStoragePartialRelativePath' is used.
2018-01-16 11:35:44 -08:00
jbeisner
552129db0d Fixed a typo... 2018-01-16 18:25:18 +00:00
jbeisner
95a5bc7e16 Ensure that the 'SetAzureProps' target runs before 'BlobStoragePartialRelativePath' is used. 2018-01-16 18:15:28 +00:00
Livar
290c66829b
Merge pull request #8392 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26115-03 (master)
2018-01-16 10:09:57 -08:00
Livar Cunha
e7625eba69 Merge branch 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1 into update_branding_for_2_1_100
* 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1:
  MSBuild 15.6.44
2018-01-16 09:38:22 -08:00
Livar Cunha
8caa7b9f0d 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. 2018-01-16 09:37:59 -08:00
jbeisner
e7bd33b200 Add "SDK" at the end of the orchestrated build blob drop point. 2018-01-16 16:09:00 +00:00
dotnet-bot
a1a1c2b762 Update CoreSetup to preview1-26115-03 2018-01-15 18:51:25 +00:00
Andy Gerlicher
af8ea2ffb7 MSBuild 15.6.54 2018-01-13 23:22:34 -08:00
Matt Mitchell
2cfc65a0c4
Merge pull request #8388 from johnbeisner/OrchestratedBuildPublishing
Enabling the publish of CLI assets to 'orchestrated' blob storage.
2018-01-12 19:33:28 -08:00
jbeisner
429f2fde07 Found a version of 'microsoft.dotnet.build.tasks.feed' that supports both parsing of the URL and the currrent Nupkg upload method: 2.1.0-prerelease-02312-02 2018-01-13 02:46:14 +00:00
Livar
1c380b3114
Merge branch 'release/2.1.1xx' into update_branding_for_2_1_100 2018-01-12 16:41:41 -08:00
jbeisner
6d9130dc61 Simplify the 'index.json' removal. 2018-01-13 00:07:01 +00:00
Livar
a4afbc9f1f
Updates the TestPlatform to 15.6.0-preview-20180109-01 2018-01-12 15:47:42 -08:00
Livar
da40320229
Merge pull request #8346 from rainersigwald/msbuild-15.6.44
MSBuild 15.6.44
2018-01-12 15:45:35 -08:00
Livar Cunha
d6d3b451d6 Updating the branding of the CLI to 2.1.100 2018-01-12 15:37:54 -08:00
jbeisner
aa458eca82 Strip off "index.json" before appending "assets" 2018-01-12 23:34:38 +00:00
jbeisner
cbcd4fd3c3 Fixing a typo... 2018-01-12 22:46:25 +00:00
dotnet-bot
0354166e05 Update CoreSetup to preview1-26112-04 2018-01-12 22:43:35 +00:00
jbeisner
5e6c339e16 Simplification: remove Boolean 'PUBLISH_NUPKG_TO_AZURE_BLOB' 2018-01-12 22:27:46 +00:00
jbeisner
bfb9322415 Enabling the publish of assets to 'orchestrated' blob storage. 2018-01-12 22:11:15 +00:00
Livar
bd9d71d71c
Merge pull request #8249 from joperezr/BindingRedirects471
Update the support package on the CLI to fix binding redirects on 4.7.1
2018-01-12 11:42:45 -08:00
Livar Cunha
65c88d8ea8 Disabling native installer tests whenever CLIBUILD_SKIP_TESTS is set to true. 2018-01-12 10:11:44 -08:00
Livar
a85a4f4547
Merge pull request #8377 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26111-03 (master)
2018-01-11 19:43:26 -08:00
John Beisner
ed2ca5d49a
Merge pull request #8354 from johnbeisner/CoalesceDebInstaller
Remove method to publish to Debian feeds.
2018-01-11 14:37:04 -08:00
jbeisner
1ea48da27c Run-Build.sh/ps1 does not behave correctly when passing in a target. 2018-01-11 21:23:46 +00:00
dotnet-bot
745e40b77d Update CoreSetup to preview1-26111-03 2018-01-11 20:55:02 +00:00
Livar
ff4299241c
Merge pull request #8360 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26110-02 (master)
2018-01-10 16:11:20 -08:00
John Beisner
7d641b76f4
Merge pull request #8361 from natemcmaster/rpm
Ignore incoherent rpm dependency on dotnet-runtime when testing aspnetcore
2018-01-10 15:32:54 -08:00
dotnet-bot
0f1fca5601 Update CoreSetup to preview1-26110-02 2018-01-10 23:04:12 +00:00
Nate McMaster
781bffd59a Use RPM --install --nodeps to ignore aspnetcore-runtime's dependencies 2018-01-10 14:48:33 -08:00
Matt Mitchell
7d2a4f60b3 Backwards compat runtimes should not come from product construction sources 2018-01-10 14:23:48 -08:00
jbeisner
a2d2923878 Removing the UploadToLinuxPackageRepository task code and tests. 2018-01-10 22:18:27 +00:00
Nate McMaster
3e05d2495a Update to aspnetcore 2.1.0-preview1-28042
- Update to 2.1.0-preview1-28042
 - Remove references to the aspnetcore-store package
 - Allow pulling aspnetcore from orchestrated build
2018-01-10 09:05:49 -08:00
Livar
3f70aa89b1
Merge pull request #8353 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26109-02 (master)
2018-01-09 21:01:16 -08:00
Livar
e9d1d025de
Merge pull request #8341 from natemcmaster/aspnetcore-sharedfx
Update to ASP.NET Core shared framework 2.1.0-preview1-28031
2018-01-09 18:57:13 -08:00
Livar Cunha
34ce5c5fdd Adding aspnet dev feed. 2018-01-09 18:52:34 -08:00
NuGet Team Bot
168bbff95d Insert NuGet Build 4.6.0-rtm-4791 into cli 2018-01-09 16:58:29 -08:00
Nate McMaster
811f3dcc27 Update TestSdkDeb targets to ignore coherence issues with dotnet-runtime 2018-01-09 15:36:23 -08:00
jbeisner
c2a9cf4c5b Remove method to publish to Debian feeds. 2018-01-09 23:31:32 +00:00
John Beisner
1a6dc96bec
Merge pull request #8347 from johnbeisner/CoalesceDebInstaller
CLI produce 'DEB' distro agnostic installer packages; CLI:master
2018-01-09 15:31:19 -08:00
Nate McMaster
576405af5f Fix reference to renamed MSBuild variable 2018-01-09 14:57:49 -08:00
dotnet-bot
5bd7e6f4cb Update CoreSetup to preview1-26109-02 2018-01-09 22:50:08 +00:00
Nate McMaster
825fa19198 PR feedback and reorder dpkg arguments 2018-01-09 14:13:37 -08:00