This repository has been archived by the owner on Aug 2, 2023. It is now read-only.
Added System.Memory.Polyfill Project #2339
+161
−0
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="..\..\tools\common.props" /> | ||
| <PropertyGroup> | ||
| <Description>Adapters for Span APIs</Description> | ||
| <TargetFrameworks>netstandard1.3;netcoreapp2.1</TargetFrameworks> | ||
| <PackageTags>Span Memory Adapter</PackageTags> | ||
| <!-- disable automatic compile item inclusion so that we can set the correct metadata on TextTemplate-generated sources --> | ||
| <EnableDefaultCompileItems>false</EnableDefaultCompileItems> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> | ||
| <PackageReference Include="System.Buffers" Version="$(SystemMemoryVersion)" /> | ||
|
There was a problem hiding this comment. Use SystemBuffersVersion instead of SystemMemoryVersion. |
||
| <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="System\**\*.*" /> | ||
| </ItemGroup> | ||
| </Project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| namespace System | ||
| { | ||
| public static partial class Int32Polyfill | ||
| { | ||
| public static bool TryParse(ReadOnlySpan<char> buffer, out int value) | ||
|
There was a problem hiding this comment. Would,'t work for implicit cast from There was a problem hiding this comment. Why not? It's not an extension method. There was a problem hiding this comment. Ah, true... Is a bit ugly then :) Static extension method would be better dotnet/csharplang#192 though alas not a thing... |
||
| { | ||
| #if NETCOREAPP2_1 | ||
| return int.TryParse(buffer, out value); | ||
|
There was a problem hiding this comment. You may want to avoid using the versioned define as it makes it more difficult if you decide to retarget. Instead use There was a problem hiding this comment. But this api exists only in netcoreapp 2.1 There was a problem hiding this comment. You aren't defining targeting here, you're just ifdefing the code. Imagine that you wanted to cross-compile for netcoreapp2.2 as well in the future, you'd need to touch this ifdef for no reason. I think you're more likely to cross-compile for a future version of netcoreapp than you are an older version that doesn't have this API. There was a problem hiding this comment. Yeah, I agree it would work today, but it won't if we ever add new targets. Correct? |
||
| #else | ||
| return int.TryParse(buffer.ToString(), out value); | ||
| #endif | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System.Buffers; | ||
| using System.IO; | ||
|
|
||
| namespace System | ||
| { | ||
| public static partial class MemoryPolyfill | ||
|
There was a problem hiding this comment. I think we want to minimize the number of extensions types. |
||
| { | ||
| public static int Read(this Stream stream, Span<byte> buffer) | ||
| { | ||
| #if NETCOREAPP2_1 | ||
| return stream.Read(buffer); | ||
| #else | ||
| byte[] pooled = null; | ||
| try | ||
| { | ||
| pooled = ArrayPool<byte>.Shared.Rent(buffer.Length); | ||
| int read = stream.Read(pooled, 0, pooled.Length); | ||
| pooled.AsSpan(0, read).CopyTo(buffer); | ||
| return read; | ||
| } | ||
| finally | ||
| { | ||
| if(pooled != null) ArrayPool<byte>.Shared.Return(pooled); | ||
| } | ||
| #endif | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.IO; | ||
| using Xunit; | ||
|
|
||
| namespace System.Polyfill.Tests | ||
| { | ||
| public class Int32Tests | ||
| { | ||
| [Fact] | ||
| public void Int32TryParse() | ||
| { | ||
| char[] buffer = int.MaxValue.ToString().ToCharArray(); | ||
| ReadOnlySpan<char> span = buffer.AsSpan(); | ||
|
There was a problem hiding this comment.
|
||
| Assert.True(Int32Polyfill.TryParse(span, out int value)); | ||
| Assert.Equal(int.MaxValue, value); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.IO; | ||
| using Xunit; | ||
|
|
||
| namespace System.Polyfill.Tests | ||
| { | ||
| public class StreamTests | ||
| { | ||
| [Fact] | ||
| public void StreamRead() | ||
| { | ||
| var buffer = new byte[100]; | ||
| for (int i = 0; i < buffer.Length; i++) buffer[i] = (byte)i; | ||
|
|
||
| var stream = new MemoryStream(buffer); | ||
| var span = new Span<byte>(new byte[100]); | ||
|
|
||
| var read = stream.Read(span); | ||
| Assert.Equal(buffer.Length, read); | ||
| for (int i = 0; i < buffer.Length; i++) | ||
| { | ||
| Assert.Equal(i, span[i]); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="..\..\tools\common.props" /> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks> | ||
| <AssemblyOriginatorKeyFile>../../tools/test_key.snk</AssemblyOriginatorKeyFile> | ||
|
There was a problem hiding this comment. All the properties from here on look unnecessary for a test project. There was a problem hiding this comment. yeah, I just copied them from some other test, but I will remove/simplify. Thanks. |
||
| <SignAssembly>true</SignAssembly> | ||
| <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> | ||
| <Description></Description> | ||
| <Copyright>Microsoft Corporation, All rights reserved</Copyright> | ||
| <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="xunit" Version="2.3.1" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | ||
| </ItemGroup> | ||
| <!-- Project references --> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\System.Memory.Polyfill\System.Memory.Polyfill.csproj" /> | ||
| </ItemGroup> | ||
| <!-- register for test discovery in Visual Studio --> | ||
| <ItemGroup> | ||
| <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> | ||
| </ItemGroup> | ||
| </Project> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't actually have any of these, so you can remove this and the compile entry below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will do.