Commit graph

1972 commits

Author SHA1 Message Date
Livar Cunha
f5a93d57da Fixing the expected fx-version. 2017-12-07 13:41:36 -08:00
Livar Cunha
90e254b9ed More fixes that were missing from the merge. 2017-12-07 13:23:27 -08:00
Livar Cunha
902904cdd6 Updating the msbuild version for Microsoft.Build.Runtime. 2017-12-07 13:13:43 -08:00
Livar Cunha
60ba27d2db Adding a separate dependency version for Microsoft.Build.Runtime. 2017-12-07 12:19:43 -08:00
Livar Cunha
5a0e95897e Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171206-080040
* dotnet/release/15.5: (26 commits)
  Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property.
  One more old style version package name needed to change in redist.
  Fixing the versions of MSBuild and passing the right property to find roslyn files.
  Use "15.5.179" for the other Microsoft.Build.* packages
  Moving the 'MicrosoftBuildPackageVersion' forward.
  Fixing "RuntimeFrameworkVersion"
  Updating version naming convention.
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  ...

	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
	build/BundledTemplates.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Test.targets
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	dir.props
	run-build.sh
	src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
	src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
	src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
	src/dotnet/dotnet.csproj
	src/redist/redist.csproj
	src/tool_fsharp/tool_fsc.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.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/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
