Skip to content

Commit d149133

Browse files
authored
Merge pull request #456 from Inxton/dev-flux
Updates Operon/Fluxion styles
2 parents ce8dcfe + 70423a2 commit d149133

102 files changed

Lines changed: 1798 additions & 3410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</GlobalPackageReference>
12-
<PackageVersion Include="Inxton.Operon" Version="0.2.0-alpha.89" />
12+
<PackageVersion Include="Inxton.Operon" Version="0.2.0-dev-flux.97" />
1313
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" Condition="'$(TargetFramework)' == 'net9.0'" />
1414
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
1515
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />

GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mode: ContinuousDeployment
2-
next-version: 0.41.0
2+
next-version: 0.44.1
33
branches:
44
main:
55
regex: ^master$|^main$

cake/BuildContext.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ public void RunTestsFromFilteredSolution(string filteredSolutionFile)
169169

170170
public void PushNugetPackages(string artifactDirectory)
171171
{
172-
if (Helpers.CanReleaseInternal())
173-
{
172+
//if (Helpers.CanReleaseInternal())
173+
//{
174174
foreach (var nugetFile in Directory.EnumerateFiles(Path.Combine(this.Artifacts, artifactDirectory), "*.nupkg")
175175
.Select(p => new FileInfo(p)))
176176
{
@@ -182,7 +182,7 @@ public void PushNugetPackages(string artifactDirectory)
182182
SkipDuplicate = true
183183
});
184184
}
185-
}
185+
//}
186186
}
187187

188188
public IEnumerable<string> TargetFrameworks { get; } = new List<string>() { "net9.0", "net8.0" };
@@ -304,4 +304,4 @@ public void CheckLicenseComplianceInArtifacts()
304304
}
305305

306306
}
307-
}
307+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// AXSharp.Abstractions
2+
// Copyright (c) 2023 MTS spol. s r.o., and Contributors. All Rights Reserved.
3+
// Contributors: https://github.com/inxton/axsharp/graphs/contributors
4+
// See the LICENSE file in the repository root for more information.
5+
// https://github.com/inxton/axsharp/blob/dev/LICENSE
6+
// Third party licenses: https://github.com/inxton/axsharp/blob/master/notices.md
7+
8+
using System;
9+
using System.Collections.Generic;
10+
using System.Globalization;
11+
12+
namespace AXSharp.Abstractions.Presentation;
13+
14+
[AttributeUsage(AttributeTargets.Property)]
15+
public class FormatAttribute : Attribute
16+
{
17+
public FormatAttribute(string format)
18+
{
19+
this.FormatString = format;
20+
}
21+
22+
public string? FormatString { get; private set; }
23+
}
24+

src/AXSharp.abstractions/src/AXSharp.Abstractions/Presentation/Attributes/TimeFormatAttribute.cs

Lines changed: 0 additions & 107 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// AXSharp.Abstractions
2+
// Copyright (c) 2023 MTS spol. s r.o., and Contributors. All Rights Reserved.
3+
// Contributors: https://github.com/inxton/axsharp/graphs/contributors
4+
// See the LICENSE file in the repository root for more information.
5+
// https://github.com/inxton/axsharp/blob/dev/LICENSE
6+
// Third party licenses: https://github.com/inxton/axsharp/blob/master/notices.md
7+
8+
using System;
9+
using System.Collections.Generic;
10+
using System.Globalization;
11+
12+
namespace AXSharp.Abstractions.Presentation;
13+
14+
[AttributeUsage(AttributeTargets.Property)]
15+
public class UnitAttribute : Attribute
16+
{
17+
public UnitAttribute(string unit)
18+
{
19+
this.UnitString = unit;
20+
}
21+
22+
public string? UnitString { get; private set; }
23+
}
24+

src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<ItemGroup>
7474
<None Include="Layouts\**\*.*" Pack="true" PackagePath="contentFiles\Layouts\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
7575
<None Include="Templates\**\*.*" Pack="true" PackagePath="contentFiles\Templates\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
76-
<None Include="build\AXSharp.Presentation.Blazor.targets" Pack="true" PackagePath="build\AXSharp.Presentation.Blazor.targets" CopyToOutputDirectory="PreserveNewest" />
76+
<None Include="build\AXSharp.Presentation.Blazor.Controls.targets" Pack="true" PackagePath="build\AXSharp.Presentation.Blazor.Controls.targets" CopyToOutputDirectory="PreserveNewest" />
7777
</ItemGroup>
7878

7979
<PropertyGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@inherits LayoutComponentBase
22

3-
<div class="simple-border">
3+
<div data-border-layout class="simple-border gap-8 p-4 my-6">
44
@Body
55
</div>

src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/GroupBoxLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@inherits LayoutComponentBase
22

3-
<div class="simple-border">
3+
<div data-group-box-layout class="simple-border gap-8 p-4 my-6">
44
<h3>@GroupName</h3>
55
<div class="mt-2">
66
@Body

src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/LayoutSetters/ArrayBorderSetter.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@if (IsArray)
22
{
3-
<div class="flex flex-wrap card p-2">
3+
<div data-array-border-setter class="flex flex-wrap card p-2 my-6">
44
<h4>@Name</h4>
55
@ChildContent
66
</div>

0 commit comments

Comments
 (0)