Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sora-yx
Sora-yx committed Dec 16, 2024
1 parent b2c0e00 commit d1de72a
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 12 deletions.
43 changes: 39 additions & 4 deletions SA-Mod-Manager/FodyWeavers.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,27 @@
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX86Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinArm64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
Expand Down Expand Up @@ -122,6 +137,11 @@
<xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableEventSubscription" type="xs:boolean">
<xs:annotation>
<xs:documentation>The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
Expand Down Expand Up @@ -154,12 +174,27 @@
</xs:attribute>
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UnmanagedWinX86Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UnmanagedWinX64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UnmanagedWinArm64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="PreloadOrder" type="xs:string">
Expand Down
4 changes: 2 additions & 2 deletions SA-Mod-Manager/SAModManager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@

<ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="Costura.Fody" Version="5.7.0">
<PackageReference Include="Costura.Fody" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets><-->
</PackageReference>
<PackageReference Include="gong-wpf-dragdrop" Version="3.2.1" />
<PackageReference Include="gong-wpf-dragdrop" Version="4.0.0" />
<PackageReference Include="NetCoreInstallChecker" Version="3.0.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
Expand Down
4 changes: 2 additions & 2 deletions SA-Mod-Manager/UI/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="50"/>
</Grid.ColumnDefinitions>
<ListView x:Name="listMods" Focusable="True" Foreground="White" Grid.Column="1" Grid.Row="1" PreviewKeyDown="ModsList_OnPreviewKeyDown"
<ListView x:Name="listMods" Focusable="True" Foreground="White" Grid.Column="1" Grid.Row="1" PreviewKeyDown="ModsList_OnPreviewKeyDown"
ItemsSource="{Binding Modsdata}" SelectedItem="{Binding SelectedMod}"
dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
dd:DragDrop.UseDefaultDragAdorner="True" dd:DragDrop.UseVisualSourceItemSizeForDragAdorner="True"
dd:DragDrop.UseDefaultDragAdorner="True"
dd:DragDrop.DropHandler="{Binding}" SelectionChanged="modListView_SelectedIndexChanged" AllowDrop="True">

<ListView.ItemContainerStyle>
Expand Down
8 changes: 4 additions & 4 deletions SA-Mod-Manager/UI/Models/MainWindowViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ public void SortViewModelCollection(MainWindowViewModel viewModel, List<string>

var sortedData = viewModel.Modsdata.OrderBy(customData =>
{
// Try to get the index of the customData.Name in the order list
//Try to get the index of the customData.Name in the order list
if (orderMap.TryGetValue(customData.Tag, out int index))
{
return index;
}
return int.MaxValue; // Place it at the end if not found
return int.MaxValue; //Place it at the end if not found
}).ToList();

//Replace with the sorted data
Expand All @@ -44,6 +44,7 @@ public void SortViewModelCollection(MainWindowViewModel viewModel, List<string>

public void DragOver(IDropInfo dropInfo)
{
dropInfo.DropTargetAdorner = DropTargetAdorners.Insert;
if (dropInfo.Data is IDataObject dataObject && dataObject.GetDataPresent(DataFormats.FileDrop))
dropInfo.Effects = DragDropEffects.Copy;
else
Expand All @@ -55,9 +56,8 @@ public void Drop(IDropInfo dropInfo)
GongSolutions.Wpf.DragDrop.DragDrop.DefaultDropHandler.Drop(dropInfo);

var mainWindow = (MainWindow)App.Current.MainWindow;
var selectedItems = dropInfo.Data as List<object>;

if (selectedItems != null)
if (dropInfo.Data is List<object> selectedItems)
{
mainWindow.listMods.SelectedItems.Clear();

Expand Down

0 comments on commit d1de72a

Please sign in to comment.