Skip to content

Commit 92cdbe1

Browse files
addabisaddabis
committed
Define 2025.2 and 2026.0 versions.
1 parent 735772e commit 92cdbe1

File tree

7 files changed

+47
-196
lines changed

7 files changed

+47
-196
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ public MetalamaDependencyDefinition(
5454
isVersioned ) { }
5555
}
5656

57-
public static ProductFamily Family { get; } = new( _projectName, "2025.1", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1_GitHub.Family )
57+
public static ProductFamily Family { get; } = new( _projectName, "2025.1", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1.Family )
5858
{
59-
DockerBaseImage = DockerImages.WindowsServerCore, UpstreamProductFamily = V2025_0.Family
60-
61-
// DownstreamProductFamily = V2025_2.Family
59+
DockerBaseImage = DockerImages.WindowsServerCore,
60+
// UpstreamProductFamily = V2025_0.Family,
61+
DownstreamProductFamily = V2025_2.Family
6262
};
6363

6464
public static DependencyDefinition Consolidated { get; } =

src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2024_2.cs renamed to src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_2.cs

Lines changed: 21 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
using PostSharp.Engineering.BuildTools.Docker;
88
using System;
99
using System.IO;
10+
using System.Runtime.InteropServices.Marshalling;
1011

1112
namespace PostSharp.Engineering.BuildTools.Dependencies.Definitions;
1213

1314
public static partial class MetalamaDependencies
1415
{
1516
// ReSharper disable once InconsistentNaming
1617

17-
[Obsolete("Metalama 2024.2 is no longer maintained or built.")]
1818
[PublicAPI]
19-
public static class V2024_2
19+
public static class V2025_2
2020
{
2121
private class MetalamaDependencyDefinition : DependencyDefinition
2222
{
@@ -51,22 +51,16 @@ public MetalamaDependencyDefinition(
5151
isVersioned,
5252
pullRequestRequiresStatusCheck: pullRequestRequiresStatusCheck,
5353
vcsRootProjectId: vcsRootProjectId ),
54-
isVersioned )
55-
{ }
54+
isVersioned ) { }
5655
}
5756

58-
public static ProductFamily Family { get; } = new( _projectName, "2024.2", DevelopmentDependencies.Family, PostSharpDependencies.V2024_1.Family )
57+
public static ProductFamily Family { get; } = new( _projectName, "2025.2", DevelopmentDependencies.Family, PostSharpDependencies.V2025_1.Family )
5958
{
60-
DockerBaseImage = DockerImages.WindowsServerCore, /* UpstreamProductFamily = V2024_1.Family, */
61-
DownstreamProductFamily = V2025_0.Family
59+
DockerBaseImage = DockerImages.WindowsServerCore,
60+
UpstreamProductFamily = V2025_1.Family,
61+
DownstreamProductFamily = V2026_0.Family
6262
};
6363

64-
public static DependencyDefinition MetalamaBackstage { get; } =
65-
new MetalamaDependencyDefinition(
66-
"Metalama.Backstage",
67-
VcsProvider.GitHub,
68-
MetalamaGitHubOrganization.PostSharp );
69-
7064
public static DependencyDefinition Consolidated { get; } =
7165
new MetalamaDependencyDefinition(
7266
ProductFamily.ConsolidatedProjectName,
@@ -87,71 +81,41 @@ public MetalamaDependencyDefinition(
8781
PrivateArtifactsDirectory = Path.Combine( "artifacts", "packages", "$(MSSBuildConfiguration)", "Shipping" )
8882
};
8983

90-
public static DependencyDefinition MetalamaFrameworkRunTime { get; } =
91-
new MetalamaDependencyDefinition(
92-
"Metalama.Framework.RunTime",
93-
VcsProvider.GitHub,
94-
MetalamaGitHubOrganization.PostSharp );
95-
96-
public static DependencyDefinition MetalamaFrameworkPrivate { get; } =
84+
public static DependencyDefinition Metalama { get; } =
9785
new MetalamaDependencyDefinition(
98-
"Metalama.Framework.Private",
86+
"Metalama",
9987
VcsProvider.GitHub,
100-
MetalamaGitHubOrganization.PostSharp,
101-
isVersioned: false,
102-
pullRequestRequiresStatusCheck: false )
88+
MetalamaGitHubOrganization.Metalama )
10389
{
104-
GenerateSnapshotDependency = false
90+
// SuppressUpstream = true
10591
};
10692

