Skip to content

MSBuild modernization: Central Package Management and project cleanup #1656

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

Open
ViktorHofer wants to merge 6 commits into
base: main
Choose a base branch
from
+68 −50
Open

MSBuild modernization: Central Package Management and project cleanup #1656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d48ade7
Implement Central Package Management
ViktorHofer Feb 17, 2026
73cb53b
Add PrivateAssets to NuGetizer package reference
ViktorHofer Feb 17, 2026
661a3cd
Remove hardcoded LangVersion from project files
ViktorHofer Feb 17, 2026
29aae1b
Remove redundant DebugSymbols/DebugType from test projects
ViktorHofer Feb 17, 2026
c43a0ee
Simplify feature flag conditions in Moq.Tests
ViktorHofer Feb 17, 2026
505e016
Centralize FEATURE_DEFAULT_INTERFACE_IMPLEMENTATIONS in Directory.Bui…
ViktorHofer Feb 17, 2026
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.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<DefineConstants>CI;$(DefineConstants)</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net8.0' "
Label="Feature Flags">
<DefineConstants Condition="'$(Language)' != 'VB'">$(DefineConstants);FEATURE_DEFAULT_INTERFACE_IMPLEMENTATIONS</DefineConstants>
<DefineConstants Condition="'$(Language)' == 'VB'">$(DefineConstants),FEATURE_DEFAULT_INTERFACE_IMPLEMENTATIONS</DefineConstants>
</PropertyGroup>

<PropertyGroup Label="Build">
<!-- Tests projects don't need API docs, typically -->
<GenerateDocumentationFile Condition="$(GenerateDocumentationFile) == '' and $(IsTestProject) == 'true'">false</GenerateDocumentationFile>
Expand Down
27 changes: 27 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,27 @@
<Project>

<ItemGroup Label="Core Dependencies">
<PackageVersion Include="Castle.Core" Version="5.2.1" />
<PackageVersion Include="IFluentInterface" Version="2.1.0" />
<PackageVersion Include="NuGetizer" Version="1.4.6" />
<PackageVersion Include="TypeNameFormatter.Sources" Version="1.1.2" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
</ItemGroup>

<ItemGroup Label="Test Infrastructure">
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
<PackageVersion Include="EntityFramework" Version="6.5.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
</ItemGroup>

<ItemGroup Label="Compatibility">
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
</ItemGroup>

</Project>
18 changes: 8 additions & 10 deletions src/Moq.Tests.FSharpTypes/Moq.Tests.FSharpTypes.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@

<PropertyGroup>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
<IsPackable>False</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="System.ValueTuple" Version="4.6.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.RegularExpressions" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
<PackageReference Include="System.ValueTuple" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 7 additions & 9 deletions src/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@

<PropertyGroup>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
<IsPackable>False</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.RegularExpressions" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>

<ItemGroup>
Expand Down
34 changes: 14 additions & 20 deletions src/Moq.Tests/Moq.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,31 @@
<PropertyGroup>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<AssemblyName>Moq.Tests</AssemblyName>
<DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<LangVersion>10.0</LangVersion>
<IsPackable>False</IsPackable>
<NoWarn>$(NoWarn);CS8032</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
<DefineConstants>$(DefineConstants);FEATURE_DYNAMICPROXY_SERIALIZABLE_PROXIES;FEATURE_EF;FEATURE_SYSTEM_WEB;FEATURE_SYSTEM_WINDOWS_FORMS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<DefineConstants>$(DefineConstants);FEATURE_DEFAULT_INTERFACE_IMPLEMENTATIONS</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Moq\Moq.csproj" />
<ProjectReference Include="..\Moq.Tests.FSharpTypes\Moq.Tests.FSharpTypes.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" PrivateAssets="all"/>
<PackageReference Include="Castle.Core" Version="5.2.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="System.ValueTuple" Version="4.6.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.RegularExpressions" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all"/>
<PackageReference Include="Castle.Core" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
<PackageReference Include="System.ValueTuple" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>

<ItemGroup>
Expand All @@ -42,15 +36,15 @@
</Reference>
</ItemGroup>

<ItemGroup Condition=" $([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants)', 'FEATURE_EF'))">
<PackageReference Include="EntityFramework" Version="6.5.1" />
<ItemGroup Condition="$(DefineConstants.Contains('FEATURE_EF'))">
<PackageReference Include="EntityFramework" />
</ItemGroup>

<ItemGroup Condition=" $([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants)', 'FEATURE_SYSTEM_WEB'))">
<ItemGroup Condition="$(DefineConstants.Contains('FEATURE_SYSTEM_WEB'))">
<Reference Include="System.Web" />
</ItemGroup>

<ItemGroup Condition=" $([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants)', 'FEATURE_SYSTEM_WINDOWS_FORMS'))">
<ItemGroup Condition="$(DefineConstants.Contains('FEATURE_SYSTEM_WINDOWS_FORMS'))">
<Reference Include="System.Windows.Forms" />
</ItemGroup>

Expand Down
17 changes: 6 additions & 11 deletions src/Moq/Moq.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
<NoWarn>$(NoWarn);0419;CS8032</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<LangVersion>10.0</LangVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net6.0' ">
<DefineConstants>$(DefineConstants);FEATURE_DEFAULT_INTERFACE_IMPLEMENTATIONS</DefineConstants>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -32,15 +27,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.2.1" />
<PackageReference Include="IFluentInterface" Version="2.1.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="NuGetizer" Version="1.4.6" />
<PackageReference Include="TypeNameFormatter.Sources" Version="1.1.2" PrivateAssets="All" />
<PackageReference Include="Castle.Core" />
<PackageReference Include="IFluentInterface" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
<PackageReference Include="NuGetizer" PrivateAssets="All" />
<PackageReference Include="TypeNameFormatter.Sources" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>

<ItemGroup>
Expand Down