Commit graph

2305 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
62ae014c37 Making this repo consume the dotnet-sdk-internal zip and produce a full core-sdk by using sdk-internal, runtime, lzma, templates and store. Also deleted a bunch of now, unecessary code. I am sure there is more to be deleted though. 2017-10-13 10:45:50 -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
Daniel Plaisted
65b0df5b43 Rename output folder from out to bin
(cherry picked from commit 97b7553e31)
2017-09-27 14:45:04 -07:00
Daniel Plaisted
78eb0a7719 Fix test that depended on old output directory layout
(cherry picked from commit 27dc8032dd)
2017-09-27 14:44:16 -07:00
Daniel Plaisted
9f3bbc40a2 Use a shorter path for test working directories, get rid of Stage 0 project.json based CLI
(cherry picked from commit 4c3b13e4a8)
2017-09-27 14:40:57 -07:00
Daniel Plaisted
7b2eb66236 Fix multiple tests using same output path
(cherry picked from commit 9fb5f746ae)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
4cd03dcae4 Use shorter output paths to avoid max path issues on Windows
For example, "out/2" instead of "artifacts/stage2"

(cherry picked from commit dcb3a7ade7)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
ca21dee79a Update MSI tests to use new output directory layout
(cherry picked from commit 2222290394)
2017-09-27 14:37:40 -07:00
Daniel Plaisted
c665fd3654 Update expected SDK version test to work with multiple stages
(cherry picked from commit e4777c0b91)
2017-09-27 14:22:29 -07:00
Daniel Plaisted
f39315771e Generate properties to pass to the next stage of the build
(cherry picked from commit 12f8c2377f)
2017-09-27 14:22:19 -07:00
Daniel Plaisted
db1dabca9a Use separate folders for different cases of a theory
(cherry picked from commit 4ccf1b6902)
2017-09-27 14:20:08 -07:00
Daniel Plaisted
2b134c91fe Support new artifacts layout in tests and other build logic
(cherry picked from commit 13da213183)
2017-09-27 14:20:05 -07:00
Daniel Plaisted
8385d37185 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly

(cherry picked from commit ae0aa8ed24)
2017-09-27 14:16:37 -07:00
Nick Guerrera
6fad8be40a Fix warnings in test projects 2017-09-27 13:29:08 -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