Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ root = true

[*]
charset = utf-8
end_of_line = crlf
end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
Expand Down
31 changes: 10 additions & 21 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
# Normalize line endings so `dotnet format` (which enforces .editorconfig's
# `end_of_line = crlf`) is consistent on every runner, while keeping the files
# that must stay LF (CI shell / YAML — CRLF breaks bash `run:` blocks on Linux
# runners) as LF.

* text=auto

# C# / MSBuild / XAML: CRLF, matching .editorconfig (what `dotnet format` checks).
*.cs text eol=crlf
*.csproj text eol=crlf
*.props text eol=crlf
*.targets text eol=crlf
*.xaml text eol=crlf
*.resw text eol=crlf
*.manifest text eol=crlf
*.slnx text eol=crlf

# CI must stay LF.
*.yml text eol=lf
*.yaml text eol=lf
*.sh text eol=lf
# Line endings: LF everywhere — in the blob and in the working tree, on every
# platform. Git stores LF regardless, and .editorconfig's `end_of_line = lf`
# (what CI's `dotnet format --verify-no-changes` enforces) matches it, so there
# is exactly one convention to obey.
#
# The repo previously checked C#/MSBuild/XAML out as CRLF while CI shell and YAML
# had to stay LF. That split cost more than it bought: tools that emit LF fought
# the format gate, and a file that reached the blob with CRLF showed as modified
# in every clone forever, which only `git add --renormalize` can clear.
* text=auto eol=lf

# Binary assets — never touch.
*.png binary
Expand Down
70 changes: 35 additions & 35 deletions tests/Snaply.Tests/Snaply.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="10.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="FsCheck.Xunit.v3" Version="3.3.3" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Snaply.Imaging\Snaply.Imaging.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Snaply.App\Strings\**\Resources.resw"
Link="Strings\%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
<None Include="..\..\src\Snaply.App\MainPage.xaml"
Link="Ui\MainPage.xaml"
CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="10.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="FsCheck.Xunit.v3" Version="3.3.3" />
</ItemGroup>

<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Snaply.Imaging\Snaply.Imaging.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\src\Snaply.App\Strings\**\Resources.resw"
Link="Strings\%(RecursiveDir)%(Filename)%(Extension)"
CopyToOutputDirectory="PreserveNewest" />
<None Include="..\..\src\Snaply.App\MainPage.xaml"
Link="Ui\MainPage.xaml"
CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
Loading