Skip to content

Commit dd13aba

Browse files
committed
Added PreferredVersions.
1 parent 29ac2fb commit dd13aba

5 files changed

Lines changed: 43 additions & 7 deletions

File tree

.teamcity/settings.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ object PublicBuild : BuildType({
7171

7272
features {
7373
swabra {
74+
filesCleanup = Swabra.FilesCleanup.BEFORE_BUILD
7475
lockingProcesses = Swabra.LockingProcessPolicy.KILL
7576
verbose = true
7677
}
@@ -146,6 +147,7 @@ object PublicDeployment : BuildType({
146147

147148
features {
148149
swabra {
150+
filesCleanup = Swabra.FilesCleanup.BEFORE_BUILD
149151
lockingProcesses = Swabra.LockingProcessPolicy.KILL
150152
verbose = true
151153
}
@@ -211,6 +213,7 @@ object VersionBump : BuildType({
211213

212214
features {
213215
swabra {
216+
filesCleanup = Swabra.FilesCleanup.BEFORE_BUILD
214217
lockingProcesses = Swabra.LockingProcessPolicy.KILL
215218
verbose = true
216219
}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ RUN Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile dotnet
5858
ENV PATH="C:\Program Files\dotnet;${PATH}"
5959

6060

61-
# Install .NET Sdk 9.0.305
62-
RUN & .\dotnet-install.ps1 -Version 9.0.305 -InstallDir 'C:\Program Files\dotnet'
61+
# Install .NET Sdk 9.0.310
62+
RUN & .\dotnet-install.ps1 -Version 9.0.310 -InstallDir 'C:\Program Files\dotnet'
6363

6464

6565
# Epilogue

Dockerfile.claude

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ RUN Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile dotnet
5858
ENV PATH="C:\Program Files\dotnet;${PATH}"
5959

6060

61-
# Install .NET Sdk 9.0.305
62-
RUN & .\dotnet-install.ps1 -Version 9.0.305 -InstallDir 'C:\Program Files\dotnet'
61+
# Install .NET Sdk 9.0.310
62+
RUN & .\dotnet-install.ps1 -Version 9.0.310 -InstallDir 'C:\Program Files\dotnet'
6363

6464

6565
# Install Node.js
@@ -68,8 +68,8 @@ RUN Invoke-WebRequest -Uri "https://nodejs.org/dist/v22.0.0/node-v22.0.0-win-x64
6868
Rename-Item "C:\node-v22.0.0-win-x64" "C:\nodejs"; `
6969
Remove-Item node.zip
7070

71-
ENV NPM_CONFIG_PREFIX=C:\\npm
72-
ENV PATH="C:\nodejs;C:\\npm;${PATH}"
71+
ENV NPM_CONFIG_PREFIX=C:\npm
72+
ENV PATH="C:\nodejs;C:\npm;${PATH}"
7373

7474

7575
# Install Claude CLI

eng/src/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
using PostSharp.Engineering.BuildTools.Dependencies.Definitions;
88
using PostSharp.Engineering.BuildTools.Docker;
99

10-
const string sdkVersion = "9.0.305";
10+
const string sdkVersion = PreferredVersions.DotNetSdk.V_9_0;
11+
1112
var product = new Product( DevelopmentDependencies.PostSharpEngineering )
1213
{
1314
GenerateNuGetConfig = true,
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
2+
3+
// ReSharper disable InconsistentNaming
4+
5+
using JetBrains.Annotations;
6+
7+
namespace PostSharp.Engineering.BuildTools.Build;
8+
9+
/// <summary>
10+
/// List of preferred versions of .NET SDK and .NET.
11+
/// The goal is to increase the reuse of Docker layers by using a small subset of versions.
12+
/// Update only when necessary.
13+
/// </summary>
14+
[PublicAPI]
15+
public static class PreferredVersions
16+
{
17+
public static class DotNetSdk
18+
{
19+
public const string V_6_0 = "6.0.428";
20+
public const string V_10_0 = "8.0.102";
21+
public const string V_9_0 = "9.0.310";
22+
public const string V_8_0 = "8.0.417";
23+
}
24+
25+
public static class DotNet
26+
{
27+
public const string V_6_0 = "6.0.36";
28+
public const string V_10_0 = "8.0.2";
29+
public const string V_9_0 = "9.0.12";
30+
public const string V_8_0 = "8.0.12";
31+
}
32+
}

0 commit comments

Comments
 (0)