Skip to content

V3.1.0/version branch #6

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

Merged
jmayer913 merged 7 commits into from
Jun 19, 2025
Merged

V3.1.0/version branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be82c3a
Updated the Version
jmayer913 Jun 14, 2025
d77c077
Updated test packages
jmayer913 Jun 14, 2025
d923cf6
Updated JMayer packages
jmayer913 Jun 14, 2025
29544d0
Updated Microsoft packages
jmayer913 Jun 14, 2025
06b98ae
Addressed VS Warnings
jmayer913 Jun 14, 2025
d0a956d
Updated Mudblazor; Addressed Breaking Changes
jmayer913 Jun 14, 2025
1070ea0
Disabled DateTime Column Filtering
jmayer913 Jun 19, 2025
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
4 changes: 2 additions & 2 deletions JMayer.Example.WebAssemblyBlazor.Shared/JMayer.Example.WebAssemblyBlazor.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>3.0.0</Version>
<Version>3.1.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JMayer.Data" Version="1.2.0" />
<PackageReference Include="JMayer.Data" Version="1.2.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...bAssemblyBlazor/JMayer.Example.WebAssemblyBlazor.Client/Components/Base/CardDialogBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class CardDialogBase<T, U> : ComponentBase
/// The property gets/sets a reference to the mud dialog.
/// </summary>
[CascadingParameter]
protected MudDialogInstance MudDialog { get; set; } = default!;
protected IMudDialogInstance MudDialog { get; set; } = default!;

/// <summary>
/// The property gets/sets the id of who owns the created sub data object.
Expand Down
2 changes: 1 addition & 1 deletion ...ebAssemblyBlazor/JMayer.Example.WebAssemblyBlazor.Client/Components/Base/NewDialogBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class NewDialogBase<T, U> : ComponentBase
/// The property gets/sets a reference to the mud dialog.
/// </summary>
[CascadingParameter]
protected MudDialogInstance MudDialog { get; set; } = default!;
protected IMudDialogInstance MudDialog { get; set; } = default!;

/// <summary>
/// The property gets/sets a reference to the server side validation.
Expand Down
9 changes: 4 additions & 5 deletions ...or/JMayer.Example.WebAssemblyBlazor.Client/JMayer.Example.WebAssemblyBlazor.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
<Version>3.0.0</Version>
<Version>3.1.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JMayer.Data" Version="1.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.17" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="MudBlazor" Version="7.15.0" />
<PackageReference Include="MudBlazor" Version="8.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ....WebAssemblyBlazor/JMayer.Example.WebAssemblyBlazor.Client/Pages/Assets/AssetSearch.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<PropertyColumn Property="x => x.Model" Hidden="true" />
<PropertyColumn Property="x => x.Priority" Hidden="true" />
<PropertyColumn Property="x => x.IsOnline" Title="Online" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Editable="false" Title="Last Edited" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Filterable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Editable="false" Filterable="false" Title="Last Edited" />
</Columns>

<PagerContent>
Expand Down
4 changes: 2 additions & 2 deletions ...azor/JMayer.Example.WebAssemblyBlazor.Client/Pages/Assets/Cards/StorageLocationCard.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<PropertyColumn Property="x => x.LocationA" Title="Location A" />
<PropertyColumn Property="x => x.LocationB" Title="Location B" />
<PropertyColumn Property="x => x.LocationC" Title="Location C" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Editable="false" Title="Last Edited" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Filterable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Editable="false" Filterable="false" Title="Last Edited" />
</Columns>

<PagerContent>
Expand Down
4 changes: 2 additions & 2 deletions ...bAssemblyBlazor/JMayer.Example.WebAssemblyBlazor.Client/Pages/Parts/Cards/StockCard.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</TemplateColumn>
<PropertyColumn Property="x => x.StorageLocationName" Title="Storage Location" />
<PropertyColumn Property="x => x.Amount" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Editable="false" Title="Last Edited" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Filterable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Filterable="false" Editable="false" Title="Last Edited" />
</Columns>

<PagerContent>
Expand Down
4 changes: 2 additions & 2 deletions ...le.WebAssemblyBlazor/JMayer.Example.WebAssemblyBlazor.Client/Pages/Parts/PartSearch.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<PropertyColumn Property="x => x.Make" Hidden="true" />
<PropertyColumn Property="x => x.Model" Hidden="true" />
<PropertyColumn Property="x => x.Obsolete" Hidden="true" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Editable="false" Title="Last Edited" />
<PropertyColumn Property="x => x.CreatedOn" Editable="false" Filterable="false" Title="Created" />
<PropertyColumn Property="x => x.LastEditedOn" Hidden="true" Filterable="false" Editable="false" Title="Last Edited" />
</Columns>

