Merge pull request #23 from WeihanLi/master

Update ReferenceResolver and Roslyn packages
night-moon-studio · Feb 6, 2024 · 680accb · 680accb
2 parents 307196b + c972cb8
commit 680accb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/NatashaPad.Core/NatashaPad.Core.csproj b/src/NatashaPad.Core/NatashaPad.Core.csproj
@@ -3,17 +3,17 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>NatashaPad</RootNamespace>
-    <RoslyncPackageVersion>4.9.0-2.final</RoslyncPackageVersion>
+    <RoslynPackageVersion>4.9.0-3.final</RoslynPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <Using Include="Microsoft.CodeAnalysis" />
     <PackageReference Include="DotNetCore.Compile.Environment" Version="3.2.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.2.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslyncPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslyncPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslyncPackageVersion)" />
-    <PackageReference Include="ReferenceResolver" Version="0.17.0-preview-20240117-161410" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslynPackageVersion)" />
+    <PackageReference Include="ReferenceResolver" Version="0.17.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NatashaPad/ViewModels/NugetManageViewModel.cs b/src/NatashaPad/ViewModels/NugetManageViewModel.cs
@@ -48,14 +48,14 @@ await InstalledPackages.Select(p => _nugetHelper.DownloadPackage(p.Name, NuGetVe
 
     private string _searchText;
     private bool _includePrerelease = true;
-    private string _selectedSource;
+    private string[] _selectedSources = [];
 
     public string[] Sources { get; }
 
-    public string SelectedSource
+    public string[] SelectedSources
     {
-        get => _selectedSource;
-        set => SetProperty(ref _selectedSource, value);
+        get => _selectedSources;
+        set => SetProperty(ref _selectedSources, value);
     }
 
     public bool IncludePrerelease
@@ -80,7 +80,7 @@ private async Task SearchAsync()
 
         //TODO: 这边都给了默认值。需要在界面上支持用户选择
         var packagesNames = (
-                await _nugetHelper.SearchPackages(text, _includePrerelease, source: _selectedSource).ToArrayAsync()
+                await _nugetHelper.SearchPackages(text, _includePrerelease, sources: _selectedSources).ToArrayAsync()
                 )
             .SelectMany(x => x.SearchResult.Select(r=> r.Identity.Id))
             .Distinct()
@@ -90,7 +90,7 @@ await _nugetHelper.SearchPackages(text, _includePrerelease, source: _selectedSou
         foreach (var name in packagesNames)
         {
             var versions = await _nugetHelper.GetPackageVersions(
-                    name, _includePrerelease, null, _selectedSource
+                    name, _includePrerelease, null, _selectedSources
                     ).ToArrayAsync();
             // TODO: we may want to show the source where the version comes from
             var pkg = new SearchedPackage(name,