Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Directory packages fix #331

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Directory packages fix #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02aa922
fix: update packages file for new format
XenotropicDev Jun 4, 2024
675f443
fix: update project files to use new Directory.Packages.props format
XenotropicDev Jun 4, 2024
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 build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.24" />
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="Nuke.Common" Version="7.0.6" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>
Expand Down
10 changes: 9 additions & 1 deletion src/API/CompanyName.MyMeetings.API/CompanyName.MyMeetings.API.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
<DocumentationFile>bin\Debug\CompanyName.MyMeetings.API.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" />
<PackageReference Include="Hellang.Middleware.ProblemDetails" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" />
<PackageReference Include="Microsoft.OpenApi" />
<PackageReference Include="Serilog.Formatting.Compact" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion src/BuildingBlocks/Domain/CompanyName.MyMeetings.BuildingBlocks.Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="MediatR" />
</ItemGroup>
</Project>
11 changes: 10 additions & 1 deletion ...BuildingBlocks/Infrastructure/CompanyName.MyMeetings.BuildingBlocks.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Autofac" />
<PackageReference Include="Dapper" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Serilog" />
<PackageReference Include="System.Data.SqlClient" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion .../Application.UnitTests/CompanyName.MyMeetings.BuildingBlocks.Application.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
7 changes: 7 additions & 0 deletions src/Database/DatabaseMigrator/DatabaseMigrator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="dbup-core" />
<PackageReference Include="dbup-sqlserver" />
<PackageReference Include="Serilog.Formatting.Compact" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.File" />
</ItemGroup>
</Project>
89 changes: 49 additions & 40 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,54 @@
<Project>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
<PackageVersion Include="Dapper" Version="2.1.24" />
<PackageVersion Include="dbup-core" Version="5.0.37" />
<PackageVersion Include="FluentValidation" Version="11.8.1" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.14" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Polly" Version="8.2.0" />
<PackageVersion Include="Quartz" Version="3.8.0" />
<PackageVersion Include="Serilog" Version="3.1.1" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Serilog.Formatting.Compact" Version="2.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageVersion Include="SqlStreamStore" Version="1.1.3" />
<PackageVersion Include="SqlStreamStore.MsSql" Version="1.1.3" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="All" />
<PackageVersion Include="IdentityServer4" Version="4.1.2" />
<PackageVersion Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageVersion Include="MediatR" Version="12.2.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.EndsWith('API'))">
<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Migrator'))">
<PackageReference Include="dbup-sqlserver" Version="5.0.37" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('API'))">
<PackageVersion Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Migrator'))">
<PackageVersion Include="dbup-sqlserver" Version="5.0.37" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.EndsWith('BuildingBlocks.Domain'))">
<PackageReference Include="MediatR" Version="12.2.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('BuildingBlocks.Application'))">
<PackageReference Include="Dapper" Version="2.1.24" />
<PackageReference Include="FluentValidation" Version="11.8.1" />
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('BuildingBlocks.Application'))">
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('BuildingBlocks.Infrastructure'))">
<PackageVersion Include="Autofac" Version="7.1.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
</ItemGroup>

