Skip to content

Commit 7808f2d

Browse files
authored
[5.0-preview7] Bring back IO.AccessControl ref assemblies & expose 5.0 ref assemblies (#38292)
* Bring back IO.AccessControl ref assemblies & expose 5.0 ref assemblies (#38252) * Move src next to ref
1 parent 17df0b8 commit 7808f2d

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project DefaultTargets="Build">
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
33
<ItemGroup>
4-
<ProjectReference Include="..\src\System.IO.Pipes.AccessControl.csproj">
4+
<ProjectReference Include="..\ref\System.IO.Pipes.AccessControl.csproj">
55
<SupportedFramework>$(NetCoreAppCurrent)</SupportedFramework>
66
</ProjectReference>
7-
<HarvestIncludePaths Include="lib/net46;runtimes/win/lib/net46" />
8-
<HarvestIncludePaths Include="lib/net461;runtimes/win/lib/net461" />
9-
<HarvestIncludePaths Include="lib/netstandard1.3" />
10-
<HarvestIncludePaths Include="lib/netstandard2.0" />
7+
<ProjectReference Include="..\src\System.IO.Pipes.AccessControl.csproj" />
8+
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
9+
<HarvestIncludePaths Include="ref/net461;lib/net461;runtimes/win/lib/net461" />
10+
<HarvestIncludePaths Include="ref/netstandard1.3;lib/netstandard1.3" />
11+
<HarvestIncludePaths Include="ref/netstandard2.0;lib/netstandard2.0" />
1112
<HarvestIncludePaths Include="runtimes/win/lib/netcoreapp2.1" />
1213
</ItemGroup>
1314
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
44
<Nullable>enable</Nullable>
55
</PropertyGroup>
66
<ItemGroup>
@@ -9,5 +9,6 @@
99
<ItemGroup>
1010
<ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" />
1111
<ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" />
12+
<ProjectReference Include="..\..\System.IO.Pipes\ref\System.IO.Pipes.csproj" />
1213
</ItemGroup>
1314
</Project>

src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>System.IO.Pipes.AccessControl</AssemblyName>
4+
<IncludeDefaultReferences>false</IncludeDefaultReferences>
45
<IsPartialFacadeAssembly Condition="'$(TargetsWindows)' == 'true'">true</IsPartialFacadeAssembly>
56
<OmitResources Condition="'$(TargetsWindows)' == 'true'">true</OmitResources>
67
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
7-
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.1;$(NetCoreAppCurrent)</TargetFrameworks>
8+
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks>
89
<Nullable>enable</Nullable>
910
</PropertyGroup>
1011
<PropertyGroup>
11-
<IncludeDefaultReferences Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">false</IncludeDefaultReferences>
12-
<AssemblyVersion Condition="'$(TargetFramework)' == 'netcoreapp2.1'">4.0.3.0</AssemblyVersion>
1312
</PropertyGroup>
1413
<ItemGroup>
1514
<Reference Include="System.Runtime" />
@@ -18,9 +17,6 @@
1817
<ProjectReference Include="..\..\System.IO.Pipes\src\System.IO.Pipes.csproj" />
1918
<ProjectReference Include="..\..\System.Security.AccessControl\src\System.Security.AccessControl.csproj" />
2019
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
22-
<Reference Include="System.Resources.ResourceManager" />
23-
</ItemGroup>
2420
<ItemGroup Condition="'$(TargetsWindows)' != 'true'">
2521
<Reference Include="System.IO.Pipes" />
2622
<Reference Include="System.Security.AccessControl" />

0 commit comments

Comments
 (0)