Commit graph

1842 commits

Author SHA1 Message Date
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