Skip to content

Central package management (CPM) #188

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.

Sign up for GitHub

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

Merged
madelson merged 4 commits into from
Mar 17, 2024
Merged

Central package management (CPM) #188

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7bf9ab
Add RestorePackagesWithLockFile true for better diffs
Bartleby2718 Feb 11, 2024
784eabd
Close #179 adopt central package management
Bartleby2718 Feb 11, 2024
a7d8a9a
Remove VersionOverride for DistributedLockCodeGen.csproj
Bartleby2718 Feb 24, 2024
8df027a
Remove RestoreLockedMode because some packages have a condition on Co…
Bartleby2718 Feb 24, 2024
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
6 changes: 6 additions & 0 deletions src/Directory.Build.props
View file
Open in desktop
Copy link
Contributor Author

@Bartleby2718 Bartleby2718 Feb 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created this file so that it's easy to tell the difference what CPM did to lock files.

Copy link
Contributor Author

@Bartleby2718 Bartleby2718 Feb 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Open question: do you want to keep the lock files? My intention was that they will make this PR a lot more review-able, but I'm fine with not using them.

Copy link
Owner

@madelson madelson Mar 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy to have them

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<RestoreLockedMode Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</RestoreLockedMode>
</PropertyGroup>
</Project>
29 changes: 29 additions & 0 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
Copy link
Contributor Author

@Bartleby2718 Bartleby2718 Feb 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're doing both CPM and transitive pinning here. See https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management for details.

</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" Condition="$(Configuration) == 'Release'"/>
Copy link
Contributor Author

@Bartleby2718 Bartleby2718 Feb 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Open question: do we need Conditions like this? I got this from the corresponding project files.

Response from @madelson (copypasting from #186 (comment)):

Yes I don't want public api analysis in debug mode, because of the weird setup I have where internal methods in Core are public in debug mode. The reason for that is that it forces me to think explicitly about which Core methods are "internal APIs" exposed to all DL implementations and which ones are for use within Core only, but it plays havoc with the analyzer in debug mode.

<PackageVersion Include="Azure.Storage.Blobs" Version="12.13.1" />
<PackageVersion Include="Nullable" Version="1.3.1" Condition="'$(TargetFramework)' != 'netstandard2.1'" />
<PackageVersion Include="MySqlConnector" Version="2.3.5" />
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.100" Condition="'$(TargetFramework)' == 'netstandard2.1'" />
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.10.0" Condition="'$(TargetFramework)' == 'net462'"/>
<PackageVersion Include="Npgsql" Version="5.0.4" />
<PackageVersion Include="StackExchange.Redis" Version="2.7.20" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="2.1.7" />
<PackageVersion Include="nunit" Version="3.12.0" />
<PackageVersion Include="nunit3testadapter" Version="3.15.1" />
<PackageVersion Include="Microsoft.NET.Test.SDK" Version="16.4.0" />
<PackageVersion Include="MedallionShell.StrongName" Version="1.6.1" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
<PackageVersion Include="Moq" Version="4.13.1" />
<PackageVersion Include="System.Threading.AccessControl" Version="5.0.0" Condition="'$(TargetFramework)' != 'net461'" />
<PackageVersion Include="ZooKeeperNetEx" Version="3.4.12.4" />
<PackageVersion Include="IsExternalInit" Version="1.0.3" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net461'" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions src/DistributedLock.Azure/DistributedLock.Azure.csproj
View file
Open in desktop
Copy link
Contributor Author

@Bartleby2718 Bartleby2718 Feb 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the Version attribute from all PackageReference items In all project files. There are only two project files of note: DistributedLock.ZooKeeper.csproj and DistributedLockCodeGen.csproj.

Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All" Condition="$(Configuration) == 'Release'"/>
<PackageReference Include="Azure.Storage.Blobs" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" Condition="$(Configuration) == 'Release'"/>
</ItemGroup>

<ItemGroup>
Expand Down
Loading