107-
public static DependencyDefinition Metalama { get; } =
93+
public static DependencyDefinition MetalamaPremium { get; } =
10894
new MetalamaDependencyDefinition(
109-
"Metalama",
95+
"Metalama.Premium",
11096
VcsProvider.GitHub,
111-
MetalamaGitHubOrganization.PostSharp,
112-
customRepositoryName: "Metalama.Framework" );
97+
MetalamaGitHubOrganization.Metalama )
98+
{
99+
// SuppressUpstream = true
100+
};
113101

114102
public static DependencyDefinition MetalamaVsx { get; } =
115103
new MetalamaDependencyDefinition(
116104
"Metalama.Vsx",
117105
VcsProvider.AzureDevOps,
118106
null );
119107

120-
public static DependencyDefinition MetalamaExtensions { get; } =
121-
new MetalamaDependencyDefinition(
122-
"Metalama.Extensions",
123-
VcsProvider.GitHub,
124-
MetalamaGitHubOrganization.PostSharp );
125-
126108
public static DependencyDefinition MetalamaSamples { get; } =
127109
new MetalamaDependencyDefinition(
128110
"Metalama.Samples",
129111
VcsProvider.GitHub,
130-
MetalamaGitHubOrganization.Metalama )
131-
{
132-
CodeStyle = "Metalama.Samples"
133-
};
112+
MetalamaGitHubOrganization.Metalama ) { CodeStyle = "Metalama.Samples" };
134113

135114
public static DependencyDefinition TimelessDotNetEngineer { get; } =
136115
new MetalamaDependencyDefinition(
137116
"TimelessDotNetEngineer",
138117
VcsProvider.GitHub,
139-
MetalamaGitHubOrganization.PostSharp )
140-
{
141-
CodeStyle = "Metalama.Samples"
142-
};
143-
144-
public static DependencyDefinition MetalamaMigration { get; } =
145-
new MetalamaDependencyDefinition(
146-
"Metalama.Migration",
147-
VcsProvider.GitHub,
148-
MetalamaGitHubOrganization.PostSharp );
149-
150-
public static DependencyDefinition MetalamaLinqPad { get; } =
151-
new MetalamaDependencyDefinition(
152-
"Metalama.LinqPad",
153-
VcsProvider.GitHub,
154-
MetalamaGitHubOrganization.PostSharp );
118+
MetalamaGitHubOrganization.PostSharp ) { CodeStyle = "Metalama.Samples" };
155119

156120
public static DependencyDefinition MetalamaCommunity { get; } =
157121
new MetalamaDependencyDefinition(
@@ -166,12 +130,6 @@ public MetalamaDependencyDefinition(
166130
MetalamaGitHubOrganization.Metalama,
167131
false );
168132

169-
public static DependencyDefinition MetalamaPatterns { get; } =
170-
new MetalamaDependencyDefinition(
171-
"Metalama.Patterns",
172-
VcsProvider.GitHub,
173-
MetalamaGitHubOrganization.PostSharp );
174-
175133
public static DependencyDefinition NopCommerce { get; } =
176134
new MetalamaDependencyDefinition(
177135
"Metalama.Tests.NopCommerce",
@@ -195,7 +153,7 @@ public MetalamaDependencyDefinition(
195153
new MetalamaDependencyDefinition(
196154
"Metalama.Tests.DotNetSdk",
197155
VcsProvider.GitHub,
198-
MetalamaGitHubOrganization.Metalama,
156+
MetalamaGitHubOrganization.PostSharp,
199157
false,
200158
parentCiProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}_MetalamaTests",
201159
vcsRootProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}" );
@@ -204,7 +162,7 @@ public MetalamaDependencyDefinition(
204162
new MetalamaDependencyDefinition(
205163
"Metalama.Performance",
206164
VcsProvider.GitHub,
207-
MetalamaGitHubOrganization.Metalama,
165+
MetalamaGitHubOrganization.PostSharp,
208166
false );
209167
}
210168
}

src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2025_0.cs renamed to src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/MetalamaDependencies.V2026_0.cs

Lines changed: 16 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using PostSharp.Engineering.BuildTools.Docker;
88
using System;
99
using System.IO;
10+
using System.Runtime.InteropServices.Marshalling;
1011

1112
namespace PostSharp.Engineering.BuildTools.Dependencies.Definitions;
1213

@@ -15,7 +16,7 @@ public static partial class MetalamaDependencies
1516
// ReSharper disable once InconsistentNaming
1617

1718
[PublicAPI]
18-
public static class V2025_0
19+
public static class V2026_0
1920
{
2021
private class MetalamaDependencyDefinition : DependencyDefinition
2122
{
@@ -53,17 +54,13 @@ public MetalamaDependencyDefinition(
5354
isVersioned ) { }
5455
}
5556

56-
public static ProductFamily Family { get; } = new( _projectName, "2025.0", DevelopmentDependencies.Family, PostSharpDependencies.V2025_0_GitHub.Family )
57+
public static ProductFamily Family { get; } = new( _projectName, "2026.0", DevelopmentDependencies.Family, PostSharpDependencies.V2026_0.Family )
5758
{
58-
DockerBaseImage = DockerImages.WindowsServerCore, DownstreamProductFamily = V2025_1.Family
59+
DockerBaseImage = DockerImages.WindowsServerCore,
60+
UpstreamProductFamily = V2025_2.Family
61+
// DownstreamProductFamily = V2026_1.Family
5962
};
6063

61-
public static DependencyDefinition MetalamaBackstage { get; } =
62-
new MetalamaDependencyDefinition(
63-
"Metalama.Backstage",
64-
VcsProvider.GitHub,
65-
MetalamaGitHubOrganization.PostSharp );
66-
6764
public static DependencyDefinition Consolidated { get; } =
6865
new MetalamaDependencyDefinition(
6966
ProductFamily.ConsolidatedProjectName,
@@ -84,38 +81,22 @@ public MetalamaDependencyDefinition(
8481
PrivateArtifactsDirectory = Path.Combine( "artifacts", "packages", "$(MSSBuildConfiguration)", "Shipping" )
8582
};
8683

87-
public static DependencyDefinition MetalamaFrameworkRunTime { get; } =
88-
new MetalamaDependencyDefinition(
89-
"Metalama.Framework.RunTime",
90-
VcsProvider.GitHub,
91-
MetalamaGitHubOrganization.PostSharp )
92-
{
93-
// SuppressDownstream = true
94-
};
95-
96-
public static DependencyDefinition MetalamaFrameworkPrivate { get; } =
84+
public static DependencyDefinition Metalama { get; } =
9785
new MetalamaDependencyDefinition(
98-
"Metalama.Framework.Private",
86+
"Metalama",
9987
VcsProvider.GitHub,
100-
MetalamaGitHubOrganization.PostSharp,
101-
isVersioned: false,
102-
pullRequestRequiresStatusCheck: false )
88+
MetalamaGitHubOrganization.Metalama )
10389
{
104-
GenerateSnapshotDependency = false
105-
106-
// SuppressDownstream = true
90+
// SuppressUpstream = true
10791
};
10892

109-
public static DependencyDefinition Metalama { get; } =
93+
public static DependencyDefinition MetalamaPremium { get; } =
11094
new MetalamaDependencyDefinition(
111-
"Metalama",
95+
"Metalama.Premium",
11296
VcsProvider.GitHub,
113-
MetalamaGitHubOrganization.PostSharp,
114-
customRepositoryName: "Metalama.Framework" )
97+
MetalamaGitHubOrganization.Metalama )
11598
{
116-
GenerateSnapshotDependency = false
117-
118-
// SuppressDownstream = true
99+
// SuppressUpstream = true
119100
};
120101

121102
public static DependencyDefinition MetalamaVsx { get; } =
@@ -124,15 +105,6 @@ public MetalamaDependencyDefinition(
124105
VcsProvider.AzureDevOps,
125106
null );
126107

127-
public static DependencyDefinition MetalamaExtensions { get; } =
128-
new MetalamaDependencyDefinition(
129-
"Metalama.Extensions",
130-
VcsProvider.GitHub,
131-
MetalamaGitHubOrganization.PostSharp )
132-
{
133-
// SuppressDownstream = true
134-
};
135-
136108
public static DependencyDefinition MetalamaSamples { get; } =
137109
new MetalamaDependencyDefinition(
138110
"Metalama.Samples",
@@ -145,24 +117,6 @@ public MetalamaDependencyDefinition(
145117
VcsProvider.GitHub,
146118
MetalamaGitHubOrganization.PostSharp ) { CodeStyle = "Metalama.Samples" };
147119

148-
public static DependencyDefinition MetalamaMigration { get; } =
149-
new MetalamaDependencyDefinition(
150-
"Metalama.Migration",
151-
VcsProvider.GitHub,
152-
MetalamaGitHubOrganization.PostSharp )
153-
{
154-
// SuppressDownstream = true
155-
};
156-
157-
public static DependencyDefinition MetalamaLinqPad { get; } =
158-
new MetalamaDependencyDefinition(
159-
"Metalama.LinqPad",
160-
VcsProvider.GitHub,
161-
MetalamaGitHubOrganization.PostSharp )
162-
{
163-
// SuppressDownstream = true
164-
};
165-
166120
public static DependencyDefinition MetalamaCommunity { get; } =
167121
new MetalamaDependencyDefinition(
168122
"Metalama.Community",
@@ -176,15 +130,6 @@ public MetalamaDependencyDefinition(
176130
MetalamaGitHubOrganization.Metalama,
177131
false );
178132

179-
public static DependencyDefinition MetalamaPatterns { get; } =
180-
new MetalamaDependencyDefinition(
181-
"Metalama.Patterns",
182-
VcsProvider.GitHub,
183-
MetalamaGitHubOrganization.PostSharp )
184-
{
185-
// SuppressDownstream = true
186-
};
187-
188133
public static DependencyDefinition NopCommerce { get; } =
189134
new MetalamaDependencyDefinition(
190135
"Metalama.Tests.NopCommerce",
@@ -208,7 +153,7 @@ public MetalamaDependencyDefinition(
208153
new MetalamaDependencyDefinition(
209154
"Metalama.Tests.DotNetSdk",
210155
VcsProvider.GitHub,
211-
MetalamaGitHubOrganization.Metalama,
156+
MetalamaGitHubOrganization.PostSharp,
212157
false,
213158
parentCiProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}_MetalamaTests",
214159
vcsRootProjectId: $"Metalama_Metalama{Family.VersionWithoutDots}" );
@@ -217,7 +162,7 @@ public MetalamaDependencyDefinition(
217162
new MetalamaDependencyDefinition(
218163
"Metalama.Performance",
219164
VcsProvider.GitHub,
220-
MetalamaGitHubOrganization.Metalama,
165+
MetalamaGitHubOrganization.PostSharp,
221166
false );
222167
}
223168
}

‎src/PostSharp.Engineering.BuildTools/Dependencies/Definitions/PostSharpDependencies.V2024_1.cs‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)