Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add net6.0 framework folders, show DotNetFrameworkName in dependencie… #1368

Merged
merged 1 commit into from
Sep 10, 2021
Merged

Add net6.0 framework folders, show DotNetFrameworkName in dependencie… #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions PackageExplorer/Converters/FrameworkNameConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,31 @@
using System;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Windows.Data;
using NuGet.Frameworks;

#if HAS_UNO
using Windows.UI.Xaml.Data;

using _CultureInfo = System.String;
#else
using System.Windows.Data;

using _CultureInfo = System.Globalization.CultureInfo;
#endif

namespace PackageExplorer
{
public class FrameworkNameConverter : IValueConverter
{
private static readonly string[] WellknownPackageFolders = new string[] { "content", "lib", "tools", "build", "ref" };

public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
public object Convert(object value, Type targetType, object parameter, _CultureInfo culture)
{
if (value is NuGetFramework framework)
{
return framework.DotNetFrameworkName;
}

var path = (string)value;
var name = Path.GetFileName(path);

Expand Down Expand Up @@ -54,7 +67,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
return string.Empty;
}

public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
public object ConvertBack(object value, Type targetType, object parameter, _CultureInfo culture)
{
throw new NotImplementedException();
}
Expand Down
3 changes: 2 additions & 1 deletion PackageExplorer/MefServices/PluginManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ internal class PluginManager : IPluginManager, IDisposable
"lib\\net48",
"lib\\netcoreapp3.0",
"lib\\netcoreapp3.1",
"lib\\net5.0",
"lib\\net5.0",
"lib\\net6.0",
};

// %localappdata%/NuGet/PackageExplorerPlugins
Expand Down
1 change: 1 addition & 0 deletions PackageExplorer/NugetPackageExplorer.Views.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Converters\EnumConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converters\FileSizeConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converters\FrameworkAssemblyReferenceDisplayConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converters\FrameworkNameConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converters\LicenseMetadataConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converters\LicenseUrlToVisibilityConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converters\NuGetVersionConverter.cs" />
Expand Down
7 changes: 4 additions & 3 deletions PackageExplorer/PackageViewer.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<self:ReferenceSetConverter x:Key="ReferenceSetConverter" />
<self:PackageDependencyConverter x:Key="PackageDependencyConverter" />
<self:FrameworkAssemblyReferenceDisplayConverter x:Key="FrameworkAssemblyReferenceDisplayConverter" />
<self:FrameworkNameConverter x:Key="FrameworkNameConverter" />
<self:NuGetVersionConverter x:Key="NuGetVersionConverter" />
<self:NuGetVersionPreReleaseConverter x:Key="NuGetVersionPreReleaseConverter" />
<self:ListToStringConverter x:Key="ListToStringConverter" />
Expand Down Expand Up @@ -314,7 +315,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock Text="{Binding TargetFramework, TargetNullValue={x:Static self:Resources.NoFxDependencyGroup}}" FontWeight="SemiBold" TextWrapping="Wrap" />
<TextBlock Text="{Binding TargetFramework, Converter={StaticResource FrameworkNameConverter}, TargetNullValue={x:Static self:Resources.NoFxDependencyGroup}}" FontWeight="SemiBold" TextWrapping="Wrap" />
<ItemsControl
x:Name="dependenciesList"
Grid.Row="1"
Expand Down Expand Up @@ -342,7 +343,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock Text="{Binding TargetFramework, TargetNullValue={x:Static self:Resources.NoFxDependencyGroup}}" FontWeight="SemiBold" TextWrapping="Wrap" />
<TextBlock Text="{Binding TargetFramework, Converter={StaticResource FrameworkNameConverter}, TargetNullValue={x:Static self:Resources.NoFxDependencyGroup}}" FontWeight="SemiBold" TextWrapping="Wrap" />
<ItemsControl
x:Name="frameworkReferencesList"
Grid.Row="1"
Expand All @@ -363,7 +364,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock Text="{Binding TargetFramework, TargetNullValue={x:Static self:Resources.NoFxDependencyGroup}}" FontWeight="SemiBold" TextWrapping="Wrap" />
<TextBlock Text="{Binding TargetFramework, Converter={StaticResource FrameworkNameConverter}, TargetNullValue={x:Static self:Resources.NoFxDependencyGroup}}" FontWeight="SemiBold" TextWrapping="Wrap" />
<ItemsControl
x:Name="referencesList"
Grid.Row="1"
Expand Down
12 changes: 10 additions & 2 deletions PackageExplorer/PackageViewer.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,16 @@ public partial class PackageViewer : UserControl
"v5.0-macos", "net5.0-macos",
"v5.0-tvos", "net5.0-tvos",
"v5.0-watchos", "net5.0-watchos",
"v5.0-windows", "net5.0-windows"
"v5.0-windows", "net5.0-windows",

"v6.0","net6.0",
"v6.0-android", "net6.0-android",
"v6.0-ios", "net6.0-ios",
"v6.0-macos", "net6.0-macos",
"v6.0-tvos", "net6.0-tvos",
"v6.0-maccatalyst", "net6.0-maccatalyst",
"v6.0-tizen", "net6.0-tizen",
"v6.0-windows", "net6.0-windows",
}
),

Expand All @@ -52,7 +61,6 @@ public partial class PackageViewer : UserControl
"v2.2","netcoreapp2.2",
"v3.0","netcoreapp3.0",
"v3.1","netcoreapp3.1",
"v5.0","net5.0",
}
),

Expand Down
7 changes: 4 additions & 3 deletions Uno/NuGetPackageExplorer.Shared/InspectPackage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<pexpl:FrameworkAssemblyReferenceDisplayConverter x:Key="FrameworkAssemblyReferenceDisplayConverter" />
<pexpl:PackageDependencyConverter x:Key="PackageDependencyConverter" />
<pexpl:ReferenceSetConverter x:Key="ReferenceSetConverter" />
<pexpl:FrameworkNameConverter x:Key="FrameworkNameConverter" />
<pexpl:LicenseMetadataConverter x:Key="LicenseMetadataConverter" />
<pexpl:LicenseUrlToVisibilityConverter x:Key="LicenseUrlToVisibilityConverter" />
<!--#endregion-->
Expand Down Expand Up @@ -548,7 +549,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="pkging:PackageDependencyGroup">
<StackPanel Padding="0,0,0,6">
<TextBlock Text="{x:Bind TargetFramework}"
<TextBlock Text="{x:Bind TargetFramework, Converter={StaticResource FrameworkNameConverter}}"
FontWeight="Bold"
Style="{StaticResource TypoBody2}" />
<ItemsControl ItemsSource="{x:Bind Packages}"
Expand Down Expand Up @@ -595,7 +596,7 @@
<ItemsControl ItemsSource="{x:Bind Package.PackageMetadata.FrameworkReferenceGroups}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="pkging:FrameworkReferenceGroup">
<wct:HeaderedItemsControl Header="{x:Bind TargetFramework}"
<wct:HeaderedItemsControl Header="{x:Bind TargetFramework, Converter={StaticResource FrameworkNameConverter}}"
ItemsSource="{x:Bind FrameworkReferences}"
Style="{StaticResource LabeledItemsControlStyle}">
<wct:HeaderedItemsControl.ItemTemplate>
Expand Down Expand Up @@ -625,7 +626,7 @@
IsTextSelectionEnabled="True"
Visibility="{Binding TargetFramework, Converter={StaticResource NullToVisible}, FallbackValue=Visible, TargetNullValue=Visible}"
Style="{StaticResource TypoBody2}" />
<wct:HeaderedItemsControl Header="{Binding TargetFramework}"
<wct:HeaderedItemsControl Header="{Binding TargetFramework, Converter={StaticResource FrameworkNameConverter}}"
ItemsSource="{Binding References}"
Visibility="{Binding TargetFramework, Converter={StaticResource NullToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}"
Style="{StaticResource LabeledItemsControlStyle}">
Expand Down