<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Quartz" Version="3.8.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('BuildingBlocks.Infrastructure'))">
<PackageReference Include="Autofac" Version="7.1.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="Polly" Version="8.2.0" />
<PackageReference Include="SqlStreamStore.MsSql" Version="1.1.3" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectFullPath.Contains('Tests'))">
<PackageReference Include="NetArchTest.Rules" Version="1.3.2" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="nunit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectFullPath.Contains('Tests'))">
<PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
<PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="nunit" Version="4.0.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
</Project>
9 changes: 8 additions & 1 deletion ...ration/Infrastructure/CompanyName.MyMeetings.Modules.Administration.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="FluentValidation" />
<PackageReference Include="Polly" />
<PackageReference Include="Quartz" />
<PackageReference Include="Serilog.Extensions.Logging" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...nistration/Tests/ArchTests/CompanyName.MyMeetings.Modules.Administration.ArchTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NetArchTest.Rules" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
8 changes: 7 additions & 1 deletion ...ts/IntegrationTests/CompanyName.MyMeetings.Modules.Administration.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NSubstitute" />
<PackageReference Include="NUnit" />
<PackageReference Include="Serilog.Sinks.Console" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion ...ion/Tests/UnitTests/CompanyName.MyMeetings.Modules.Administration.Domain.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion src/Modules/Meetings/Application/CompanyName.MyMeetings.Modules.Meetings.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="FluentValidation" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Administration\IntegrationEvents\CompanyName.MyMeetings.Modules.Administration.IntegrationEvents.csproj" />
<ProjectReference Include="..\..\Payments\IntegrationEvents\CompanyName.MyMeetings.Modules.Payments.IntegrationEvents.csproj"/>
<ProjectReference Include="..\..\Payments\IntegrationEvents\CompanyName.MyMeetings.Modules.Payments.IntegrationEvents.csproj" />
<ProjectReference Include="..\..\Registrations\IntegrationEvents\CompanyName.MyMeetings.Modules.Registrations.IntegrationEvents.csproj" />
<ProjectReference Include="..\..\UserAccess\IntegrationEvents\CompanyName.MyMeetings.Modules.UserAccess.IntegrationEvents.csproj" />
</ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion ...les/Meetings/Infrastructure/CompanyName.MyMeetings.Modules.Meetings.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Polly" />
<PackageReference Include="Quartz" />
<PackageReference Include="Serilog.Extensions.Logging" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...Modules/Meetings/Tests/ArchTests/CompanyName.MyMeetings.Modules.Meetings.ArchTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NetArchTest.Rules" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
8 changes: 7 additions & 1 deletion ...gs/Tests/IntegrationTests/CompanyName.MyMeetings.Modules.Meetings.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NSubstitute" />
<PackageReference Include="NUnit" />
<PackageReference Include="Serilog.Sinks.Console" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion .../Meetings/Tests/UnitTests/CompanyName.MyMeetings.Modules.Meetings.Domain.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="FluentAssertions" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
11 changes: 10 additions & 1 deletion ...les/Payments/Infrastructure/CompanyName.MyMeetings.Modules.Payments.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="FluentValidation" />
<PackageReference Include="Polly" />
<PackageReference Include="Quartz" />
<PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="SqlStreamStore" />
<PackageReference Include="SqlStreamStore.MsSql" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...Modules/Payments/Tests/ArchTests/CompanyName.MyMeetings.Modules.Payments.ArchTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NetArchTest.Rules" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
8 changes: 7 additions & 1 deletion ...ts/Tests/IntegrationTests/CompanyName.MyMeetings.Modules.Payments.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NSubstitute" />
<PackageReference Include="NUnit" />
<PackageReference Include="Serilog.Sinks.Console" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion .../Payments/Tests/UnitTests/CompanyName.MyMeetings.Modules.Payments.Domain.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...gistrations/Tests/ArchTests/CompanyName.MyMeetings.Modules.Registrations.ArchTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NetArchTest.Rules" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...ts/IntegrationTests/CompanyNames.MyMeetings.Modules.Registrations.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NSubstitute" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...ions/Tests/UnitTests/CompanyName.MyMeetings.Modules.Registrations.Domain.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NSubstitute" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions ...dules/UserAccess/Application/CompanyName.MyMeetings.Modules.UserAccess.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="FluentValidation" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Meetings\IntegrationEvents\CompanyName.MyMeetings.Modules.Meetings.IntegrationEvents.csproj" />
</ItemGroup>
Expand Down
7 changes: 5 additions & 2 deletions ...UserAccess/Infrastructure/CompanyName.MyMeetings.Modules.UserAccess.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="IdentityServer4" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" />
<PackageReference Include="Polly" />
<PackageReference Include="Quartz" />
<PackageReference Include="Serilog.Extensions.Logging" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...les/UserAccess/Tests/ArchTests/CompanyName.MyMeetings.Modules.UserAccess.ArchTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NetArchTest.Rules" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion ...Tests/IntegrationTests/CompanyNames.MyMeetings.Modules.UserAccess.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NSubstitute" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion ...rAccess/Tests/UnitTests/CompanyName.MyMeetings.Modules.UserAccess.Domain.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion src/Tests/ArchTests/CompanyName.MyMeetings.ArchTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NetArchTest.Rules" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion src/Tests/IntegrationTests/CompanyName.MyMeetings.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" />
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="NSubstitute" />
<PackageReference Include="NUnit" />
</ItemGroup>
</Project>
Loading