PostSharp.Engineering updated.

Author: prochan2

.teamcity/settings.kts

@@ -1,21 +1,25 @@
+// This file is automatically generated when you do `Build.ps1 prepare`.
+
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.powerShell
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.*
 
 version = "2019.2"
 
 project {
-    buildType(DebugBuild)
-    buildType(ReleaseBuild)
-    buildType(PublicBuild)
-    buildType(Deploy)
+
+   buildType(DebugBuild)
+   buildType(ReleaseBuild)
+   buildType(PublicBuild)
+
+   buildType(Deploy)
 }
 
-// Debug build (a numbered build)
 object DebugBuild : BuildType({
+
     name = "Build [Debug]"
 
-    artifactRules = "+:artifacts/publish/**/*=>artifacts/publish"
+    artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private"
 
     vcs {
         root(DslContext.settingsRoot)
@@ -27,27 +31,41 @@ object DebugBuild : BuildType({
                 path = "Build.ps1"
             }
             noProfile = false
-            param("jetbrains_powershell_scriptArguments", "test --numbered %build.number%")
+            param("jetbrains_powershell_scriptArguments", "test --configuration Debug --buildNumber %build.number%")
         }
     }
 
+    requirements {
+        equals("env.BuildAgentType", "caravela02")
+    }
+
+
+
     triggers {
+
         vcs {
-            quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
+            watchChangesInDependencies = true
             branchFilter = "+:<default>"
-        }
-    }
+        }        
 
-    requirements {
-        equals("env.BuildAgentType", "caravela02")
     }
+
+  dependencies {
+
+        snapshot(AbsoluteId("Metalama_Metalama_DebugBuild")) {
+                     onDependencyFailure = FailureAction.FAIL_TO_START
+                }
+
+
+     }
+
 })
 
-// Release build (with unsuffixed version number, unsigned)
 object ReleaseBuild : BuildType({
+
     name = "Build [Release]"
 
-    artifactRules = "+:artifacts/publish/**/*=>artifacts/publish"
+    artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private"
 
     vcs {
         root(DslContext.settingsRoot)
@@ -59,20 +77,32 @@ object ReleaseBuild : BuildType({
                 path = "Build.ps1"
             }
             noProfile = false
-            param("jetbrains_powershell_scriptArguments", "test  --numbered %build.number% --configuration Release")
+            param("jetbrains_powershell_scriptArguments", "test --configuration Release --buildNumber %build.number%")
         }
     }
 
     requirements {
         equals("env.BuildAgentType", "caravela02")
     }
+
+
+
+  dependencies {
+
+        snapshot(AbsoluteId("Metalama_Metalama_ReleaseBuild")) {
+                     onDependencyFailure = FailureAction.FAIL_TO_START
+                }
+
+
+     }
+
 })
 
-// Public build (a release build with unsuffixed version number)
 object PublicBuild : BuildType({
+
     name = "Build [Public]"
 
-    artifactRules = "+:artifacts/publish/**/*=>artifacts/publish"
+    artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private"
 
     vcs {
         root(DslContext.settingsRoot)
@@ -84,17 +114,30 @@ object PublicBuild : BuildType({
                 path = "Build.ps1"
             }
             noProfile = false
-            param("jetbrains_powershell_scriptArguments", "test --public --configuration Release --sign")
+            param("jetbrains_powershell_scriptArguments", "test --configuration Public --buildNumber %build.number%")
         }
     }
 
     requirements {
         equals("env.BuildAgentType", "caravela02")
     }
+
+
+
+  dependencies {
+
+        snapshot(AbsoluteId("Metalama_Metalama_PublicBuild")) {
+                     onDependencyFailure = FailureAction.FAIL_TO_START
+                }
+
+
+     }
+
 })
 
 // Publish the release build to public feeds
 object Deploy : BuildType({
+
     name = "Deploy [Public]"
     type = Type.DEPLOYMENT
 
@@ -108,7 +151,7 @@ object Deploy : BuildType({
                 path = "Build.ps1"
             }
             noProfile = false
-            param("jetbrains_powershell_scriptArguments", "publish --public")
+            param("jetbrains_powershell_scriptArguments", "publish --configuration Public")
         }
     }
 
@@ -119,12 +162,14 @@ object Deploy : BuildType({
 
             artifacts {
                 cleanDestination = true
-                artifactRules = "+:artifacts/publish/**/*=>artifacts/publish"
+                artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public"
             }
         }
     }
-
+    
     requirements {
         equals("env.BuildAgentType", "caravela02")
     }
 })
+
+

eng/Versions.props

@@ -11,7 +11,7 @@
 
     <!-- Set the default versions of dependencies -->
     <PropertyGroup>
-        <PostSharpEngineeringVersion>1.0.24-preview</PostSharpEngineeringVersion>
+        <PostSharpEngineeringVersion>1.0.33-preview</PostSharpEngineeringVersion>
 		<MetalamaVersion>branch:master</MetalamaVersion>
 
         <!-- Example of dependencies to third parties -->

eng/src/Program.cs

@@ -5,27 +5,17 @@
 using PostSharp.Engineering.BuildTools.Build.Model;
 using PostSharp.Engineering.BuildTools.Dependencies.Model;
 using Spectre.Console.Cli;
-using System.Collections.Immutable;
 
-namespace BuildCaravela
+var product = new Product
 {
-    internal static class Program
-    {
-        private static int Main( string[] args )
-        {
-       
-            var product = new Product
-            {
-                ProductName = "My.Product",
-                Solutions = ImmutableArray.Create<Solution>( new DotNetSolution( "src\\My.Product.sln" ) ),
-                PublicArtifacts = Pattern.Create( "My.Product.$(PackageVersion).nupkg" ),
-                Dependencies = ImmutableArray.Create( Dependencies.PostSharpEngineering, Dependencies.Metalama )
-            };
+    ProductName = "My.Product",
+    Solutions = new[] { new DotNetSolution( "src\\My.Product.sln" ) },
+    PublicArtifacts = Pattern.Create( "My.Product.$(PackageVersion).nupkg" ),
+    Dependencies = new[] { Dependencies.PostSharpEngineering, Dependencies.Metalama }
+};
 
-            var commandApp = new CommandApp();
-            commandApp.AddProductCommands( product );
+var commandApp = new CommandApp();
 
-            return commandApp.Run( args );
-        }
-    }
-}
+commandApp.AddProductCommands( product );
+
+return commandApp.Run( args );

global.json

@@ -4,6 +4,6 @@
     "rollForward": "disable"
   },
   "msbuild-sdks": {
-    "PostSharp.Engineering.Sdk": "1.0.24-preview"
+    "PostSharp.Engineering.Sdk": "1.0.33-preview"
   }
 }