Skip to content

Commit 80a7935

Browse files
authored
Bring back System.IO.Pipes.AccessControl package and make it available in .NET 5.0 (#38177)
* Bring back System.IO.Pipes.AccessControl package and make it available in .NET 5.0. * address suggestions * fix test error * Microsoft.Windows.Compatibility.pkgproj
1 parent 92153e9 commit 80a7935

File tree

5 files changed

+29
-13
lines changed

5 files changed

+29
-13
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project DefaultTargets="Build">
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
3+
<ItemGroup>
4+
<ProjectReference Include="..\src\System.IO.Pipes.AccessControl.csproj">
5+
<SupportedFramework>$(NetCoreAppCurrent)</SupportedFramework>
6+
</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" />
11+
<HarvestIncludePaths Include="runtimes/win/lib/netcoreapp2.1" />
12+
</ItemGroup>
13+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
14+
</Project>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<!-- We are no longer shipping this assembly and it is only used in desktop facades.
4-
The reference assembly version needs to be frozen so that our desktop compat facades point to the version from the package. -->
5-
<AssemblyVersion>4.0.3.0</AssemblyVersion>
63
<TargetFrameworks>netstandard2.0</TargetFrameworks>
74
<Nullable>enable</Nullable>
85
</PropertyGroup>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>System.IO.Pipes.AccessControl</AssemblyName>
4-
<IncludeDefaultReferences>false</IncludeDefaultReferences>
54
<IsPartialFacadeAssembly Condition="'$(TargetsWindows)' == 'true'">true</IsPartialFacadeAssembly>
65
<OmitResources Condition="'$(TargetsWindows)' == 'true'">true</OmitResources>
76
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
8-
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix</TargetFrameworks>
7+
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.1;$(NetCoreAppCurrent)</TargetFrameworks>
98
<Nullable>enable</Nullable>
109
</PropertyGroup>
10+
<PropertyGroup>
11+
<IncludeDefaultReferences Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">false</IncludeDefaultReferences>
12+
<AssemblyVersion Condition="'$(TargetFramework)' == 'netcoreapp2.1'">4.0.3.0</AssemblyVersion>
13+
</PropertyGroup>
1114
<ItemGroup>
1215
<Reference Include="System.Runtime" />
1316
</ItemGroup>
1417
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
1518
<ProjectReference Include="..\..\System.IO.Pipes\src\System.IO.Pipes.csproj" />
1619
<ProjectReference Include="..\..\System.Security.AccessControl\src\System.Security.AccessControl.csproj" />
1720
</ItemGroup>
21+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
22+
<Reference Include="System.Resources.ResourceManager" />
23+
</ItemGroup>
1824
<ItemGroup Condition="'$(TargetsWindows)' != 'true'">
1925
<Reference Include="System.IO.Pipes" />
2026
<Reference Include="System.Security.AccessControl" />

src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<PrereleaseLibraryPackage Include="System.DirectoryServices.Protocols" />
3131
<PrereleaseLibraryPackage Include="System.IO.FileSystem.AccessControl" />
3232
<PrereleaseLibraryPackage Include="System.IO.Packaging" />
33+
<PrereleaseLibraryPackage Include="System.IO.Pipes.AccessControl" />
3334
<PrereleaseLibraryPackage Include="System.IO.Ports" />
3435
<PrereleaseLibraryPackage Include="System.Management" />
3536
<PrereleaseLibraryPackage Include="System.Runtime.Caching" />
@@ -49,9 +50,6 @@
4950
<NS21PrereleaseLibraryPackage Include="System.Reflection.Context" />
5051

5152
<!-- Packages we don't build in master anymore -->
52-
<LibraryPackage Include="System.IO.Pipes.AccessControl">
53-
<Version>4.5.1</Version>
54-
</LibraryPackage>
5553
<LibraryPackage Include="System.Data.DataSetExtensions">
5654
<Version>4.5.0</Version>
5755
</LibraryPackage>

src/libraries/pkg/baseline/packageIndex.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3382,12 +3382,13 @@
33823382
"4.5.0",
33833383
"4.5.1"
33843384
],
3385-
"BaselineVersion": "4.5.1",
3385+
"BaselineVersion": "5.0.0",
33863386
"InboxOn": {},
33873387
"AssemblyVersionInPackageVersion": {
33883388
"4.0.1.0": "4.3.0",
33893389
"4.0.2.0": "4.4.0",
3390-
"4.0.3.0": "4.5.0"
3390+
"4.0.3.0": "4.5.0",
3391+
"5.0.0.0": "5.0.0"
33913392
}
33923393
},
33933394
"System.IO.Ports": {
@@ -7254,8 +7255,8 @@
72547255
}
72557256
},
72567257
"ModulesToPackages": {
7257-
"sni.dll": "runtime.native.System.Data.SqlClient.sni",
7258-
"libSystem.IO.Ports.Native": "runtime.native.System.IO.Ports"
7258+
"libSystem.IO.Ports.Native": "runtime.native.System.IO.Ports",
7259+
"sni.dll": "runtime.native.System.Data.SqlClient.sni"
72597260
},
72607261
"MetaPackages": {
72617262
"NETStandard.Library": [
@@ -7304,4 +7305,4 @@
73047305
"System.Xml.XDocument"
73057306
]
73067307
}
7307-
}
7308+
}

0 commit comments

Comments
 (0)