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
41 changes: 41 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AWSSDK.Core" Version="4.0.3.21" />
<PackageVersion Include="coverlet.collector" Version="8.0.1" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="10.3.4" />
<PackageVersion Include="FluentAssertions" Version="8.9.0" />
<PackageVersion Include="JD.MSBuild.Fluent" Version="1.3.15" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="Microsoft.Build.Framework" Version="18.4.0" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.2" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.4.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.14" />
<PackageVersion Include="Microsoft.NET.StringTools" Version="18.4.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="MySqlConnector" Version="2.5.0" />
<PackageVersion Include="Npgsql" Version="9.0.5" />
<PackageVersion Include="Oracle.ManagedDataAccess" Version="23.26.100" />
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="23.26.100" />
<PackageVersion Include="PatternKit.Core" Version="0.34.4" />
<PackageVersion Include="PolySharp" Version="1.15.0" />
<PackageVersion Include="Snowflake.Data" Version="5.4.1" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
<PackageVersion Include="System.IO.Hashing" Version="10.0.5" />
<PackageVersion Include="Testcontainers.FirebirdSql" Version="4.11.0" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.11.0" />
<PackageVersion Include="Testcontainers.MySql" Version="4.11.0" />
<PackageVersion Include="Testcontainers.Oracle" Version="4.11.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.11.0" />
<PackageVersion Include="TinyBDD.Xunit" Version="0.19.9" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JD.MSBuild.Fluent" Version="1.3.15" />
<PackageReference Include="JD.MSBuild.Fluent" />
</ItemGroup>

</Project>
30 changes: 15 additions & 15 deletions src/JD.Efcpt.Build.Tasks/JD.Efcpt.Build.Tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@
MSBuild packages: Use ExcludeAssets="runtime" to prevent copying to output.
These assemblies are provided by the MSBuild host (Visual Studio/dotnet).
-->
<PackageReference Include="Microsoft.Build.Framework" Version="18.4.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.4.0" ExcludeAssets="runtime" />
<PackageReference Include="PatternKit.Core" Version="0.34.4" />
<PackageReference Include="System.IO.Hashing" Version="10.0.5" />
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" />
<PackageReference Include="PatternKit.Core" />
<PackageReference Include="System.IO.Hashing" />
</ItemGroup>

<!--
Database Provider Packages (build-time only, not runtime dependencies for consumers).
These packages work across all target frameworks.
-->
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
<PackageReference Include="MySqlConnector" Version="2.5.0" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.14" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.4" />
<PackageReference Include="Snowflake.Data" Version="5.4.1" />
<PackageReference Include="Microsoft.Data.SqlClient" VersionOverride="6.1.4" />
<PackageReference Include="MySqlConnector" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" />
<PackageReference Include="Snowflake.Data" />
<!-- Override vulnerable AWSSDK.Core transitive dependency from Snowflake.Data -->
<PackageReference Include="AWSSDK.Core" Version="4.0.3.18" />
<PackageReference Include="AWSSDK.Core" VersionOverride="4.0.3.18" />
</ItemGroup>

<!--
Expand All @@ -59,20 +59,20 @@
Oracle.ManagedDataAccess.Core is .NET Core only; use full framework package for net472.
-->
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Npgsql" Version="8.0.9" />
<PackageReference Include="Oracle.ManagedDataAccess" Version="23.26.100" />
<PackageReference Include="Npgsql" VersionOverride="8.0.9" />
<PackageReference Include="Oracle.ManagedDataAccess" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
<PackageReference Include="Npgsql" Version="9.0.5" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.26.100" />
<PackageReference Include="Npgsql" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" />
</ItemGroup>

<!--
Polyfills for net472: provides IsExternalInit, init accessors, etc.
-->
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="PolySharp" Version="1.15.0">
<PackageReference Include="PolySharp">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/JD.Efcpt.Build/JD.Efcpt.Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JD.MSBuild.Fluent" Version="1.3.15" />
<PackageReference Include="JD.MSBuild.Fluent" />

<!-- Reference Tasks project to use nameof() for type safety -->
<ProjectReference Include="../JD.Efcpt.Build.Tasks/JD.Efcpt.Build.Tasks.csproj"
Expand Down Expand Up @@ -103,7 +103,7 @@
</Target>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.0" />
<PackageReference Include="Microsoft.Data.SqlClient" />
<None Include="defaults/**/*.*" Pack="true" PackagePath="build/Defaults" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/JD.Efcpt.Sdk/JD.Efcpt.Sdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<!-- Add JD.MSBuild.Fluent package reference -->
<ItemGroup>
<PackageReference Include="JD.MSBuild.Fluent" Version="1.3.15" />
<PackageReference Include="JD.MSBuild.Fluent" />
</ItemGroup>

<!-- Reference JD.Efcpt.Build.Tasks to ensure it's built before packing -->
Expand Down
34 changes: 17 additions & 17 deletions tests/JD.Efcpt.Build.Tests/JD.Efcpt.Build.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,37 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="8.0.1" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.11.2">
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.Build.Locator">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.Build.Framework" Version="18.4.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Build.Framework">
<ExcludeAssets>runtime</ExcludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.4.0">
<PackageReference Include="Microsoft.Build.Utilities.Core">
<ExcludeAssets>runtime</ExcludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.StringTools" Version="18.4.0">
<PackageReference Include="Microsoft.NET.StringTools">
<ExcludeAssets>runtime</ExcludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Testcontainers.MsSql" Version="4.11.0" />
<PackageReference Include="Testcontainers.PostgreSql" Version="4.11.0" />
<PackageReference Include="Testcontainers.MySql" Version="4.11.0" />
<PackageReference Include="Testcontainers.FirebirdSql" Version="4.11.0" />
<PackageReference Include="Testcontainers.Oracle" Version="4.11.0" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
<PackageReference Include="TinyBDD.Xunit" Version="0.19.9" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="Xunit.SkippableFact" Version="1.5.61" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="Testcontainers.MsSql" />
<PackageReference Include="Testcontainers.PostgreSql" />
<PackageReference Include="Testcontainers.MySql" />
<PackageReference Include="Testcontainers.FirebirdSql" />
<PackageReference Include="Testcontainers.Oracle" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" />
<PackageReference Include="TinyBDD.Xunit" />
<PackageReference Include="xunit" />
<PackageReference Include="Xunit.SkippableFact" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Override vulnerable AWSSDK.Core transitive dependency -->
<PackageReference Include="AWSSDK.Core" Version="4.0.3.21" />
<PackageReference Include="AWSSDK.Core" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="Xunit.SkippableFact" Version="1.5.61" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="Xunit.SkippableFact" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="8.9.0" />
<PackageReference Include="Testcontainers.MsSql" Version="4.11.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.0" />
<PackageReference Include="FluentAssertions" />
<PackageReference Include="Testcontainers.MsSql" />
<PackageReference Include="Microsoft.Data.SqlClient" />
</ItemGroup>

<!-- Include test fixtures as content -->
Expand Down
6 changes: 3 additions & 3 deletions tests/TestAssets/SampleApp/Sample.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
</ItemGroup>

<Import Project="$(EfcptBuildRoot)JD.Efcpt.Build.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@

<!-- EF Core dependencies for DbContext -->
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore" VersionOverride="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" VersionOverride="8.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="8.0.0" />
</ItemGroup>

<Import Project="$(EfcptBuildRoot)JD.Efcpt.Build.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<!-- No EF Core dependencies - just plain POCOs with DataAnnotations -->
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" />
</ItemGroup>

<Import Project="$(EfcptBuildRoot)JD.Efcpt.Build.targets" />
Expand Down
Loading