Skip to content

Commit dadf419

Browse files
Merge pull request #774 from aspnet/dev/phil-allen-msft/packageUpdates
Set of changes to get librarymanager 'fully passing'
2 parents 4e15779 + 5bf862c commit dadf419

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12+
<PackageVersion Include="MessagePack" Version="2.5.187"/>
1213
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
1314
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.3" />
1415
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.8.3" />
@@ -44,7 +45,7 @@
4445
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
4546
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="7.0.0" />
4647
<PackageVersion Include="System.Security.Permissions" Version="7.0.0" />
47-
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
48+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
4849
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4"/>
4950
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
5051

src/LibraryManager/Json/LibraryStateToFileConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public ILibraryInstallationState ConvertToLibraryInstallationState(LibraryInstal
5757
[SuppressMessage("Globalization", "CA1307:Specify StringComparison for clarity", Justification = "Not available on net481, not needed here (caseless)")]
5858
private string ExpandDestination(string destination, string name, string version)
5959
{
60-
if (!destination.Contains("["))
60+
if (destination is null || !destination.Contains("["))
6161
{
6262
return destination;
6363
}

src/LibraryManager/Providers/BaseProvider.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ protected virtual string GetCachedFileLocalPath(ILibraryInstallationState state,
440440
/// Copies ILibraryInstallationState files to cache
441441
/// </summary>
442442
/// <param name="state"></param>
443+
/// <param name="library"></param>
443444
/// <param name="cancellationToken"></param>
444445
/// <returns></returns>
445446
private async Task<ILibraryOperationResult> RefreshCacheAsync(ILibraryInstallationState state, ILibrary library, CancellationToken cancellationToken)

test/LibraryManager.IntegrationTest/InstallDialogTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void InstallClientSideLibraries_FromProjectRoot_SmokeTest()
3030
};
3131

3232
string manifestContents = @"{
33-
""version"": ""1.0"",
33+
""version"": ""3.0"",
3434
""defaultProvider"": ""cdnjs"",
3535
""libraries"": [
3636
{
@@ -61,7 +61,7 @@ public void InstallClientSideLibraries_FromFolder_SmokeTest()
6161
};
6262

6363
string manifestContents = @"{
64-
""version"": ""1.0"",
64+
""version"": ""3.0"",
6565
""defaultProvider"": ""cdnjs"",
6666
""libraries"": [
6767
{

test/LibraryManager.IntegrationTest/LibmanCompletionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@ public void LibmanCompletion_LibraryForUnpkg()
180180
Editor.KeyboardCommands.Enter();
181181

182182
Editor.KeyboardCommands.Type("\"library\":");
183-
Editor.KeyboardCommands.Type("bootstr");
184-
Helpers.Completion.WaitForCompletionEntries(Editor, new[] { "bootstrap" }, caseInsensitive: true, timeout: 5000);
183+
Editor.KeyboardCommands.Type("react");
184+
Helpers.Completion.WaitForCompletionEntries(Editor, new[] { "react-redux" }, caseInsensitive: true, timeout: 5000);
185185

186-
Editor.KeyboardCommands.Backspace(7);
186+
Editor.KeyboardCommands.Backspace(5);
187187
Editor.KeyboardCommands.Type("jque");
188-
Helpers.Completion.WaitForCompletionEntries(Editor, new[] { "jquery" }, caseInsensitive: true, timeout: 5000);
188+
Helpers.Completion.WaitForCompletionEntries(Editor, new[] { "jquery-csswatch" }, caseInsensitive: true, timeout: 5000);
189189
}
190190

191191
[TestMethod]

0 commit comments

Comments
 (0)