Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions src/Moq.Tests.Issue1648Harness/Issue1648Harness.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" PrivateAssets="All" ExcludeAssets="all" GeneratePathProperty="true" />
<!-- Force exact 4.5.4 net461 copy for genuine conflict sim (asm ver 4.2.0.1).
This is the 'older' version preloaded to trigger the original FileLoad scenario against Moq's 4.6.3 ref. -->
<Content Include="C:\Users\danie\.nuget\packages\system.threading.tasks.extensions\4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll">
This is the 'older' version preloaded to trigger the original FileLoad scenario against Moq's 4.6.3 ref.
Uses the package-specific path property (guaranteed to be present after restore) instead of $(NuGetPackageRoot). -->
<Content Include="$(PkgSystem_Threading_Tasks_Extensions)\lib\net461\System.Threading.Tasks.Extensions.dll">
<Link>System.Threading.Tasks.Extensions.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
Expand Down
4 changes: 4 additions & 0 deletions src/Moq.Tests/Moq.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="System.CodeDom" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition=" $([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants)', 'FEATURE_EF'))">
<PackageReference Include="EntityFramework" Version="6.5.2" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Moq/Moq.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<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.8" />
<PackageReference Include="NuGetizer" Version="1.4.9" />
<PackageReference Include="TypeNameFormatter.Sources" Version="1.1.2" PrivateAssets="All" />
</ItemGroup>

Expand Down
Loading