This repository has been archived by the owner on Apr 20, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Lowercase ID and version in NuGet global packages directory
Bump NuGet version to 3.5.0-rc-1298
- Loading branch information
1 parent
dd51836
commit 7389a3a
Showing
17 changed files
with
175 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
test/Microsoft.DotNet.ProjectModel.Tests/LockFileReaderTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // Copyright (c) .NET Foundation and contributors. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.IO; | ||
| using System.Text; | ||
| using FluentAssertions; | ||
| using Microsoft.DotNet.ProjectModel.Graph; | ||
| using Xunit; | ||
| using NuGet.Versioning; | ||
|
|
||
| namespace Microsoft.DotNet.ProjectModel.Tests | ||
| { | ||
| public class LockFileReaderTests | ||
| { | ||
| [Theory] | ||
| [InlineData("", null)] | ||
| [InlineData(@"""path"": null,", null)] | ||
| [InlineData(@"""path"": ""foo/1.0.0"",", "foo/1.0.0")] | ||
| public void SupportsTheOptionalPathPropertyOfALibraryPackage(string pathProperty, string expected) | ||
| { | ||
| // Arrange | ||
| var reader = new LockFileReader(); | ||
| var lockFileJson = @" | ||
| { | ||
| ""libraries"": { | ||
| ""Foo/1.0.0"": { | ||
| ""sha512"": ""something"", | ||
| " + pathProperty + @" | ||
| ""type"": ""package"", | ||
| ""files"": [ | ||
| ""lib/netstandard1.0/Foo.dll"" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| "; | ||
| var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(lockFileJson)); | ||
|
|
||
| // Act | ||
| var lockFile = reader.ReadLockFile("project.lock.json", memoryStream, false); | ||
|
|
||
| // Assert | ||
| lockFile.PackageLibraries.Should().HaveCount(1); | ||
| var library = lockFile.PackageLibraries[0]; | ||
| library.Path.Should().Be(expected); | ||
|
|
||
| library.Name.Should().Be("Foo"); | ||
| library.Version.Should().Be(new NuGetVersion("1.0.0")); | ||
| library.Sha512.Should().Be("something"); | ||
| library.Files.Should().HaveCount(1); | ||
| library.Files[0].Should().Be(Path.Combine("lib", "netstandard1.0", "Foo.dll")); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // Copyright (c) .NET Foundation and contributors. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.IO; | ||
| using Microsoft.DotNet.Cli.Utils; | ||
| using Microsoft.DotNet.TestFramework; | ||
| using Microsoft.DotNet.Tools.Test.Utilities; | ||
| using Xunit; | ||
|
|
||
| namespace Microsoft.DotNet.Tools.Builder.Tests | ||
| { | ||
| public class BuildMissingPackagesTests : TestBase | ||
| { | ||
| [Fact] | ||
| public void MissingPackageDuringBuildCauseFailure() | ||
| { | ||
| // Arrange | ||
| TestInstance instance = TestAssetsManager.CreateTestInstance("PortableTests"); | ||
| var testProject = Path.Combine(instance.TestRoot, "StandaloneApp", "project.json"); | ||
| var workingDirectory = Path.GetDirectoryName(testProject); | ||
| var testNuGetCache = Path.Combine(instance.Path, "packages"); | ||
| var oldLocation = Path.Combine(testNuGetCache, "system.console"); | ||
| var newLocation = Path.Combine(testNuGetCache, "system.console.different"); | ||
|
|
||
| var restoreCommand = new RestoreCommand(); | ||
|
|
||
| restoreCommand.WorkingDirectory = workingDirectory; | ||
| restoreCommand.Environment["NUGET_PACKAGES"] = testNuGetCache; | ||
| restoreCommand.Execute(); | ||
|
|
||
| // Delete all System.Console packages. | ||
| foreach (var directory in Directory.EnumerateDirectories(testNuGetCache, "*system.console*")) | ||
| { | ||
| Directory.Delete(directory, true); | ||
| } | ||
|
|
||
| var buildCommand = new BuildCommand(testProject); | ||
|
|
||
| buildCommand.WorkingDirectory = workingDirectory; | ||
| buildCommand.Environment["NUGET_PACKAGES"] = testNuGetCache; | ||
|
|
||
| // Act & Assert | ||
| buildCommand | ||
| .ExecuteWithCapturedOutput() | ||
| .Should() | ||
| .Fail() | ||
| .And | ||
| .HaveStdErrMatching("The dependency System.Console >= (?<Version>.+?) could not be resolved."); | ||
| } | ||
| } | ||
| } |