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.

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

Jump to bottom

Add .net standard support to AutoFoq #1184

Merged
merged 2 commits into from Jun 29, 2020
Merged

Add .net standard support to AutoFoq #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53f7f31
Add .net standard support to AutoFoq
Jun 23, 2020
fa1d641
Updated target framework for AutoFoqUnitTest to .NET core 2.2
Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions Src/AutoFoq/AutoFoq.fsproj
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Common.props" />

<PropertyGroup>
<TargetFramework>net452</TargetFramework>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<AssemblyTitle>AutoFixture.AutoFoq</AssemblyTitle>
<AssemblyName>AutoFixture.AutoFoq</AssemblyName>
<RootNamespace>AutoFixture.AutoFoq</RootNamespace>
Expand All @@ -29,8 +29,12 @@
<Compile Include="AutoFoqCustomization.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Foq" Version="[1.5.1,2.0.0)" />
<ItemGroup Condition="'$(TargetFramework)' != 'net452'">
<PackageReference Include="Foq" Version="[1.8.0,2.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
<PackageReference Include="Foq" Version="[1.5.1,2.0.0)" />
<PackageReference Include="FSharp.Core" Version="3.0.2" PrivateAssets="All" />
</ItemGroup>

Expand Down
9 changes: 6 additions & 3 deletions Src/AutoFoqUnitTest/AutoFoqUnitTest.fsproj
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
<Import Project="..\Common.Test.xUnit.props" />

<PropertyGroup>
<TargetFramework>net452</TargetFramework>
<TargetFrameworks>net452;netcoreapp2.2</TargetFrameworks>
<AssemblyTitle>AutoFixture.AutoFoq.UnitTest</AssemblyTitle>
<AssemblyName>AutoFixture.AutoFoq.UnitTest</AssemblyName>
<RootNamespace>AutoFixture.AutoFoq.UnitTest</RootNamespace>
Expand All @@ -19,12 +19,15 @@
<Compile Include="FixtureIntegrationTest.fs" />
</ItemGroup>

<ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
<PackageReference Include="Unquote" Version="3.1.0" />
<!-- AutoFoq targets FSharp.Core 3.0.2, but we require 3.1.2 as Unquote was compiled against it. -->
<!-- AutoFoq targets FSharp.Core 3.0.2, but we require 3.1.2 as Unquote was compiled against it for .Net Framework. -->
<PackageReference Include="FSharp.Core" Version="3.1.2" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net452'">
<PackageReference Include="Unquote" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AutoFixture\AutoFixture.csproj" />
<ProjectReference Include="..\AutoFoq\AutoFoq.fsproj" />
Expand Down