Commit graph

1171 commits

Author SHA1 Message Date
Zlatko Knezevic
ab41acd8f5 Adding strings for dotnet-sln command for LOC
Adding strings both in the command folder as well as in the Help command.
2017-01-05 14:44:53 -08:00
Justin Goshi
f8de8d5a80 dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218)
* dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid

* Create ProjectInstanceExtensions per PR comments
2017-01-05 12:04:57 -10:00
Livar
8effe48566 Merge pull request #5212 from livarcocc/update_sdk_with_globbing
Updating the SDK to an SDK that includes globing for source and resources
2017-01-05 13:49:32 -08:00
Livar
bf47363a5f Merge pull request #5219 from livarcocc/remove_define_constants_release
Adding Release to the sdk defined constants so that we don't emit it anymore
2017-01-05 12:46:56 -08:00
Livar Cunha
92ee4aac26 Pinning the CLI version because once this goes in, the next stage0 won't allow for having compile in the csprojs. We will have to update the CLI ones. 2017-01-05 12:31:49 -08:00
Livar Cunha
3a4e23e373 Updating the SDK to an SDK that includes globing for source and resources implicitly. 2017-01-05 12:31:48 -08:00
Krzysztof Wicher
dfb0a28224 Merge pull request #5180 from krwq/5070b
Remove some cross project compile includes on cs files
2017-01-05 12:13:54 -08:00
Livar Cunha
69e963669f Adding Release to the sdk defined constants so that we don't emit it during migration anymore. 2017-01-05 11:46:02 -08:00
Eric Erhardt
639d467c14 Merge pull request #5210 from eerhardt/UpdateSharedFx103
Update Microsoft.NETCore.App to 1.0.3.
2017-01-05 12:06:57 -06:00
Eric Erhardt
75786cd59a Fixing It_adds_fx_version_as_a_param_when_the_tool_has_the_prefercliruntime_file test to expect 1.0.3. 2017-01-05 09:43:02 -06:00
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06:00
Livar
fa52ea9d18 Merge pull request #5200 from livarcocc/remove_condition_tfm_for_single_tfm
Remove condition tfm for single tfm
2017-01-04 22:19:19 -08:00
Justin Goshi
d0151a6111 Add/remove solution items based on directory structure (#5197)
* WIP support solution folders for dotnet add and remove

* Add/remove solution folders based on directory hierarchy

* Fix tests

* Disable the solution building tests

* Address PR comments

* Fix a build break due to a new tool version used in the build

* Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
Livar Cunha
a4dcff9ea8 Addressing code review comments. 2017-01-04 12:25:48 -08:00
Livar Cunha
47eafb9ef4 Removing the PackageTargetFallback condition on TFM when there is only a single TFM 2017-01-03 20:36:51 -08:00
Livar Cunha
e9561b3679 Removing the IsCrossTargetBuild from migrated scripts when there is only a single TFM 2017-01-03 17:15:39 -08:00
Justin Goshi
281eca2f8c Disable tests that fail sporadically (#5192) 2017-01-03 11:06:51 -10:00
Justin Goshi
19b4bad315 Add/remove projects also updates build configurations (#5134)
* Add/remove projects also updates build configurations

* Fix the algorithm for adding/removing build configurations

* Address PR comments
2017-01-03 07:18:45 -10:00
Livar
06d33f01ce Merge pull request #5178 from livarcocc/update_tools_msbuild3
Updating the migrated tools version to 1.0.0-msbuild3-final.
2016-12-30 13:16:29 -08:00
Krzysztof Wicher
941575d188 Remove cross project compile include on DotnetFiles.cs 2016-12-29 14:34:24 -08:00
Justin Goshi
10f52d9a15 Improve error messages for why a solution failed to load (#5176)
* WIP Improve sln reader/writer error messages

* Added more tests

* Fix a few tests
2016-12-29 09:21:55 -10:00
Krzysztof Wicher
961905a301 Merge pull request #5158 from krwq/i5070
Fix #5071: Eliminate some cross project dependencies in tests and fix local builds on windows
2016-12-28 23:26:51 -08:00
Livar Cunha
24b5e00d14 Updating the expected versions in the tests for the test sdk and the test adapter and framework. 2016-12-28 23:13:02 -08:00
Livar Cunha
1f3356b330 Copying the nuget.config template for the publish web app test, so that the new tools packages can be resolved. 2016-12-28 22:03:18 -08:00
Livar Cunha
fa675cb5e5 Updating the migrated tools version to 1.0.0-msbuild3-final. 2016-12-28 21:26:31 -08:00
Livar
a1a30e35a1 Merge pull request #5174 from livarcocc/no_transitive_dependency_migration
Stopped doing hoisting of transitive project dependencies and references
2016-12-28 20:24:12 -08:00
Krzysztof Wicher
efe1b7b143 fix local build and ci build failures 2016-12-28 14:50:34 -08:00
Livar Cunha
ad88058266 Stopped doing hoisting of transitive project dependencies and references. We also don't validate if a dependency exist, since migration strictly speaking does not need it. We move the project.json and the csproj will fail to build just like the project.json would. 2016-12-28 14:48:38 -08:00
Justin Goshi
35f2192f3b Improve Sln reader/writer tests (#5157)
* WIP improve sln reader/writer tests

* Complete the tests
2016-12-28 09:40:49 -10:00
Satya Madala
05df71825d Testplatform release 15.0.0-preview-20161227-02 (#5055)
* Update testplatform packages version

* Refer TestPlatform version from DependencyVersions.props

* Updating the packages with respect to Testplatform release 15.0.0-preview-20161227-02

* Add dit.props to test assets projects
2016-12-28 10:17:33 -08:00
Krzysztof Wicher
e9dc08eafa make localizablestrings internal again 2016-12-27 14:53:45 -08:00
Krzysztof Wicher
88e7f0f593 remove cross project reference from dotnet-remove-p2p (and fix local failures) 2016-12-27 14:53:45 -08:00
Krzysztof Wicher
35bc8e1cc1 remove cross project reference from dotnet-add-p2p tests 2016-12-27 14:53:44 -08:00
Krzysztof Wicher
5095981ec3 fix line endings related errors in dotnet-add-p2p tests 2016-12-27 14:53:44 -08:00
Justin Goshi
b72d625168 Include ASP packages in offline cache (#5124)
* Archive asp.net package references

* Archive asp.net package references

* Change the hash input so it's the same on all platforms

* Address PR comments
2016-12-27 11:28:24 -10:00
Livar
b4ef34bc38 Merge pull request #5104 from livarcocc/update_sdks
Updating the projects files in the repo to use the SDK attribute.
2016-12-21 15:34:33 -08:00
Livar Cunha
64360cb08b Commenting out building solution step in migrate tests because we have an issue in the SDK for it. 2016-12-21 14:06:06 -08:00
Jon Sequeira
3b0a2f5d20 Merge pull request #5106 from jonsequitur/make-migration-backup-folder-peer-of-project
make migration backup folder a sibling of the project root
2016-12-21 12:12:11 -08:00
Krzysztof Wicher
a65d857f73 Merge pull request #5102 from krwq/i1494tools
fix tools when restoring with --packages
2016-12-20 18:20:25 -08:00
jonsequitur
a145c7ae81 fix path length problem in test 2016-12-20 18:17:36 -08:00
Livar
10a1695d6c Merge pull request #5090 from livarcocc/migrate_app_config
Emitting a None item for App.config if one exists side-by-side to the project.json
2016-12-20 16:43:24 -08:00
Livar Cunha
3b081316ad Updating the SDK version in the BundleSdks.props and adding dirs.props back to all csprojs but the TestAssets ones. 2016-12-20 16:38:04 -08:00
Livar Cunha
fadacc0aac Updating the projects files in the repo to use the SDK attribute. 2016-12-20 15:52:50 -08:00
Jon Sequeira
35e3625d4b Merge branch 'rel/1.0.0' into make-migration-backup-folder-peer-of-project 2016-12-20 15:24:33 -08:00
Justin Goshi
89f0b05958 Improve sln migration tests (#5066)
* WIP Improve sln migration tests

* Simple migration test

* Improve the test

* WIP update test assets

* Update test

* Test a bug fix

* Add another migrate sln test

* Fix FilePath related tests

* Finish the migrate sln tests

* Fix tests

* Fix another path issue
2016-12-20 13:04:01 -10:00
Krzysztof Wicher
aa7fb60d73 remove redundant packagesRoot path check and reorder methods 2016-12-20 14:56:21 -08:00
Livar Cunha
4bda166b2f Emitting a None item for App.config if one exists side-by-side to the project.json. 2016-12-20 14:42:31 -08:00
jonsequitur
620e573f95 make migration backup folder a sibling of the project root 2016-12-20 14:35:52 -08:00
Krzysztof Wicher
444dd6a031 shorten random package name, address pr feedback 2016-12-20 13:53:21 -08:00
Krzysztof Wicher
59ae0e2d3d fix tools when restoring with --packages 2016-12-20 12:18:55 -08:00