Merge branch 'develop' into ILoggerBuilder

testcontainers · Feb 27, 2024 · f034278 · f034278
2 parents e535cbe + c0932f2
commit f034278
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -31,6 +31,9 @@
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
+ <PropertyGroup>
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
  <ItemGroup>
  <None Include="$(MSBuildThisFileDirectory)docs/banner.png" Visible="false" Pack="true" PackagePath="docs/" />
  <None Include="$(MSBuildThisFileDirectory)docs/logo.png" Visible="false" Pack="true" PackagePath="docs/" />

diff --git a/build.cake b/build.cake
@@ -67,6 +67,7 @@ Task("Build")
  Verbosity = param.Verbosity,
  NoRestore = true,
  ArgumentCustomization = args => args
+ .Append($"/p:ContinuousIntegrationBuild=true")
  });
 });
 
@@ -130,12 +131,8 @@ Task("Create-NuGet-Packages")
  Verbosity = param.Verbosity,
  NoRestore = true,
  NoBuild = true,
- IncludeSymbols = true,
- SymbolPackageFormat = "snupkg",
  OutputDirectory = param.Paths.Directories.NuGetDirectoryPath,
  ArgumentCustomization = args => args
- .Append("/p:ContinuousIntegrationBuild=true")
- .Append("/p:EmbedUntrackedSources=true")
  .Append($"/p:Version={param.Version}")
  });
 });
@@ -160,7 +157,7 @@ Task("Publish-NuGet-Packages")
  .WithCriteria(() => param.ShouldPublish)
  .Does(() =>
 {
- foreach(var package in GetFiles($"{param.Paths.Directories.NuGetDirectoryPath}/*.(nupkg|snupkgs)"))
+ foreach (var package in GetFiles($"{param.Paths.Directories.NuGetDirectoryPath}/*.nupkg"))
  {
  DotNetNuGetPush(package.FullPath, new DotNetNuGetPushSettings
  {

diff --git a/src/Testcontainers/Clients/TestcontainersClient.cs b/src/Testcontainers/Clients/TestcontainersClient.cs
@@ -339,7 +339,7 @@ public async Task<string> BuildAsync(IImageFromDockerfileConfiguration configura
  var cachedImages = await Image.GetAllAsync(filters, ct)
  .ConfigureAwait(false);
 
- var repositoryTags = new HashSet<string>(cachedImages.SelectMany(image => image.RepoTags));
+ var repositoryTags = new HashSet<string>(cachedImages.SelectMany(image => image.RepoTags ?? Array.Empty<string>()));
 
  var uncachedImages = baseImages.Where(baseImage => !repositoryTags.Contains(baseImage.FullName));
 

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
- <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
- <PropertyGroup>
- <SignAssembly>false</SignAssembly>
- </PropertyGroup>
- <PropertyGroup>
- <VSTestLogger>trx%3BLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
- </PropertyGroup>
-</Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+ <PropertyGroup>
+ <SignAssembly>false</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <VSTestLogger>trx%3BLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
+ </PropertyGroup>
+ <PropertyGroup>
+ <EnableSourceLink>false</EnableSourceLink>
+ <Deterministic>false</Deterministic>
+ </PropertyGroup>
+</Project>