Skip to content

Add NetCoreAppCurrent rid agnostic tfm to libs #64518

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

Merged
ViktorHofer merged 2 commits into from
Feb 1, 2022
Merged

Add NetCoreAppCurrent rid agnostic tfm to libs #64518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75281ee
Add NetCoreAppCurrent rid agnostic tfm to libs
ViktorHofer Jan 30, 2022
4783bee
Use default impl for DriveInfo & ZipFile
ViktorHofer Jan 31, 2022
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
Prev Previous commit
Use default impl for DriveInfo & ZipFile
  • Loading branch information
@ViktorHofer
ViktorHofer committed Jan 31, 2022
commit 4783bee8074b1cb366179a3d6319afda9a21aba5
3 changes: 0 additions & 3 deletions src/libraries/System.IO.Compression.ZipFile/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,4 @@
<data name="UnauthorizedAccess_IODenied_Path" xml:space="preserve">
<value>Access to the path '{0}' is denied.</value>
</data>
<data name="PlatformNotSupported_CompressionZipFile" xml:space="preserve">
<value>System.IO.Compression.ZipFile is not supported on this platform.</value>
</data>
</root>
9 changes: 2 additions & 7 deletions src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' == ''">SR.PlatformNotSupported_CompressionZipFile</GeneratePlatformNotSupportedAssemblyMessage>
</PropertyGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''">
<ItemGroup>
<Compile Include="System\IO\Compression\ZipFile.Create.cs" />
<Compile Include="System\IO\Compression\ZipFile.Extract.cs" />
<Compile Include="System\IO\Compression\ZipFile.Utils.cs" />
Expand Down
3 changes: 0 additions & 3 deletions src/libraries/System.IO.FileSystem.DriveInfo/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,4 @@
<data name="IO_PathTooLong_Path" xml:space="preserve">
<value>The path '{0}' is too long, or a component of the specified path is too long.</value>
</data>
<data name="PlatformNotSupported_FileSystemDriveInfo" xml:space="preserve">
<value>System.IO.FileSystem.DriveInfo is not supported on this platform.</value>
</data>
</root>
21 changes: 8 additions & 13 deletions src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' == ''">SR.PlatformNotSupported_FileSystemDriveInfo</GeneratePlatformNotSupportedAssemblyMessage>
</PropertyGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''">
<ItemGroup>
<Compile Include="System\IO\DriveInfo.cs" />
<Compile Include="System\IO\DriveNotFoundException.cs" />
<Compile Include="System\IO\DriveType.cs" />
Expand All @@ -18,7 +13,11 @@
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == ''">
<Compile Include="System\IO\DriveInfo.UnixOrDefault.cs" />
<Compile Include="System\IO\DriveInfo.Default.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="System\IO\Error.cs" />
<Compile Include="System\IO\DriveInfo.Windows.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
Expand Down Expand Up @@ -53,7 +52,7 @@
Link="Common\System\IO\DriveInfoInternal.Windows.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
<Compile Include="System\IO\DriveInfo.UnixOrBrowser.cs" />
<Compile Include="System\IO\DriveInfo.UnixOrDefault.cs" />
<Compile Include="System\IO\DriveInfo.Unix.cs" />
<Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs"
Link="Common\Interop\Unix\Interop.Libraries.cs" />
Expand All @@ -70,10 +69,6 @@
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MountPoints.FormatInfo.cs"
Link="Common\Interop\Unix\Interop.MountPoints.FormatInfo.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsBrowser)' == 'true' ">
<Compile Include="System\IO\DriveInfo.UnixOrBrowser.cs" />
<Compile Include="System\IO\DriveInfo.Browser.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.IO.FileSystem" />
<Reference Include="System.Memory" />
Expand Down
0 ...veInfo/src/System/IO/DriveInfo.Browser.cs → ...veInfo/src/System/IO/DriveInfo.Default.cs
View file
Open in desktop
File renamed without changes.
0 .../src/System/IO/DriveInfo.UnixOrBrowser.cs → .../src/System/IO/DriveInfo.UnixOrDefault.cs
View file
Open in desktop
File renamed without changes.