Skip to content

Commit 757ff6f

Browse files
DennisDyalloDennisDyallo
committed
chore: normalize line endings
1 parent 1300c61 commit 757ff6f

File tree

2 files changed

+62
-120
lines changed

2 files changed

+62
-120
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -154,63 +154,5 @@ TODO text
154154
# uncomment the group further below
155155
###############################################################################
156156

157-
*.sln text eol=crlf
158-
*.csproj text eol=crlf
159-
*.vbproj text eol=crlf
160-
*.vcxproj text eol=crlf
161-
*.vcproj text eol=crlf
162-
*.dbproj text eol=crlf
163-
*.fsproj text eol=crlf
164-
*.lsproj text eol=crlf
165-
*.wixproj text eol=crlf
166-
*.modelproj text eol=crlf
167-
*.sqlproj text eol=crlf
168-
*.wwaproj text eol=crlf
169-
170-
*.xproj text eol=crlf
171-
*.props text eol=crlf
172-
*.filters text eol=crlf
173-
*.vcxitems text eol=crlf
174-
175-
*.resx text eol=crlf
176-
177-
#*.sln merge=binary
178-
#*.csproj merge=binary
179-
#*.vbproj merge=binary
180-
#*.vcxproj merge=binary
181-
#*.vcproj merge=binary
182-
#*.dbproj merge=binary
183-
#*.fsproj merge=binary
184-
#*.lsproj merge=binary
185-
#*.wixproj merge=binary
186-
#*.modelproj merge=binary
187-
#*.sqlproj merge=binary
188-
#*.wwaproj merge=binary
189-
190-
#*.xproj merge=binary
191-
#*.props merge=binary
192-
#*.filters merge=binary
193-
#*.vcxitems merge=binary
194-
195-
# Python
196-
197-
*.pxd text diff=python
198-
*.py text diff=python
199-
*.py3 text diff=python
200-
*.pyw text diff=python
201-
*.pyx text diff=python
202-
*.pyz text diff=python
203-
*.pyi text diff=python
204-
205-
*.db binary
206-
*.p binary
207-
*.pkl binary
208-
*.pickle binary
209-
*.pyc binary
210-
*.pyd binary
211-
*.pyo binary
212-
213-
# Note: .db, .p, and .pkl files are associated
214-
# with the python modules ``pickle``, ``dbm.*``,
215-
# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
216-
# (among others).
157+
*.sln text eol=lf
158+
*.csproj text eol=lf

‎Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
<!-- Copyright 2025 Yubico AB
2-
3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
6-
7-
http://www.apache.org/licenses/LICENSE-2.0
8-
9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License. -->
14-
15-
<Project Sdk="Microsoft.NET.Sdk">
16-
17-
<PropertyGroup>
18-
<AssemblyName>Yubico.YubiKey.IntegrationTests</AssemblyName>
19-
<RootNamespace></RootNamespace>
20-
<PackageId>Yubico.YubiKey.IntegrationTests</PackageId>
21-
22-
<TargetFramework>net8.0</TargetFramework>
23-
24-
<AnalysisMode>AllDisabledByDefault</AnalysisMode>
25-
26-
<!-- StrongName signing -->
27-
<!-- StrongNaming requires that friend assemblies are strong named as well. That means this unit test project must
28-
be strong named, since it uses InternalsVisibleTo. -->
29-
<SignAssembly>true</SignAssembly>
30-
<AssemblyOriginatorKeyFile>..\..\..\Yubico.NET.SDK.snk</AssemblyOriginatorKeyFile>
31-
</PropertyGroup>
32-
33-
<ItemGroup>
34-
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
35-
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.10" />
36-
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
37-
<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
38-
<PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
39-
<ProjectReference Include="..\..\src\Yubico.YubiKey.csproj" />
40-
<ProjectReference Include="..\unit\Yubico.YubiKey.UnitTests.csproj" />
41-
<ProjectReference Include="..\utilities\Yubico.YubiKey.TestUtilities.csproj" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
43-
<PackageReference Include="Serilog" Version="4.3.0" />
44-
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
45-
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
46-
<PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
47-
<PackageReference Include="xunit" Version="2.9.3" />
48-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
49-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
50-
<PackageReference Include="Moq" Version="4.20.72" />
51-
52-
<None Update="xunit.runner.json">
53-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
54-
</None>
55-
56-
<None Update="appsettings.json">
57-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
58-
</None>
59-
</ItemGroup>
60-
</Project>
1+
<!-- Copyright 2025 Yubico AB
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License. -->
14+
15+
<Project Sdk="Microsoft.NET.Sdk">
16+
17+
<PropertyGroup>
18+
<AssemblyName>Yubico.YubiKey.IntegrationTests</AssemblyName>
19+
<RootNamespace></RootNamespace>
20+
<PackageId>Yubico.YubiKey.IntegrationTests</PackageId>
21+
22+
<TargetFramework>net8.0</TargetFramework>
23+
24+
<AnalysisMode>AllDisabledByDefault</AnalysisMode>
25+
26+
<!-- StrongName signing -->
27+
<!-- StrongNaming requires that friend assemblies are strong named as well. That means this unit test project must
28+
be strong named, since it uses InternalsVisibleTo. -->
29+
<SignAssembly>true</SignAssembly>
30+
<AssemblyOriginatorKeyFile>..\..\..\Yubico.NET.SDK.snk</AssemblyOriginatorKeyFile>
31+
</PropertyGroup>
32+
33+
<ItemGroup>
34+
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
35+
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.10" />
36+
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
37+
<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
38+
<PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
39+
<ProjectReference Include="..\..\src\Yubico.YubiKey.csproj" />
40+
<ProjectReference Include="..\unit\Yubico.YubiKey.UnitTests.csproj" />
41+
<ProjectReference Include="..\utilities\Yubico.YubiKey.TestUtilities.csproj" />
42+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
43+
<PackageReference Include="Serilog" Version="4.3.0" />
44+
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
45+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
46+
<PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
47+
<PackageReference Include="xunit" Version="2.9.3" />
48+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
49+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
50+
<PackageReference Include="Moq" Version="4.20.72" />
51+
52+
<None Update="xunit.runner.json">
53+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
54+
</None>
55+
56+
<None Update="appsettings.json">
57+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
58+
</None>
59+
</ItemGroup>
60+
</Project>

0 commit comments

Comments
 (0)