Piotr Puszkiewicz
85b2a129db
Merge branch 'rel/1.0.0'
...
Conflicts:
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
build.proj
build/Compile.targets
build/Microsoft.DotNet.Cli.Compile.targets
build/Microsoft.DotNet.Cli.DependencyVersions.props
build/Microsoft.DotNet.Cli.Monikers.props
build/Microsoft.DotNet.Cli.Prepare.targets
build/package/Microsoft.DotNet.Cli.Nupkg.targets
build/package/Nupkg.targets
build/test/TestPackageProjects.targets
build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
build_projects/dotnet-cli-build/GetCommitCount.cs
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
src/dotnet-archive/dotnet-archive.csproj
src/tool_msbuild/tool_msbuild.csproj
src/tool_nuget/tool_nuget.csproj
test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
test/ArgumentsReflector/ArgumentsReflector.csproj
test/EndToEnd/EndToEnd.csproj
test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
test/binding-redirects.Tests/binding-redirects.Tests.csproj
test/crossgen.Tests/crossgen.Tests.csproj
test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
test/dotnet-build.Tests/dotnet-build.Tests.csproj
test/dotnet-help.Tests/dotnet-help.Tests.csproj
test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
test/dotnet-new.Tests/dotnet-new.Tests.csproj
test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
test/dotnet-run.Tests/dotnet-run.Tests.csproj
test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
test/dotnet-test.Tests/dotnet-test.Tests.csproj
test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
test/dotnet.Tests/dotnet.Tests.csproj
test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
tools/Archiver/Archiver.csproj
2017-02-17 02:00:05 -08:00
Livar Cunha
1c409befbe
Updating DependencyModel to 1.0.2
2017-02-17 00:29:17 -08:00
Livar Cunha
3eafd9de02
Updating Microsoft.DotNet.PlatformAbstractions version to 1.1.0.
2017-02-16 22:46:04 -08:00
Livar Cunha
8d38a2a67f
Making the tool name comparison with the package case insensitive, so that tools are not required to be declared with the exact casing as the packages that contain them.
2017-02-15 11:33:59 -08:00
Justin Goshi
149a4590b5
Do not add duplicate projects ( #5698 )
2017-02-14 15:47:06 -08:00
Rama Krishnan Raghupathy
c20e106d75
Adding End to End test for cache and filtered publish
2017-02-13 17:56:25 -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
Livar Cunha
9f2ca9989c
Introducing a in DependencyVersions to facilitate these updates in the future. Also aligns with master.
2017-02-10 23:05:16 -08:00
Livar Cunha
1d61bf97ed
Updated the Shared Framework to 1.1.1 and 1.0.4.
2017-02-10 23:05:16 -08:00
Justin Emgarten
1c256d7c56
Removing extra PackageReference workaround for tests
...
Fixes https://github.com/NuGet/Home/issues/4416
2017-02-07 14:31:27 -08:00
Piotr Puszkiewicz
b0a5d53ed5
Merge rel/1.0.0 to master
2017-02-06 12:43:57 -08:00
Eric Erhardt
a2c1a39d07
Fix projects and tests after merge of rel/1.0.0.
2017-02-01 18:35:52 -06:00
Livar
408a0afe8e
Merge branch 'rel/1.0.0' into wrong_global_json_folders
2017-02-01 15:53:10 -08:00
jonsequitur
905db127a6
use missing package test to verify correct package feed parsing
2017-02-01 14:13:07 -08:00
Livar Cunha
0c411e7e1f
Adding another global.json to a failing test asset.
2017-02-01 13:58:15 -08:00
Livar Cunha
0c338ced75
Fixing a failing test. Basically, now that global.json paths have precedence, we were using the CLI global.json and finding the wrong project dependencies.
2017-02-01 12:15:00 -08:00
Livar Cunha
6a72ec603e
Changing the order in which search paths are added for migration and setting the project file path in the ProjectDependency appropriately in the case of csproj and project.json
2017-02-01 10:33:53 -08:00
Livar Cunha
64042937cf
Creating the half migrated test asset.
2017-02-01 10:33:53 -08:00
Justin Goshi
5aded80a7b
Migration: excluded files need to be removed ( #5485 )
...
* WIP
* Implement Remove attribute
* Enable tests
* Fix test
* Try a shorter test name
* Try more shortened test names
* Shorten some more
* Merge issues
* Try shortinging names more
* Fix test errors related to test asset renaming
2017-01-28 17:14:17 -08:00
Rohit Agrawal
4c55fb6211
update nuget and sdk rtm-2241 ( #5447 )
...
* update nuget and sdk rtm-2241
* Applying the no packagereference workaround.
* Fix merge issue
* add comments for restore related workarounds added in test assets
2017-01-27 19:12:35 -08:00
Krzysztof Wicher
d6d39a5c9d
fix 5466: explicity including a file causes a build break ( #5475 )
...
* fix 5466: explicity including a file causes a build break
* fix failing unit tests
* Add unit tests and apply fix also to includeFiles
* apply review feedback
2017-01-27 18:39:44 -08:00
Piotr Puszkiewicz
bbf14163a4
Merge branch 'rel/1.0.0' into PortChange
2017-01-27 02:08:49 -08:00
Livar
60f2b2e4ab
Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ
2017-01-26 20:46:56 -08:00
Livar
99ed699311
Merge branch 'rel/1.0.0' into migrate_sln_file
2017-01-26 19:51:03 -08:00
jonsequitur
8a79abe4c9
fix conditional
2017-01-26 14:48:42 -08:00
Piotr Puszkiewicz
add5f72573
Simplify desktop test packaging
2017-01-26 14:48:41 -08:00
jonsequitur
f66dbdb4b4
dotnet-desktop-and-portable.csproj to netcoreapp1.1
2017-01-26 14:48:41 -08:00
jonsequitur
25e3395684
dotnet-desktop-and-portable.csproj to netcoreapp1.0
2017-01-26 14:48:40 -08:00
jonsequitur
573c4efea5
test fixes
2017-01-26 14:48:40 -08:00
jonsequitur
0c80992384
move additional tests to netcoreapp1.1
2017-01-26 14:48:40 -08:00
jonsequitur
d55be626a9
netcoreapp1.1 fixes
2017-01-26 14:48:39 -08:00
Justin Goshi
2cc4f3f166
Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ
2017-01-26 14:28:37 -08:00
Livar Cunha
85ec8a6f2c
Fixing our solution tests so that they go back to building the solution. Seems to work now, at least on OSX. Also, made a change to update solution to update any solutions in the folder where dotnet migrate is executed.
2017-01-26 12:40:55 -08:00
Justin Goshi
037da3fc01
Finish tests
2017-01-26 11:00:50 -08:00
Justin Goshi
61ae452fe2
Updating tests
2017-01-26 09:55:09 -08:00
Justin Goshi
8b7c0ad468
Add more tests
2017-01-26 09:15:30 -08:00
Krzysztof Wicher
3fa73a90d4
fix EOL in test asset
2017-01-26 09:02:28 -08:00
Krzysztof Wicher
000734d1ef
Ignore explicit glob **/*.cs
2017-01-26 09:02:28 -08:00
Justin Goshi
ddf3261a67
Add more tests
2017-01-26 08:34:36 -08:00
Justin Goshi
150e3c4313
Add more tests
2017-01-25 17:28:57 -08:00
Justin Goshi
b8d4010d85
Handle some of the deprecated properties
2017-01-25 12:30:56 -08:00
Eric Erhardt
15930fac0f
Fix build with latest stage0.
2017-01-24 17:53:19 -06:00
Justin Goshi
3884c90938
Merge from rel/1.0.0
2017-01-23 10:25:16 -08:00
Piotr Puszkiewicz
1dfee9ead8
[WIP] Reduce test target complexity [and running time] ( #5403 )
...
* Reduce test target complexity [and running time]
* WiP
* Enable building tests via solution
Remove deprecated tests
Make Microsoft.DotNet.Tools.Tests.Utilities portable-only
Remove MSI tests from the solution as they are the only tests that currently require dekstop.
* Enable building of tests
* Move migration tests to TA to allow them to self-restore
* Reduce project nesting and test directory name
2017-01-22 14:40:00 -08:00
Justin Goshi
b2c51b7269
Do not add duplicate solution folders or project directories ( #5377 )
...
* Do not add duplicate solution folders or project directories
* Fix the algorithm for removing empty solution folders
* Improving code by adding description methods. To address PR comments.
2017-01-20 18:34:37 -08:00
Justin Goshi
baecbd8d43
WIP
2017-01-20 17:37:11 -08:00
Piotr Puszkiewicz
fe290f1e26
Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343
2017-01-20 14:08:49 -08:00
Piotr Puszkiewicz
26aa05cfea
Merge pull request #5394 from livarcocc/migrate_global_json
...
Handle dotnet migrate global.json
2017-01-20 14:07:27 -08:00
Justin Goshi
33c962a481
Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343
2017-01-20 12:21:43 -08:00
Livar Cunha
dbf4b5de77
Adding a test that verifies that running dotnet migrate solution.sln will only migrate the projects in the solution file.
2017-01-19 13:59:31 -08:00
Justin Goshi
56c3010f72
Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343
2017-01-19 13:17:05 -08:00
Livar
c4e2c35d25
Merge branch 'rel/1.0.0' into migrate_global_json
2017-01-19 12:25:35 -08:00
Justin Goshi
5bbac55736
Migration: do not add a csproj to the solution if it already exists
2017-01-19 11:23:01 -08:00
Livar Cunha
cdf91f2f30
Fixing dotnet migrate global.json. This was failing because we were turning global.json into an empty string and trying to construct a directory for it. The fix was to detect this and transform it into a . directory. Migrate is already respecting the projects node in global.json.
2017-01-19 10:55:23 -08:00
Krzysztof Wicher
3e2b28f9eb
fix a warning in a test asset causing test failure
2017-01-18 13:41:57 -08:00
Krzysztof Wicher
1a20d7f82c
Merge remote-tracking branch 'github/rel/1.0.0-rc3' into rel/1.0.0
2017-01-18 12:38:11 -08:00
Justin Goshi
a5fb786228
Ensure we don't downgrade VS version
2017-01-17 14:48:54 -08:00
Livar Cunha
2161364116
Adding a test for a project that has a package dependency whose name is also the name of a folder in the repo.
...
Moved the test to dotnet-migrate.Test and modified the code that find possible P2P dependencies to actually check if the folder holds a project.
2017-01-17 13:14:18 -08:00
Livar Cunha
8c2e7c9f01
Merge branch 'rel/1.0.0-rc3' into merge_rc3
...
* rel/1.0.0-rc3:
Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
Adding a few more packages that were not in the manifest and moving some tests around.
Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift.
Migration: do not inject built in compile includes that the SDK does
Update msbuild to 15.1.0-preview-000522-02
Migration: Do not add RIDs for Library projects (#5279 )
Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses.
Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-13 14:08:31 -08:00
Krzysztof Wicher
5fea7c3ae6
Remove try catches choking all exceptions ( #5206 )
...
* remove some try catches choking all exceptions
* rename ExceptionExtension to ReportAsWarning, show full stack instead of just message
* dotnet-migrate try catch clean-up
* fix migration test failures
2017-01-12 15:42:36 -08:00
Livar
a442449c55
Updating the branding on rel/1.0.0 to rc4. ( #5267 )
2017-01-12 13:14:57 -08:00
Justin Goshi
03be0e56d4
Migration: Do not add RIDs for Library projects ( #5279 )
...
* WIP
* Do not add runtime identifiers for libraries
* Reusing an existing test project
* Fix up tests
2017-01-11 17:05:12 -08:00
PiotrP
c008e85f6a
revert rc3->preview5
2017-01-11 13:18:44 -08:00
PiotrP
9008aaff85
merge RC3 into rel/1.0.0
2017-01-11 13:03:09 -08:00
Livar Cunha
8a6faa2dca
Fixing windows test.
2017-01-10 14:12:04 -08:00
Eric Erhardt
5035320247
Add NuGet version to DependencyVersions.props.
2017-01-10 10:43:14 -06:00
Livar Cunha
3220b14248
Updating the branding of the CLI to 1.0.0-rc3
2017-01-09 13:59:03 -08:00
Rohit Agrawal
5bbfbfeeed
update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 ( #5214 )
...
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5
* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.
* add a nuget dependency so migrated project has packageref and generates an assets file on restore
2017-01-06 16:28:04 -08:00
Livar
5bdbe354b2
Merge pull request #5226 from livarcocc/migrate_full_framework
...
Migration will now pick win7-x86 as the RuntimeIdentifier to be used by Full Framework TFMs
2017-01-06 14:48:35 -08:00
Livar Cunha
0ebb92f3c4
Renaming a test asset to avoid running into long path issues on Windows.
2017-01-06 11:34:37 -08:00
Livar Cunha
b60b134674
Updating the M.NC.App version to 1.0.3 on a couple of new test assets.
2017-01-05 22:57:16 -08:00
Livar Cunha
7e5f18b584
Fixing full framework tests.
2017-01-05 22:55:43 -08:00
Livar Cunha
b41eb43883
Updating our projects and test assets to work with the latest SDK.
2017-01-05 19:44:52 -08:00
Livar Cunha
abe7641f03
Migration will now pick win7-x86 as the RuntimeIdentifier to be used by Full Framework TFMs when no RIDs exist in the source PJ. This will allow build/publish etc to continue working in csproj without extra RIDs parameters in the command line.
2017-01-05 16:52:02 -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 Cunha
205244fb8a
Fixing failing test and making it work with the new SDK
2017-01-05 12:31:49 -08:00
Livar Cunha
3b69588db2
Picking up the latest SDK and adding back some named parameters to MigrateBuildOptionsRule for clarity.
...
Updating the tool project to use BuiltProjectOutputGroupOutput instead of content because of SDK issue https://github.com/dotnet/sdk/issues/588
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
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
a80e8fa636
Update Microsoft.NETCore.App to 1.0.3.
2017-01-05 08:57:53 -06: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
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
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
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
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
Krzysztof Wicher
a65d857f73
Merge pull request #5102 from krwq/i1494tools
...
fix tools when restoring with --packages
2016-12-20 18:20:25 -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
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
59ae0e2d3d
fix tools when restoring with --packages
2016-12-20 12:18:55 -08:00
Krzysztof Wicher
2d5e40f3ba
Merge pull request #5085 from krwq/i5019
...
Add error message when tool is ivoked but not restored
2016-12-19 16:51:14 -08:00
Krzysztof Wicher
ccfb4135c4
Add error message when tool is not restored
2016-12-19 14:12:04 -08:00
Livar Cunha
b2ce6c794a
Only adding rids for full framework TFMs if the project.json does not already have Runtimes in its Runtimes section.
2016-12-18 18:45:35 -08:00
Justin Goshi
45264edcd7
Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj
2016-12-16 14:53:33 -08:00
Livar
af3cab66f4
Merge pull request #5034 from livarcocc/duplicate_resource_migration
...
Adding a Exclude @(EmbeddedResource) during migration to EmbeddedResources
2016-12-16 14:26:07 -08:00
Justin Goshi
ae1e183e41
Complete the refactor and test improvements
2016-12-16 10:23:26 -08:00
Justin Goshi
82f5278d8a
Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj
2016-12-16 08:44:38 -08:00
Justin Goshi
806d5a2589
Implement dotnet list projects ( #5027 )
...
* Implement dotnet list projects
* Address PR comments
* Fix build breaks
2016-12-16 06:41:47 -10:00
Justin Goshi
20f2242947
Adding dotnet remove project tests
2016-12-15 15:48:04 -08:00
Livar Cunha
e710958b79
Adding a Exclude @(EmbeddedResource) during migration so that we don't get duplicate resources when building migrated apps.
2016-12-15 11:17:20 -08:00
Justin Goshi
441277ccfa
Implement dotnet add project ( #5022 )
...
* Implement dotnet add project
* Addressed PR comments
2016-12-14 13:53:11 -10:00
Livar Cunha
a22f4be938
Adding a UpdateContextTransform that generates items with the Update attribute set instead of Include. Also, removed the Exists condition for published content, because now that we are using Update, that check is not needed. I left the option to set a condition on the metadata though.
2016-12-13 16:45:39 -08:00
Livar Cunha
84682562bf
Adding a condition to Content CopyToPublishDirectory to validate that the file exists before trying to copy it to output, to keep the same functionality as it existed in PJ. In MSBuild world, without this condition, CopyToPublishDirectory will fail.
2016-12-13 16:45:39 -08:00
Krzysztof Wicher
8eaec8715b
Merge pull request #4972 from krwq/p2p-compat-check
...
add compat checks to dotnet add
2016-12-09 15:32:15 -08:00
Krzysztof Wicher
524fe3cb6b
apply review feedback
2016-12-09 12:11:11 -08:00
Piotr Puszkiewicz
70c8ecbf16
Merge branch 'rel/1.0.0' into migrate_pj_without_frameworks
2016-12-09 00:30:36 -08:00
Livar
1fd99f1588
Merge rel/1.0.0-preview4 back into rel/1.0.0 ( #4974 )
...
* Updating the preview4 channel to rel-1.0.0-preview4
* Add more xlf files for new strings
* bundle fsharp sdk, only Sdk directory is required
* align f# console proj
* align f# lib template
* align f# mstest template
* align f# xunit template
* align f# web template
* fix mstest package version, aligned to c#
* remove unused directories from bundled sdks
* Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of https://github.com/NuGet/Home/issues/4063 . Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.
* Update web template for Web SDK 154 (#4948 )
* Update WebSDK version
* Update web template to get rid of globs
https://github.com/aspnet/Templates/pull/735
* MSBuild to 15.1.458 (#4950 )
* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (#4963 )
* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.
* Do not migrate compile and EmbeddedResources for web application, because those are included in the Web Sdk already.
* Addressing code review comments
2016-12-09 00:30:02 -08:00
Livar Cunha
9bddb5bac7
Addressing code review comments.
2016-12-08 20:06:55 -08:00
Livar Cunha
bb1bceb8bb
When we had a project.json without frameworks, we were failing to show the appropriate error message because when we were generating the error message itself we tried to access the project context (which requires a framework in the PJ). This fix makes the ProjectContext optional to add the migration error.
2016-12-08 19:53:35 -08:00
Krzysztof Wicher
9a8d158e09
add test coverage
2016-12-08 16:23:21 -08:00
Krzysztof Wicher
2d38aaa6e1
fix dotnet-add-p2p tests
2016-12-08 14:56:31 -08:00
Justin Goshi
0831316321
Allow migration of sln files ( #4949 )
...
* WIP Migrate sln files
* WIP add reference to redist
* Adding tests and fixing a few bugs
* Fix some tests
* Remove use of DeepClone
* Fix test build errors
* Fix more tests
2016-12-07 11:49:15 -10:00
Livar Cunha
de9ae38375
Updating the branding of rel/1.0.0 to preview5.
2016-12-05 14:47:16 -08:00
Piotr Puszkiewicz
d6cab4af58
use Sdks attribute in dotnet new
templates ( #4916 )
...
* Move dotnet-new templates to Sdk attribute
* Update to MSBuild 15.1.0-preview-000454-01
To pick up a fix for Microsoft/msbuild#1431 .
* Fix template newlines
* Fix casing on Microsoft.Net.Sdk
* Move migration test csproj's to Sdk attribute
* Disable parallel sdk restore
Each SDK restore operation will try to manipulate the same assets.json file since the dependency name&version are injected into a common csproj file. This can cause runtime failures when two NuGets try to restore the project at once.
* Make casing of SDK 'NET' and not 'Net'
* Remove redundatn imports
* Fix test string
* Additional race
* Replacing the SDK with the Web.Sdk when it is a Web project.
* Fixing the test by writting the csproj before running the migration rule.
2016-12-04 22:31:58 -08:00
Piotr Puszkiewicz
d2d0353e60
Include Microsoft.Net.Sdk in CLI layout ( #4895 )
...
* WiP
* Update test
* Working version of Net SDK
* Latest SDK doesn't work as packageref
* DCR + PR
* Harden CLI tests against #4884
2016-12-03 14:19:54 -08:00
Rohit Agrawal
4311926366
update nuget to 4.0.0-rc2 (dev build 2067) ( #4904 )
2016-12-02 19:19:54 -08:00
Piotr Puszkiewicz
da82bdb05d
Centralize Microsoft.Net.SDK Version ( #4890 )
...
* Centralize Microsoft.Net.Sdk package version
Note: Templates were omitted as their version needs to be static.
* Unifying additional missmatched versions
* prefercliruntime
whitespace threw off ReplaceAll
* Additional missed globs
* Revert SDK version for performance tests
* PR Feedback
* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
2016-12-02 09:34:03 -08:00
Krzysztof Wicher
7312e1cb3a
Merge pull request #4868 from krwq/i4746-dotnet-remove
...
Add dotnet-remove-p2p
2016-11-30 16:14:47 -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
Krzysztof Wicher
0349aed9a7
complete tests
2016-11-30 12:07:13 -08:00
Krzysztof Wicher
f49e29711f
Merge pull request #4758 from krwq/i4521
...
Fix 4521: Add dotnet-add-p2p
2016-11-28 13:51:08 -08:00
Livar
325b849858
Merge pull request #4814 from livarcocc/invoke_tool_cli_fx
...
Making Project Tools use the CLI shared runtime
2016-11-25 16:12:38 -08:00
Faizan2304
eb8e0cfa40
Bug fixes ( #4810 )
...
* Bug fixes
* Nitpick
* -Fixed failed tests
-Added test to cover trx logger scenario.
* Fix for issue https://github.com/Microsoft/vstest/issues/241
* Fix for failed test. We have taken fix where dotnet test will return nonzero if test fails. In multi TFM scenario if test fails it termates the whole process as dotnet test is returning 1. As a fix of this we should continue if some test fails for next TFM
* Bump Microsoft.Testplatform.CLI and Microsoft.NET.Test.Sdk version
2016-11-24 00:48:54 -08:00
Piotr Puszkiewicz
3a3ab7e0b0
MSBuildSDKsPath ( #4824 )
...
* Tests in place
* Implementation
2016-11-23 23:54:44 -08:00
Livar
923320b66b
Merge pull request #4829 from jeffkl/4753
...
Move project.lock.json during migration
2016-11-23 14:02:35 -08:00
Jeff Kluge
2205a8577c
Move project.lock.json during migration
...
Closes #4753
2016-11-23 09:46:36 -08:00
Livar Cunha
dc87680337
Making Project Tools use the CLI shared runtime if they have the prefercliruntime in the root of their package. This allows for project tools to not have to change when a new runtime comes up as long as they are compatible with the runtime that the CLI is using.
2016-11-23 09:25:47 -08:00
Livar
da0e7b744b
Revert "update NuGet to 4.0.0-rc2 build ( #4802 )" ( #4818 )
...
This reverts commit 0bafbd061e
.
2016-11-23 09:01:32 -08:00
Krzysztof Wicher
8e5ffaf176
fix some of the stuff in the feedback
2016-11-22 14:46:32 -08:00
Krzysztof Wicher
5d1deeeea1
test project - almost finished - not all review changes included
2016-11-22 14:46:32 -08:00
Krzysztof Wicher
8416085b3a
Add test assets for testing and tiny bugfix
2016-11-22 14:45:29 -08:00
Rob Relyea
0bafbd061e
update NuGet to 4.0.0-rc2 build ( #4802 )
2016-11-22 00:51:12 -08:00
dasMulli
acb4d64c07
Migration: Handle different variations of specifying assembly attributes.
2016-11-18 18:05:00 +01:00
Piotr Puszkiewicz
d39ee4a463
add *.xproj.user to backup file types
2016-11-16 01:10:55 -08:00
Justin Goshi
51562109ea
Migrate test packages ( #4720 )
...
* Migrate TestPackages
* Add check for desktop available
* Revert previous change
* WIP try something for non-Windows
* Another attempt to pack properly on non-windows
* Another attempt to fix pack errors
* Remove spaces
* Another attempt to make pack work cross-platform
2016-11-15 12:12:28 -10:00
Krzysztof Wicher
7a3bc96f75
Fix 4508: CLI verbs that call into msbuild should control their output ( #4719 )
...
* Fix 4508: CLI verbs that call into msbuild should control their output
* fix failing tests + tiny bufix in dotnet test
2016-11-15 11:56:39 -08:00
Krzysztof Wicher
43df9a170d
Fix 4655: Migrate errors are not getting put in formatted output ( #4718 )
...
* Fix 4655: Migrate errors are not getting put in formatted output
* Move test asset to NonRestoredTestProjects
* use group test asset manager: NonRestoredTestProjects
2016-11-15 09:39:58 -08:00
Krzysztof Wicher
9212605e89
binding redirects tests: Simplify and get ready for enabling ( #4692 )
...
* binding redirects tests: Simplify and get ready for enabling
* fix targets broken during cleanup
* fix non-windows build
* apply pr feedback: remove some not needed code
* remigrate BindingRedirects samples, add x64 to bind redir proj
2016-11-14 14:26:03 -08:00
Livar
312559ccdc
Merge pull request #4636 from Faizan2304/xunitTemplateFix
...
Update version of xunit adapter in test assets and xunit template
2016-11-08 14:42:47 -08:00
Livar Cunha
92e7d8e9e9
Making M.NC.App conditional on netcoreapp1.0 framework for the test asset so that it can restore.
2016-11-07 17:41:51 -08:00
Livar Cunha
ef90667375
Hoisting FrameworkAssemblies for desktop frameworks during migration.
2016-11-07 16:16:48 -08:00
Faizan Ahmad
f3cffa0bf4
Update version of xunit adapter and runner
2016-11-07 14:50:08 +05:30
Parallels
d68341b92d
Removing DocumentationFile path from migration and one test asset.
2016-11-04 11:51:43 -07:00
Piotr Puszkiewicz
24596b23ae
02->2
2016-11-04 10:30:00 -07:00
Piotr Puszkiewicz
6e5527ba4c
Final Version Numbers
2016-11-04 10:09:22 -07:00
seancpeters
40c34f891a
Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions ( #4585 )
...
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions
* Fixed merge conflicts. Had to re-update the Sdk version in one place.
* re-migrate dotnet.dll
* Revert Performance Test Projects
* Fix test test
* Add missing WithRuntime
* Disable failing test test
2016-11-03 22:12:33 -07:00
Rob Relyea
f961fef8e0
update NuGet in CLI to 4.0.0.2048 ( #4614 )
...
* update NuGet in CLI to 4.0.0.2047
* update NuGet in CLI to 4.0.0.2048
2016-11-03 22:11:44 -07:00
Faizan Ahmad
5c5f593449
Merge branch 'rel/1.0.0' into enablevstest
2016-11-02 23:50:44 +05:30
Faizan Ahmad
111499899d
Reduced the test name to overcome 256 character file length limit in windows
2016-11-02 23:38:20 +05:30
Krzysztof Wicher
d520160ce3
Merge pull request #4554 from krwq/fix_lib_wo_netstandard
...
When Library add reference to NETStandardLib if not present
2016-11-01 16:50:47 -07:00
Krzysztof Wicher
e3bc102b06
When Library add reference to NETStandardLib if not present
2016-11-01 15:52:24 -07:00
Krzysztof Wicher
875e275e38
Revert "When Library add reference to NETStandardLib if not present"
...
This reverts commit 57d79bb2d3
.
2016-11-01 15:45:14 -07:00
Krzysztof Wicher
57d79bb2d3
When Library add reference to NETStandardLib if not present
2016-11-01 15:34:17 -07:00
Livar Cunha
82ff6397f5
Migrating unqualifing references as projects if we find a matching project. Without this, we have project references being migrated as package references.
2016-11-01 14:17:12 -07:00
Faizan Ahmad
dfea5b780f
Nitpick
2016-11-02 01:56:42 +05:30
Faizan Ahmad
0995daf83e
1) Added test to cover xunit scenario
...
2) Added log in multi tfm test to root cause the issue where it is failing for net46
2016-11-02 01:45:44 +05:30
Faizan Ahmad
5c5ce3d336
Enable test verb tests
2016-11-01 22:01:30 +05:30
Faizan Ahmad
1b5497afda
Enale disabled vstest test. It was failing in restore.
...
Going with increamental approach. In this commit i am trying to enable restore. In next commit will enable vstest
2016-11-01 16:18:33 +05:30
Livar Cunha
9139c4006b
Fixing full framework tests
2016-11-01 00:31:21 -07:00
Livar Cunha
c2f60cede4
Updating the SDK to the latest.
2016-11-01 00:29:54 -07:00
Piotr Puszkiewicz
d804502a8a
Remove deprecated test assets ( #4546 )
...
* Remove deprecated test assets
* Add missing nuget configs and fix poorly named test folder
* Test Cleanup
2016-10-31 16:16:07 -07:00
Piotr Puszkiewicz
f53c51fc07
[WiP] enable /m by default ( #4543 )
...
* MSBuild integration project + refactoring
* Feature Complete
* Change default target to an existing one
2016-10-29 12:08:52 -07:00
Piotr Puszkiewicz
5ede3b6367
post migration cleanup ( #4449 )
...
* Create tests
* Basic scenario working & tested
* Feature Complete
* prevent build of intentionally broken test asset
* Update migrate command backup
* PR Feedback
* Move negative test to negative test directory
* Fix tests
* make test output directories unique
* Merge Conflict
* make backup the default behavior
* Pass2Fail
* Remove tests' PJ dependency
2016-10-29 01:58:37 -07:00
Justin Emgarten
f34a870bf7
Merge pull request #4535 from dotnet/emgarten/nuget2037
...
Updating nuget to 4.0.0-rc-2037
2016-10-28 18:12:56 -07:00
Livar
4c321d4148
Merge pull request #4529 from piotrpMSFT/PiotrpMSFT/FixUnicode
...
Remove Unicdoe Path
2016-10-28 17:58:41 -07:00
Justin Emgarten
54cad0b7a6
Updating nuget to 4.0.0-rc-2037
2016-10-28 17:13:29 -07:00
Livar
cbed94dbef
Merge pull request #4517 from livarcocc/promote_project_dependencies
...
Promote project dependencies
2016-10-28 15:17:47 -07:00
Piotr Puszkiewicz
1a43d79b46
Remove Unicdoe Path
2016-10-28 13:40:19 -07:00
Faizan Ahmad
a09690d8df
1) Added diag support
...
2) Added log in test which are failing in windows machine for framework net46
2016-10-28 20:15:38 +05:30
Faizan Ahmad
63a14fd3ab
Merge from rel/1.0.0
2016-10-28 17:56:24 +05:30
Piotr Puszkiewicz
1dc0c57885
Remove duplicate test asset ( #4518 )
2016-10-27 21:57:17 -07:00
Livar Cunha
83350434bc
Adding a E2E test and a indirect dependency to TestAppDependencyGraph.
2016-10-27 20:08:53 -07:00
Livar Cunha
fa6aa749bd
Doing a tree traversal of all dependencies and creating a list that is then added to the project dependencies of the project.
2016-10-27 20:08:53 -07:00
Piotr Puszkiewicz
6fcbefa4f7
[WIP] Removes *3 verbs, making msbuild the driver ( #4456 )
...
Removes *3 verbs, making msbuild the driver
2016-10-27 18:46:43 -07:00
Livar
53dc665e9b
Merge pull request #4505 from livarcocc/assembly_info_migration
...
Assembly info migration
2016-10-26 17:00:22 -07:00
Justin Goshi
68afda8e4d
Handle "runtimes" section ( #4503 )
...
* Migrate "runtimes" section as a RuntimeIdentifiers property in the resulting csproj file. Also do not call restore3 from publish3 anymore.
* Fix up the publish3 tests to call restore3 first and the csproj files to have RuntimeIdentifiers
2016-10-26 22:23:40 +00:00
Livar Cunha
f863630fd8
Adding a rule that turns off assembly info generation for attributes already defined when migrating.
2016-10-26 13:55:15 -07:00
Faizan Ahmad
d6f4f5f606
Update the version of Microsoft.NET.Sdk in test project
2016-10-26 23:46:56 +05:30
Faizan Ahmad
c7200f1599
Merge branch 'rel/1.0.0' into test3formultipletfm
2016-10-26 23:42:53 +05:30
Livar
4aa1c1bfb4
Merge pull request #4499 from eerhardt/FixRun3Project
...
Fix dotnet run3 --project to pass the project to msbuild.
2016-10-26 10:57:06 -07:00
Faizan Ahmad
679ea57acf
Merge branch 'rel/1.0.0' into test3formultipletfm
2016-10-26 21:46:55 +05:30
Faizan Ahmad
aea25b1fc5
Addressed PR comment
2016-10-26 16:53:34 +05:30
Livar
8befd890d8
Merge pull request #4494 from livarcocc/migrate_target_package
...
When determining the P2P dependencies, only use dependencies of type project
2016-10-25 22:25:28 -07:00
Eric Erhardt
33ec55aee3
Fix dotnet run3 --project to pass the project to msbuild.
...
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301 .
2016-10-26 00:04:40 -05:00
Livar Cunha
175eaeb5c1
When determining the P2P dependencies, only use dependencies of type project. This prevents us from migrating a package dependency as a project dependency because of a project with the same name being present.
2016-10-25 13:09:06 -07:00
Faizan Ahmad
33caa408a1
1) Added support to run test from test3 verb for the project targeting multiple TFM
...
2) Added test to address above change
3) Crossgen were creating problem for full CLR built assemblies. Removed All those assembly from Crossgen list.
4) Removed the line of code which were deleting Extensions folder under sdk folder as this folder contain trx logger dlls
2016-10-25 20:10:18 +05:30
Livar
2cc007520d
Merge pull request #4479 from livarcocc/projectdependencies_full_framework
...
Making OutputPathCommandResolver work with MSBuild.
2016-10-24 16:18:15 -07:00
Livar Cunha
d61ebd3087
Making OutputPathCommandResolver work with MSBuild.
2016-10-24 12:41:27 -07:00
Livar Cunha
be419e3b70
Fixing project dependencies migration so that they are only conditioned when they where under a TFM in the project.json to begin with.
2016-10-21 18:00:17 -07:00
Bryan Thornbury
eeb4ec52bd
remove desktop from multi target test asset
2016-10-20 17:39:51 -07:00
Bryan Thornbury
16ff3734a3
fix the multi tfm test to not build net20
2016-10-20 15:33:47 -07:00
Bryan Thornbury
481aebd18a
turn on the web test
2016-10-20 15:04:53 -07:00
Livar Cunha
368d7a19af
Updating the SDK version to the latest.
2016-10-19 16:21:54 -07:00
Livar Cunha
e2e72a9662
Updating the msbuild templates in the CLI to use TargetFramework (singular).
2016-10-18 15:02:35 -07:00
Eric Erhardt
469f7be5c3
Add test for dotnet run with multiple frameworks.
2016-10-17 21:03:08 -05:00
Justin Goshi
71666cc9b5
Auto add referenced assemblies for desktop migration
...
* https://github.com/dotnet/cli/issues/4351
Auto add referenced assemblies for desktop migration. Adds the same ones
that the build for project.json does.
* Address PR comments
* Address CR comments
* Address CR comment
Use .ToList() instead of new List
* Fix a build break
Needed .noautobuild file in my test asset project
* Change the migrate test for desktop framework to windows only
* Reducing to 120 characters per line
2016-10-18 01:02:10 +00:00
Livar Cunha
391d04c67a
Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running.
2016-10-16 18:44:07 -07:00
Livar Cunha
d8a10024e5
Addressing code review comments by removing unnecessary test artifacts.
2016-10-14 12:56:18 -07:00