Skip to content

Topic/2023.2/bug 35776 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
addabis merged 2 commits into from
Apr 28, 2025
Merged

Topic/2023.2/bug 35776 #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf398b
#35776 Consolidated NuGet deployment failure.
addabis Apr 22, 2025
5a54716
Rename.
addabis Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCityHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ bool TryPopulateBuildConfigurations(
];

var artifactRules = string.Join( "\\n", rules );

nuGetDependencies.Add(
new(
buildConfiguration.BuildConfigurationId,
Expand Down Expand Up @@ -998,7 +998,7 @@ bool TryPopulateBuildConfigurations(
TeamCitySourceDependency CreateSourceDependency( string vcsProjectRootId, string projectName )
=> new( vcsProjectRootId, true, $"+:. => {context.Product.SourceDependenciesDirectory}/{projectName}" );

TeamCitySourceDependency CreateSourceDependencyFromDefintion( DependencyDefinition dependencyDefinition )
TeamCitySourceDependency CreateSourceDependencyFromDefinition( DependencyDefinition dependencyDefinition )
=> CreateSourceDependency( GetVcsRootId( dependencyDefinition ), dependencyDefinition.Name );

foreach ( var buildConfiguration in buildConfigurationsByKind[publicBuildObjectName] )
Expand Down Expand Up @@ -1033,7 +1033,7 @@ TeamCitySourceDependency CreateSourceDependencyFromDefintion( DependencyDefiniti
$"Bump version of {bumpedProjectName}",
"bump" ) { WorkingDirectory = $"source-dependencies/{bumpedProjectName}" } );

consolidatedVersionBumpSourceDependencies.Add( CreateSourceDependencyFromDefintion( dependencyDefinition ) );
consolidatedVersionBumpSourceDependencies.Add( CreateSourceDependencyFromDefinition( dependencyDefinition ) );

if ( dependencyDefinition.VcsRepository.DefaultBranchParameter != VcsRepository.DefaultDefaultBranchParameter )
{
Expand Down Expand Up @@ -1104,7 +1104,7 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
continue;
}

sourceDependencies.Add( CreateSourceDependencyFromDefintion( projectDependencyDefinition ) );
sourceDependencies.Add( CreateSourceDependencyFromDefinition( projectDependencyDefinition ) );

if ( projectDependencyDefinition.VcsRepository.DefaultBranchParameter != VcsRepository.DefaultDefaultBranchParameter )
{
Expand Down Expand Up @@ -1173,7 +1173,7 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
}
}

sourceDependencies.Add( CreateSourceDependencyFromDefintion( context.Product.DependencyDefinition ) );
sourceDependencies.Add( CreateSourceDependencyFromDefinition( context.Product.DependencyDefinition ) );

steps.Add(
new TeamCityEngineeringCommandBuildStep(
Expand Down Expand Up @@ -1234,13 +1234,16 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
var publicNuGetDeploymentCiId = $"{consolidatedProjectIdPrefix}{MarkNuGetObjectId( publicDeploymentObjectName )}";

var nuGetPublicDeploymentSteps = new TeamCityBuildStep[] { new TeamCityEngineeringPublishBuildStep( publicConfiguration ) };


// TODO: Only Public builds of dependencies that define version need to be included.
Comment thread
addabis marked this conversation as resolved.
// Here we include all Public builds which will cause download of all artifacts.
var nuGetPublicDeploymentDependencies =
nuGetPublicBuildDependencies
.Select(
d => new TeamCitySnapshotDependency(
d.ObjectId.Replace( $"_{publicBuildObjectName}", $"_{publicDeploymentObjectName}", StringComparison.Ordinal ),
true ) )
true ) )
.Concat( nuGetPublicBuildDependencies )
.Append( new( publicNuGetBuildCiId, true, nuGetBuildArtifactRules ) );

nuGetConfigurations.Add(
Expand Down