Commit graph

3992 commits

Author SHA1 Message Date
Faizan Ahmad
578edc9350 Rebase with rel/1.0.0 2016-10-12 22:53:43 +05:30
Eric Erhardt
90a51bdd00 Merge pull request #4385 from dotnet/emgarten/1979
Updating NuGet to 3.6.0-rc-1979
2016-10-12 07:50:49 -05:00
Faizan Ahmad
4dd685a45c Addressed livar PR comment 2016-10-12 15:20:07 +05:30
Justin Emgarten
f2eef338db Updating NuGet to 3.6.0-rc-1979 2016-10-12 00:49:44 -07:00
Faizan Ahmad
391fff1f20 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-12 11:57:46 +05:30
Justin Goshi
07418af874 Fixes #4293
https://github.com/dotnet/cli/issues/4293
2016-10-11 18:25:47 -10:00
Eric Erhardt
ea092717ac Merge pull request #4369 from eerhardt/SingleTFM
Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible.
2016-10-11 20:59:48 -05:00
Justin Goshi
59f2483fd3 https://github.com/dotnet/cli/issues/4293
Improve help text for commands that shell out to msbuild.
2016-10-11 17:29:09 -07:00
Eric Erhardt
742d48b596 Fix binding-redirects.Tests to work with net46. 2016-10-11 18:30:15 -05:00
Eric Erhardt
acbef441b1 fixup Cli.Utils.Tests for latest code from rel/1.0.0 2016-10-11 17:31:18 -05:00
Bryan Thornbury
924c2c2954 Fix Migration Imports (#4350)
* Fix Migration Imports

* turn tests back on

* turn other tests back on

* test update

* update nuget version

* fix string join

* bump nuget version

* undo

* undo

* undo
2016-10-11 15:22:18 -07:00
Eric Erhardt
b8dbdc29ae Merging Test.Utilties with the latest code from rel/1.0.0. 2016-10-11 17:20:15 -05:00
Eric Erhardt
b5329995d8 Merge branch 'rel' 2016-10-11 17:01:33 -05:00
Eric Erhardt
00f543d089 Fix dotnet-tests to run tests on net46, since we only support netstandard1.3 in ProjectModel. 2016-10-11 16:59:58 -05:00
Eric Erhardt
7618cce420 Remove GivenADesktopAppWhichUsesCommandCreateDotnet, since Cli.Utils will only support netstandard1.5 going forward. 2016-10-11 16:16:44 -05:00
Eric Erhardt
38753d42b0 Fix the tests for targeting netstandard1.3. 2016-10-11 16:01:03 -05:00
Justin Goshi
19abf66412 Fixes issue #4313
Improve error messages for the migrate command
2016-10-11 10:58:49 -10:00
Livar
4780eb667b Merge pull request #4374 from livarcocc/update_msbuild_to_316
Updating the MSBuild version to 15.1.316-preview5.
2016-10-11 11:40:17 -07:00
Piotr Puszkiewicz
28193c5f75 Merge pull request #4303 from dasMulli/feature/dotnet-clean-verb
Added clean3 verb for msbuild based projects.
2016-10-11 11:36:27 -07:00
Justin Goshi
70a8872f45 Address CR comments for the new migration tests
Changing the tests to also verify the error messages.
2016-10-11 11:19:04 -07:00
Livar Cunha
7dec493a8a Updating the MSBuild version to 15.1.316-preview5. 2016-10-11 10:35:40 -07:00
Bryan Thornbury
0a889b2feb Merge pull request #4371 from brthor/brthor/typebuild
Fix Migration type:build
2016-10-11 10:09:28 -07:00
Eric Erhardt
edf2fc1f53 Merge pull request #4367 from eerhardt/NewSdk
Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk.
2016-10-10 20:31:58 -05:00
Justin Goshi
5016aea90c Add tests 2016-10-10 18:01:59 -07:00
Livar
40c7144fc2 Merge pull request #4364 from mendhak/proxy
Allow dotnet-install.ps1 to work behind an outbound proxy
2016-10-10 17:15:52 -07:00
Bryan Thornbury
0bdd3bd59f type build, suppress parent, include, exclude working 2016-10-10 16:21:55 -07:00
Bryan Thornbury
c44e50dfc4 type build tests 2016-10-10 16:21:53 -07:00
Justin Goshi
48ae5d17ac Improve error messages for the migrate command
https://github.com/dotnet/cli/issues/4313
2016-10-10 15:38:25 -07:00
Piotr Puszkiewicz
b9abb2460e Merge pull request #4359 from dotnet/piotrpMSFT/fixMsiSigning
Prevent rebuild of CLI SDK installer after signing
2016-10-10 14:48:12 -07:00
mendhak
ee239e54cf Using HttpClientHandler only if ProxyAddress argument specified 2016-10-10 22:34:30 +01:00
Livar
31c88e112f Merge pull request #4363 from livarcocc/update_msbuild_313
Updating the msbuild dependencies to 15.1.313-preview5.
2016-10-10 14:16:14 -07:00
Eric Erhardt
85a737c223 Respond to PR feedback.
Small variable rename.
2016-10-10 16:07:31 -05:00
Eric Erhardt
eec324a844 Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible.
Microsoft.Extensions.Testing.Abstractions is the only one I couldn't move to netstandard1.3 that should be.  But this library should be removed with the new `dotnet test` strategy.
2016-10-10 15:57:08 -05:00
Eric Erhardt
93166dd77c Merge pull request #4361 from eerhardt/RemoveFsc
Remove dotnet-compile-fsc.
2016-10-10 14:17:29 -05:00
Eric Erhardt
633b56e448 Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk. 2016-10-10 14:04:30 -05:00
Livar
f7823bcf06 Merge pull request #4352 from livarcocc/add_a_way_to_develop_in_sierra
Getting the CLI to build on OSX Sierra
2016-10-10 11:47:08 -07:00
Livar Cunha
5ff4887dd1 Updating the msbuild dependencies to 15.1.313-preview5. 2016-10-10 09:55:30 -07:00
Livar Cunha
c2bce2e2cc Moving the InferLegacyRestoreRuntime method to Test.Utilities, since it is needed only by tests. 2016-10-10 09:52:39 -07:00
mendhak
047eb4f732 Corrected proxy in synopsis for installer 2016-10-10 17:49:28 +01:00
dasMulli
148319a3c2 Added clean3 verb for msbuild based projects. 2016-10-10 18:31:30 +02:00
Eric Erhardt
6cf0327875 Remove dotnet-compile-fsc.
It's new home is https://github.com/dotnet/netcorecli-fsc/
2016-10-10 11:23:46 -05:00
Piotr Puszkiewicz
bf7c9d3d0c PR Feedback 2016-10-10 08:52:57 -07:00
Piotr Puszkiewicz
e8d90e1c19 Expand MSI generation inputs to include all files in the directory 2016-10-10 08:32:09 -07:00
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
mendhak
47a4b44f1f HttpClient to use ProxyAddress argument if passed in 2016-10-08 20:10:56 +01:00
Livar Cunha
09d811fdbd Adding an OverrideRid property used in the GetRuntimeInfo task to override the rid of the CLI. This allows us to build for osx.10.11 when building on osx.10.12. 2016-10-08 11:45:19 -07:00
Bryan Thornbury
2727b191e3 Merge pull request #4310 from brthor/brthor/migrationreport
Migration Report
2016-10-07 11:01:06 -07:00
Eric Erhardt
77e526396c Merge pull request #4288 from livarcocc/msbuild15
Moving msbuild dependencies to msbuild 15.
2016-10-06 22:56:42 -05:00
Livar Cunha
06aa54d16c Fixing a test. 2016-10-06 19:29:20 -07:00
Livar Cunha
167470b1c9 Updating the SDK version, which we need to pick up the NuGetTargetMoniker fix. 2016-10-06 18:31:15 -07:00