version bumps after rebase

philosowaffle · Jul 30, 2023 · ad4ff91 · ad4ff91
1 parent bcc2790
commit ad4ff91
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 33 deletions.
diff --git a/src/Api.Contract/Api.Contract.csproj b/src/Api.Contract/Api.Contract.csproj
@@ -1,15 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Common\Common.csproj" />
 	</ItemGroup>

diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ClientUI/ClientUI.csproj b/src/ClientUI/ClientUI.csproj
@@ -61,7 +61,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+		<!-- Pinning this version fixes a dependency downgrade issue with Havit -->
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     </ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj
@@ -17,12 +17,12 @@
     <PackageReference Include="prometheus-net" Version="8.0.1" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
 
-	  <PackageReference Include="Serilog" Version="2.12.0" />
-	  <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
-	  <PackageReference Include="Serilog.Enrichers.Span" Version="3.0.0" />
-	  <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+	  <PackageReference Include="Serilog" Version="3.0.1" />
+	  <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+	  <PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
+	  <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
 	  <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
 	  <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 	  <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />

diff --git a/src/SharedUI/SharedUI.csproj b/src/SharedUI/SharedUI.csproj
@@ -11,36 +11,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.3" />
-	<PackageReference Include="Havit.Blazor.Components.Web.Bootstrap" Version="3.2.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.9" />
+	<PackageReference Include="Havit.Blazor.Components.Web.Bootstrap" Version="4.0.4" />
 	<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Api.Contract\Api.Contract.csproj" />
     <ProjectReference Include="..\Common\Common.csproj" />
   </ItemGroup>
-
-	<ItemGroup>
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.css" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.css.map" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.min.css" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.min.css.map" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.rtl.css" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.rtl.css.map" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.rtl.min.css" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-grid.rtl.min.css.map" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-reboot.css" />
-	  <_ContentIncludedByDefault Remove="wwwroot\lib\bootstrap\css\bootstrap-reboot.css.map" />
-	</ItemGroup>
 
 	<ItemGroup>
 	  <None Include="wwwroot\favicon.ico" />
-	  <None Include="wwwroot\lib\bootstrap\css\bootstrap-grid.css.map" />
-	  <None Include="wwwroot\lib\bootstrap\css\bootstrap-grid.min.css.map" />
-	  <None Include="wwwroot\lib\bootstrap\css\bootstrap-grid.rtl.css.map" />
-	  <None Include="wwwroot\lib\bootstrap\css\bootstrap-grid.rtl.min.css.map" />
-	  <None Include="wwwroot\lib\bootstrap\css\bootstrap-reboot.css.map" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/SharedUI/libman.json b/src/SharedUI/libman.json
@@ -7,7 +7,7 @@
       "destination": "wwwroot/lib/font-awesome/"
     },
     {
-      "library": "bootstrap@5.2.3",
+      "library": "bootstrap@5.3.0",
       "destination": "wwwroot/lib/bootstrap/"
     },
     {