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.

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

Bumped System-Text.Json to 8.0.4 #854

Merged
merged 25 commits into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6956f09
Merge branch 'development'
RobertBeekman Feb 25, 2024
be92701
Merge branch 'development'
RobertBeekman Feb 25, 2024
39c0b6c
Merge branch 'development'
diogotr7 Feb 25, 2024
e6565a2
Merge branch 'development'
RobertBeekman Feb 28, 2024
1d23c69
Merge branch 'development'
RobertBeekman Feb 28, 2024
13c4820
Merge branch 'development'
RobertBeekman Mar 1, 2024
554f3e1
Merge branch 'development'
RobertBeekman Mar 2, 2024
9fcd20d
Merge branch 'development'
RobertBeekman Mar 3, 2024
59c9538
Merge branch 'development'
RobertBeekman Mar 13, 2024
1201820
Merge branch 'development'
RobertBeekman Mar 14, 2024
8c1fef2
Merge branch 'development'
RobertBeekman Mar 14, 2024
e588a06
Merge branch 'development'
RobertBeekman Mar 14, 2024
91d1d16
Merge branch 'development'
RobertBeekman Mar 14, 2024
8d7af6b
Merge branch 'development'
RobertBeekman Mar 15, 2024
4c2eca2
Storage - Fix profile order not loading/saving
RobertBeekman Mar 15, 2024
e5cb058
Merge branch 'development'
RobertBeekman Mar 21, 2024
058513f
Merge branch 'development'
RobertBeekman Apr 14, 2024
d9a3a23
Merge branch 'development'
RobertBeekman May 3, 2024
7052ee3
Merge branch 'development'
RobertBeekman May 18, 2024
bd90417
Merge branch 'development'
RobertBeekman Jul 4, 2024
0e911d6
Merge branch 'development'
RobertBeekman Jul 12, 2024
a793a08
Merge branch 'development'
RobertBeekman Jul 22, 2024
4debfee
Merge branch 'development'
RobertBeekman Jul 22, 2024
972f1c6
Merge branch 'development'
RobertBeekman Jul 22, 2024
bedf1f5
Bumped System-Text.Json to 8.0.4
DarthAffe Aug 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Artemis.Core/Models/Profile/ProfileCategory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public void Load()
IsSuspended = Entity.IsSuspended;
Order = Entity.Order;

ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).ToList());
ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).OrderBy(pc => pc.Order).ToList());
}

/// <inheritdoc />
Expand All @@ -180,7 +180,10 @@ public void Save()

Entity.ProfileConfigurations.Clear();
foreach (ProfileConfiguration profileConfiguration in ProfileConfigurations)
{
profileConfiguration.Save();
Entity.ProfileConfigurations.Add(profileConfiguration.Entity);
}
}

#endregion
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<PackageVersion Include="Splat.DryIoc" Version="15.1.1" />
<PackageVersion Include="StrawberryShake.Server" Version="13.9.6" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.2" />
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="TextMateSharp.Grammars" Version="1.0.57" />
</ItemGroup>
</Project>
Loading