Skip to content

Commit 9fea189

Browse files
committed
Add back a .NET Framework target
This changes adds a target for .NET Framework 4.6.1 so that we can get rid of the System.IO.FileSystem.AccessControl reference which causes problems for certain .NET Framework consumption patterns Fixes #547
1 parent 1380c1a commit 9fea189

4 files changed

Lines changed: 17 additions & 5 deletions

File tree

System.IO.Abstractions.TestingHelpers.Tests/System.IO.Abstractions.TestingHelpers.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
4-
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net472</TargetFrameworks>
4+
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net461</TargetFrameworks>
55
<Description>The unit tests for our pre-built mocks</Description>
66
<AssemblyName>System.IO.Abstractions.TestingHelpers.Tests</AssemblyName>
77
<RootNamespace>System.IO.Abstractions.TestingHelpers.Tests</RootNamespace>

System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AssemblyName>System.IO.Abstractions.TestingHelpers</AssemblyName>
44
<RootNamespace>System.IO.Abstractions.TestingHelpers</RootNamespace>
55
<Description>A set of pre-built mocks to help when testing file system interactions.</Description>
6-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
77
<PackageProjectUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions</PackageProjectUrl>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>
99
<PackageTags>testing</PackageTags>
@@ -12,4 +12,10 @@
1212
<ItemGroup>
1313
<ProjectReference Include="..\System.IO.Abstractions\System.IO.Abstractions.csproj" />
1414
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
19+
</PackageReference>
20+
</ItemGroup>
1521
</Project>

System.IO.Abstractions/System.IO.Abstractions.csproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
<AssemblyName>System.IO.Abstractions</AssemblyName>
44
<RootNamespace>System.IO.Abstractions</RootNamespace>
55
<Description>A set of abstractions to help make file system interactions testable.</Description>
6-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
77
<PackageProjectUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions</PackageProjectUrl>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>
99
<PackageTags>testing</PackageTags>
1010
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants);FEATURE_ASYNC_FILE;FEATURE_ENUMERATION_OPTIONS</DefineConstants>
1111
</PropertyGroup>
12-
<ItemGroup>
12+
<ItemGroup Condition="'$(TargetFramework)' != 'net461'">
1313
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0"/>
1414
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
19+
</PackageReference>
20+
</ItemGroup>
1521
</Project>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "8.0",
3+
"version": "8.1",
44
"assemblyVersion": {
55
"precision": "major"
66
},

0 commit comments

Comments
 (0)