<PagerContent>
Expand Down
9 changes: 4 additions & 5 deletions ...ebAssemblyBlazor/JMayer.Example.WebAssemblyBlazor/JMayer.Example.WebAssemblyBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.0.0</Version>
<Version>3.1.0</Version>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\JMayer.Example.WebAssemblyBlazor.Shared\JMayer.Example.WebAssemblyBlazor.Shared.csproj" />
<ProjectReference Include="..\JMayer.Example.WebAssemblyBlazor.Client\JMayer.Example.WebAssemblyBlazor.Client.csproj" />
<PackageReference Include="JMayer.Data" Version="1.2.0" />
<PackageReference Include="JMayer.Web.Mvc" Version="1.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.11" />
<PackageReference Include="JMayer.Web.Mvc" Version="1.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.17" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.17" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion TestProject/Test/WebRequest/Assets/AssetUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
[InlineData("Test Equipment 2", "Test Equipment 2", AssetType.Equipment, null, null)]
[InlineData("Test Equipment 3", "Test Equipment 3", AssetType.Equipment, "Main Bag Room", null)]
[InlineData("Test Equipment 4", "Test Equipment 4", AssetType.Equipment, "Main Bag Room", "Equipment")]
public async Task VerifyAddAsset(string name, string description, AssetType assetType, string parentName, string? category)
public async Task VerifyAddAsset(string name, string? description, AssetType assetType, string? parentName, string? category)
{
HttpClient client = _factory.CreateClient();
AssetDataLayer dataLayer = new(client);
Expand Down Expand Up @@ -303,7 +303,7 @@
/// <param name="online">Marks the asset as obsolete.</param>
/// <returns>A Task object for the async.</returns>
[Theory]
[InlineData("Test Asset 1", "Test AL1", null, null, null, null, null, null, Priority.Low, false)]

Check warning on line 306 in TestProject/Test/WebRequest/Assets/AssetUnitTest.cs

View workflow job for this annotation

GitHub Actions / build 

Null should not be used for type parameter 'description' of type 'string'. Use a non-null value, or convert the parameter to a nullable type. (https://xunit.net/xunit.analyzers/rules/xUnit1012)

Check warning on line 306 in TestProject/Test/WebRequest/Assets/AssetUnitTest.cs

View workflow job for this annotation

GitHub Actions / build 

Null should not be used for type parameter 'description' of type 'string'. Use a non-null value, or convert the parameter to a nullable type. (https://xunit.net/xunit.analyzers/rules/xUnit1012)
[InlineData("Test Asset 2", "Test AL1-01", "Test AL1-02", null, null, null, null, null, Priority.Medium, false)]
[InlineData("Test Asset 3", "Test AL1-02", "Test AL1-02", "Conveyor", null, null, null, null, Priority.High, false)]
[InlineData("Test Asset 4", "Test AL1-03", "Test AL1-03", "Conveyor", "Make", null, null, null, Priority.Medium, false)]
Expand Down
4 changes: 2 additions & 2 deletions TestProject/Test/WebRequest/Parts/PartUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public async Task VerifyAddDuplicatePartFailure()
[InlineData("Test Motor", null, null)]
[InlineData("Test Push Button", "Test Push Button", null)]
[InlineData("Test Contact", "Test Contact", "Contact")]
public async Task VerifyAddPart(string name, string description, string? category)
public async Task VerifyAddPart(string name, string? description, string? category)
{
HttpClient client = _factory.CreateClient();
PartDataLayer dataLayer = new(client);
Expand Down Expand Up @@ -290,7 +290,7 @@ public async Task VerifyUpdateDuplicatePartFailure()
[InlineData("Test Part 6", "Test Limit Switch", "Test Limit Switch", "Switch", "Make", "Model", "Manufacturer", null, false)]
[InlineData("Test Part 7", "Test Belt", "Test Belt", "Belt", "Make", "Model", "Manufacturer", "Manufacturer Number", false)]
[InlineData("Test Part 8", "Test VFD", "Test VFD", "VFD", "Make", "Model", "Manufacturer", "Manufacturer Number", true)]
public async Task VerifyUpdatePart(string originalName, string newName, string description, string? category, string? make, string? model, string? manufacturer, string? manufacturerNumber, bool obsolete)
public async Task VerifyUpdatePart(string originalName, string newName, string? description, string? category, string? make, string? model, string? manufacturer, string? manufacturerNumber, bool obsolete)
{
HttpClient client = _factory.CreateClient();
PartDataLayer dataLayer = new(client);
Expand Down
19 changes: 9 additions & 10 deletions TestProject/TestProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,22 @@

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Version>3.0.0</Version>
<Version>3.1.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JMayer.Data" Version="1.2.0" />
<PackageReference Include="JMayer.Web.Mvc" Version="1.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
<PackageReference Include="JMayer.Web.Mvc" Version="1.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.17" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.17" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.17" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading