Skip to content

Commit

Permalink
Fix whitespace formatting in .csproj files (#878)
Browse files Browse the repository at this point in the history 
* chore: configure editorconfig to add space before self closing tag

* chore: format

* chore: delete remainders of old admin ui

* chore: undo formatting of .cs files
  • Loading branch information
@tnotheis
tnotheis authored Sep 20, 2024
1 parent 24bfcf5 commit b40decc
Show file tree
Hide file tree
Showing 84 changed files with 788 additions and 871 deletions.
30 changes: 15 additions & 15 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[*.{appxmanifest,axml,build,config,csproj,dbml,discomap,dtd,jsproj,lsproj,njsproj,nuspec,proj,props,resw,resx,StyleCop,targets,tasks,vbproj,xml,xsd}]
indent_style = space
indent_size = 4
Expand All @@ -10,7 +9,9 @@ indent_style = space
indent_size = 4
tab_width = 4

[*]
[**]
ij_html_space_inside_empty_tag = true
ij_xml_space_inside_empty_tag = true

# Microsoft .NET properties
csharp_indent_braces = false
Expand Down Expand Up @@ -149,24 +150,24 @@ dotnet_naming_style.lower_camel_case_style_1.capitalization = camel_case
dotnet_naming_style.t_upper_camel_case_style.capitalization = pascal_case
dotnet_naming_style.t_upper_camel_case_style.required_prefix = T
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.constants_symbols.applicable_kinds = field
dotnet_naming_symbols.constants_symbols.required_modifiers = const
dotnet_naming_symbols.event_symbols.applicable_accessibilities = *
dotnet_naming_symbols.event_symbols.applicable_kinds = event
dotnet_naming_symbols.instance_fields_protected_override_symbols.applicable_accessibilities = local,protected
dotnet_naming_symbols.instance_fields_protected_override_symbols.applicable_accessibilities = local, protected
dotnet_naming_symbols.instance_fields_protected_override_symbols.applicable_kinds = field
dotnet_naming_symbols.instance_fields_protected_override_symbols.required_modifiers = static
dotnet_naming_symbols.instance_fields_protected_override_symbols_1.applicable_accessibilities = local,protected
dotnet_naming_symbols.instance_fields_protected_override_symbols_1.applicable_accessibilities = local, protected
dotnet_naming_symbols.instance_fields_protected_override_symbols_1.applicable_kinds = field
dotnet_naming_symbols.instance_fields_protected_override_symbols_1.required_modifiers = static
dotnet_naming_symbols.instance_fields_protected__symbols.applicable_accessibilities = local,protected
dotnet_naming_symbols.instance_fields_protected__symbols.applicable_accessibilities = local, protected
dotnet_naming_symbols.instance_fields_protected__symbols.applicable_kinds = field
dotnet_naming_symbols.instance_fields_protected__symbols.resharper_applicable_kinds = field,readonly_field
dotnet_naming_symbols.instance_fields_protected__symbols.resharper_applicable_kinds = field, readonly_field
dotnet_naming_symbols.instance_fields_protected__symbols.resharper_required_modifiers = instance
dotnet_naming_symbols.instance_fields_protected__symbols_1.applicable_accessibilities = local,protected
dotnet_naming_symbols.instance_fields_protected__symbols_1.applicable_accessibilities = local, protected
dotnet_naming_symbols.instance_fields_protected__symbols_1.applicable_kinds = field
dotnet_naming_symbols.instance_fields_protected__symbols_1.resharper_applicable_kinds = field,readonly_field
dotnet_naming_symbols.instance_fields_protected__symbols_1.resharper_applicable_kinds = field, readonly_field
dotnet_naming_symbols.instance_fields_protected__symbols_1.resharper_required_modifiers = instance
dotnet_naming_symbols.interfaces_symbols.applicable_accessibilities = *
dotnet_naming_symbols.interfaces_symbols.applicable_kinds = interface
Expand All @@ -191,16 +192,16 @@ dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
dotnet_naming_symbols.property_symbols.applicable_accessibilities = *
dotnet_naming_symbols.property_symbols.applicable_kinds = property
dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly
dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static, readonly
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities = *
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, class, struct, enum, delegate
dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = *
dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
dotnet_separate_import_directive_groups = false
Expand All @@ -216,7 +217,6 @@ dotnet_style_qualification_for_method = false:warning
dotnet_style_qualification_for_property = false:warning
dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
file_header_template =

dotnet_diagnostic.bc40000.severity = warning
dotnet_diagnostic.bc400005.severity = warning
dotnet_diagnostic.bc40008.severity = warning
Expand Down
6 changes: 3 additions & 3 deletions ...inApi.Infrastructure.Database.SqlServer/AdminApi.Infrastructure.Database.SqlServer.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<ProjectReference Include="..\AdminApi.Infrastructure\AdminApi.Infrastructure.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AdminApi.Infrastructure\AdminApi.Infrastructure.csproj" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions Applications/AdminApi/src/AdminApi.Infrastructure/AdminApi.Infrastructure.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<ProjectReference Include="..\..\..\..\BuildingBlocks\src\BuildingBlocks.Infrastructure\BuildingBlocks.Infrastructure.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\BuildingBlocks\src\BuildingBlocks.Infrastructure\BuildingBlocks.Infrastructure.csproj" />
</ItemGroup>

</Project>
26 changes: 13 additions & 13 deletions Applications/AdminApi/src/AdminApi/AdminApi.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\BuildingBlocks\src\BuildingBlocks.API\BuildingBlocks.API.csproj"/>
<ProjectReference Include="..\..\..\..\Modules\Challenges\src\Challenges.Application\Challenges.Application.csproj"/>
<ProjectReference Include="..\..\..\..\Modules\Challenges\src\Challenges.Infrastructure\Challenges.Infrastructure.csproj"/>
<ProjectReference Include="..\..\..\..\Modules\Devices\src\Devices.Application\Devices.Application.csproj"/>
<ProjectReference Include="..\..\..\..\Modules\Devices\src\Devices.Infrastructure\Devices.Infrastructure.csproj"/>
<ProjectReference Include="..\..\..\..\Infrastructure\Infrastructure.csproj"/>
<ProjectReference Include="..\..\..\..\Modules\Quotas\src\Quotas.Application\Quotas.Application.csproj"/>
<ProjectReference Include="..\..\..\..\Modules\Quotas\src\Quotas.Infrastructure\Quotas.Infrastructure.csproj"/>
<ProjectReference Include="..\AdminApi.Infrastructure.Database.Postgres\AdminApi.Infrastructure.Database.Postgres.csproj"/>
<ProjectReference Include="..\AdminApi.Infrastructure.Database.SqlServer\AdminApi.Infrastructure.Database.SqlServer.csproj"/>
<ProjectReference Include="..\AdminApi.Infrastructure\AdminApi.Infrastructure.csproj"/>
<ProjectReference Include="..\..\..\..\BuildingBlocks\src\BuildingBlocks.API\BuildingBlocks.API.csproj" />
<ProjectReference Include="..\..\..\..\Modules\Challenges\src\Challenges.Application\Challenges.Application.csproj" />
<ProjectReference Include="..\..\..\..\Modules\Challenges\src\Challenges.Infrastructure\Challenges.Infrastructure.csproj" />
<ProjectReference Include="..\..\..\..\Modules\Devices\src\Devices.Application\Devices.Application.csproj" />
<ProjectReference Include="..\..\..\..\Modules\Devices\src\Devices.Infrastructure\Devices.Infrastructure.csproj" />
<ProjectReference Include="..\..\..\..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\..\..\..\Modules\Quotas\src\Quotas.Application\Quotas.Application.csproj" />
<ProjectReference Include="..\..\..\..\Modules\Quotas\src\Quotas.Infrastructure\Quotas.Infrastructure.csproj" />
<ProjectReference Include="..\AdminApi.Infrastructure.Database.Postgres\AdminApi.Infrastructure.Database.Postgres.csproj" />
<ProjectReference Include="..\AdminApi.Infrastructure.Database.SqlServer\AdminApi.Infrastructure.Database.SqlServer.csproj" />
<ProjectReference Include="..\AdminApi.Infrastructure\AdminApi.Infrastructure.csproj" />
</ItemGroup>

<Target Name="PreBuild" BeforeTargets="Build" Condition="$(Configuration) == Debug">
<Delete Files="$(ProjectDir)appsettings.override.json"/>
<Copy SourceFiles="..\..\..\..\appsettings.override.json" DestinationFolder="$(ProjectDir)" UseHardlinksIfPossible="true"/>
<Delete Files="$(ProjectDir)appsettings.override.json" />
<Copy SourceFiles="..\..\..\..\appsettings.override.json" DestinationFolder="$(ProjectDir)" UseHardlinksIfPossible="true" />
</Target>
</Project>
57 changes: 0 additions & 57 deletions ...ientApp/src/app/components/client/change-secret-dialog/change-secret-dialog.component.css
View file

This file was deleted.

26 changes: 0 additions & 26 deletions ...entApp/src/app/components/client/change-secret-dialog/change-secret-dialog.component.html
View file

This file was deleted.

Empty file removed ...ity-details/deletion-processes/dp-details/cancel-dp-dialog/cancel-dp-dialog.component.css
View file
Empty file.
Empty file removed ...etion-processes/start-deletion-process-dialog/start-deletion-process-dialog.component.css
View file
Empty file.
Empty file removed Applications/AdminApi/src/AdminApi/ClientApp/src/assets/.gitkeep
View file
Empty file.
64 changes: 32 additions & 32 deletions Applications/ConsumerApi/src/ConsumerApi.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,43 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2"/>
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8"/>
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.24.0"/>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0"/>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8"/>
<PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2"/>
<PackageReference Include="Serilog.Enrichers.Sensitive" Version="1.7.3"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8"/>
<PackageReference Include="Serilog" Version="4.0.1"/>
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2"/>
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.1"/>
<PackageReference Include="Serilog.Enrichers.Demystifier" Version="1.0.2"/>
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
<PackageReference Include="Serilog.Exceptions" Version="8.4.0"/>
<PackageReference Include="Serilog.Exceptions.EntityFrameworkCore" Version="8.4.0"/>
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0"/>
<PackageReference Include="Serilog.Sinks.Http" Version="9.0.0"/>
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0"/>
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.24.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2" />
<PackageReference Include="Serilog.Enrichers.Sensitive" Version="1.7.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
<PackageReference Include="Serilog" Version="4.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.1" />
<PackageReference Include="Serilog.Enrichers.Demystifier" Version="1.0.2" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
<PackageReference Include="Serilog.Exceptions.EntityFrameworkCore" Version="8.4.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.Http" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\BuildingBlocks\src\BuildingBlocks.API\BuildingBlocks.API.csproj"/>
<ProjectReference Include="..\..\..\Infrastructure\Infrastructure.csproj"/>
<ProjectReference Include="..\..\..\Modules\Challenges\src\Challenges.ConsumerApi\Challenges.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\Modules\Devices\src\Devices.ConsumerApi\Devices.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\Modules\Files\src\Files.ConsumerApi\Files.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\Modules\Messages\src\Messages.ConsumerApi\Messages.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\Modules\Quotas\src\Quotas.ConsumerApi\Quotas.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\Modules\Relationships\src\Relationships.ConsumerApi\Relationships.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\Modules\Synchronization\src\Synchronization.ConsumerApi\Synchronization.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\Modules\Tokens\src\Tokens.ConsumerApi\Tokens.ConsumerApi.csproj"/>
<ProjectReference Include="..\..\..\BuildingBlocks\src\BuildingBlocks.API\BuildingBlocks.API.csproj" />
<ProjectReference Include="..\..\..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\..\..\Modules\Challenges\src\Challenges.ConsumerApi\Challenges.ConsumerApi.csproj" />
<ProjectReference Include="..\..\..\Modules\Devices\src\Devices.ConsumerApi\Devices.ConsumerApi.csproj" />
<ProjectReference Include="..\..\..\Modules\Files\src\Files.ConsumerApi\Files.ConsumerApi.csproj" />
<ProjectReference Include="..\..\..\Modules\Messages\src\Messages.ConsumerApi\Messages.ConsumerApi.csproj" />
<ProjectReference Include="..\..\..\Modules\Quotas\src\Quotas.ConsumerApi\Quotas.ConsumerApi.csproj" />
<ProjectReference Include="..\..\..\Modules\Relationships\src\Relationships.ConsumerApi\Relationships.ConsumerApi.csproj" />
<ProjectReference Include="..\..\..\Modules\Synchronization\src\Synchronization.ConsumerApi\Synchronization.ConsumerApi.csproj" />
<ProjectReference Include="..\..\..\Modules\Tokens\src\Tokens.ConsumerApi\Tokens.ConsumerApi.csproj" />
</ItemGroup>

<Target Name="PreBuild" BeforeTargets="Build" Condition="$(Configuration) == Debug">
<Delete Files="$(ProjectDir)appsettings.override.json"/>
<Copy SourceFiles="..\..\..\appsettings.override.json" DestinationFolder="$(ProjectDir)" UseHardlinksIfPossible="true"/>
<Delete Files="$(ProjectDir)appsettings.override.json" />
<Copy SourceFiles="..\..\..\appsettings.override.json" DestinationFolder="$(ProjectDir)" UseHardlinksIfPossible="true" />
</Target>
</Project>
Loading

0 comments on commit b40decc

Please sign in to comment.