Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shared ConsolidatedCalamari Library solution + roundtrip test #1424

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8740bc2
Use Library
rain-on Dec 17, 2024
f1a5768
clean up cherry-pick
rain-on Jan 15, 2025
62d1377
revert some files not needed
rain-on Jan 15, 2025
e8c3b6f
fixing the tests, slowly
rain-on Jan 15, 2025
c7a1932
remove cruft
rain-on Jan 15, 2025
8f56bdb
its finally passing
rain-on Jan 15, 2025
d34754d
Pulled in the changes required
rain-on Jan 15, 2025
3bda1fc
working with library
rain-on Jan 15, 2025
97e74b9
Merge remote-tracking branch 'origin/main' into tmm/redo_everything_f…
rain-on Jan 15, 2025
5ecbc2d
moved everything out of common package
rain-on Jan 15, 2025
fdaef73
also publish the consolidated library - whatever that means
rain-on Jan 15, 2025
8426277
still trying
rain-on Jan 15, 2025
aba7f9e
trying to make it work
rain-on Jan 15, 2025
95b54f1
updated build-system to publish the consol library
rain-on Jan 16, 2025
a7611fa
updated proj to make nuget
rain-on Jan 16, 2025
2dc7956
added the DEFINE_VERSION_ATTRIB const
rain-on Jan 16, 2025
895e033
not sure - think its getting there
rain-on Jan 16, 2025
e10c836
pulled in bits and pieces from tentacle to make shared libs work
rain-on Jan 16, 2025
8480085
was this overkill?
rain-on Jan 16, 2025
39162f8
its making a nupkg for consolidated - but its also going into package
rain-on Jan 16, 2025
a324d4c
clean up
rain-on Jan 16, 2025
ea2ede5
remove superfluous things
rain-on Jan 16, 2025
0d7194a
don't need it
rain-on Jan 16, 2025
d4a6eb2
revert oddness in CalamariFlavourProgram
rain-on Jan 16, 2025
4c08188
Merge remote-tracking branch 'origin/main' into tmm/redo_everything_f…
rain-on Jan 16, 2025
aba14b0
clean up
rain-on Jan 16, 2025
490ec9e
personal review
rain-on Jan 16, 2025
c3594c4
auto gen assembly info
rain-on Jan 16, 2025
5e3b221
Rever soln file
rain-on Jan 16, 2025
c8e673f
fix the namespacing
rain-on Jan 16, 2025
ce2b907
clean up the santising of hashes
rain-on Jan 17, 2025
a25ee2d
created an API assembly
rain-on Jan 20, 2025
e4f64c9
update the build to publish the api
rain-on Jan 21, 2025
1f90305
make index fields public so json can be created
rain-on Jan 21, 2025
80a2b2c
Merge remote-tracking branch 'origin/main' into tmm/redo_everything_f…
rain-on Jan 21, 2025
5f381a6
move to the right assembly and namespace
rain-on Jan 22, 2025
6d2bcdf
Remove IConsolidatedPackageStreamProvider from the impl package
rain-on Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Calamari.ConsolidateCalamariPackages;
using NuGet.Packaging;
using Nuke.Common;
using Nuke.Common.CI.TeamCity;
Expand All @@ -17,6 +16,7 @@
using Nuke.Common.Tools.GitVersion;
using Nuke.Common.Tools.NuGet;
using Nuke.Common.Utilities.Collections;
using Octopus.Calamari.ConsolidatedPackage;
using Serilog;
using static Nuke.Common.IO.FileSystemTasks;
using static Nuke.Common.Tools.DotNet.DotNetTasks;
Expand Down Expand Up @@ -419,6 +419,12 @@ void CompressCalamariProject(Project project)
foreach (var project in commonProjects)
packageActions.Add(() => SignAndPack(project.ToString(), dotNetCorePackSettings));

// Pack the Consolidation Library
var consolidateCalamariPackagesProjectName = "Calamari.ConsolidateCalamariPackages";
var consolidationCalamariProject = Solution.Projects.First(project => project.Name == consolidateCalamariPackagesProjectName);
packageActions.Add(() => SignAndPack(consolidationCalamariProject, dotNetCorePackSettings));


var sourceProjectPath =
SourceDirectory / "Calamari.CloudAccounts" / "Calamari.CloudAccounts.csproj";
packageActions.Add(() => SignAndPack(sourceProjectPath,
Expand Down Expand Up @@ -718,4 +724,4 @@ static List<string> GetCalamariFlavours()
: MigratedCalamariFlavours.Flavours;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<PackageReference Include="nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="SharpCompress" Version="0.37.2" />
<PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading