Skip to content

Commit

Permalink
Bump packages, fix Linux wine dll override, unify eof newlines
Browse files Browse the repository at this point in the history
  • Loading branch information
@affederaffe
affederaffe committed Jul 8, 2022
1 parent 80c7477 commit 3618466
Show file tree
Hide file tree
Showing 105 changed files with 233 additions and 206 deletions.
11 changes: 6 additions & 5 deletions BeatSaberModManager/BeatSaberModManager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.15" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.15" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.15" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.15" />
<PackageReference Include="Avalonia" Version="0.10.16" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.16" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.16" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.16" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.16" />
<PackageReference Include="DryIoc.dll" Version="5.1.0" />
<PackageReference Include="ReactiveUI" Version="18.2.9" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.0.9" />
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
Expand Down
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/BeatMods/BeatModsDependency.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ public class BeatModsDependency
[JsonIgnore]
public IMod? DependingMod { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/BeatMods/BeatModsDownload.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public class BeatModsDownload
[JsonPropertyName("hashMd5")]
public BeatModsHash[] Hashes { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/BeatMods/BeatModsHash.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public class BeatModsHash
[JsonPropertyName("file")]
public string File { get; set; } = null!;
}
}
}
6 changes: 3 additions & 3 deletions BeatSaberModManager/Models/Implementations/BeatSaber/BeatMods/BeatModsMod.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ public class BeatModsMod : IMod, IEquatable<BeatModsMod>
public BeatModsDependency[] Dependencies { get; set; } = null!;

/// <inheritdoc />
public bool Equals(BeatModsMod? other) => other is not null && (ReferenceEquals(this, other) || Name == other.Name && Version.Equals(other.Version));
public bool Equals(BeatModsMod? other) => other is not null && (ReferenceEquals(this, other) || (Name == other.Name && Version.Equals(other.Version)));

/// <inheritdoc />
public override bool Equals(object? obj) => obj is not null && (ReferenceEquals(this, obj) || obj.GetType() == GetType() && Equals(obj as BeatModsMod));
public override bool Equals(object? obj) => obj is not null && (ReferenceEquals(this, obj) || (obj.GetType() == GetType() && Equals(obj as BeatModsMod)));

/// <inheritdoc />
public override int GetHashCode() => HashCode.Combine(Name, Version);
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/BeatSaver/BeatSaverMap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ public class BeatSaverMap
[JsonPropertyName("versions")]
public BeatSaverMapVersion[] Versions { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/BeatSaver/BeatSaverMapMetaData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public class BeatSaverMapMetaData
[JsonPropertyName("songName")]
public string SongName { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/BeatSaver/BeatSaverMapVersion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public class BeatSaverMapVersion
[JsonPropertyName("downloadURL")]
public string DownloadUrl { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/Playlists/Playlist.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ public class Playlist
[JsonPropertyName("songs")]
public PlaylistSong[] Songs { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/BeatSaber/Playlists/PlaylistSong.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public class PlaylistSong
[JsonPropertyName("hash")]
public string? Hash { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/GitHub/Asset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public class Asset
[JsonPropertyName("browser_download_url")]
public string DownloadUrl { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/GitHub/Release.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public class Release
[JsonPropertyName("assets")]
public Asset[] Assets { get; set; } = null!;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Json/BeatModsJsonSerializerContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ namespace BeatSaberModManager.Models.Implementations.Json
{
[JsonSerializable(typeof(HashSet<BeatModsMod>))]
internal partial class BeatModsModJsonSerializerContext : JsonSerializerContext { }
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Json/BeatSaverJsonSerializerContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ namespace BeatSaberModManager.Models.Implementations.Json
{
[JsonSerializable(typeof(BeatSaverMap))]
internal partial class BeatSaverJsonSerializerContext : JsonSerializerContext { }
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Json/CommonJsonSerializerContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ namespace BeatSaberModManager.Models.Implementations.Json
[JsonSerializable(typeof(string[]))]
[JsonSerializable(typeof(Dictionary<string, string[]>))]
internal partial class CommonJsonSerializerContext : JsonSerializerContext { }
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Json/GitHubJsonSerializerContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ namespace BeatSaberModManager.Models.Implementations.Json
[JsonSerializable(typeof(Asset))]
[JsonSerializable(typeof(Release))]
internal partial class GitHubJsonSerializerContext : JsonSerializerContext { }
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Json/PlaylistJsonSerializerContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ namespace BeatSaberModManager.Models.Implementations.Json
{
[JsonSerializable(typeof(Playlist))]
internal partial class PlaylistJsonSerializerContext : JsonSerializerContext { }
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Json/SettingsJsonSerializerContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ namespace BeatSaberModManager.Models.Implementations.Json
{
[JsonSerializable(typeof(AppSettings))]
internal partial class SettingsJsonSerializerContext : JsonSerializerContext { }
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Json/VersionConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ public override Version Read(ref Utf8JsonReader reader, Type typeToConvert, Json
public override void Write(Utf8JsonWriter writer, Version value, JsonSerializerOptions options) =>
writer.WriteStringValue(value.ToString());
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/PlatformType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ public enum PlatformType
/// </summary>
Oculus
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Progress/ProgressInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ public ProgressInfo(StatusType statusType, string? text)
/// </summary>
public string? Text { get; }
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Progress/StatusType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ public enum StatusType
/// </summary>
Failed
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Implementations/Settings/AppSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ public HashSet<string> SelectedMods

private HashSet<string>? _selectedMods;
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Interfaces/IMod.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ public interface IMod
/// </summary>
bool IsRequired { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Models/Interfaces/ISettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ public interface ISettings<out T>
/// </summary>
T Value { get; }
}
}
}
11 changes: 3 additions & 8 deletions BeatSaberModManager/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,9 @@ private static void RegisterSerilog(this IRegistrator container)
}

private static void RegisterSettings(this IRegistrator container)
{
container.RegisterDelegate<ISettings<AppSettings>>(() => new JsonSettingsProvider<AppSettings>(SettingsJsonSerializerContext.Default.AppSettings));
}
=> container.RegisterDelegate<ISettings<AppSettings>>(() => new JsonSettingsProvider<AppSettings>(SettingsJsonSerializerContext.Default.AppSettings));

private static void RegisterHttpClient(this IRegistrator container)
{
container.Register<HttpProgressClient>();
}
private static void RegisterHttpClient(this IRegistrator container) => container.Register<HttpProgressClient>();

private static void RegisterGameServices(this IRegistrator container)
{
Expand Down Expand Up @@ -162,4 +157,4 @@ private static void RegisterViews(this IRegistrator container, IReadOnlyList<str
}
}
}
}
}
2 changes: 1 addition & 1 deletion BeatSaberModManager/Resources/Icons/Icons.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<PathGeometry x:Key="Icons:Discord" Figures="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" />
<PathGeometry x:Key="Icons:Download" Figures="M18.2498 20.5009C18.664 20.5008 19 20.8365 19 21.2507C19 21.6649 18.6644 22.0008 18.2502 22.0009L5.25022 22.0047C4.836 22.0048 4.5 21.6691 4.5 21.2549C4.5 20.8407 4.83557 20.5048 5.24978 20.5047L18.2498 20.5009ZM11.6482 2.01271L11.75 2.00586C12.1297 2.00586 12.4435 2.28801 12.4932 2.65409L12.5 2.75586L12.499 16.4409L16.2208 12.7205C16.4871 12.4543 16.9038 12.4301 17.1974 12.648L17.2815 12.7206C17.5477 12.9869 17.5719 13.4036 17.354 13.6972L17.2814 13.7813L12.2837 18.7779C12.0176 19.044 11.6012 19.0683 11.3076 18.8507L11.2235 18.7782L6.22003 13.7816C5.92694 13.4889 5.92661 13.014 6.21931 12.7209C6.48539 12.4545 6.90204 12.43 7.1958 12.6477L7.27997 12.7202L10.999 16.4339L11 2.75586C11 2.37616 11.2822 2.06237 11.6482 2.01271L11.75 2.00586L11.6482 2.01271Z" />

</ResourceDictionary>
</ResourceDictionary>
2 changes: 1 addition & 1 deletion BeatSaberModManager/Resources/Localization/de.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
<sys:String x:Key="Theme:Dark">Dunkel</sys:String>
<sys:String x:Key="Theme:Light">Hell</sys:String>

</ResourceDictionary>
</ResourceDictionary>
2 changes: 1 addition & 1 deletion BeatSaberModManager/Resources/Styles/Brushes.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
<SolidColorBrush x:Key="SearchIconBrush" Color="{DynamicResource SystemChromeAltLowColor}" />
</Styles.Resources>

</Styles>
</Styles>
2 changes: 1 addition & 1 deletion BeatSaberModManager/Resources/Styles/HyperlinkButton.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@
<Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
<Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
</Style>
</Styles>
</Styles>
16 changes: 13 additions & 3 deletions BeatSaberModManager/Resources/Styles/IconHeader.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,22 @@
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}">
<DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<PathIcon DockPanel.Dock="{TemplateBinding IconPlacement}" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{TemplateBinding IconData}" Foreground="{TemplateBinding Foreground}" />
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" Text="{TemplateBinding Content}" FontSize="{TemplateBinding FontSize}" />
<PathIcon DockPanel.Dock="{TemplateBinding IconPlacement}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{TemplateBinding IconData}"
Foreground="{TemplateBinding Foreground}">
</PathIcon>
<TextBlock HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="{TemplateBinding Padding}"
Text="{TemplateBinding Content}"
FontSize="{TemplateBinding FontSize}">
</TextBlock>
</DockPanel>
</Border>
</ControlTemplate>
</Setter>
</Style>

</Styles>
</Styles>
84 changes: 42 additions & 42 deletions BeatSaberModManager/Resources/Styles/ProgressRing.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
xmlns:c="using:BeatSaberModManager.Views.Controls">

<Design.PreviewWith>
<Border>
<c:ProgressRing IsIndeterminate="True" />
</Border>
</Design.PreviewWith>
<Border>
<c:ProgressRing IsIndeterminate="True" />
</Border>
</Design.PreviewWith>

<Style Selector="c|ProgressRing">
<Style Selector="c|ProgressRing">
<Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
<Setter Property="BorderThickness" Value="9" />
<Setter Property="MinHeight" Value="16" />
<Setter Property="MinWidth" Value="16" />
</Style>

<Style Selector="c|ProgressRing[IsIndeterminate=False]">
<Style Selector="c|ProgressRing[IsIndeterminate=False]">
<Setter Property="Template">
<ControlTemplate>
<ControlTemplate>
<Panel>
<Ellipse Stroke="{TemplateBinding Background}"
StrokeThickness="{TemplateBinding StrokeThickness}" />
Expand All @@ -31,46 +31,46 @@
</Arc.RenderTransform>
</Arc>
</Panel>
</ControlTemplate>
</Setter>
</Style>
</ControlTemplate>
</Setter>
</Style>

<Style Selector="c|ProgressRing[IsIndeterminate=True]">
<Setter Property="Template">
<ControlTemplate>
<Panel>
<Style Selector="c|ProgressRing[IsIndeterminate=True]">
<Setter Property="Template">
<ControlTemplate>
<Panel>
<Ellipse Stroke="{TemplateBinding Background}"
StrokeThickness="{TemplateBinding StrokeThickness}" />
<Arc Stroke="{TemplateBinding Foreground}"
<Arc Stroke="{TemplateBinding Foreground}"
StrokeThickness="{TemplateBinding StrokeThickness}"
Classes="rc">
<Arc.RenderTransform>
<RotateTransform Angle="-90" />
</Arc.RenderTransform>
</Arc>
</Panel>
</ControlTemplate>
</Setter>
</Style>
<Arc.RenderTransform>
<RotateTransform Angle="-90" />
</Arc.RenderTransform>
</Arc>
</Panel>
</ControlTemplate>
</Setter>
</Style>

<Style Selector="c|ProgressRing[IsIndeterminate=True] /template/ Arc.rc">
<Style.Animations>
<Animation Duration="0:0:.75" FillMode="Both"
<Style Selector="c|ProgressRing[IsIndeterminate=True] /template/ Arc.rc">
<Style.Animations>
<Animation Duration="0:0:.75" FillMode="Both"
IterationCount="Infinite">
<KeyFrame Cue="0%">
<Setter Property="StartAngle" Value="0" />
<Setter Property="SweepAngle" Value="180" />
</KeyFrame>
<KeyFrame Cue="50%">
<Setter Property="StartAngle" Value="270" />
<Setter Property="SweepAngle" Value="22.5" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="StartAngle" Value="360" />
<Setter Property="SweepAngle" Value="180" />
</KeyFrame>
</Animation>
</Style.Animations>
</Style>
<KeyFrame Cue="0%">
<Setter Property="StartAngle" Value="0" />
<Setter Property="SweepAngle" Value="180" />
</KeyFrame>
<KeyFrame Cue="50%">
<Setter Property="StartAngle" Value="270" />
<Setter Property="SweepAngle" Value="22.5" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="StartAngle" Value="360" />
<Setter Property="SweepAngle" Value="180" />
</KeyFrame>
</Animation>
</Style.Animations>
</Style>

</Styles>
</Styles>
2 changes: 1 addition & 1 deletion BeatSaberModManager/Resources/Styles/SideBar.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@
<Style Selector="TabControl.SideBar > TabItem:pointerover /template/ Border#PART_LayoutRoot">
<Setter Property="Background" Value="#3fffffff" />
</Style>
</Styles>
</Styles>
Loading

0 comments on commit 3618466

Please sign in to comment.