From 15e3798a92d17768f781dc0b1b5985e4c18409a6 Mon Sep 17 00:00:00 2001 From: Ubhaya Hettiarachchi Date: Thu, 18 Jan 2024 12:40:03 +0530 Subject: [PATCH] Update packages for resolve conflict --- .../src/Infrastructure/Infrastructure.csproj | 6 +++--- .../src/WebUi/WebUi/WebUi.csproj | 2 +- .../Application.IntegrationTests.csproj | 2 +- .../Application.UnitTests/Application.UnitTests.csproj | 2 +- .../tests/Domain.UnitTests/Domain.UnitTests.csproj | 2 +- .../WebUi.AcceptanceTests/WebUi.AcceptanceTests.csproj | 4 ++-- .../src/WebUi/WebUi/WebUi.csproj | 8 ++------ 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/content/CleanArchitecture.Blazored/src/Infrastructure/Infrastructure.csproj b/src/content/CleanArchitecture.Blazored/src/Infrastructure/Infrastructure.csproj index 3fbea42..5cb8fa1 100644 --- a/src/content/CleanArchitecture.Blazored/src/Infrastructure/Infrastructure.csproj +++ b/src/content/CleanArchitecture.Blazored/src/Infrastructure/Infrastructure.csproj @@ -13,10 +13,10 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/content/CleanArchitecture.Blazored/src/WebUi/WebUi/WebUi.csproj b/src/content/CleanArchitecture.Blazored/src/WebUi/WebUi/WebUi.csproj index 8c5aa22..24f1fd2 100644 --- a/src/content/CleanArchitecture.Blazored/src/WebUi/WebUi/WebUi.csproj +++ b/src/content/CleanArchitecture.Blazored/src/WebUi/WebUi/WebUi.csproj @@ -13,7 +13,7 @@ - + all diff --git a/src/content/CleanArchitecture.Blazored/tests/Application.IntegrationTests/Application.IntegrationTests.csproj b/src/content/CleanArchitecture.Blazored/tests/Application.IntegrationTests/Application.IntegrationTests.csproj index b7677b1..929d3a2 100644 --- a/src/content/CleanArchitecture.Blazored/tests/Application.IntegrationTests/Application.IntegrationTests.csproj +++ b/src/content/CleanArchitecture.Blazored/tests/Application.IntegrationTests/Application.IntegrationTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/content/CleanArchitecture.Blazored/tests/Application.UnitTests/Application.UnitTests.csproj b/src/content/CleanArchitecture.Blazored/tests/Application.UnitTests/Application.UnitTests.csproj index 8151448..5f06db2 100644 --- a/src/content/CleanArchitecture.Blazored/tests/Application.UnitTests/Application.UnitTests.csproj +++ b/src/content/CleanArchitecture.Blazored/tests/Application.UnitTests/Application.UnitTests.csproj @@ -15,7 +15,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/content/CleanArchitecture.Blazored/tests/Domain.UnitTests/Domain.UnitTests.csproj b/src/content/CleanArchitecture.Blazored/tests/Domain.UnitTests/Domain.UnitTests.csproj index 6f31463..2f3078c 100644 --- a/src/content/CleanArchitecture.Blazored/tests/Domain.UnitTests/Domain.UnitTests.csproj +++ b/src/content/CleanArchitecture.Blazored/tests/Domain.UnitTests/Domain.UnitTests.csproj @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/content/CleanArchitecture.Blazored/tests/WebUi.AcceptanceTests/WebUi.AcceptanceTests.csproj b/src/content/CleanArchitecture.Blazored/tests/WebUi.AcceptanceTests/WebUi.AcceptanceTests.csproj index 4dcdd34..a2e4675 100644 --- a/src/content/CleanArchitecture.Blazored/tests/WebUi.AcceptanceTests/WebUi.AcceptanceTests.csproj +++ b/src/content/CleanArchitecture.Blazored/tests/WebUi.AcceptanceTests/WebUi.AcceptanceTests.csproj @@ -18,10 +18,10 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/content/CleanArchitecture.MudBlazored/src/WebUi/WebUi/WebUi.csproj b/src/content/CleanArchitecture.MudBlazored/src/WebUi/WebUi/WebUi.csproj index 1a0e9bd..f3641fe 100644 --- a/src/content/CleanArchitecture.MudBlazored/src/WebUi/WebUi/WebUi.csproj +++ b/src/content/CleanArchitecture.MudBlazored/src/WebUi/WebUi/WebUi.csproj @@ -15,17 +15,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - +