fix(#650): Update SharpZipLib to version 1.4.1 to prevent a deadlock …

…in the Docker container image build (#671)
testcontainers · Nov 12, 2022 · 801ba3c · 801ba3c
1 parent acf0560
commit 801ba3c
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### Fixed
 
 - 610 Trim traling slashes in Dockerfile directory path (otherwise, it cuts the first character of the relative path), Normalize paths to forward slashes
+- 650 Update SharpZipLib to version 1.4.1 to prevent a deadlock in the Docker container image build
 
 ## [2.2.0]
 

diff --git a/Packages.props b/Packages.props
@@ -4,13 +4,12 @@
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" />
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
-    <PackageReference Update="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="all" />
+    <PackageReference Update="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="all" />
     <PackageReference Update="Docker.DotNet" Version="3.125.12" />
     <PackageReference Update="Docker.DotNet.X509" Version="3.125.12" />
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
     <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="3.1.26" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
-    <PackageReference Update="SharpZipLib" Version="1.4.0" />
+    <PackageReference Update="SharpZipLib" Version="1.4.1" />
     <PackageReference Update="System.Text.Json" Version="4.7.2" />
     <!-- Unit and integration test dependencies: -->
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />

diff --git a/examples/WeatherForecast/Directory.Build.props b/examples/WeatherForecast/Directory.Build.props
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <!-- https://github.com/dotnet/sdk/issues/17645 -->
-    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
     <SolutionDir Condition=" '$(SolutionDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), WeatherForecast.sln))/</SolutionDir>
     <BuildDir>$(SolutionDir)build/</BuildDir>
     <BaseIntermediateOutputPath>$(BuildDir)obj/$(MSBuildProjectName)</BaseIntermediateOutputPath>

diff --git a/examples/WeatherForecast/Dockerfile b/examples/WeatherForecast/Dockerfile
@@ -8,7 +8,7 @@ COPY . .
 
 RUN dotnet restore $CSPROJ_FILE_PATH
 
-RUN dotnet publish $CSPROJ_FILE_PATH --configuration Release --output out
+RUN dotnet publish $CSPROJ_FILE_PATH --configuration Release --framework net6.0 --output out
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0
 ARG RESOURCE_REAPER_SESSION_ID="00000000-0000-0000-0000-000000000000"

diff --git a/examples/WeatherForecast/README.md b/examples/WeatherForecast/README.md
@@ -4,7 +4,7 @@ This example builds and ships a Blazor application in a Docker image build, runs
 
 ```console
 git lfs version
-git clone git@github.com:testcontainers/testcontainers-dotnet.git
+git clone --branch develop git@github.com:testcontainers/testcontainers-dotnet.git
 cd ./testcontainers-dotnet/examples/WeatherForecast/
 dotnet build WeatherForecast.sln
 dotnet test WeatherForecast.sln

diff --git a/examples/WeatherForecast/WeatherForecast.sln b/examples/WeatherForecast/WeatherForecast.sln
@@ -21,9 +21,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherForecast.Interactors
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherForecast.Repositories", "src\WeatherForecast.Repositories\WeatherForecast.Repositories.csproj", "{B56FE398-0CD9-4747-9B58-812EE659A61A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherForecast.Test", "tests\WeatherForecast.Test\WeatherForecast.Test.csproj", "{B8C371A9-6B6C-4595-9B5B-88071D6F3A71}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherForecast.Tests", "tests\WeatherForecast.Tests\WeatherForecast.Tests.csproj", "{B8C371A9-6B6C-4595-9B5B-88071D6F3A71}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherForecast.InProcess.Test", "tests\WeatherForecast.InProcess.Test\WeatherForecast.InProcess.Test.csproj", "{2D4474DB-9E16-4931-ADD0-569306C1C5AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherForecast.InProcess.Tests", "tests\WeatherForecast.InProcess.Tests\WeatherForecast.InProcess.Tests.csproj", "{2D4474DB-9E16-4931-ADD0-569306C1C5AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...est/WeatherForecast.InProcess.Test.csproj → ...ts/WeatherForecast.InProcess.Tests.csproj b/...est/WeatherForecast.InProcess.Test.csproj → ...ts/WeatherForecast.InProcess.Tests.csproj
@@ -12,6 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../../src/Testcontainers/Testcontainers.csproj"/>
-    <ProjectReference Include="$(SolutionDir)src/WeatherForecast/WeatherForecast.csproj"/>
+    <!-- https://github.com/dotnet/sdk/issues/17645 -->
+    <ProjectReference Include="$(SolutionDir)src/WeatherForecast/WeatherForecast.csproj" Private="False"/>
   </ItemGroup>
 </Project>
diff --git a/...ast.InProcess.Test/WeatherForecastTest.cs → ...st.InProcess.Tests/WeatherForecastTest.cs b/...ast.InProcess.Test/WeatherForecastTest.cs → ...st.InProcess.Tests/WeatherForecastTest.cs
@@ -15,7 +15,7 @@
 using WeatherForecast.Repositories;
 using Xunit;
 
-namespace WeatherForecast.InProcess.Test;
+namespace WeatherForecast.InProcess.Tests;
 
 [UsedImplicitly]
 public sealed class WeatherForecastTest : IAsyncLifetime

diff --git a/...Forecast.Test/WeatherForecast.Test.csproj → ...recast.Tests/WeatherForecast.Tests.csproj b/...Forecast.Test/WeatherForecast.Test.csproj → ...recast.Tests/WeatherForecast.Tests.csproj
diff --git a/...Forecast.Test/WeatherForecastContainer.cs → ...orecast.Tests/WeatherForecastContainer.cs b/...Forecast.Test/WeatherForecastContainer.cs → ...orecast.Tests/WeatherForecastContainer.cs
@@ -9,7 +9,7 @@
 using JetBrains.Annotations;
 using Xunit;
 
-namespace WeatherForecast.Test;
+namespace WeatherForecast.Tests;
 
 [UsedImplicitly]
 public sealed class WeatherForecastContainer : HttpClient, IAsyncLifetime

diff --git a/...therForecast.Test/WeatherForecastImage.cs → ...herForecast.Tests/WeatherForecastImage.cs b/...therForecast.Test/WeatherForecastImage.cs → ...herForecast.Tests/WeatherForecastImage.cs
@@ -7,7 +7,7 @@
 using JetBrains.Annotations;
 using Xunit;
 
-namespace WeatherForecast.Test;
+namespace WeatherForecast.Tests;
 
 [UsedImplicitly]
 public sealed class WeatherForecastImage : IDockerImage, IAsyncLifetime

diff --git a/...atherForecast.Test/WeatherForecastTest.cs → ...therForecast.Tests/WeatherForecastTest.cs b/...atherForecast.Test/WeatherForecastTest.cs → ...therForecast.Tests/WeatherForecastTest.cs
@@ -13,7 +13,7 @@
 using WeatherForecast.Entities;
 using Xunit;
 
-namespace WeatherForecast.Test;
+namespace WeatherForecast.Tests;
 
 public static class WeatherForecastTest
 {

diff --git a/src/Testcontainers/Testcontainers.csproj b/src/Testcontainers/Testcontainers.csproj
@@ -10,7 +10,6 @@
     <PackageReference Include="JetBrains.Annotations" />
     <PackageReference Include="Docker.DotNet" />
     <PackageReference Include="Docker.DotNet.X509" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Portable.BouncyCastle" />
     <PackageReference Include="SharpZipLib" />