Commit graph

150 commits

Author SHA1 Message Date
Eric Erhardt
07bd09a155 Append -portable to shared framework assets.
core-setup is producing "portable" assets with a "-portable" name.  We should be consuming those from the CLI build.
2017-04-10 18:25:22 -05:00
Livar
18126c4ea8 Merge branch 'master' into CacheRename 2017-04-08 09:36:15 -07:00
Livar
95a367136c Merge pull request #6263 from johnbeisner/CLI-backcompat-tests
Adding backwards compat tests to the CLI test catalog.
2017-04-08 00:30:18 -07:00
Eric Erhardt
95ff3f9bf8 Fix tests for cache => store rename. 2017-04-07 15:51:37 -05:00
Eric Erhardt
07b25e268c Rename cache to store.
Rename `dotnet publish --filter` to `dotnet publish --target`.

Partial fixes for #6243, #6244
2017-04-07 14:21:16 -05:00
John Beisner
9bfe67a8e8 Adding backwards compat tests to the CLI test catalog.
https://github.com/dotnet/cli/issues/6227
https://github.com/dotnet/cli/issues/6228
2017-04-06 11:58:19 -07:00
Eric Erhardt
a7becbe6d8 Fix passing /p:DISABLE_CROSSGEN on cli.
When passing a property using the commandline, it is not flown through to "dotnet publish" calls.  So instead of using "dotnet publish", just use the MSBuild task to invoke the Publish target on the reidst project.  This way properties flow correctly.

I also did a little cleaning of unused build logic.
2017-04-04 17:50:28 -05:00
Eric Erhardt
dff66c1acb Update the .sln file to contain all the build logic in an organized way. 2017-03-24 16:19:50 -05:00
Unknown
b28ec60ed0 Remove MigrationDefaultsConstructor 2017-03-01 14:55:18 -08:00
Unknown
2d08b5523a Let VS2017 do its thing to the sln file 2017-03-01 14:55:18 -08:00
Piotr Puszkiewicz
9bdd38cc19 Initial 2017-02-28 01:17:22 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Justin Goshi
5bb7ca8112 Add back BranchInfo.props 2017-02-24 10:34:16 -08:00
Justin Goshi
74e343e111 First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
Justin Goshi
acc77e2a46 Address pr comments 2017-02-23 09:26:14 -08:00
Justin Goshi
08ffc78be6 Merge branch 'master' into dev/jgoshi/refactorPublishTarget 2017-02-23 09:01:44 -08:00
Piotr Puszkiewicz
1199df1c05 Move tool deps file creation into redist.csproj 2017-02-22 22:47:11 -08:00
Justin Goshi
8b2933839c Merge 2017-02-22 16:56:34 -08:00
Justin Goshi
e894d7e60e Refactor publish.target 2017-02-22 16:54:15 -08:00
Unknown
1c9f2e9b83 ProjectsToPublish 2017-02-22 15:33:55 -08:00
Piotr Puszkiewicz
5be3a70121 RootProject property 2017-02-22 15:31:55 -08:00
Justin Goshi
02e47f1d00 Address PR comments 2017-02-22 10:10:54 -08:00
Justin Goshi
70b6dc3be6 Merge branch 'master' into dev/jgoshi/refactorCrossgenTarget 2017-02-22 10:08:54 -08:00
Justin Goshi
2eb2c00b30 Refactor props in crossgen.target 2017-02-21 14:22:36 -08:00
Justin Goshi
30a43b3bda Merge 2017-02-17 09:53:00 -08:00
Justin Goshi
58d167f3e5 Refactor properties out of Compile.targets 2017-02-16 12:21:15 -08:00
Justin Goshi
8e58a247b0 Finish renaming props file to remove Microsoft.Dotnet.Cli prefix 2017-02-16 11:16:20 -08:00
Justin Goshi
c8fb586677 merge 2017-02-16 08:58:40 -08:00
Piotr Puszkiewicz
159f7a1547 Fix up sln file 2017-02-15 19:38:50 -08:00
Justin Goshi
e66f6cd1a3 Do not rename the file yet 2017-02-15 12:05:36 -08:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00
Piotr Puszkiewicz
a906069859 Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj
Remove more properties from build.proj
2017-02-14 16:19:53 -08:00
Justin Goshi
87ee130ab5 Create CoreSetupInfo.props 2017-02-14 10:30:28 -08:00
Rama Krishnan Raghupathy
c20e106d75 Adding End to End test for cache and filtered publish 2017-02-13 17:56:25 -08:00
Justin Goshi
3b9ecf7f86 Address PR comments 2017-02-13 17:37:23 -08:00
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647)
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
2017-02-13 13:06:30 -08:00
Eric Erhardt
25f9a1bbc7 Fix dotnet new classlib to contain the correct NETStandard.Library version.
Fix #5638
2017-02-10 14:22:07 -06:00
Eric Erhardt
8e2a7bfa12 Fix the CLI .sln file to load and build in VS 2017. 2017-02-08 10:03:06 -06:00
Eric Erhardt
d4153815d5 Update the CLI to netcoreapp2.0. 2017-01-26 07:28:59 -06:00
Piotr Puszkiewicz
d14698f1f6 Bump MSBuild Version to 15.1.0-preview-000503-01 (#5199)
* Bump MSBuild Version to 15.1.0-preview-000503-01

* tool_csc->tool_roslyn

* pull some properties up to dir.props

* Move Roslyn to "Roslyn" subdirectory

* Fix relative paths in RunCsc.*

* Add removal of csc & vbc from deps.json

* Revert roslyn to 2.0.0-rc3-61212-03

* netcoreapp -> 1.0.3
2017-01-05 14:56:11 -08:00
Justin Goshi
8afb8ebf31 sln reader/writer (#4870)
* Snap of sln reader/writer from https://github.com/mono/monodevelop

* Remove unnecessary code

* Create a new test asset with an sln file because adding an sln to an existing one broke other tests

* Remove commented out line

* Removing unneeded PropertyGroup per PR comments

* Update the license

* Fixing the license
2016-11-30 14:08:28 -10:00
Justin Goshi
14152207f6 Update our sln file to reference our csproj files (#4876) 2016-11-30 12:44:23 -10:00
Eric Erhardt
469f7be5c3 Add test for dotnet run with multiple frameworks. 2016-10-17 21:03:08 -05:00
Justin Goshi
a6d37d25f5 Clean up dotnet-cli-build.csproj (#4416)
Clean up dotnet-cli-build.csproj
2016-10-17 23:50:22 +00:00
Faizan Ahmad
579df78466 - Implementation of test3 verb for single TragetFramework
- E2E test for test3 verb.
2016-10-04 15:37:36 +05:30
Faizan Ahmad
0bf92b635a Revert unintended change in Microsoft.DotNet.Cli.sln 2016-10-04 00:22:14 +05:30
Faizan Ahmad
b240b855c1 Update the new version of Microsoft.TestPlatform.cli which has fix related to testAdapterPath.
Updated the test project to reflect the same.
2016-10-04 00:17:35 +05:30
Eric Erhardt
eed29be806 Add dotnet publish3 command. 2016-09-23 12:12:55 -05:00
Eric Erhardt
5bd310bbd5 Add dotnet msbuild tests. 2016-09-22 15:56:36 -05:00
Faizan2304
0ce597a147 Implemented vstest verb which will run the test from given container. (#4115)
* Implemented vstest verb which will run the test from given container.

* Fixed Nitpick.

* 1) Addressed PR comment
2) Added tests for vstest verb

* Using specific version of Microsoft.TestPlatform.

* Address PR comments.

Modified help text for the vstest command.
Removed unused function.

* Fixed package related issue.
--Taking reference of microsoft.testplatform.cli nuget package which has contentFolder in it so that sub folder of this nuget can also be added in cli package.
-- Removing vstest.console, vshost and datacollector from Bundletools as we dont want *.deps.json to be override

* Nitpick

* Making vstest.console arguments compatible for non windows platform

* Fix tests to run on linux machine

* Updated the microsoft.testplatform.cli nuget package version. This version has fix related to non windows machine.

* changed dapter path from bin/debug to bin/Debug

* updated nuget version of package Microsoft.TestPlatform.CLI.

* Revert "updated nuget version of package Microsoft.TestPlatform.CLI."

This reverts commit bcc26c21d11c2bd2e5259a74f9890b0fd75962c7.

* Updated version of nuget package Microsoft.TestPlatform.CLI
Added Test project in solution file

* Addressed PR comment.

* Removed unnecessary --platform argument from test
2016-09-19 10:59:26 -07:00