Livar Cunha
a6165feec5
Adding an E2E test for pack with content during migration.
2017-02-23 23:07:38 -08:00
Livar
6d9137cf11
Merge branch 'rel/1.0.0' into migrate_content
2017-02-23 22:56:20 -08:00
Livar Cunha
8e35beccb8
Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
2017-02-23 22:55:35 -08:00
Livar Cunha
733ee18c5a
Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
2017-02-23 20:36:02 -08:00
Livar Cunha
f05bbd92a6
Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
2017-02-23 18:47:17 -08:00
Livar Cunha
b660311772
Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
2017-02-23 18:47:17 -08:00
Livar Cunha
1228c7ef55
Do not migrate Content that is already included in the Web SDK for web apps.
2017-02-23 18:47:17 -08:00
Livar Cunha
14a7dd7ef1
Migrate now moves all file copies to the None element.
2017-02-23 18:47:17 -08:00
Livar Cunha
3bbfcb428b
Adding merging of ProjectItemElement.Update. Before, we only merged Include.
2017-02-23 18:47:16 -08:00
Unknown
db2c5378cb
Remove runtime specification in favor of implicit runtime
2017-02-23 17:57:32 -08:00
Eric Erhardt
ace9526681
Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0'
...
Conflicts:
README.md
build/Microsoft.DotNet.Cli.Monikers.props
test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
2017-02-23 15:42:35 -06:00
Livar Cunha
24431edfa3
Fixing the origin versions of BrowserLink to migrate.
2017-02-22 20:11:53 -08:00
Livar Cunha
ef49240f78
Fixing failing test. I changed the version but forgot to update the test. Should have fixed the test first.
2017-02-22 20:11:46 -08:00
Livar Cunha
3701b94c32
Updating the FTS versions of packages. Started uplifting FTS packages. And migration BrowserLink.Loader to BrowserLink.
2017-02-22 20:11:34 -08:00
Eric Erhardt
8aaffc2238
Fix tests on netcoreapp1.1 only platforms
2017-02-22 21:34:21 -06:00
Krzysztof Wicher
de7587782e
remove dotnet test unit test stub
2017-02-22 17:41:20 -08:00
Krzysztof Wicher
eddca32b2f
add dotnet clean unit tests
2017-02-22 17:40:02 -08:00
Krzysztof Wicher
b85a2ec6f2
unit tests for dotnet-cache invocation, some cleanup
2017-02-22 15:49:39 -08:00
Krzysztof Wicher
3415a79940
vstest unit tests
2017-02-22 13:53:44 -08:00
Krzysztof Wicher
22bcf2cddc
add ForwardingApp unit tests
2017-02-22 13:44:06 -08:00
Piotr Puszkiewicz
cb98421950
Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateTemplatePackages
2017-02-22 13:23:16 -08:00
Krzysztof Wicher
1514dd5e16
add dotnet-publish unit tests
2017-02-22 12:45:11 -08:00
Krzysztof Wicher
584b4a93c0
add dotnet pack unit tests
2017-02-22 12:01:59 -08:00
Krzysztof Wicher
06ceb66089
skip not finished tests and add restore unit tests
2017-02-22 11:43:03 -08:00
Mike Lorbetske
0a242633ca
Use the curated feed with all the relevant ASP.NET packages
2017-02-22 11:29:34 -08:00
Krzysztof Wicher
099dca3950
stub for tests
2017-02-22 10:44:15 -08:00
Mike Lorbetske
7b4c064756
Correct version of the MVC package being looked for in tests
2017-02-21 20:16:34 -08:00
Piotr Puszkiewicz
3457f0894e
Merge branch 'rel/1.0.0' into dev/jgoshi/enableSolutionBuildTestsRel100
2017-02-21 20:02:20 -08:00
Mike Lorbetske
04f714c01f
Test fixes - update AspNetCore version being looked for, account for diasymreadernative showing up in output, account for new default of netcoreapp1.1 for console apps
2017-02-21 19:48:24 -08:00
Mike Lorbetske
2659a777b5
Fix tests by updating the temporary asp.net feeds
...
Revert change to feed ordering for normal nuget.config
2017-02-21 18:40:11 -08:00
Mike Lorbetske
0aa4e83cb8
Reorder feeds to prevent issue where a package with the same name and version has been rebuilt
...
Update package versions in tests
2017-02-21 17:10:53 -08:00
Mike Lorbetske
e145ca88e4
Placeholder for template update
2017-02-21 16:28:47 -08:00
Livar
99f7eb4843
Merge pull request #5699 from krwq/2017-02-13-psi-extraction
...
Unit tests for dotnet build
2017-02-19 09:57:07 -08:00
Satya Madala
74086bec31
Merge branch 'tp-20170217' of https://github.com/smadala/cli into tp-20170217
2017-02-18 23:08:42 +05:30
Satya Madala
67142bfd5d
Set console-logger output to normal
2017-02-18 23:05:33 +05:30
Justin Goshi
aefdb22ae4
Shorten test folder name
2017-02-17 17:02:15 -08:00
Livar Cunha
b8a68ad2e0
No longer add runtime identifier when migrating apps that contain full framework and no runtime identifiers already.
2017-02-17 11:30:20 -08:00
Justin Goshi
aaa9fe2c1d
Re-enable solution building tests
2017-02-17 11:13:33 -08:00
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
Krzysztof Wicher
e6578eeb14
split msbuildforwardingapp unit tests with build invocation
2017-02-16 14:22:02 -08:00
Krzysztof Wicher
1b7d4e3200
split env var test
2017-02-16 14:22:02 -08:00
Krzysztof Wicher
39feabd941
patterns for environmental variables
2017-02-16 14:22:02 -08:00
Krzysztof Wicher
27d358c884
add EOLs in the end of files
2017-02-16 14:22:02 -08:00
Krzysztof Wicher
531b0136eb
add tests for checking filename, working dir and validation of presence of environmental variables
2017-02-16 14:22:02 -08:00
Krzysztof Wicher
8ad8fe7e8e
complete dotnet-build invocation test cases
2017-02-16 14:22:02 -08:00
Krzysztof Wicher
8ebc06da46
add more unit tests
2017-02-16 14:22:02 -08:00
Krzysztof Wicher
9c00966956
preview of single unit test for dotnet build
2017-02-16 14:22:02 -08:00
Shayne Boyer
4edbcb06ee
misspelling of targeting
2017-02-16 16:10:19 -05:00
Piotr Puszkiewicz
dfde101b7c
Merge pull request #5610 from jonsequitur/NonWindowsFactAttribute
...
use WindowsOnlyTheory where appropriate, introduce NonWindowsOnlyFactAttribute
2017-02-16 11:06:41 -08:00
Piotr Puszkiewicz
d3d6bdebd1
Merge pull request #5618 from jonsequitur/remove-incorrect-localizations
...
Remove incorrect localizations
2017-02-16 11:05:36 -08:00
Krzysztof Wicher
6d4ef71083
fix newly added remainings of TestAssetsManager
2017-02-15 16:33:21 -08:00
Livar
47c16b271e
Merge branch 'rel/1.0.0' into ignore_case_tools
2017-02-15 15:35:53 -08:00
Krzysztof Wicher
a6bc22e499
Remove TAM ( #5670 )
...
* remove reference to TestAssetsManager in dotnet-add-reference
* remove TestAssetsManager dependency from dotnet-build
* remove TAM ref from dotnet-list-reference
* remove TAM dependency from dotnet-msbuild
* remove TAM dependency from ProjectJsonMigration tests
* remove TAM dependency from dotnet.Tests
* remove TAM dependency from dotnet-new.Tests
* remove TAM from dotnet-pack.Tests
* remove TAM from dotnet-publish.Tests
* remove TAM from dotnet-restore.Tests
* remove TAM dependency from dotnet-remove-reference.Tests
* remove TAM dependency from dotnet-run.Tests
* remove TAM dependency from dotnet-test.Tests
* remove TAM dependency from Microsoft.DotNet.Cli.Utils.Tests
* remove TAM from TestBase
* remove TAM
* remove newly introduced dependency on TAM
2017-02-15 15:35:03 -08:00
Livar
d1a844da2c
Merge branch 'rel/1.0.0' into dev/jgoshi/dotnetAddDefaultProjectTypeGuid
2017-02-15 14:10:10 -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
Justin Goshi
4d24ae06bb
Default to C# project type guid
2017-02-14 14:57:04 -08:00
Livar Cunha
54464dda36
Updating the version test to check that dotnet --version uses the .version file instead of using a regular expression to validate the printed version.
2017-02-14 10:32:11 -08:00
Rama Krishnan Raghupathy
c20e106d75
Adding End to End test for cache and filtered publish
2017-02-13 17:56:25 -08:00
Livar
6ef4bdf4e2
Merge branch 'rel/1.0.0' into new_shared_framework_versions
2017-02-13 13:44:57 -08:00
jonsequitur
1a0adcbe5a
fix loc text dependent test
2017-02-13 13:35:41 -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
02c70abe49
Updating the version of the ASP.NET packages that we migrate to, to the RTM package versions.
2017-02-12 22:09:44 -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
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
454dd10f8d
Update dotnet new to use the new 2.0 templates.
2017-02-09 10:18:39 -06:00
Justin Goshi
5e3f368338
Update the test
2017-02-08 14:26:14 -08:00
Eric Erhardt
546d62061a
Merge branch 'master' into rel100toMaster
2017-02-08 12:30:32 -06:00
Justin Goshi
50c10decf5
Migrate compilationOptions
2017-02-08 00:20:04 -08:00
jonsequitur
161b10d0d0
WIP
2017-02-07 10:08:14 -08:00
Piotr Puszkiewicz
b0a5d53ed5
Merge rel/1.0.0 to master
2017-02-06 12:43:57 -08:00
Eric Erhardt
e947baaa17
Update Microsoft.NETCore.App to 2.0.0-beta-001507-00.
...
Use the crossgen and jit that comes with Microsoft.NETCore.App so we don't have to keep a corresponding CoreCLR version around.
Remove workarounds for crossgen bug https://github.com/dotnet/coreclr/issues/9118
2017-02-06 14:37:39 -06:00
jonsequitur
182c695275
throw CommandParsingException rather than crash on missing single value
2017-02-03 10:57: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
jonsequitur
667f1cf018
also escape ://
2017-02-01 14:13:07 -08:00
jonsequitur
2ea3af799d
escape semicolons when forwarding RestoreSources to MSBuild
2017-02-01 14:13:07 -08:00
Livar
1af25e0fd9
Merge branch 'rel/1.0.0' into wrong_global_json_folders
2017-02-01 14:07:57 -08:00
Justin Goshi
3e07297525
Migration: Remove System.GC.Server from runtimeconfig.template.json and inject ServerGarbageCollection property into the csproj ( #5537 )
...
* Remove runtimeconfig.template.json from templates
* Inject ServerGarbageCollection property
2017-02-01 14:05:53 -08:00
Eric Erhardt
9f0bb778a1
Merge rel/1.0.0 into master.
2017-02-01 14:32:59 -06:00
Livar Cunha
49ae86d09f
Fixing new test to work crossplat by calculating path with Path.Combine
2017-02-01 10:33:53 -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
Jon Sequeira
6990c71e84
refresh enumerator when moving to next subcommand ( #5533 )
2017-01-31 21:31:02 -08:00
Justin Goshi
626c8983c2
Migration: embed compiler resources ( #5517 )
...
* Embed compiler resources
* Fix null ref
2017-01-31 20:30:37 -08:00
seancpeters
2d93968a88
New3 integration ( #5430 )
...
* Partial conversion to new3. 2 tests fail due to browserlink not restoring.
* new cache initialization
* More lzma changes, and removed a razor ref from templates
* Ephemeral hive flag added to tests that need it
* Updated the template engine version to build against. Minor code cleanup
* Config changes to make template versions separate from template engine versions
* Changed dotnet new versioning to use Product.Version
* Fixing Archiver.csproj
* Fixing dotnet new test.
* Fix LZMA Package Source Condition
* Workaround for newline differences.
* fixed tests with changed template parameters. Added a new3 template non-match test
2017-01-31 17:31:37 -08:00
Piotr Puszkiewicz
d2035ff036
Merge remote-tracking branch 'refs/remotes/dotnet/rel/1.0.0-rc3'
...
Conflicts:
build/Microsoft.DotNet.Cli.DependencyVersions.props
2017-01-30 23:27:48 -08:00
Justin Goshi
1c80899909
dotnet migrate uses the correct TreatWarningsAsErrors property ( #5492 )
2017-01-30 16:34:19 -08:00
Jon Sequeira
e8c5d23c29
display CommandParsingException gracefully ( #5493 )
...
* display CommandParsing gracefully
This set of changes handles CommandParsingException gracefuly (so as not to show the user a stack trace) and generalizes graceful exception display somewhat away from being type-specific.
* fix compile error by inlining constant
* remove unused test logging
2017-01-30 14:36:44 -08:00
Eric Erhardt
fd65cb03b6
Update dotnet new to generate a "2.0" project.
2017-01-29 09:46:46 -06: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
Livar
e38bc4950c
Migrating Microsoft.NetCore.App and NETStandard.Library to RuntimeFrameworkVersion and NetStandardImplicitPackageVersion, respectively. ( #5478 )
2017-01-27 19:47:57 -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
ba69c88c79
Work around build test.sln
race condition until fixed ( #5490 )
...
* Remove GenerateRuntimeConfigurationFiles from this library
* Disable parallel build of test.sln
* PR feedback
2017-01-27 17:13:04 -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
Justin Goshi
835bc5bae1
Shorten test name
2017-01-26 15:26:55 -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
9824fa945b
FluentAssertions 4.18.0
2017-01-26 14:48:40 -08:00
jonsequitur
927f0b6dc5
rebase fix
2017-01-26 14:48:39 -08:00
jonsequitur
d55be626a9
netcoreapp1.1 fixes
2017-01-26 14:48:39 -08:00
Eric Erhardt
cfb4cc3cb9
Update tests to netcoreapp1.1.
2017-01-26 14:48:39 -08:00
Eric Erhardt
0073fc8534
Update CLI to run on netcoreapp1.1.
2017-01-26 14:48:39 -08:00
Justin Goshi
d87653a7c6
Update tests
2017-01-26 14:32:41 -08:00
Justin Goshi
2cc4f3f166
Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ
2017-01-26 14:28:37 -08:00
Justin Goshi
3821d39d6c
Address PR comments
2017-01-26 12:53:29 -08:00
Livar Cunha
40c0c41cde
Handling a potential race condition when writing global.json during migration.
2017-01-26 12:40:56 -08:00
Livar Cunha
537d78d2a6
Fixing test failures. One of them, is a known issue that still reproes intermittently. The other was some left over code that was causing problems.
2017-01-26 12:40:56 -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
Eric Erhardt
fafc2eedae
Work around ZipArchive bug in tests
...
See https://github.com/dotnet/corefx/issues/15516 , 'dotnet' executable doesn't get its execute flag set in netcoreapp2.0.
2017-01-26 13:18:41 -06: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
ecd034b95c
fix build errors after rebase
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
Eric Erhardt
eefdbb8846
Disable test due to crossgen bug https://github.com/dotnet/coreclr/issues/9118 .
2017-01-26 10:05:11 -06:00
Eric Erhardt
d4153815d5
Update the CLI to netcoreapp2.0.
2017-01-26 07:28:59 -06: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
Justin Goshi
731ab92c1f
Update the test
2017-01-24 10:57:07 -08:00
Piotr Puszkiewicz
7c62621b8f
Merge branch 'rel/1.0.0-rc3' into rel/1.0.0-rc3
2017-01-24 03:07:49 -08:00
Piotr Puszkiewicz
ad8710decc
SDK 20170123-1 ( #5434 )
...
* Revert "Merge pull request #5362 from dotnet/ragrawal/updatesdktrial"
This reverts commit 4e0b465093
.
* bump SDK to 20170123-1
2017-01-24 01:14:35 -08:00
Mike Lorbetske
872e96cfe2
Update version of Microsoft.AspNetCore.Mvc
2017-01-23 20:21:58 -08:00
Justin Goshi
a2088e2641
Refactor and finish the feature
2017-01-23 13:01:58 -08: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
Dustin Campbell
0a62481cc0
Create backup folder in the directory where 'dotnet migrate' is executed ( #5306 )
...
* Create backup folder in the directory where 'dotnet migrate' is executed
With this change, 'dotnet migrate' will create the backup folder in the workspace directory rather
than the parent of the workspace directory. This solves two problems:
1. It makes it easier for the user where the backup is -- it's in the directory they targeted with
'dotnet migrate'.
2. It solves a problem of file oollisions with global.json files when migrating multiple projects.
Consider the following directory structure:
root
|
project1
|
global.json
|
src
|
project1
project2
|
global.json
|
src
|
project2
Prior to this change, running 'dotnet migrate' project1 and then running it again in project2
would have caused an exception to be thrown because the migration would try to produce a backup
folder like so:
root
|
backup
| |
| global.json
| |
| project1
| |
| project2
|
|
project1
|
src
|
project1
project2
|
src
|
project2
Now, we produce the following structure, which has no collisions:
root
|
project1
|
backup
| |
| global.json
| |
| project1
|
src
|
project1
|
project2
|
backup
| |
| global.json
| |
| project2
|
src
|
project2
In addition, to help avoid further collisions, a number is appened to the backup folder's name if
it already exists. So, if the user runs dotnet migrate again for some reason, they'll see backup_1,
backup_2, etc.
* Fix test helper
* Fix foolish bug causing infinite loop
* Fix up a couple more tests
* Rework MigrationBackupPlan to process all projects at once
* Fix up tests
* Still fixing tests
* Compute common root folder of projects to determine where backup folder should be placed
* Fix typo
* Fix test to not look in backup folder now that it's in a better location
2017-01-21 01:58:28 -08:00
Piotr Puszkiewicz
04a7fca9fc
Fixing argument parsing in add package command ( #5421 )
...
* Fixing argument parsing in add package command
* Adding check to throw if extra args were passed
* Removing string and adding test cases for dotnet add package command
* Add new test to test.sln, and fix naming, and clean csproj
2017-01-21 00:11:18 -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
Justin Goshi
717d0a45fa
Moving existing csproj files with same name as migration output to backup
2017-01-20 12:21:04 -08:00
Livar
870f7edc87
Merge branch 'rel/1.0.0' into migrate_sln
2017-01-19 18:42:00 -08:00
Piotr Puszkiewicz
dd59e2ce97
Merge pull request #5130 from blackdwarf/slntest
...
Introducing solution file for test projects
2017-01-19 16:12:38 -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
Livar Cunha
7f4273d4b1
Adding one more test to ensure that migrate global.json will continue to target only projects under the global.json's project node.
2017-01-19 12:24:42 -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
Piotr Puszkiewicz
05956f6efa
Merge branch 'rel/1.0.0-rc3' into ragrawal/updatesdktrial
2017-01-18 13:41:50 -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
Zlatko Knezevic
0ce6b0cc0f
Merge branch 'rel/1.0.0' into slntest
2017-01-17 21:12:11 -08:00
Justin Goshi
a5fb786228
Ensure we don't downgrade VS version
2017-01-17 14:48:54 -08:00
Justin Goshi
2676682fec
Migrate should change the visual studio version
2017-01-17 13:45:48 -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
Zlatko Knezevic
d93b7abca0
Merge branch 'rel/1.0.0' into slntest
2017-01-17 12:53:44 -08:00
Rohit Agrawal (NUGET)
337d579949
update nuget and sdk to run a trial build
2017-01-17 11:08:17 -08:00
Livar
557999a5bd
Merge pull request #5352 from livarcocc/skip_project_references
...
Skipping project dependencies check when the skip-project-references flag is passed
2017-01-16 16:20:39 -08:00
Livar Cunha
e1f355065d
Moving the project dependencies construction to after we check for the skip project reference check, so that we really don't look for P2P projects when the flag is passed.
2017-01-16 15:16:31 -08:00
Livar Cunha
b8da3b9a87
Updating the versions of xunit 2.2.0-beta5-build3474 and xunit runner to 2.2.0-beta5-build1225.
2017-01-16 13:08:40 -08:00
Zlatko Knezevic
632a6f0ce7
Fixing build breaks
2017-01-13 14:14:12 -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
Piotr Puszkiewicz
968ee5c3f6
Merge branch 'rel/1.0.0' into slntest
2017-01-13 11:19:47 -08:00
Justin Goshi
f972cf80a9
Treat /? the same as --help ( #5285 )
...
* Fixes issue 4539
* Support -?
2017-01-13 01:24:12 -08:00
Zlatko Knezevic
75dc96be2a
Merge branch 'rel/1.0.0' into slntest
2017-01-12 23:00:41 -08:00
Livar Cunha
18a3dd60b5
Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
2017-01-12 18:23:35 -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
a9c5f4e90a
Merge pull request #5293 from dotnet/dev/jgoshi/issue5253
...
Migration: do not inject built in compile includes that the SDK does
2017-01-12 15:00:03 -08:00
Pranav K
80c435e6a1
Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
2017-01-12 13:49:28 -08:00
Livar Cunha
deb50a3cc7
Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
2017-01-12 11:38:05 -08:00
Livar Cunha
12abcf7208
Adding a few more packages that were not in the manifest and moving some tests around.
2017-01-12 11:38:05 -08:00
Livar Cunha
a0aa8150de
Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
2017-01-12 11:38:05 -08:00
Livar Cunha
89fba856e8
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.
2017-01-12 11:38:05 -08:00
Justin Goshi
71da7f6a45
Migration: do not inject built in compile includes that the SDK does
2017-01-12 11:22:41 -08:00
Piotr Puszkiewicz
c0b73e4b5f
Merge branch 'rel/1.0.0' into slntest
2017-01-11 17:37:46 -08:00
Piotr Puszkiewicz
0f9888c11d
Merge branch 'rel/1.0.0' into piotrpMSFT/merge/rc3toRTM
2017-01-11 17:15:44 -08:00
Krzysztof Wicher
c9b873caad
make dotnet-build show build summary ( #5277 )
...
* make dotnet-build show build summary
* Fix race in some dotnet-migrate (sln) tests
2017-01-11 17:06:03 -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
9008aaff85
merge RC3 into rel/1.0.0
2017-01-11 13:03:09 -08:00
Livar
4b82852d56
Updating the version of msbuild to 15.1.0-preview-000516-03 ( #5266 )
...
* Updating the version of msbuild to 15.1.0-preview-000516-03
* Remove test that assumes props/targets imports
The test ItAddsRefBetweenImports validated that the MSBuild XML model contained new project references between the props and targets imports. While useful be fore the SDK attribute, the test no longer adds value since the SDK is added implicitly, guaranteeing it wraps the remaining project contents.
* Move MSBuild to 15.1.0-preview-000509-03
This is the last msbuild version prior to the change of MSBuild's dependencies to include .NET 1.1 components.
* Move MSBuild invocations to use dirs.props/dirs.tasks
* Put back the test targets. We'll unify later.
* Remove dirs.props props from templates msbuild invocation
2017-01-11 01:49:22 -08:00
Piotr Puszkiewicz
19f18a291f
Merge branch 'rel/1.0.0' into slntest
2017-01-11 01:17:52 -08:00
Mike Lorbetske
ad6fab0a15
Synchronize templates with new3, add global.json ( #5244 )
...
* Synchronize templates with new3, add global.json
* Add runtimeconfig.template.json for web
Removes global.json write during template creation
* Remove global.json check from the test
* making templates the same as new3 templates
* Fix broken PrivateAssets, content update
Sets OutputType as appropriate
Alphabetizes package references
* Rollback browserlink version to 1.0.0
* Downgrade 1.1.0 of browserlink to 1.0.0 as well
* Add newline to the end of the console project
2017-01-10 22:58:30 -08:00
Eric Erhardt
5035320247
Add NuGet version to DependencyVersions.props.
2017-01-10 10:43:14 -06:00
Livar
87e9815a25
Merge pull request #5234 from harshjain2/tpv2update
...
Updated version of Test Platform
2017-01-07 14:44:01 -08:00
Harsh Jain
ce64bee309
updated veersion of Microsoft.NET.Test.sdk for failing tests.
2017-01-08 03:01:58 +05:30
Livar
f2f37729b8
Merge pull request #5235 from eerhardt/PopulateNuGetCache11
...
Populate nuget cache for shared fx and asp.net 1.1
2017-01-07 11:31:54 -08:00
Eric Erhardt
10f70dd034
Add a test to ensure 1.0 and 1.1 packages are available in the nuget cache on first run.
2017-01-07 08:43:28 -06: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
Eric Erhardt
0cfc54c377
First time experience populating the NuGet cache with 1.1 packages.
2017-01-06 17:45:34 -06:00
Krzysztof Wicher
7042e85292
dotnet list p2ps -> dotnet list reference
2017-01-06 14:58:38 -08:00
Krzysztof Wicher
528d37bda5
dotnet remove p2p -> dotnet remove reference
2017-01-06 14:58:38 -08:00
Krzysztof Wicher
3ad9b72664
dotnet add p2p -> dotnet add reference
2017-01-06 14:58:38 -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
Mike Lorbetske
decec5f8da
First step to ingest template engine ( #5065 )
...
* First step to ingest template engine
Please do not merge yet
@piotrp @seancpeters @livarocc
* Localization
* Attempt to get a build going
Rename program.cs to New3Command.cs
Move TableFormatter into its own file
Consume template engine packages version 1.0.0-beta1-20161218-24
Temporarily add MyGet templating feed so that package restore will work
* Update ExtendedCommandParser
Make short form args prefer longer runs of characters in the source
parameter before falling back to p:shortname syntax
Change scoping for a few methods to get rid of inconsistent visiblity
errors
* Fix package installation wildcards
* Cleanup New3Command, fix review issue, bump version, sorting for template list
* Installation, loc fix, help formatting
* Use latest TemplateEngine packages
* New3 unit tests
* Fixed formatting on csproj files
* Add the build steps to add templates to the layout
* Change tests slightly to make comparisons easier
Also fixes the wrong flag getting passed to set language
* Fixes for 127, 128, 130, 131 - help display
* Sync to latest TemplateEngine version
Absorbs new search logic
* All tests passing
Cleaner New3Command
Support for project/item template contexts
* Try to make tests more durable
* Disable test parallelization for dotnet-new tests
* Update web SDK and template engine versions
* Remove AI package feed
* Simplify CLI interface to Template Engine
* Fix host identifier and update to latest packages
* Update template engine & Web SDK versions
* Fix template engine version
* Remove UsingTask and redeclaration of property
2017-01-06 14:48:27 -08:00
Justin Goshi
e109a9be47
dotnet sln command ( #5233 )
...
* Add dotnet sln command
* Use new names for localizable strings
* Fix up the tests for the verb rename
2017-01-06 10:58:23 -10: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
Piotr Puszkiewicz
bf4588b6fc
Add PJ support to TestAssets ( #5109 )
...
* Add PJ support to TestAssets
* Cleaning the test assets is hard, so throwing instead
* better assets filter
* PR feedback
* PR Feedback
* Fix NullRef
* Move lock to surround action + file read/write
2017-01-06 01:40:26 -08:00
Livar
b5991909fb
Merge pull request #5227 from livarcocc/update_cli_no_implicit
...
Updating our projects and test assets to work with the latest SDK.
2017-01-05 23:04:17 -08:00
Livar Cunha
7e5f18b584
Fixing full framework tests.
2017-01-05 22:55:43 -08:00
Livar
7bcffe9e82
Merge pull request #5222 from blackdwarf/slnlocstrings
...
Adding strings for dotnet-sln command for LOC
2017-01-05 22:07:48 -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
Livar
80f2ef6533
Merge pull request #5181 from harshjain2/clirunsettings
...
Added ability to pass runsettings as commandline parameters after --
2017-01-05 16:22:08 -08:00
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
Harsh Jain
f04930658d
Merge branch 'rel/1.0.0' into clirunsettings
2017-01-06 01:15:49 +05:30
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
Harsh Jain
6e9e5baa83
Merge branch 'rel/1.0.0' into clirunsettings
2017-01-05 10:25:53 +05:30
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
Harsh Jain
71027cda33
Merge branch 'rel/1.0.0' into clirunsettings
2017-01-05 00:53:41 +05:30
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
Harsh Jain
473d3cca37
Merge branch 'rel/1.0.0' into clirunsettings
2017-01-02 19:54:31 +05:30
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
Harsh Jain
19d919a640
Added method GetSemiColonEscapedArgs
2016-12-30 15:47:15 +05:30
Harsh Jain
245727183c
Handling both mstest args and runsettings options after --
2016-12-30 15:34:00 +05:30
Harsh Jain
8d86e14d44
Added support for passing runsettings options through command line after --
2016-12-30 11:27:37 +05:30
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
Zlatko Knezevic
116ed9bca6
Introducing solution file for test projects
...
This commit introduces a solution file for test projects and modifies
the needed build targets to restore the test solution instead of each
test project separately.
It also introduces a new template called "sln" to dotnet new that drops
a template solution file for users to consume.
Fixes #5099
2016-12-22 09:47:19 -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
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
Zlatko Knezevic
b467d66182
Remove argument separator from commands ( #5080 )
...
* Remove argument separator from commands
Currently, the argument separator (`--`) is only supported on
`dotnet run`. This PR removes it from other commands to make the help and
usage of these command clearer.
* Adding dotnet run message test
* Responding to PR feedback
2016-12-19 22:11:39 -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
Livar
134e9af798
Merge pull request #5078 from livarcocc/preserve_rids_from_pj
...
Only adding rids for full framework TFMs if the project.json does not have runtimes
2016-12-19 16:20:12 -08:00
Krzysztof Wicher
ccfb4135c4
Add error message when tool is not restored
2016-12-19 14:12:04 -08:00
Livar
2aa166b5d0
Merge pull request #5069 from livarcocc/version_attributes
...
Making version an attribute for packagereference and dotnetclitoolreference
2016-12-19 09:48:00 -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
Krzysztof Wicher
476a83eb1a
Ensure dotnet restore --packages is working ( #5008 )
...
* add dotnet restore --packages tests
* add dotnet build, publish, pack, dotnet-test test
* Shorten the test name in attempt to fix test failure
* fix whitespaces
2016-12-18 00:45:25 -08:00
Livar Cunha
52b45d0c49
Fixing tests and a couple of issues in the code due to Localization.
2016-12-16 23:59:58 -08:00
Piotr Puszkiewicz
2a612f88af
https://github.com/dotnet/cli/issues/5070
2016-12-16 22:45:48 -08:00
Scott Addie
e25e387f1f
Add hyphen in Welcome to .NET Core Telemetry paragraph - commandline
2016-12-16 22:45:47 -08:00
Livar Cunha
ee999ef874
Adding clean to the expected help output.
2016-12-16 20:14:33 -08:00
Livar Cunha
612da09a78
Fixing the failing dotnet --help test.
2016-12-16 19:16:38 -08:00
Livar Cunha
e1c0bbe0f7
Making version an attribute for packagereference and dotnetclitoolreference.
2016-12-16 19:13:37 -08:00
Livar
9c3141b63f
Merge pull request #5057 from dotnet/dev/jgoshi/removeProj
...
Implement dotnet remove project
2016-12-16 18:56:28 -08:00
Livar
e491fbdcd0
Merge pull request #5054 from codito/fix-retcode
...
Return non-zero exit code for test failure in multitargeted test project
2016-12-16 18:08:12 -08:00
Livar
a9ca6d8c5b
Merge pull request #5062 from livarcocc/clean_empty_targets_migration
...
Added a clean empty targets method to CleanOutputProjectRule
2016-12-16 18:07:37 -08:00
Livar
f1c16e59d6
Merge pull request #5043 from livarcocc/d_for_diagnostics
...
Changing the host verbosity flag to -d|--diagnostics
2016-12-16 16:05:02 -08:00
Justin Goshi
e94748f172
Update tests for non-windows platforms
2016-12-16 15:25:07 -08:00
Justin Goshi
45264edcd7
Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj
2016-12-16 14:53:33 -08:00
Livar Cunha
2336cd7aa0
Fixing the help message.
2016-12-16 14:31:53 -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
Livar Cunha
d6d6fc612b
Added a unit test for cleaning empty targets.
...
Added a clean empty targets method to CleanOutputProjectRule that removes any targets without content inside of them from the csproj.
2016-12-16 13:31:42 -08:00
Livar Cunha
9fd4903bf3
Addressing code review comments and adding a test for dotnet --help.
2016-12-16 12:58:34 -08:00
Livar Cunha
5558e5f728
Changing the host verbosity flag to -d|--diagnostics from -v|--verbosity so that it is not confused with the verbs verbosity flag.
2016-12-16 12:58:34 -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
Arun Mahapatra
f3a74f1162
Return non-zero exit code for test failure in multitargeted test project.
...
Treat the errors from vstest task as errors (instead of warnings) before continuing further.
Add asserts for exit code in tests for dotnet-test and dotnet-vstest.
2016-12-16 15:39:52 +05:30
Justin Goshi
023a899db0
WIP Refactor and improve tests
2016-12-16 01:04:09 -08: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
56dd76bdb0
Adding Update under Content for BuildOptions as well, but limiting this change only to Web Apps at the moment, because regular SDK does not have Content Include=**/* in place yet.
2016-12-13 16:45:40 -08: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
Justin Goshi
76722fd403
Improve the help text ( #5002 )
...
* WIP Improve help text
* Improve help text
* Address PR comments
* Address PR comments
* Address PR comments
2016-12-13 14:31:35 -10:00
Piotr Puszkiewicz
2fbafe6f3f
Remove StreamForwarder from CLI tests ( #4936 )
...
* WiP
* Replace StreamForwarder with OutputDataReceived
* Add build logging around test execution
* add newlines
* Add handling for the null terminator while maintaining empty lines
* Extra Diag
* Verbose logging for VS Test Console
* Fix asset file locking tests
* Add testcommand timeout + improve dotnet-new tests
* WiP
* Welcome, JoSequ!
* Fix failing tests
* Clean out diagnostics writelines
* self-PR1
2016-12-13 14:15:35 -08:00
Justin Goshi
2b7e9b6524
Clean up sln reader/writer ( #5005 )
2016-12-13 06:45:00 -10:00
Zlatko Knezevic
d335b5de40
Changing dotnet-test options ( #4987 )
...
In Preview 3, the `dotnet test` options were not aligned with the CLI's
adopted format. This PR changes the options to be aligned. Where
possible/applicable, I have shortened the long options to a meaningful
mnemonic short version.
Fixes #4960
2016-12-12 23:29:29 -08:00
Livar
1a49787a1f
Merge pull request #4993 from livarcocc/cyclic_dependency_test
...
Adding a test that validates CLI templates don't depend on CLI packages.
2016-12-12 15:48:41 -08:00
Livar Cunha
e1965327e0
Adding a test that restores all c# templates and checks that none of them depend on a package produced by the CLI. I had to write this as a single test for all templates because it cuts the test time in about half to restore all the packages at once to the same folder than to clean and restore again everytime per template.
2016-12-09 16:11:57 -08:00
Livar
bd590f51e6
Emitting PackageId whenever we emit AssemblyName. We need to do this to preserve the behavior from PJ where the package id matched the containing PJ folder name. In MSBuild, PackageId will match AssemblyName, unless it is explicitly specified. ( #4990 )
2016-12-09 16:10:16 -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
21993e0129
fix dotnet-remove-p2p tests
2016-12-08 15:04:32 -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
Krzysztof Wicher
79e6126b2a
add dotnet list p2ps ( #4929 )
...
* add stub for dotnet list p2ps
* apply review feedback
* PR feedback: consistent method modifiers
* apply missed review feedback
* add test coverage and do not treat no p2ps as error
* move private methods to the bottom, rename weird res name
2016-12-07 12:56:27 -08:00
Livar Cunha
c94934dfc5
Replacing snake casing with Camel casing for GivenThatIWantToMigrateBuildOptions. At some point, I will be able to change them all.
2016-12-05 20:34:11 -08:00
Livar Cunha
9d96bf8c20
Adding GenerateRuntimeConfigurationFiles when migrating a test project.
2016-12-05 18:23:34 -08:00
Piotr Puszkiewicz
7eb87f3397
Remove tests affected by https://github.com/dotnet/cli/issues/4381
2016-12-05 12:23:29 -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
Scott Carlton
dc3d88c587
Localize changes for dotnet-remove ( #4900 )
...
* Rename centralized LocalizableStrings file
* Added RemoveDefinition
* Rebase
* rebase, remove localizablestrings for help
* loc for help command
* remove localizablestrings
* Localization changes for dotnet-remove
* Slight refactoring
2016-12-04 21:33:43 -08:00
Piotr Puszkiewicz
caad95491a
Fix output race ( #4911 )
...
* Fix output race
TestCommand starts the test process before wiring up stderr & stdout. This change delays process start until after the wireup is finished so that the test process cannot shut down before we have wired up output redirection.
* Bypass stream forwarder when it fails to attach to a process
CLI has tests failing errenously when, due to timing issues, the StreamForwarders fail to attach to a process because it managed to exit before attachment occurs.
We tried attaching the forwarders prior to Process Start but this proved impossible because the OUT and ERR streams are not available to attach before the process starts.
This exposes a fundamental flaw in our output redirection mechanisms. We should probably move to using https://msdn.microsoft.com/en-us/library/system.diagnostics.process.outputdatareceived.aspx or a similar mechanism. However, I don't know that @brthor hadn't considered and discarded this approach.
For the time being I am attempting to make tests more deterministic by capturing the associated exceptions and moving to a different mechanism when StreamForwarders are not available.
Opened https://github.com/dotnet/cli/issues/4913 to track the broader issue.
* File.Copy is not atomic...
2016-12-04 11:54:29 -08:00
Livar
ac4f903731
Merge pull request #4897 from livarcocc/no_publish_iis
...
Skipping dotnet publish-iis when migrating scripts as it is now part of the web.sdk
2016-12-04 09:36:52 -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
Livar Cunha
7583bcb2fd
Skipping dotnet publish-iis when migrating scripts as it is now part of the web.sdk
2016-12-02 10:41:25 -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
Piotr Puszkiewicz
f18967e39a
Update CLI's MSBuild Version to 15.1.0-preview-000451-02 ( #4889 )
...
* Centralize definition of MSBuild Version in CLI
* MSBuild --> 15.1.0-preview-000451-02
2016-12-01 20:10:42 -08:00
Piotr Puszkiewicz
ecfd970045
Extra strings for localization ( #4880 )
...
* Update strings for localization
* re-align strings
2016-12-01 16:01:29 -08:00
Piotr Puszkiewicz
e82ed6799d
Enable overriding MSBuildSDKsPath with env var ( #4885 )
2016-12-01 14:45:55 -08:00
Martin Andreas Ullrich
4af30914c9
Show meaningful error when failing to migrate invalid scripts ( #4842 )
2016-11-30 20:36:13 -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
23b46490a3
add some test cases stubs
2016-11-29 16:14:05 -08:00
Krzysztof Wicher
65f699f1cc
Prepare test project for dotnet-remove-p2p
2016-11-29 15:47:30 -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
Piotr Puszkiewicz
b47d728516
Hide restore output of first-run experience ( #4740 )
...
* Fix 4066
* Merge Conflict
* Move fix to the DotNetCommandFactory
* More normalization
The `\r\n` issue is oddly non-deterministic. This change did not affect the message endings and yet CI started failing. Normalizing both string should have the desired result...
2016-11-28 00:46:26 -08:00
Enrico Sada
7b0117ac85
Update fsharp templates for preview4 with latest msbuild style ( #4836 )
...
* update web template
* add test build of fsharp/web template
* align fsharp/xunittest template
* add test for all template projects
* align fsharp/console template to #4821
* align fsharp/lib template to #4821
* align fsharp/mstest template to #4821
* align fsharp/xunittest template to #4821
* fix shortened test directory path (was same for c# test)
* try fix ci failure
2016-11-28 00:45:38 -08:00
Enrico Sada
a0060ac321
Fix for current ci fails ( #4838 )
...
* test ci
* try fix ci failure
2016-11-28 00:45:17 -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
9862fbb4d7
Checking that the lock file exists before trying to acquire the lock for it. ( #4797 )
...
* Checking that the lock file exists before trying to acquire a lock for it, which takes up to 30 seconds.
* Adding a test for failing when reading the lock file and it does not exists.
2016-11-23 22:59:54 -08:00
Enrico Sada
2cf0675270
add F# templates to dotnet new
( #4789 )
...
* add F# templates to `dotnet new`
* add dotnet new tests
* avoid conflict with cs test dir
* fix test
2016-11-23 22:57:54 -08:00
Krzysztof Wicher
8b565616a0
Strings->LocalizableStrings, Extensions->ProjectRootElementExtensions, fix long lines, remove empty line
2016-11-23 15:35:48 -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
Krzysztof Wicher
93c30898e4
fix non-windows failures
2016-11-23 14:02:19 -08:00
Krzysztof Wicher
2bd020d015
attempt to fix broken linux build
2016-11-23 13:46:44 -08:00
Livar Cunha
9e9d7f1d52
Turns out I had missed one code review comment. Fixing the string validation for one of the tests.
2016-11-23 12:56:37 -08:00
Krzysztof Wicher
b22276a4a6
add fake msbuild.exe to workaround the msbuild issue
2016-11-23 11:03:39 -08:00
Livar Cunha
d5f7efbe86
Addressing code review comments.
2016-11-23 10:19:00 -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
b8b7d98256
last touches
2016-11-22 14:46:33 -08:00
Krzysztof Wicher
58fe57e315
Lock on spec - all tests passing on Windows
2016-11-22 14:46:32 -08:00
Krzysztof Wicher
19dde128ba
detect non-existing references and tiny refactor of tests
2016-11-22 14:46: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
Rob Relyea
0bafbd061e
update NuGet to 4.0.0-rc2 build ( #4802 )
2016-11-22 00:51:12 -08:00
Livar
09f62cdd7e
Merge pull request #4741 from piotrpMSFT/piotrpMSFT/issues/4739-xprojUser
...
add *.xproj.user to backup file types
2016-11-16 09:30:17 -08:00
Livar
9847196c95
Merge pull request #4737 from livarcocc/migrate_authors
...
Adding Authors migration.
2016-11-16 09:29:13 -08:00
Livar
11f871b715
Merge pull request #4733 from livarcocc/migrate_adds_rids_for_desktop
...
Emitting runtime identifiers if the source project has any full framework TFMs
2016-11-16 09:29:01 -08:00
Piotr Puszkiewicz
d39ee4a463
add *.xproj.user to backup file types
2016-11-16 01:10:55 -08:00
Justin Goshi
be61afcfa5
Remove unused project.json and .xproj files ( #4735 )
...
* Remove unused project.json and .xproj files
* Update the test msi script
2016-11-15 16:12:19 -10:00
Livar Cunha
c364f27346
Adding Authors migration.
2016-11-15 16:36:04 -08:00
Livar Cunha
9513428013
Emitting runtime identifiers if the source project has any full framework TFMs.
2016-11-15 14:07:35 -08: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
Piotr Puszkiewicz
bf425a6f0a
Removing dotnet-test-mstest when migrating because that package is no longer needed. ( #4690 )
2016-11-14 14:59:59 -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
Justin Goshi
6d57ca7e14
Migrating all test projects ( #4668 )
...
* WIP migrate tests
* WIP fixing more tests
* WIP fix test build break
* Test results files are now trx
* Get CI to pass until we get an xunit xml logger
* Added DotNetTestPJ since that was needed for one test
* Fix build break
* Forgot to add DotNetTestPJ as a build task
* Need to restore project.json for the project used in ubuntu test
* Restore PJ for ubuntu test
* Switch the Ubuntu test to csproj based
2016-11-11 21:46:29 -10:00
Livar Cunha
df755b5554
Removing dotnet-test-mstest when migrating because that package is no longer needed.
2016-11-11 10:52:33 -08:00
Livar
43dfa6b8ba
Updating script migration to use the correct BeforeTargets. ( #4680 )
2016-11-10 18:24:35 -08:00
Livar
9869b82412
Merge pull request #4662 from livarcocc/remove_dotnet_test_xunit_migration
...
Removing dotnet-test-xunit when migration from project.json to csproj
2016-11-09 11:11:17 -08:00
Livar Cunha
7f549314ff
Removing dotnet-test-xunit when migration from project.json to csproj, as that package is no longer needed.
2016-11-09 09:52:52 -08:00
Piotr Puszkiewicz
b918b2a6b6
Invoking a command waits up to 30s for NuGet or another process ( #4657 )
...
* Invoking a command waits up to 30s for NuGet or another process
* PR Feedback
2016-11-08 23:23:13 -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
Faizan Ahmad
c9a5c95cd6
Updated test to reflect xunit version change
2016-11-09 01:23:46 +05:30
Livar Cunha
ef90667375
Hoisting FrameworkAssemblies for desktop frameworks during migration.
2016-11-07 16:16:48 -08:00
Parallels
7edea7e23e
Fixing pack tests that were looking for the nupkg under bin/debug/TFM instead of bin/Debug. This was a change in pack that needed to be reflected in the tests.
2016-11-04 12:56:21 -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
Livar
d6eef01015
Adding a tool migration for BundleMinifier.Core to move all version of the tool to 2.2.301 during migration. ( #4613 )
2016-11-03 19:55:52 -07:00
Livar
de5da5870f
Marking hoisted P2P projects with a FromP2P attribute. ( #4598 )
2016-11-03 10:27:51 -07:00
Piotr Puszkiewicz
fd9cb55f1a
Add msbuild-based stage0 where possible ( #4597 )
...
* Add msbuild-based stage0 where possible
* Fix bash initialization script
* Windows Fixes
* Fix dotnet deb tool
2016-11-02 23:01:57 -07:00
Livar
14c285db1c
Merge pull request #4583 from NTaylorMullen/nimullen/removert
...
Remove Razor.Tools/Razor.Design from migration logic.
2016-11-02 21:21:20 -07:00
Livar
d84c89be15
Merge pull request #4589 from livarcocc/cleanup_migration
...
Cleanup migration
2016-11-02 17:03:29 -07:00
Livar
14ad04a400
Merge pull request #4580 from jeffkl/telemetry
...
Some unit tests for MSBuild telemetry
2016-11-02 16:05:43 -07:00
Jeff Kluge
6a4d49e227
Remove quotes from /Logger argument because the argument escaper will do it for me
2016-11-02 15:19:21 -07:00
N. Taylor Mullen
411dd02923
Remove Razor.Tools/Razor.Design from migration logic.
...
- Razor.Tools/Razor.Design will not be shipping with MSBuild support for the upcoming release.
2016-11-02 15:16:57 -07:00
Livar Cunha
4e1f2f2b20
Removing TFM specific defines for migrated projects, since they are not being set in the SDK itself.
2016-11-02 15:05:45 -07:00
Livar
f84ce89e30
Merge pull request #4558 from Faizan2304/enablevstest
...
Enable disabled vstest and test verb test.
2016-11-02 13:59:45 -07:00
Jeff Kluge
a2d438288e
Reduce line lengths
2016-11-02 13:06:44 -07:00
Faizan Ahmad
fa4fad1ba0
Update vstest test to use short name test asset
2016-11-03 00:49:49 +05:30
Justin Goshi
d1772f6ed4
Add mstest support ( #4572 )
...
* Migrate: auto-injected dependencies should overwrite existing dependency version if present
* WIP adding new mstest templates
* Auto-inject mstest dependencies when testrunner is set to mstest
* WIP trying to get new web test to work
* Get dotnet new -t Web test to pass
* Remove whitespace and accidentally added (redundant) tests
* Shorten test method name
2016-11-02 08:49:45 -10:00
Faizan Ahmad
734afe84cf
Update test to point new short name test assets
2016-11-03 00:14:03 +05:30
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
Livar Cunha
0c833f5349
Making the default exclude option empty, so that by default, we don't set any excludes for compile or embed during migration.
2016-11-02 10:11:37 -07:00
Faizan Ahmad
dc249a94e9
Logging
2016-11-02 21:34:35 +05:30
Jeff Kluge
9c10867194
Unit tests for the logger command-line argument when telemetry is enabled or disabled
2016-11-02 08:04:02 -07:00
Faizan Ahmad
4af8d52a23
Updated the version of microsoft.testplatform.cli package
2016-11-02 18:11:36 +05:30
Faizan Ahmad
9b92fe2336
Adding try catch for xunit test to get logs
2016-11-02 15:07:13 +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
Livar
aaa343a1c8
Merge pull request #4566 from livarcocc/migrate_unqualified_references
...
Migrating unqualifing references as projects
2016-11-01 15:54:45 -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
Justin Goshi
155ef033f2
Migrate: auto-inject test dependency version ( #4565 )
...
* Migrate: auto-injected dependencies should overwrite existing dependency version if present
* Address PR comments
2016-11-01 12:10:51 -10:00
Livar Cunha
23a44f192f
Fixing the test on windows. We need to use path.combine because of the forward/backward slashes for directory separation.
2016-11-01 14:58:11 -07:00
Faizan Ahmad
061722d4ad
Enable some more test
2016-11-02 03:01:13 +05:30
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
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
Livar Cunha
c7858afc48
Attempting to actually fix the build this time. We were not pointing to the right packages cache before.
2016-11-01 12:46:29 -07:00
Faizan Ahmad
5c5ce3d336
Enable test verb tests
2016-11-01 22:01:30 +05:30
Faizan Ahmad
b13a7cee50
Enable Vstest test
2016-11-01 17:17:45 +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
Justin Goshi
f9493545dc
Address PR comments to improve test readability and reliability
2016-10-31 20:50:52 -07:00
Justin Goshi
45ccc74ace
Merge from rel/1.0.0
2016-10-31 20:00:15 -07:00
Livar
3c52adf53d
Merge pull request #4537 from livarcocc/rename_tools_packages
...
Rename tools packages
2016-10-31 18:39:32 -07:00
Jeff Kluge
595a768e30
Custom logger for MSBuild to receive telemetry events ( #4551 )
...
* Upgrade MSBuild references to 15.1.0-preview-000370-00
* Custom logger for MSBuild to receive telemetry events
Had to make the telemetry session ID a static variable so that the forwarding app could use it.
I've tested this all manually and will be writing tests after everyone signs off on the implementation here.
2016-10-31 16:16:39 -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
Justin Goshi
4cd74bff88
Only add the xunit references if the test running is xunit
2016-10-31 15:55:22 -07:00
Justin Goshi
4ea37c91a8
Migrate: add package dependencies to test projects
2016-10-31 13:59:47 -07:00
Livar Cunha
be2ab211f1
Addressing code review comments.
2016-10-31 12:39:03 -07:00
Livar Cunha
b16c9018b6
Adding a map of asp tools packages that tells which versions we need to migrate and to what. Any package in that list, will also have its version updated.
2016-10-31 12:33:01 -07:00
Livar
5a621b53e2
Merge pull request #4540 from livarcocc/issue4492/migrateWeb
...
Issue4492/migrate web
2016-10-31 12:26:26 -07:00
Livar Cunha
c3b57f2e72
Changing the Sdk.Web version to match the current SDK version so that we can update them together. Also added the dotnet-web to the migrated tests.
2016-10-30 21:32:11 -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
Livar
3ec5279491
Merge pull request #4516 from dagood/disable-parallel
...
Use --disable-parallel during xplat restores
2016-10-29 00:49:09 -07:00
Livar Cunha
9e88b811a0
Refactoring the ProjectTypeDetector to use the Project in the MigrationInputs.
2016-10-29 00:33:22 -07:00
Mike Lorbetske
2d27092513
Fix the test for web project migration
2016-10-29 00:33:22 -07:00
Mike Lorbetske
e847389fc2
Update migration to use the web template as a base for web projects
2016-10-29 00:33:22 -07:00
Livar
22a5a15ba9
Merge pull request #4536 from krwq/outputNameIssue
...
Migrating project with OutputName
2016-10-28 20:55:18 -07:00
Livar Cunha
6c1dd226ec
Fixing windows failure due to path length.
2016-10-28 19:03:03 -07:00
Livar Cunha
9cbc563b55
Fixing tests in Windows.
2016-10-28 18:19:42 -07:00
Livar Cunha
59ac685dcd
Updating the msbuild version to one with the preserve compilation context fix.
2016-10-28 18:19:41 -07:00
Bryan Thornbury
c9f9421b93
preserve whitespace
2016-10-28 18:19:39 -07:00
Krzysztof Wicher
e9e05006da
Migrating project with OutputName
2016-10-28 17:27:42 -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
Arun Mahapatra
45a05417aa
Update GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs
2016-10-29 03:03:14 +05:30
Arun Mahapatra
43d27b843b
Add issue to track vstest break
2016-10-29 01:30:49 +05:30
Arun Mahapatra
9ba8f816df
Disable vstest tests temporarily to unblock PR build
2016-10-29 01:05:18 +05:30
Davis Goodin
6b361b8dad
--disable-parallel in tests.
2016-10-28 11:06:37 -05: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
Livar Cunha
29bd1e12e6
Fixing a merge with a new test that I added. No more restore3, hooray.
2016-10-27 20:56:36 -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