Skip to content

Commit 6b16a33

Browse files
committed
chore: audit and clean legacy project artifacts
1 parent 4592f6b commit 6b16a33

34 files changed

Lines changed: 192 additions & 403 deletions

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Preserve native Windows project files without treating their CRLF terminator as trailing space.
2+
*.bat text eol=crlf whitespace=cr-at-eol
3+
*.cmd text eol=crlf whitespace=cr-at-eol
4+
*.csproj whitespace=cr-at-eol
5+
*.sln whitespace=cr-at-eol

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Avalonia CI and packages
22

33
on:
44
push:
5-
branches: [master, 'port/**']
5+
branches: [master, 'port/**', 'cleanup/**']
66
pull_request:
77
branches: [master]
88
workflow_dispatch:

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Avalonia CodeQL
22

33
on:
44
push:
5-
branches: [master, 'port/**']
5+
branches: [master, 'port/**', 'cleanup/**']
66
pull_request:
77
branches: [master]
88
schedule:

.github/workflows/main.yml

Lines changed: 0 additions & 83 deletions
This file was deleted.

Directory.Build.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Audit the complete transitive graph and never allow a known NuGet advisory into an
4+
active build silently. Keep these errors explicit instead of hiding them in NoWarn. -->
5+
<NuGetAudit>true</NuGetAudit>
6+
<NuGetAuditMode>all</NuGetAuditMode>
7+
<NuGetAuditLevel>low</NuGetAuditLevel>
8+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
9+
<WarningsAsErrors>$(WarningsAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsAsErrors>
10+
</PropertyGroup>
11+
</Project>

Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
55
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.13" />
66
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.13" />
7-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.18" />
87
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
98
<PackageVersion Include="Avalonia.Controls.ColorPicker" Version="11.3.18" />
109
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
@@ -37,5 +36,7 @@
3736
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
3837
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
3938
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
39+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
40+
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
4041
</ItemGroup>
4142
</Project>

ExtLibs/ArduPilot/MissionPlanner.ArduPilot.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PackageReference Include="SharpDX.DirectInput" Version="4.1.0" />
2525
<PackageReference Include="DokanNet" Version="2.1.0" />
2626
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
27+
<PackageReference Include="System.Private.Uri" Version="4.3.2" PrivateAssets="all" />
2728
</ItemGroup>
2829

2930
<ItemGroup>

ExtLibs/Comms/MissionPlanner.Comms.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<PackageReference Include="System.Memory" Version="4.6.3" />
4242
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
4343
<PackageReference Include="System.Net.Security" Version="4.3.2" />
44+
<PackageReference Include="System.Private.Uri" Version="4.3.2" PrivateAssets="all" />
4445
</ItemGroup>
4546

4647
<ItemGroup>
@@ -62,4 +63,4 @@
6263
</ItemGroup>
6364

6465

65-
</Project>
66+
</Project>

ExtLibs/MissionPlanner.Drawing/MissionPlanner.Drawing.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<ItemGroup>
2121
<PackageReference Include="SkiaSharp" Version="2.80.2" />
2222
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
23+
<PackageReference Include="System.Private.Uri" Version="4.3.2" PrivateAssets="all" />
2324
</ItemGroup>
2425

2526
<ItemGroup>

ExtLibs/Utilities/MissionPlanner.Utilities.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
5353
<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
5454
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
55+
<!-- Override the vulnerable 4.3.0 transitive dependency pulled by the legacy netstandard
56+
graph. This project is the shared source of that dependency for ArduPilot and tests. -->
57+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
58+
<PackageReference Include="System.Private.Uri" Version="4.3.2" PrivateAssets="all" />
5559
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
5660
<PackageReference Include="WebSocket4Net" Version="0.15.2" />
5761
</ItemGroup>

0 commit comments

Comments
 (0)