Skip to content

Commit e1745d2

Browse files
gfraiteurPostSharpAgent
authored andcommitted
Merge branch 'develop/2023.2' of https://github.com/postsharp/PostSharp.Engineering into develop/2023.2
2 parents 1d1f0f9 + 999cbf4 commit e1745d2

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

eng/AutoUpdatedVersions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<PostSharpEngineeringReleaseVersion>2023.2.343</PostSharpEngineeringReleaseVersion>
4-
<PostSharpEngineeringReleaseMainVersion>2023.2.343</PostSharpEngineeringReleaseMainVersion>
3+
<PostSharpEngineeringReleaseVersion>2023.2.344</PostSharpEngineeringReleaseVersion>
4+
<PostSharpEngineeringReleaseMainVersion>2023.2.344</PostSharpEngineeringReleaseMainVersion>
55
</PropertyGroup>
66
</Project>

eng/MainVersion.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<MainVersion>2023.2.343</MainVersion>
3+
<MainVersion>2023.2.344</MainVersion>
44
<PackageVersionSuffix></PackageVersionSuffix>
55
</PropertyGroup>
66
</Project>

src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,15 +1418,6 @@ $envVarAssignments$gitConfigCommands$postInitCommands
14181418
}
14191419
}
14201420

1421-
# If no existing container, remove any containers with same image to avoid conflicts
1422-
if (-not $existingContainerId)
1423-
{
1424-
docker ps -a -q --filter "ancestor=$ImageTag" | ForEach-Object {
1425-
Write-Host "Removing container $_"
1426-
docker rm -f $_ 2>&1 | Out-Null
1427-
}
1428-
}
1429-
14301421
# Registry authentication and pull logic
14311422
$builtNewImage = $false
14321423
$dockerConfigArg = @()

0 commit comments

Comments
 (0)