Commit graph

238 commits

Author SHA1 Message Date
Peter Huene
6c411e824b
Merge branch 'release/2.1.3xx-MSRC' into release/2.1.3xx
* release/2.1.3xx-MSRC:
  Updates asp.net versions to match prodcon
  Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
  Update expected versions to 2.1.2
  Disable NewProjectRestoresCorrectPackageVersion "console" test for now.
  Update the version for 'microsoft.netcore.app' to "2.1.1*"
  Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
  Merged PR 126122: Fix alpine file ownership issues with newer docker
  Fix mismatch of dotnet-watch with package variable name
  Set package versions for bundled aspnet tools separately from the metapackage version
  Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable
  Fixup myget feed for aspnetcore
  Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
  Updated Version.props
2018-07-10 10:43:47 -07:00
John Beisner
460788c91a
Removing 'Locked-file' test; CLI:release/2.1.3xx (#9604)
* Removing 'Locked-file' test: ItFailsInLessThanOneSecondWhenTheProjectAssetsJsonDoesNotExist
2018-07-03 16:23:35 +00:00
Peter Huene
c0eff4fa56
Merge branch 'release/2.1.3xx' into release/2.1.3xx-MSRC
* release/2.1.3xx:
  Updating the CLI stage0 to 2.1.300 and fixing some build failures.
  Update Microsoft.NETCore.App Package Version
  Formatting...
  Drop the LZMA archive for every build.
2018-06-12 10:31:56 -07:00
Livar Cunha
15e6928b02 Updating the CLI stage0 to 2.1.300 and fixing some build failures. 2018-06-08 16:03:24 -07:00
Matt Mitchell
41d2418bfb Update expected versions to 2.1.2 2018-06-05 17:32:01 -07:00
jbeisner
5541529bbe Update the version for 'microsoft.netcore.app' to "2.1.1*" 2018-06-05 17:30:34 -07:00
jbeisner
fec5f38b93 Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*" 2018-06-05 17:28:32 -07:00
jbeisner
74a7d63e43 Update the version for 'microsoft.netcore.app' to "2.1.1*" 2018-06-05 17:51:19 +00:00
jbeisner
0015821db6 Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*" 2018-06-05 16:51:32 +00:00
Nate McMaster
4eaf45ba85 Fix mismatch of dotnet-watch with package variable name 2018-05-31 19:31:34 -07:00
Nate McMaster
1386aa28e1
Fix mismatch of dotnet-watch with package variable name 2018-05-31 14:44:29 -07:00
William Li
2f01bb4fad
Add TryGetMostFitRuntimeIdentifier (#8997) 2018-04-06 17:39:58 -07:00
William Li
cbd6434c8b Adapt to no config file Apphost shim
Instead of writing the config file. Embed the relative path, instead of only the file name of app binary, to the AppHost itself.
2018-04-06 12:23:05 -07:00
Nate McMaster
ba8e18dac7
Fix #4139 - escape quoted strings for process start 2018-03-20 16:53:42 -07:00
Livar Cunha
9c5c453da5 Fixing the expected path to the generateDeps.proj file, now that the SDK moved away from the build folder. 2018-02-28 13:20:17 -08:00
William Lee
08f050c012
bundled DotnetTool (#8606)
Extract packages to DotnetTools folder under sdk/{version}

Add new resolver to discover it

Add test to enforce package structure. It will fail when the structure
changed
2018-02-16 13:32:29 -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
John Beisner
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -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
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
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
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
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
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
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
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
023acbd212 Make Microsoft.Dotnet.Cli.Utils.Tests pass on localized setup 2017-06-12 18:32:07 -07:00
Daniel Plaisted
b6d9520ffc Fix tests that require .NET Core 1.1 2017-04-27 15:48:48 -07:00
Daniel Plaisted
b972f8229e Use backwards compatible runtimes for app throwing exception tests 2017-04-27 13:45:12 -07:00
Daniel Plaisted
cc9e942ede Apply code review feedback 2017-04-27 09:30:40 -07:00
Daniel Plaisted
5c679cd32e Test fixes for tools deps.json generation 2017-04-27 09:29:16 -07:00
Livar Cunha
3d0089552c Fixing failures in tests when the user has a fallbackfolder setup on this machine already. These failures are again due to the fact that --packages are not populated when the packages are found in the fallback folder. 2017-04-03 22:15:40 -07:00
Livar Cunha
b2116cd2e1 Addressing comments by adding a test covering the case where the tool assemblies are not found. 2017-03-26 21:52:27 -07:00
Livar Cunha
a4300cc069 Improving the test slightly by checking that it is finding the correct path to the tool dll. 2017-03-24 12:17:27 -07:00
Livar Cunha
10e743e8e5 Switched to using a FallbackPackagePathResolver to find the tool dll, because now with Fallback folders, we can have the tool dll in the fallback folder but its assets file in the user nuget cache. This happens because Nuget never writes to the fallback folder, including the tool's assets file that it generates during restore. 2017-03-24 12:17:27 -07:00
jonsequitur
4effd9354c merge 2017-03-21 11:57:08 -07:00
Eric Erhardt
8e239a4825 Clean up dead code
These are old usages of GetRuntimeIdentifier() that are no longer needed.
2017-03-20 12:23:23 -05:00
Livar Cunha
bb178a5133 Updated tests to the new appropriate TFM 1.1, since we need a shared runtime besides 2.0 in the new distros. Once we have vstest for 2.0 then we won't need it anymore. 2017-03-17 20:32:51 -07:00
Piotr Puszkiewicz
9d2d633d1c Move remaining TestCommand("dotnet") to DotnetCommand 2017-03-16 01:31:16 -07:00
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master'
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.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/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
2017-03-02 23:49:01 -08:00
Piotr Puszkiewicz
e617376bc7 Trailing newlines + standardize tabs -> spaces 2017-03-02 20:35:20 -08:00
Piotr Puszkiewicz
c56ef29300 Remove remaining unnecessary P2P's 2017-03-02 20:05:12 -08:00