New build

OctopusDeploy · Sep 4, 2024 · fa46cfe · fa46cfe
1 parent 9290def
commit fa46cfe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build/Build.cs b/build/Build.cs
@@ -167,8 +167,15 @@ public Build()
                   .DependsOn(Restore)
                   .Executes(() =>
                   {
-                      Log.Information("Compiling Calamari v{CalamariVersion}", NugetVersion.Value);
+                      Log.Information("Compiling Calamari v{CalamariVersion}", OctoVersionInfo.Value);
 
+                      DotNetBuild(_ => _.SetProjectFile(SourceDirectory / "Calamari.FullFrameworkTools"/ "Calamari.FullFrameworkTools.csproj")
+                                        .SetConfiguration(Configuration)
+                                        .SetNoRestore(false)
+                                        .SetVersion(OctoVersionInfo.Value?.FullSemVer)
+                                        .SetInformationalVersion(OctoVersionInfo.Value?.InformationalVersion));
+                    Log.Information("Done");
+
                       DotNetBuild(_ => _.SetProjectFile(Solution)
                                         .SetConfiguration(Configuration)
                                         .SetNoRestore(true)

diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj
@@ -115,7 +115,7 @@
 
   <Target Name="IncludeDALImplementation" BeforeTargets="BeforeBuild">
     <!--<Exec Command="dotnet build ..\Calamari.FullFrameworkTools\Calamari.FullFrameworkTools.csproj &#45;&#45;output $(OutDir)\Calamari.FullFrameworkTools" />-->
-    <Exec Command="dotnet build ..\Calamari.FullFrameworkTools\Calamari.FullFrameworkTools.csproj --configuration $(Configuration)" />
+    <!--<Exec Command="dotnet build ..\Calamari.FullFrameworkTools\Calamari.FullFrameworkTools.csproj &#45;&#45;configuration $(Configuration)" />-->
     <ItemGroup>
       <FullFrameworkFiles Include="$(MSBuildProjectDirectory)/../Calamari.FullFrameworkTools/bin/Debug/net462/*" />
     </ItemGroup>