2017-12-07 09:55:12 -08:00
Livar Cunha
0f8dfedc6f Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property. 2017-12-06 23:06:43 -08:00
Livar Cunha
cd86a4cac4 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171206-080037
* dotnet/release/2.0.0:
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn/tool_roslyn.csproj
2017-12-06 12:18:28 -08:00
William Lee
55f62d9d64
Add install tool command (#8132)
* compose all the parts

* Fix on obtain and shim maker for better end to end experience
  * Fix error when there is space in the middle of path of nuget config
  * Fix path in profile.d is the tmp home path during install
  * better handle of ~home
  * remove profile.d file in uninstall script
  * Fix test since it looks up current directory
  * folder structure inside nupkg to tools/TFM/RID/mytool.dll
  * Add check for config file existence
  * Rename name space to Microsoft.DotNet.ShellShim
  * Rename name space to Microsoft.DotNet.ToolPackage
2017-12-04 14:13:24 -08:00
John Beisner
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -08:00
John Beisner
3cb1cca44d Third pass clean-up of package names. 2017-12-04 09:44:51 -08:00
John Beisner
4d694d2c56 Second pass clean-up of package names; resequencing download. 2017-12-04 09:31:28 -08:00
John Beisner
f0abfb6b12 Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props 2017-12-01 20:07:48 -08:00
Peter Huene
4f7c76b4e4 Make --no-build imply --no-restore for run command.
This commit makes the `--no-build` option for the run command
automatically imply `--no-restore`.

Fixes issue #7472.
2017-11-28 16:01:18 -08:00
Peter Huene
ea85555a97 Add verbosity option to run command.
This commit adds the verbosity option to the run command.

This will be used in tests for visibility into what the run command is
doing.

The default verbosity is unaffected.

Fixes issue #7932.
2017-11-28 16:00:36 -08:00
Livar Cunha
3b1c67bb55 Fixing failing test. Now that the latest NetStandard.Library version moved to 2.0.1, the test needed to account for that. 2017-11-28 12:54:06 -08:00
Peter Huene
40b0e0fcec Make --no-build imply --no-restore for pack command.
This commit makes the `--no-build` option for the pack command
automatically imply `--no-restore`.

Fixes issue #7472.
2017-11-27 23:53:22 -08:00
Peter Huene
de10b22bcd Make --no-build imply --no-restore for test command.
This commit makes the `--no-build` option for the test command
automatically imply `--no-restore`.

Fixes issue #7472.
2017-11-27 23:06:48 -08:00
Livar Cunha
9e97e53446 Updating the CLI branding to 2.1.2 and ingesting the 2.0.4 runtime. 2017-11-27 11:36:12 -08:00
William Lee
cc80ed43e0
Tools shim maker and env path handling (#8085)
* Tools shim maker and env path handling

Includes component:

* Given executable, create shim (all three OSs)
* Add executable path to Env PATH during first run
* including manual instruction when there is no access
2017-11-27 10:45:43 -08:00
Livar
1239b21477
Merge pull request #8082 from peterhuene/fix-sln-remove-dependencies
Remove project dependencies when removing a project from a solution.
2017-11-21 21:52:26 -08:00
William Lee
584d3f0502
Global tools package obtain (#8035)
Add ExeutablePackageObtainer

Given a tools package id, it can create a fake project and restore to correct folder

- DI, aka no circular dependency of commands
- Parser of config XML
- I try to create test nupkg at build time, so I can run test and debug
easily with VSCode. The code is in test csproj.
2017-11-21 20:10:06 -08:00
Peter Huene
6210dab09c Remove project dependencies when removing a project from a solution.
This commit fixes #6198.

When a project is removed from a solution using the `sln remove`
command, any projects in the solution with a project dependency (note:
this is different from a project reference) on the project should have
the project removed as a dependency.

The fix is to scan the projects in the solution and remove any
dependencies on the projects being removed.  If the dependencies section
is empty after the remove, we skip serialization of the section like
Visual Studio does.
2017-11-21 18:20:05 -08:00
Livar Cunha
0ffc530aee Merge branch 'release/2.0.0-MSRC' into merge_release_200_MSRC
* release/2.0.0-MSRC:
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-03 09:58:08 -07:00
William Li
8c3b640540 Fix merge 2 2017-10-31 13:37:28 -07:00
Livar
2031c9cf33
Merge branch 'master' into merges/release/15.5-to-master-20171031-070033 2017-10-31 10:15:11 -07:00
Nick Guerrera
cd489a356a
Merge pull request #7896 from nguerrera/one-process-restore
Use msbuild /restore instead of a separate process
2017-10-27 15:33:09 -07:00
William Lee
cef9a90ad1
Hashed telemetry and event name change (#7919) 2017-10-27 10:58:25 -07:00
Nick Guerrera
35b7ad2789 Use msbuild /restore instead of separate invocations where possible
It is not currently possible when there is a -f|--framework argument because
we cannot force a TargetFramework global property on to the restore evaluation.
Doing so completely breaks restore by applying the TargetFramework to all
projects transitively. The correct behavior is to restore for all frameworks,
then build/publish/etc for the given target framework. Achieving that still
requires two distinct msbuild invocations.

This also changes the verbosity of implicit restore from quiet to that
of the subsequent command (default=minimal). Similar to global properties,
we cannot specify a distinct console verbosity for the /restore portion of
the overall execution. For consistency, we apply the same verbosity change
to the case where we still use two separate msbuild invocations.

This also fixes an issue where the separate restore invocation's msbuild log
would be overwritten by the subsequent command execution. However, this remains
unfixed in the case where we still use two separate msbuild invocations.
2017-10-26 16:01:34 -07:00
Nick Guerrera
8fead788d7 Fix dotnet build /clp:NoSummary 2017-10-26 06:37:45 -07:00
Nick Guerrera
20b0b820a8 Remove unnecessary handling of verbosity in RestoreCommand
We were taking care to set the console verbosity to minimal, but
only when no verbosity argument is passed. However, the default
verbosity for all CLI msbuild commands is already minimal and so
we can just get out of the way.
2017-10-24 15:04:24 -07:00
Peter Huene
03f0c51292 Fix relative path handling on Windows.
On Windows, `PathUtility.GetRelativePath` was not properly handling
paths that differed by case in the drive reference (e.g. "C:\" vs.
"c:\").  The fix was to add the missing case-insensitive comparison
argument.

Replaced uses of `PathUtility.GetRelativePath` with
`Path.GetRelativePath` where possible (requires 2.0.0+).

Additionally, `PathUtility.RemoveExtraPathSeparators` was not handling
paths with drive references on Windows.  If the path contained a drive
reference, the separator between the drive reference and the first part
of the path was removed.  This is due to `Path.Combine` not handling
this case, so an explicit concatenation of the separator was added.

This commit resolves issue #7699.
2017-10-24 11:23:52 -07:00
Livar Cunha
72eda50303 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-17 17:30:58 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
Livar Cunha
27aa698710 Manually merging some changes that git merged wrong and deleted from the 15.5 branch. 2017-10-13 09:56:08 -07:00
Livar Cunha
1943ddc57f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171013-070028
* dotnet/release/2.0.0:
  Use temporary path for fake deps.json in test
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Keeping the branding for release/2.0.0 at 2.0.3.
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-13 09:04:58 -07:00
Nick Guerrera
e59fd7af46 Use temporary path for fake deps.json in test
(cherry picked from commit 796b4a06e7)
2017-10-12 16:32:12 -07:00
Livar Cunha
f6a07bcb39 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
2017-10-12 14:56:23 -07:00
faahmad
273f4bc4a5 Fixed tests 2017-10-11 12:21:59 +05:30
Livar Cunha
fead8521c3 Moving the runtime version to 2.0.0 for the SDK.
(cherry picked from commit e24b53dda7)
2017-10-09 13:59:09 -07:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995
There were incorrect merges from release/15.5 to release/2.0.0 since then
2017-10-09 13:55:13 -07:00
Livar Cunha
e11c66e7f0 Fixing the expected runtime version by the tool tests. 2017-10-09 12:35:38 -07:00
Nick Guerrera
796b4a06e7 Use temporary path for fake deps.json in test 2017-10-06 10:53:21 -07:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
Ashley Hauck
97b027b232 Remove CscToolPath 2017-10-02 12:26:52 -07:00
Jan Vorlicek
90e217831b Enable RHEL 6 support
This change enables RHEL 6 support. It also adds a new command line option to the
run-build.sh script that enables passing in a folder containing a bootstrap CLI.
This helps in bringup of new target platforms.
2017-09-21 15:20:55 +00:00
Livar
d624a96a1f Merge pull request #7663 from livarcocc/move_testframework_from_output
Removing Microsoft.DotNet.TestFramework from the product code
2017-09-15 15:31:31 -07:00
Livar Cunha
3efd44f935 Removing Microsoft.DotNet.TestFramework from the product code and from the SDK deployment and moving the code to the test folder. 2017-09-15 09:49:19 -07:00
William Li
9c1fa7c9d9 Do not move forward if there is parsing error 2017-09-12 16:54:51 -07:00
Livar
a8dd209359 Merge branch 'master' into merges/release/2.0.0-to-master-20170907-070027 2017-09-07 11:11:28 -07:00
Livar Cunha
093512a64e Pinning the package version expected by NewProjectRestoresCorrectPackageVersion to 2.0.0. 2017-09-06 15:40:31 -07:00
Livar Cunha
cbc87958cc Fix implicit Microsoft.NetCore.App version test. 2017-09-06 12:52:19 -07:00
Daniel Plaisted
97b7553e31 Rename output folder from out to bin 2017-09-01 16:43:02 -07:00
Daniel Plaisted
27dc8032dd Fix test that depended on old output directory layout 2017-09-01 13:53:17 -07:00
Daniel Plaisted
9b331673fe Merge upstream changes 2017-09-01 13:17:40 -07:00
Nick Guerrera
f4f5100af1 Merge pull request #7480 from mikkelbu/list-store-and-help-as-commands
Add store and help to SDK commands
2017-09-01 12:48:58 -07:00
Nick Guerrera
03293f5b90 Fix test expectation for package restored n new project 2017-08-31 17:56:15 -07:00
seancpeters
7f3c93cd0c fixed the bug annotation 2017-08-31 16:40:28 -07:00
seancpeters
bb90633cad annotated the commented out test cases related to netstandard2.0 2017-08-31 16:38:33 -07:00
seancpeters
ffdccdfc21 Re-enabling some unit tests that were skipped, but are again valid with net core 2.1 2017-08-31 15:31:44 -07:00
seancpeters
99489cf402 fixed indentation on Nuget.tempaspnetpatch.config 2017-08-31 10:49:37 -07:00
Daniel Plaisted
4c3b13e4a8 Use a shorter path for test working directories, get rid of Stage 0 project.json based CLI 2017-08-29 17:59:34 -07:00
seancpeters
79e94eb908 Updating new templates to 2.1.0 versions 2017-08-29 15:21:13 -07:00
Daniel Plaisted
9fb5f746ae Fix multiple tests using same output path 2017-08-29 11:26:28 -07:00
Daniel Plaisted
dcb3a7ade7 Use shorter output paths to avoid max path issues on Windows
For example, "out/2" instead of "artifacts/stage2"
2017-08-29 06:55:43 -07:00
Mikkel Nylander Bundgaard
607f72983c Correct unit test 2017-08-29 11:48:53 +02:00
Matt Galbraith
1156e52eb8 Update dependency version 2017-08-28 13:14:23 -07:00
Daniel Plaisted
107252ebe7 Merge upstream changes 2017-08-28 11:09:19 -07:00
Nick Guerrera
497f6c5b0c Fix warnings in test projects 2017-08-25 20:17:58 -07:00
Nick Guerrera
ac3900d9c1 Re-enable some tests 2017-08-25 20:17:58 -07:00
Daniel Plaisted
2222290394 Update MSI tests to use new output directory layout 2017-08-24 17:16:11 -07:00
Daniel Plaisted
e4777c0b91 Update expected SDK version test to work with multiple stages 2017-08-24 15:51:38 -07:00
Daniel Plaisted
12f8c2377f Generate properties to pass to the next stage of the build 2017-08-24 15:51:37 -07:00
Daniel Plaisted
4ccf1b6902 Use separate folders for different cases of a theory 2017-08-24 15:49:14 -07:00
Daniel Plaisted
13da213183 Support new artifacts layout in tests and other build logic 2017-08-24 15:49:13 -07:00
Daniel Plaisted
ae0aa8ed24 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly
2017-08-24 15:46:45 -07:00
Daniel Plaisted
b461e75524 Disable tests on non-Windows due to bugs related to .NET Core 2.1
https://github.com/dotnet/corefx/issues/23496
https://github.com/dotnet/cli/issues/7501
2017-08-23 10:41:37 -07:00
Mikkel Nylander Bundgaard
ed2a8f4432 Add store and help to SDK commands
I've added the store command as a localizable string (the
help command was already one), but I've not supplied any
translations.

Fixes #7432
2017-08-20 00:57:32 +02:00
Daniel Plaisted
360e657884 Disable tests that require templates that target .NET Core 2.1 (which aren't available yet) 2017-08-18 18:07:57 -07:00
Daniel Plaisted
60e5fabde2 Update tool tests to target netcoreapp2.1 2017-08-18 18:07:14 -07:00
Daniel Plaisted
dc4046ca7e Update test code to use netcoreapp2.1 2017-08-18 15:36:01 -07:00
Mikkel Nylander Bundgaard
44d25ae3af Add test for commands without doclink 2017-08-17 15:01:31 -07:00
John Doe
8fc8a03081 typo 2017-08-14 21:26:49 -07:00
William Li
1fa454bda4 Ingest new version Aspnet store
Change the url and name accordingly for the name naming convention
2017-08-14 16:05:22 -07:00
Livar
96b122e26f Merge branch 'master' into merges/release/2.0.0-to-master-20170731-070024 2017-07-31 11:00:18 -07:00
Livar
54377abbec Merge pull request #7292 from dotnet/stevesa/update-spa-templates-to-1.0.417
Update spa templates to 1.0.417
2017-07-27 11:26:40 -07:00
William Li
081f208942 Add telemetry data points for .NET Core 2.0 2017-07-27 09:55:40 -07:00
Steve Sanderson
f08bdbdf89 Remove template test workaround because it's no longer needed 2017-07-27 15:16:52 +01:00
Livar Cunha
015af46c99 Fixing a test that fails due to a race condition, because the .dotnet folder might not have been created yet. 2017-07-26 13:22:31 -07:00
Livar Cunha
20f0dac6b2 Making a change that will cause the first run notice to always show up in the first run of the CLI, even when it is installed by native installers. 2017-07-25 22:33:54 -07:00
Livar
58c580dbcc Merge pull request #7201 from dotnet/merges/release/2.0.0-to-master-20170720-070024
Merge release/2.0.0 to master
2017-07-20 11:53:12 -07:00
Nick Guerrera
a1c423c0f6 Honor UI language override in test runs
Also fix some incorrect unlocalized test expectations that slipped in.
2017-07-18 22:03:31 -07:00
Livar
a04273474e Merge branch 'master' into merges/release/2.0.0-to-master-20170712-070028 2017-07-12 14:28:17 -07:00
Mike Lorbetske
ea467db3af Update test to pass --no-restore to templates 2017-07-10 16:27:54 -07:00
Livar Cunha
9a1e39f083 Fix wrong number of parameters passed to test when doing the merge. 2017-07-10 10:57:28 -07:00
Livar Cunha
8c45238a1f Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170710-070025
* dotnet/rel/1.1.0:
  Enable VB dotnet new  test cases
  Fix fedora.23 dockerfile
  Updating the ReadMe: "rel-1.0.1" to "rel-1.1.0"
  Update Roslyn to 2.3.0-beta4-61830-03
  update nuget to 4.3.0-preview4-4258
2017-07-10 09:52:28 -07:00
Tom Meschter
5a37290f24 Merge pull request #7112 from dotnet/merges/release/2.0.0-to-master-20170710-070027
Merge release/2.0.0 to master
2017-07-10 08:54:29 -07:00
Kevin Ransom (msft)
a81984aae7 Merge branch 'rel/1.1.0' into vbtests 2017-07-07 23:44:01 -07:00
Kevin Ransom
3b180f49ba Enable VB dotnet new test cases 2017-07-07 23:38:20 -07:00
William Li
941c29c2be Mark test windows only 2017-07-07 12:56:21 -07:00
William Li
191e3e3019 Installer Success Reporting for Windows
Issue https://github.com/dotnet/cli/issues/7091

Add internal command dotnet internal-reportinstallsuccess. Before
Windows installer finishes, run this command instead of dotnet new. It
will trigger the first time experience as well as sending telemetry with
installer exe name.

This command blocks to ensure that the webservice call completes.
2017-07-07 12:56:21 -07:00
Livar
7e1fe7eba7 Merge pull request #7095 from dotnet/merges/release/2.0.0-to-master-20170707-070029
Merge release/2.0.0 to master
2017-07-07 11:10:48 -07:00
Livar Cunha
2b15cb43cf Adding a Minimum VS Defined SDK version to the resolver. If it set to 1.0.4 if the minimum SDK version file is not found. 2017-07-05 09:54:46 -07:00
Livar
f5c677c37a Merge branch 'master' into merges/release/2.0.0-to-master-20170703-070031 2017-07-03 09:39:32 -07:00
Livar
20023717b5 Merge pull request #7048 from livarcocc/fix_help_message
Fixing help text for version, info and diagnostics and also removing …
2017-06-30 15:54:40 -07:00
Livar Cunha
3ec572f824 Fixing help text for version, info and diagnostics and also removing runtime options that are only available for dotnet exec. 2017-06-30 13:19:52 -07:00
Mike Lorbetske
0dd4f123d2 Update Template Engine and templates for 1.x 2017-06-29 19:09:54 -07:00
Livar
57dd81e842 Merge pull request #7025 from dotnet/merges/release/2.0.0-to-master-20170629-070032
Merge release/2.0.0 to master
2017-06-29 14:34:24 -07:00
Mike Lorbetske
d8087d35d4 Update engine and templates, update to SetupCrossgen 224 - Coherence 25975 2017-06-29 10:16:02 -07:00
Livar
5c67b11d62 Merge pull request #7014 from dotnet/merges/release/2.0.0-to-master-20170628-070032
Merge release/2.0.0 to master
2017-06-28 10:29:31 -07:00
Nick Guerrera
9b77dc50f1 Redirect parser to localized validation messages 2017-06-27 15:49:00 -07:00
Livar Cunha
a5aba4929a Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170627-070029
* dotnet/release/2.0.0: (27 commits)
  Updating the runtime to pick up the satellite assembly host fix.
  Fixing some merges from release/2.0.0-preview2.
  Create the Dotnet User Profile folder when running the first experience, if the folder does not exist, if will fail the first run because it will fail to create the first notice sentinel.
  Add F# and Roslyn satellites
  Fix tests expecting unlocalized messages from dotnet/sdk
  Generating a layout folder with the satellite assemblies only which we use to generate a language pack tarball/zip. Initially, I wanted a IncludeOnlyFilter, but couldn't quite get that to work on tar, just passing the filter in the command line didn't work because the shell does not do recursive globbing. So, I opted for the layout folder.
  Update SPA templates version to 1.0.0-preview-000321
  Fix dotnet/sdk#1364
  Add rhel and Debian download link
  Exclude satellite assemblies from archive.
  Remove failed workaround for Microsoft.Composition warning
  Update templates to add missing BrowserLink package
  Update to SetupCrossgen 215 - Coherence 25794
  Update templates to suppress the warning for Microsoft.Composition and AssetTargetFallback
  Add explicit dependency for pakcage smoke test
  Update templates to remove the package NETStandard.Library.NETFramework
  Update F# compiler to latest
  Update to SetupCrossgen 213 - Coherence 25769
  Pinning to the dotnet-install to version '2.0.0-preview2-006470'
  Updating branch/channel information.
  ...
2017-06-27 14:53:41 -07:00
Nick Guerrera
a115df9543 Adjust help message test expectations to match new parser 2017-06-27 10:03:54 -07:00
Livar
7af62e423e Merge pull request #6999 from livarcocc/first_run_sentinel_when_no_dotnet_folder_exists
Create the Dotnet User Profile folder when running the first experience
2017-06-26 12:53:02 -07:00
Livar
eeddfb6ea1 Merge pull request #7001 from dotnet/merges/release/2.0.0-to-master-20170626-070030
Merge release/2.0.0 to master
2017-06-26 11:25:58 -07:00
Nick Guerrera
b8a2ce4e8c Merge pull request #6997 from nguerrera/loc-compilers
Add F# and Roslyn satellites
2017-06-26 11:10:49 -07:00
Livar Cunha
cd984f5b50 Create the Dotnet User Profile folder when running the first experience, if the folder does not exist, if will fail the first run because it will fail to create the first notice sentinel. 2017-06-24 22:59:35 -07:00
Nick Guerrera
162d620038 Fix tests expecting unlocalized messages from dotnet/sdk 2017-06-23 19:48:07 -07:00
William Li
10d59cd982 Merge branch 'master' into merges/release/2.0.0-to-master-20170623-070040 2017-06-23 11:32:24 -07:00
Livar Cunha
37f531be4c Handling an exception that happens when dotnet run is invoked with a file that is not a valid project file. We catch that exception and re-throw it as a GracefulException. 2017-06-23 10:47:09 -07:00
Nick Guerrera
1ad0e4dffa Merge pull request #6974 from nguerrera/msbuild-satellites
Add msbuild satellite assemblies
2017-06-21 18:03:25 -07:00
Nick Guerrera
74acc40036 Add msbuild satellite assemblies 2017-06-21 13:34:16 -07:00
Nick Guerrera
6b0cd0e52f Make configurer unit tests pass on localized setup 2017-06-21 12:44:34 -07:00
Nick Guerrera
1661fd0975 Merge pull request #6961 from nguerrera/loc-tests
Make remaining tests pass on localized setup
2017-06-21 10:42:01 -07:00
Livar Cunha
5cab325335 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170621-070039
* dotnet/release/2.0.0: (35 commits)
  Fixing an issue in the RepoDirectoriesProvider where it assumed that the only directory under SDK was the SDK directories. This is no longer true now that we moved the NuGet fallback folder there.
  Simple clean up to the store tests
  Updating xlf files for the Configurer.
  Removing NuGetConfig from the first run experience and replacing the sentinel with the FirstUseNoticeSentinel when needed.
  Moving the expanding fallback folder to the dotnet folder hive. The folder will be expanded at sdk/NuGetFallbackFolder.
  Fixing CRLF issue.
  Updating xlf and fixing line ending problems with one file.
  Add rhel and Debian download link
  Fix race in telemetry msbuild arg tests
  Avoid repeating the first-run message if lzma archive is missing
  Use fluent helper for line-end normalization
  Update CoreSetup to preview3-25419-01
  Updating Roslyn to 2.3.0-beta3-61816-04
  Update CoreSetup to preview3-25418-01
  insert new tpv2 which fixes following issue https://github.com/Microsoft/vstest/issues/632 https://github.com/Microsoft/vstest/issues/844 https://github.com/Microsoft/vstest/issues/847 https://github.com/Microsoft/vstest/issues/840 https://github.com/Microsoft/vstest/issues/843
  Windows installer refresh
  Update SDK to 1.1.0-alpha-20170615-3
  Updating NuGet to 4.3.0-preview3-4168
  MSBuild 15.3.388
  Make dotnet-sln-add.Tests pass on localized setup
  ...
2017-06-21 08:51:19 -07:00
Parallels
235482b8da Fixing an issue in the RepoDirectoriesProvider where it assumed that the only directory under SDK was the SDK directories. This is no longer true now that we moved the NuGet fallback folder there. 2017-06-20 22:05:44 -07:00
Nick Guerrera
b922d7e550 Make dotnet-remove-reference tests pass on localized setup 2017-06-20 18:45:36 -07:00
Nick Guerrera
273dea9371 Make dotnet-list-reference tests pass on localized setup 2017-06-20 17:57:32 -07:00
Nick Guerrera
20e0a46e59 Make dotnet-add-reference tests pass on localized setup 2017-06-20 16:16:38 -07:00
Livar
1792723623 Merge pull request #6955 from livarcocc/fallback_folder_in_dotnet_hive
Move the NuGet fallback folder into the dotnet hive
2017-06-20 15:51:39 -07:00
Eric Erhardt
a356fca39a Simple clean up to the store tests
Align class name with file name.
miscellaneous code clean up
2017-06-20 15:19:51 -05:00
Livar Cunha
a357fd7bca Removing NuGetConfig from the first run experience and replacing the sentinel with the FirstUseNoticeSentinel when needed. 2017-06-20 10:59:23 -07:00
Livar Cunha
529d7caa79 Moving the expanding fallback folder to the dotnet folder hive. The folder will be expanded at sdk/NuGetFallbackFolder. 2017-06-20 10:59:23 -07:00
Livar
f6f96e334b Merge pull request #6869 from omajid/missing-lzma-repated-first-run-message
Avoid repeating the first-run message if lzma archive is missing
2017-06-19 20:50:59 -07:00
Nick Guerrera
3de5eb96c2 Fix race in telemetry msbuild arg tests 2017-06-19 15:35:22 -07:00
Omair Majid
34b44b999b Avoid repeating the first-run message if lzma archive is missing
If the LZMA archive is missing, the first-run message is printed every time.
This commit fixes that.

Split the first-run message into two pieces:

- The first-run (welcome and telemetry) message is printed only once, no matter
  whether the cache was primed or not.

- The cache-priming message is printed only if the cache is avaialble.
  Otherwise skip the cache introduction and the ccache priming operation.
2017-06-19 18:08:05 -04:00
Nick Guerrera
62c3798679 Use fluent helper for line-end normalization 2017-06-19 11:54:42 -07:00
Ashley Hauck
ca848eddd3 Detect git worktrees correctly
Git worktrees are represented as a file named .git, with contents that
look like:

    gitdir: E:/cli/.git/worktrees/cli2
2017-06-19 10:57:38 -07:00
Nick Guerrera
11967b7d9c Merge branch 'release/2.0.0' into loc 2017-06-16 18:20:44 -07:00
Livar Cunha
0a4a0a082c Updating the SDK. Mostly, had to change PackageTargetFallback to AssetTargetFallback. 2017-06-14 00:27:26 -07:00
Nick Guerrera
8754fa4e68 Make dotnet-sln-add.Tests pass on localized setup 2017-06-13 21:58:03 -07:00
Nick Guerrera
5da3bfdd6a Make dotnet-sln-list.Tests pass on localized setup 2017-06-13 21:13:47 -07:00
Nick Guerrera
50c68c4f5e Make dotnet-remove-package.Tests pass on localized setup 2017-06-13 20:38:15 -07:00
Nick Guerrera
2b74bf73dc Make dotnet-add-package.Tests pass on localized setup 2017-06-13 20:29:44 -07:00
Nick Guerrera
3e827fca61 Make dotnet-sln-remove.Tests pass on localized setup 2017-06-13 20:22:27 -07:00
Livar Cunha
5e5b4de0b9 Do no pass down to implicit restore the framework option. 2017-06-13 19:25:23 -07:00
Nick Guerrera
419562ba95 Make dotnet-help.Tests pass on localized setup 2017-06-13 19:24:30 -07:00
Nick Guerrera
6e0cfa7839 Make dotnet-msbuild.Tests pass on localized setup 2017-06-13 19:05:16 -07:00
Nick Guerrera
38e5b7123a Make Sln.Internal.Tests pass on localized setup 2017-06-13 18:22:41 -07:00
Nick Guerrera
981e3ae19c Made dotnet-(vs)test.Tests pass on localized setup 2017-06-12 18:32:31 -07:00
Nick Guerrera
023acbd212 Make Microsoft.Dotnet.Cli.Utils.Tests pass on localized setup 2017-06-12 18:32:07 -07:00
Nick Guerrera
f09124fcd6 Make dotnet.Tests pass on localized setup 2017-06-12 17:31:40 -07:00
Livar
3ea6a6e672 Merge pull request #6816 from enricosada/fsharp_e2e
add more f# tests
2017-06-11 18:59:18 -07:00
Enrico Sada
00eadc6e8f test pack command 2017-06-09 23:09:21 +02:00
Enrico Sada
56d03c10e6 reenable smoke test of F# templates 2017-06-09 20:07:33 +02:00
Daniel Plaisted
6b44f8938b Merge upstream changes 2017-06-09 00:43:29 -07:00
Daniel Plaisted
c19ff8cc13 Add test for consuming .NET Standard 2.0 library from .NET Framework 4.6.1 project 2017-06-08 15:40:22 -07:00
Livar Cunha
3231295acf Fixing a bug in the restore option where specifying verbosity through /v was not entirely honored.
Adding tests for implicit restore for all the affected commands.

Fixing an issue where the command target was being passed to the restore command during implicit restore.

Adding restore params to all commands with implicit restore. Also, implicitly set the restore output to quiet.

Adding tests for the no-restore option.
2017-06-07 17:41:30 -07:00
Steve Sanderson
7e0747ec89 Bundle SPA templates package 2017-06-06 11:11:34 +01:00
Kevin Ransom (msft)
ac3ed6fbe6 Merge pull request #6743 from KevinRansom/release/2.0.0
This updates the F# compiler to the latest nuget published build.
2017-06-05 12:00:43 -07:00
Mike Lorbetske
093c8ecfca Update to SetupCrossgen 142 - Coherence 25368, add support for timestamped stores for the MSI 2017-06-02 13:57:08 -07:00
Livar
4fe8fc2faf Merge branch 'release/2.0.0' into release/2.0.0 2017-06-02 09:57:16 -07:00
Eric Erhardt
c45dd3bf82 Fix dotnet store tests for new error message. 2017-06-02 10:19:59 -05:00
Livar
6d84f6db77 Fixing test failure.
NuGet changed how they display the error message.
2017-06-01 21:32:20 -07:00
Livar
718b049ae9 Fixing test failure.
NuGet changed how they display the error message.
2017-06-01 21:31:14 -07:00
Kevin Ransom
2cfad18b0b This updates the F# compiler to the latest nuget published build. 2017-06-01 17:38:20 -07:00
Livar
413fa23eee Merge pull request #6731 from livarcocc/merge_rel_110
Merge rel/1.1.0 into release/2.0.0
2017-06-01 11:54:16 -07:00
Livar Cunha
f4bb13acaa Merge branch 'rel/1.1.0' into merge_rel_110
* rel/1.1.0: (41 commits)
  Updating the Sdk to one that includes the error surfacing work.
  Update NuGet to 4.3.0-preview2-4082
  Update NuGet to 4.3.0-preview1-4081 and SDK to corresponding 1.1.0 based version
  Updating MSBuild to 15.3.0-preview-000246-05 to match VS.
  Updating the global.json creation to use the IFile interface and adding a unit test to cover it.
  Making restore use a config file so that it does not use fallback folders that may exist in the machine.
  Dropping a global.json when running the first run experience with a version that matches the version of the CLI being used in the command that triggered the first run.
  Updating the websdk version for 1.0
  Trying to fix the opensuse42 test failure, where we tried to invoke a tool that target 1.0.4 where the 1.0 runtime is not available.
  Pinning the stage0 to the last build out of rel/1.0.1 and adding a project to download 1.0 dependencies for test assets.
  Updating the branding to rel/1.1.0
  Dummy commit.
  Adding the access token to the lzma url.
  Dummy change to force a build.
  Reverting the msbuild version to the release version.
  Adding the web feed to nuget.config, as some packages failed to mirror and we need a build ASAP.
  Updating the msbuild, SDK and Web SDK versions.
  Dummy commit to kick off the build.
  the FSharp.NET.Sdk version `-bundled` contains only the Sdk dir
  bump f# sdk package version
  ...
2017-06-01 09:43:31 -07:00
mlorbetske
55953f05e3 Shorten names a bit more, make project names match folder names 2017-05-31 14:07:34 -07:00
mlorbetske
ddde45f345 Shorten test project names 2017-05-31 11:48:01 -07:00
mlorbetske
452e642ac7 Make errors more specific, add support for setting the launch URL for ASP.NET apps 2017-05-30 22:42:46 -07:00
Mike Lorbetske
0243354355 Ad tests, fix issue where profile not found isn't an error 2017-05-30 22:42:46 -07:00
Livar
6db5ff4638 Merge pull request #6690 from livarcocc/fix_verbosity_option_in_help
Changing verbose to verbosity in the help options
2017-05-30 14:53:58 -07:00
jbeisner
cd0ec6abd3 Merge pull request #6713 from johnbeisner/ScriptRename
.NET Core 2+ Naming and Versioning; Install scripts
2017-05-30 14:49:54 -07:00
Livar Cunha
c27b89dfd4 Changing verbose to verbosity in the help options to match what we actually use. 2017-05-30 13:05:38 -07:00
Livar
5a47e7db07 Merge pull request #6701 from nguerrera/resolver-fix
Allow resolution of SDKs without minimum msbuild version file
2017-05-27 10:02:56 -07:00
John Beisner
b48b7d2ea0 .NET Core 2+ Naming and Versioning
New file name structure for the runtime and the CLI
per: https://github.com/dotnet/designs/issues/2

The renaming of assets, therefore the dotnet installation scripts must change to accommodate.

Trivial:
"Write-Host" should be "Write-Output"
2017-05-26 15:46:56 -07:00
Nick Guerrera
7c8bf26eaf Allow resolution of SDKs without minimum msbuild version file 2017-05-26 15:06:55 -07:00
Livar Cunha
8b07dfa149 Adding the runtime identifier option to dotnet clean. 2017-05-25 12:29:51 -07:00
Livar Cunha
db68d4505e Pinning the MSBuild Minimum version to 15.3.0. 2017-05-24 19:28:26 -07:00
Livar Cunha
1a117568fe Addressing code review comments by comparing the versions differently and by changing the name of SDK to .NET Core SDK. 2017-05-24 18:00:05 -07:00
Livar Cunha
75eac0c92b Moving version validation to only when a SDK is not overriden. Also adding a validation for the minimum MSBuild version. 2017-05-24 18:00:05 -07:00
Livar Cunha
a692cb89f3 Fixing the tests to handle the extra tests added by the min version change. 2017-05-23 23:19:56 -07:00
Livar Cunha
79a817bbc7 Fixing windows build and addressing code review comments. 2017-05-23 22:49:52 -07:00
Livar Cunha
5b3cd63198 Changing the resolver so that it will search for dotnet in the PATH instead of hard coded program files. 2017-05-23 22:49:52 -07:00
Livar
96ff9a3223 Merge pull request #6646 from livarcocc/min_version_resolver
Add a min version check to the resolver
2017-05-23 22:17:42 -07:00
Livar Cunha
3539fb2a77 Disabling net461 tests for the resolver. 2017-05-23 15:59:31 -07:00
Livar Cunha
37267bf158 Addressing code review comments and trying to fix the windows break. 2017-05-22 21:26:44 -07:00
Livar
059e29b600 Merge pull request #6660 from rainersigwald/enable-vb-tests
Enable VB tests on all platforms
2017-05-22 12:15:28 -07:00
mlorbetske
0dd30b92d5 Update to SetupCrossGen 121 - Coherence 25102 2017-05-22 11:48:30 -07:00
Rainer Sigwald
a3dbfa47c9 Revert "Disabling the VB tests in non-windows platforms while MSBuild fixes a bug that we need for cross-plat."
This reverts commit a4c3e69c3c.

This should work since 28e25657cb picked
up the fix for Microsoft/msbuild#137.
2017-05-22 13:06:34 -05:00
Livar Cunha
822b290bb6 Updating the global.json creation to use the IFile interface and adding a unit test to cover it. 2017-05-22 09:51:30 -07:00
Livar Cunha
f67a72d9c4 Making restore use a config file so that it does not use fallback folders that may exist in the machine. 2017-05-22 09:42:40 -07:00
Livar Cunha
a4213f78e0 Adding more tests for the min version check in the resolver. 2017-05-19 22:40:11 -07:00
Livar Cunha
f61d1ffbb0 Adding a check for the min version in the CLI Resolver. 2017-05-19 21:42:05 -07:00
Livar
947c8daabc Merge pull request #6462 from nguerrera/sdk-resolver-tests
Better sdk resolver test
2017-05-19 21:40:56 -07:00
Eric Erhardt
8c1dacbe23 Merge pull request #6631 from eerhardt/StoreOptions
Fix dotnet store options
2017-05-18 21:23:47 -05:00
William Li
88b2e06dd1 Merged host and SDK help
Change help according to https://github.com/dotnet/cli/issues/6215
2017-05-18 18:12:04 -07:00
Eric Erhardt
6ba3fbf5be Fix tests now that --preserve-working-dir is no longer an option. 2017-05-18 19:36:28 -05:00
Livar
6647eddf24 Merge pull request #6627 from livarcocc/fix_restore_verbosity
Fixing restore so that it respects the verbosity param.
2017-05-18 15:39:05 -07:00
Livar Cunha
357fd3daf1 Fixing restore so that it respects the verbosity param. The problem was that ConsoleLoggerParameters was overwritting whatever was coming through the command line. 2017-05-18 14:13:01 -07:00