Skip to content

Commit ba8a3e3

Browse files
committedFeb 5, 2025
Prepare 2025.1 repo merge.
1 parent 540b6b8 commit ba8a3e3

File tree

3 files changed

+9
-166
lines changed

3 files changed

+9
-166
lines changed
 

‎src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_0.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ public MetalamaDependencyDefinition(
5353

5454
public static ProductFamily Family { get; } = new( _projectName, "2025.0", DevelopmentDependencies.Family, PostSharpDependencies.V2025_0.Family )
5555
{
56-
DockerBaseImage = DockerImages.WindowsServerCore, UpstreamProductFamily = V2024_2.Family, DownstreamProductFamily = V2025_1.Family
56+
DockerBaseImage = DockerImages.WindowsServerCore, UpstreamProductFamily = V2024_2.Family
57+
58+
// No downstream merge is supported into 2025.1 because repo merge.
5759
};
5860

5961
public static DependencyDefinition MetalamaBackstage { get; } = new MetalamaDependencyDefinition( "Metalama.Backstage", VcsProvider.GitHub );

‎src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_1.cs

+6-17
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,11 @@ public MetalamaDependencyDefinition(
5353

5454
public static ProductFamily Family { get; } = new( _projectName, "2025.1", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1.Family )
5555
{
56-
DockerBaseImage = DockerImages.WindowsServerCore, UpstreamProductFamily = V2025_0.Family
56+
DockerBaseImage = DockerImages.WindowsServerCore
5757

5858
// DownstreamProductFamily = V2025_2.Family
5959
};
6060

61-
public static DependencyDefinition MetalamaBackstage { get; } = new MetalamaDependencyDefinition( "Metalama.Backstage", VcsProvider.GitHub );
62-
6361
public static DependencyDefinition Consolidated { get; } = new MetalamaDependencyDefinition(
6462
ProductFamily.ConsolidatedProjectName,
6563
VcsProvider.AzureDevOps,
@@ -78,41 +76,32 @@ public MetalamaDependencyDefinition(
7876
public static DependencyDefinition Metalama { get; } = new MetalamaDependencyDefinition(
7977
"Metalama",
8078
VcsProvider.GitHub,
81-
customRepositoryName: "Metalama.Framework" );
79+
customRepositoryName: "Metalama.Framework.2025.1" ); // TODO: Change after open-sourcing.
8280

83-
public static DependencyDefinition MetalamaVsx { get; } = new MetalamaDependencyDefinition( "Metalama.Vsx", VcsProvider.AzureDevOps );
81+
public static DependencyDefinition MetalamaPremium { get; } = new MetalamaDependencyDefinition(
82+
"Metalama.Premium",
83+
VcsProvider.GitHub );
8484

85-
public static DependencyDefinition MetalamaExtensions { get; } = new MetalamaDependencyDefinition( "Metalama.Extensions", VcsProvider.GitHub );
85+
public static DependencyDefinition MetalamaVsx { get; } = new MetalamaDependencyDefinition( "Metalama.Vsx", VcsProvider.AzureDevOps );
8686

8787
public static DependencyDefinition MetalamaSamples { get; } =
8888
new MetalamaDependencyDefinition( "Metalama.Samples", VcsProvider.GitHub ) { CodeStyle = "Metalama.Samples" };
8989

9090
public static DependencyDefinition TimelessDotNetEngineer { get; } =
9191
new MetalamaDependencyDefinition( "TimelessDotNetEngineer", VcsProvider.GitHub ) { CodeStyle = "Metalama.Samples" };
9292

93-
public static DependencyDefinition MetalamaMigration { get; } = new MetalamaDependencyDefinition( "Metalama.Migration", VcsProvider.GitHub );
94-
95-
public static DependencyDefinition MetalamaLinqPad { get; } = new MetalamaDependencyDefinition( "Metalama.LinqPad", VcsProvider.GitHub );
96-
9793
public static DependencyDefinition MetalamaCommunity { get; } = new MetalamaDependencyDefinition( "Metalama.Community", VcsProvider.GitHub );
9894

9995
public static DependencyDefinition MetalamaDocumentation { get; } = new MetalamaDependencyDefinition(
10096
"Metalama.Documentation",
10197
VcsProvider.GitHub,
10298
false );
10399

104-
public static DependencyDefinition MetalamaTry { get; } =
105-
new MetalamaDependencyDefinition( "Metalama.Try", VcsProvider.AzureDevOps, false ) { EngineeringDirectory = "eng-Metalama" };
106-
107100
public static DependencyDefinition PostSharpPatterns { get; } = new MetalamaDependencyDefinition(
108101
"PostSharp.Patterns",
109102
VcsProvider.AzureDevOps,
110103
false );
111104

112-
public static DependencyDefinition MetalamaPatterns { get; } = new MetalamaDependencyDefinition(
113-
"Metalama.Patterns",
114-
VcsProvider.GitHub );
115-
116105
public static DependencyDefinition NopCommerce { get; } = new MetalamaDependencyDefinition(
117106
"Metalama.Tests.NopCommerce",
118107
VcsProvider.GitHub,

‎src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_1_WithPremium.cs

-148
This file was deleted.

0 commit comments

Comments
 (0)