Skip to content

Commit

Permalink
Merge branch 'main' into robe/calamari-legacy
Browse files Browse the repository at this point in the history
  • Loading branch information
zentron committed Sep 7, 2024
2 parents 63dbb2e + 082dcf6 commit d6c88ca
Show file tree
Hide file tree
Showing 72 changed files with 827 additions and 1,977 deletions.
10 changes: 5 additions & 5 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@

<ItemGroup>
<PackageReference Include="NuGet.CommandLine" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Nuke.Common" Version="7.0.6" />
</ItemGroup>

<ItemGroup>
<PackageDownload Include="AzureSignTool" Version="[3.0.0]" />
<PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
<PackageDownload Include="AzureSignTool" Version="[3.0.0]" />
<PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\source\Calamari.ConsolidateCalamariPackages\Calamari.ConsolidateCalamariPackages.csproj" />
<ProjectReference Include="..\source\Calamari.ConsolidateCalamariPackages\Calamari.ConsolidateCalamariPackages.csproj" />
</ItemGroup>

</Project>

This file was deleted.

68 changes: 0 additions & 68 deletions source/Calamari.Common/Features/Processes/Semaphores/FileLock.cs

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions source/Calamari.Common/Features/Processes/Semaphores/ILockIo.cs

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit d6c88ca

Please sign in to comment.