Skip to content

Commit da9ee15

Browse files
committed
Merge branch 'master' of https://github.com/postsharp/PostSharp.Documentation into topic/doc-2025.0
2 parents 74b5bbc + 59e076b commit da9ee15

File tree

5 files changed

+49
-38
lines changed

5 files changed

+49
-38
lines changed

.teamcity/settings.kts

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,45 @@ object DebugBuild : BuildType({
2727

2828
name = "Build [Debug]"
2929

30-
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n"
30+
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n+:artifacts/logs/**/*=>logs\n"
3131

3232
params {
3333
text("BuildArguments", "", label = "Build Arguments", description = "Arguments to append to the 'Build' build step.", allowEmpty = true)
34+
text("DefaultBranch", "dev", label = "Default Branch", description = "The default branch of this build configuration.")
3435
text("TimeOut", "300", label = "Time-Out Threshold", description = "Seconds after the duration of the last successful build.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
3536
}
37+
3638
vcs {
37-
root(DslContext.settingsRoot)
39+
root(AbsoluteId("PostSharp_PostSharpDocumentation"))
3840
}
3941

4042
steps {
4143
powerShell {
4244
name = "Kill background processes before cleanup"
45+
id = "PreKill"
4346
scriptMode = file {
4447
path = "Build.ps1"
4548
}
4649
noProfile = false
47-
param("jetbrains_powershell_scriptArguments", "tools kill")
50+
scriptArgs = "tools kill"
4851
}
4952
powerShell {
5053
name = "Build"
54+
id = "Build"
5155
scriptMode = file {
5256
path = "Build.ps1"
5357
}
5458
noProfile = false
55-
param("jetbrains_powershell_scriptArguments", "test --configuration Debug --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %BuildArguments%")
59+
scriptArgs = "test --configuration Debug --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %BuildArguments%"
5660
}
5761
powerShell {
5862
name = "Kill background processes before next build"
63+
id = "PostKill"
5964
scriptMode = file {
6065
path = "Build.ps1"
6166
}
6267
noProfile = false
63-
param("jetbrains_powershell_scriptArguments", "tools kill")
68+
scriptArgs = "tools kill"
6469
}
6570
}
6671

@@ -89,7 +94,7 @@ object DebugBuild : BuildType({
8994
}
9095

9196
dependencies {
92-
dependency(AbsoluteId("PostSharp_PostSharp20241_BuildDistribution")) {
97+
dependency(AbsoluteId("PostSharp_PostSharp20250_BuildDistribution")) {
9398
snapshot {
9499
onDependencyFailure = FailureAction.FAIL_TO_START
95100
}
@@ -99,7 +104,6 @@ object DebugBuild : BuildType({
99104
artifactRules = "+:artifacts/publish/private/**/*=>dependencies/PostSharpPackage"
100105
}
101106
}
102-
103107
}
104108

105109
})
@@ -108,40 +112,45 @@ object ReleaseBuild : BuildType({
108112

109113
name = "Build [Release]"
110114

111-
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n"
115+
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n+:artifacts/logs/**/*=>logs\n"
112116

113117
params {
114118
text("BuildArguments", "", label = "Build Arguments", description = "Arguments to append to the 'Build' build step.", allowEmpty = true)
119+
text("DefaultBranch", "dev", label = "Default Branch", description = "The default branch of this build configuration.")
115120
text("TimeOut", "300", label = "Time-Out Threshold", description = "Seconds after the duration of the last successful build.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
116121
}
122+
117123
vcs {
118-
root(DslContext.settingsRoot)
124+
root(AbsoluteId("PostSharp_PostSharpDocumentation"))
119125
}
120126

121127
steps {
122128
powerShell {
123129
name = "Kill background processes before cleanup"
130+
id = "PreKill"
124131
scriptMode = file {
125132
path = "Build.ps1"
126133
}
127134
noProfile = false
128-
param("jetbrains_powershell_scriptArguments", "tools kill")
135+
scriptArgs = "tools kill"
129136
}
130137
powerShell {
131138
name = "Build"
139+
id = "Build"
132140
scriptMode = file {
133141
path = "Build.ps1"
134142
}
135143
noProfile = false
136-
param("jetbrains_powershell_scriptArguments", "test --configuration Release --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %BuildArguments%")
144+
scriptArgs = "test --configuration Release --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %BuildArguments%"
137145
}
138146
powerShell {
139147
name = "Kill background processes before next build"
148+
id = "PostKill"
140149
scriptMode = file {
141150
path = "Build.ps1"
142151
}
143152
noProfile = false
144-
param("jetbrains_powershell_scriptArguments", "tools kill")
153+
scriptArgs = "tools kill"
145154
}
146155
}
147156

@@ -170,7 +179,7 @@ object ReleaseBuild : BuildType({
170179
}
171180

172181
dependencies {
173-
dependency(AbsoluteId("PostSharp_PostSharp20241_BuildDistribution")) {
182+
dependency(AbsoluteId("PostSharp_PostSharp20250_BuildDistribution")) {
174183
snapshot {
175184
onDependencyFailure = FailureAction.FAIL_TO_START
176185
}
@@ -180,7 +189,6 @@ object ReleaseBuild : BuildType({
180189
artifactRules = "+:artifacts/publish/private/**/*=>dependencies/PostSharpPackage"
181190
}
182191
}
183-
184192
}
185193

186194
})
@@ -189,40 +197,45 @@ object PublicBuild : BuildType({
189197

190198
name = "Build [Public]"
191199

192-
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n"
200+
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n+:artifacts/logs/**/*=>logs\n"
193201

194202
params {
195203
text("BuildArguments", "", label = "Build Arguments", description = "Arguments to append to the 'Build' build step.", allowEmpty = true)
204+
text("DefaultBranch", "dev", label = "Default Branch", description = "The default branch of this build configuration.")
196205
text("TimeOut", "300", label = "Time-Out Threshold", description = "Seconds after the duration of the last successful build.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
197206
}
207+
198208
vcs {
199-
root(DslContext.settingsRoot)
209+
root(AbsoluteId("PostSharp_PostSharpDocumentation"))
200210
}
201211

202212
steps {
203213
powerShell {
204214
name = "Kill background processes before cleanup"
215+
id = "PreKill"
205216
scriptMode = file {
206217
path = "Build.ps1"
207218
}
208219
noProfile = false
209-
param("jetbrains_powershell_scriptArguments", "tools kill")
220+
scriptArgs = "tools kill"
210221
}
211222
powerShell {
212223
name = "Build"
224+
id = "Build"
213225
scriptMode = file {
214226
path = "Build.ps1"
215227
}
216228
noProfile = false
217-
param("jetbrains_powershell_scriptArguments", "test --configuration Public --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %BuildArguments%")
229+
scriptArgs = "test --configuration Public --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %BuildArguments%"
218230
}
219231
powerShell {
220232
name = "Kill background processes before next build"
233+
id = "PostKill"
221234
scriptMode = file {
222235
path = "Build.ps1"
223236
}
224237
noProfile = false
225-
param("jetbrains_powershell_scriptArguments", "tools kill")
238+
scriptArgs = "tools kill"
226239
}
227240
}
228241

@@ -251,7 +264,7 @@ object PublicBuild : BuildType({
251264
}
252265

253266
dependencies {
254-
dependency(AbsoluteId("PostSharp_PostSharp20241_BuildDistribution")) {
267+
dependency(AbsoluteId("PostSharp_PostSharp20250_BuildDistribution")) {
255268
snapshot {
256269
onDependencyFailure = FailureAction.FAIL_TO_START
257270
}
@@ -261,7 +274,6 @@ object PublicBuild : BuildType({
261274
artifactRules = "+:artifacts/publish/private/**/*=>dependencies/PostSharpPackage"
262275
}
263276
}
264-
265277
}
266278

267279
})
@@ -274,20 +286,23 @@ object PublicDeployment : BuildType({
274286

275287
params {
276288
text("PublishArguments", "", label = "Publish Arguments", description = "Arguments to append to the 'Publish' build step.", allowEmpty = true)
289+
text("DefaultBranch", "dev", label = "Default Branch", description = "The default branch of this build configuration.")
277290
text("TimeOut", "300", label = "Time-Out Threshold", description = "Seconds after the duration of the last successful build.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
278291
}
292+
279293
vcs {
280-
root(DslContext.settingsRoot)
294+
root(AbsoluteId("PostSharp_PostSharpDocumentation"))
281295
}
282296

283297
steps {
284298
powerShell {
285299
name = "Publish"
300+
id = "Publish"
286301
scriptMode = file {
287302
path = "Build.ps1"
288303
}
289304
noProfile = false
290-
param("jetbrains_powershell_scriptArguments", "publish --configuration Public %PublishArguments%")
305+
scriptArgs = "publish --configuration Public %PublishArguments%"
291306
}
292307
}
293308

@@ -320,7 +335,7 @@ object PublicDeployment : BuildType({
320335
}
321336

322337
dependencies {
323-
dependency(AbsoluteId("PostSharp_PostSharp20241_BuildDistribution")) {
338+
dependency(AbsoluteId("PostSharp_PostSharp20250_BuildDistribution")) {
324339
snapshot {
325340
onDependencyFailure = FailureAction.FAIL_TO_START
326341
}
@@ -337,10 +352,9 @@ object PublicDeployment : BuildType({
337352

338353
artifacts {
339354
cleanDestination = true
340-
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults"
355+
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private"
341356
}
342357
}
343-
344358
}
345359

346360
})
@@ -353,20 +367,23 @@ object PublicUpdateSearch : BuildType({
353367

354368
params {
355369
text("UpdateSearchArguments", "", label = "Update search Arguments", description = "Arguments to append to the 'Update search' build step.", allowEmpty = true)
370+
text("DefaultBranch", "dev", label = "Default Branch", description = "The default branch of this build configuration.")
356371
text("TimeOut", "300", label = "Time-Out Threshold", description = "Seconds after the duration of the last successful build.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
357372
}
373+
358374
vcs {
359-
root(DslContext.settingsRoot)
375+
root(AbsoluteId("PostSharp_PostSharpDocumentation"))
360376
}
361377

362378
steps {
363379
powerShell {
364380
name = "Update search"
381+
id = "UpdateSearch"
365382
scriptMode = file {
366383
path = "Build.ps1"
367384
}
368385
noProfile = false
369-
param("jetbrains_powershell_scriptArguments", "tools search update https://0fpg9nu41dat6boep.a1.typesense.net postsharpdoc https://doc-production.postsharp.net/il/sitemap.xml --ignore-tls %UpdateSearchArguments%")
386+
scriptArgs = "tools search update https://0fpg9nu41dat6boep.a1.typesense.net postsharpdoc https://doc-production.postsharp.net/il/sitemap.xml --ignore-tls %UpdateSearchArguments%"
370387
}
371388
}
372389

@@ -400,7 +417,6 @@ object PublicUpdateSearch : BuildType({
400417
onDependencyFailure = FailureAction.FAIL_TO_START
401418
}
402419
}
403-
404420
}
405421

406422
})

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<!-- Set versions of dependencies that need special treatment or consist of multiple packages of the same version. -->
77
<PropertyGroup>
8-
<PostSharpEngineeringVersion Condition="'$(PostSharpEngineeringVersion)'==''">2023.2.122</PostSharpEngineeringVersion>
8+
<PostSharpEngineeringVersion Condition="'$(PostSharpEngineeringVersion)'==''">2023.2.151</PostSharpEngineeringVersion>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<PackageVersion Include="PostSharp.Engineering.BuildTools" Version="$(PostSharpEngineeringVersion)" />

eng/AutoUpdatedVersions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33

44
<PropertyGroup>
5-
<PostSharpPackageVersion>2024.1.5.199311-dev-release</PostSharpPackageVersion>
5+
<PostSharpPackageVersion>2025.0.3.248641-dev-release</PostSharpPackageVersion>
66
</PropertyGroup>
77

88
</Project>

eng/src/Program.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@
44
using BuildPostSharpDocumentation;
55
using PostSharp.Engineering.BuildTools;
66
using PostSharp.Engineering.BuildTools.Build.Solutions;
7-
using PostSharp.Engineering.BuildTools.S3.Publishers;
87
using PostSharp.Engineering.BuildTools.Build;
98
using PostSharp.Engineering.BuildTools.Build.Model;
10-
using PostSharp.Engineering.BuildTools.Utilities;
11-
using Spectre.Console.Cli;
129
using System.IO;
13-
using System.Diagnostics;
1410
using PostSharp.Engineering.BuildTools.Build.Publishers;
1511
using PostSharp.Engineering.BuildTools.Dependencies.Definitions;
1612
using PostSharp.Engineering.BuildTools.Dependencies.Model;
1713
using PostSharp.Engineering.BuildTools.Search;
1814
using PostSharp.Engineering.DocFx;
1915
using PostSharpDocumentationDependencies = PostSharp.Engineering.BuildTools.Dependencies.Definitions.PostSharpDependencies;
20-
using PostSharpDependencies = PostSharp.Engineering.BuildTools.Dependencies.Definitions.PostSharpDependencies.V2024_1;
16+
using PostSharpDependencies = PostSharp.Engineering.BuildTools.Dependencies.Definitions.PostSharpDependencies.V2025_0;
2117

2218
const string docPackageFileName = "PostSharp.Doc.zip";
2319

@@ -53,7 +49,6 @@
5349
{
5450
PublicPublishers =
5551
[
56-
new MergePublisher(),
5752
new DocumentationPublisher( [
5853
new(docPackageFileName, RegionEndpoint.EUWest1, "doc.postsharp.net",
5954
docPackageFileName)

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"rollForward": "minor"
55
},
66
"msbuild-sdks": {
7-
"PostSharp.Engineering.Sdk": "2023.2.122"
7+
"PostSharp.Engineering.Sdk": "2023.2.151"
88
}
99
}

0 commit comments

Comments
 (0)