diff options
| -rw-r--r-- | clr.coreclr.props | 1 | ||||
| -rw-r--r-- | clr.defines.targets | 2 | ||||
| -rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 2 | ||||
| -rw-r--r-- | src/mscorlib/model.xml | 8 | ||||
| -rw-r--r-- | src/mscorlib/mscorlib.shared.sources.props | 8 | ||||
| -rw-r--r-- | src/mscorlib/src/System.Private.CoreLib.txt | 4 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Runtime/CompilerServices/jithelpers.cs | 2 | ||||
| -rw-r--r-- | src/mscorlib/src/System/String.cs | 2 | ||||
| -rw-r--r-- | src/mscorlib/src/System/ThrowHelper.cs | 2 |
9 files changed, 9 insertions, 22 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index 092ab82295..afb5994a53 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -24,7 +24,6 @@ <FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine> <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine> <FeaturePrejit>true</FeaturePrejit> - <FeatureSpanOfT Condition="'$(UseLegacyCompiler)'!='true'">true</FeatureSpanOfT> <FeatureStandaloneSn>true</FeatureStandaloneSn> <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed> <FeatureStrongnameMigration>true</FeatureStrongnameMigration> diff --git a/clr.defines.targets b/clr.defines.targets index 0ada349f88..c6c6c70571 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -80,7 +80,6 @@ <CDefines Condition="'$(FeatureRwlock)' == 'true'">$(CDefines);FEATURE_RWLOCK</CDefines> <CDefines Condition="'$(FeatureSerialization)' == 'true'">$(CDefines);FEATURE_SERIALIZATION</CDefines> <CDefines Condition="'$(FeatureSortTables)' == 'true'">$(CDefines);FEATURE_SORT_TABLES</CDefines> - <CDefines Condition="'$(FeatureSpanOfT)' == 'true'">$(CDefines);FEATURE_SPAN_OF_T</CDefines> <CDefines Condition="'$(FeatureStackProbe)' == 'true'">$(CDefines);FEATURE_STACK_PROBE</CDefines> <CDefines Condition="'$(FeatureStandaloneSn)' == 'true'">$(CDefines);FEATURE_STANDALONE_SN</CDefines> <CDefines Condition="'$(FeatureStrongnameDelaySigningAllowed)' == 'true'">$(CDefines);FEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED</CDefines> @@ -163,7 +162,6 @@ <DefineConstants Condition="'$(FeatureRwlock)' == 'true'">$(DefineConstants);FEATURE_RWLOCK</DefineConstants> <DefineConstants Condition="'$(FeatureSerialization)' == 'true'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants> <DefineConstants Condition="'$(FeatureSortTables)' == 'true'">$(DefineConstants);FEATURE_SORT_TABLES</DefineConstants> - <DefineConstants Condition="'$(FeatureSpanOfT)' == 'true'">$(DefineConstants);FEATURE_SPAN_OF_T</DefineConstants> <DefineConstants Condition="'$(FeatureStrongnameMigration)' == 'true'">$(DefineConstants);FEATURE_STRONGNAME_MIGRATION</DefineConstants> <DefineConstants Condition="'$(FeatureSynchronizationcontextWait)' == 'true'">$(DefineConstants);FEATURE_SYNCHRONIZATIONCONTEXT_WAIT</DefineConstants> <DefineConstants Condition="'$(FeatureSyntheticCultures)' == 'true'">$(DefineConstants);FEATURE_SYNTHETIC_CULTURES</DefineConstants> diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index d24d0dae09..fb8f3378f7 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -2,7 +2,7 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- Always use latest Roslyn compiler --> - <Import Project="..\..\Tools\net45\roslyn\build\Microsoft.Net.Compilers.props" Condition="'$(OS)'=='Windows_NT' and '$(UseLegacyCompiler)'!='true'" /> + <Import Project="..\..\Tools\net45\roslyn\build\Microsoft.Net.Compilers.props" Condition="'$(OS)'=='Windows_NT'" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index ead6193d61..52441138f3 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -12644,7 +12644,7 @@ <Member Name="WriteLine(System.String)" /> <Member Name="WriteLine" /> </Type> - <Type Name="System.Span<T>" Condition="FEATURE_SPAN_OF_T"> + <Type Name="System.Span<T>"> <Member Name="#ctor(T[])" /> <Member Name="#ctor(T[],System.Int32)" /> <Member Name="#ctor(T[],System.Int32,System.Int32)" /> @@ -12669,7 +12669,7 @@ <Member Name="CopyTo(System.Span<T>)" /> <Member Name="TryCopyTo(System.Span<T>)" /> </Type> - <Type Name="System.ReadOnlySpan<T>" Condition="FEATURE_SPAN_OF_T"> + <Type Name="System.ReadOnlySpan<T>"> <Member Name="#ctor(T[])" /> <Member Name="#ctor(T[],System.Int32)" /> <Member Name="#ctor(T[],System.Int32,System.Int32)" /> @@ -12692,13 +12692,13 @@ <Member Name="TryCopyTo(System.Span<T>)" /> <Member Name="CopyTo(System.Span<T>)" /> </Type> - <Type Name="System.SpanExtensions" Condition="FEATURE_SPAN_OF_T"> + <Type Name="System.SpanExtensions"> <Member Name="AsBytes<T>(System.Span<T>)" /> <Member Name="AsBytes<T>(System.ReadOnlySpan<T>)" /> <Member Name="NonPortableCast<TFrom,TTo>(System.Span<TFrom>)" /> <Member Name="NonPortableCast<TFrom,TTo>(System.ReadOnlySpan<TFrom>)" /> </Type> - <Type Name="System.ReadOnlySpanExtensions" Condition="FEATURE_SPAN_OF_T"> + <Type Name="System.ReadOnlySpanExtensions"> <Member Name="Slice(System.String)" /> <Member Name="Slice(System.String,System.Int32)" /> <Member Name="Slice(System.String,System.Int32,System.Int32)" /> diff --git a/src/mscorlib/mscorlib.shared.sources.props b/src/mscorlib/mscorlib.shared.sources.props index eb7e8c744e..eeb800f401 100644 --- a/src/mscorlib/mscorlib.shared.sources.props +++ b/src/mscorlib/mscorlib.shared.sources.props @@ -24,7 +24,7 @@ <CompilerServicesSources Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\TypeDependencyAttribute.cs" /> <CompilerServicesSources Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\CompilerMarshalOverride.cs" /> <CompilerServicesSources Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\jithelpers.cs" /> - <CompilerServicesSources Condition="'$(FeatureSpanOfT)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\Unsafe.cs" /> + <CompilerServicesSources Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\Unsafe.cs" /> <CompilerServicesSources Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\SpecialNameAttribute.cs" /> <CompilerServicesSources Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\SuppressMergeCheckAttribute.cs" /> <CompilerServicesSources Condition="'$(FeatureICastable)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\CompilerServices\ICastable.cs" /> @@ -411,9 +411,9 @@ <SystemSources Condition="'$(FeatureCominterop)' == 'true'" Include="$(BclSourcesRoot)\System\__ComObject.cs" /> <SystemSources Condition="'$(FeatureCominterop)' == 'true'" Include="$(BclSourcesRoot)\System\Variant.cs" /> <SystemSources Condition="'$(FeatureClassicCominterop)' == 'true'" Include="$(BclSourcesRoot)\System\OleAutBinder.cs" /> - <SystemSources Condition="'$(FeatureSpanOfT)' == 'true'" Include="$(BclSourcesRoot)\System\ByReference.cs" /> - <SystemSources Condition="'$(FeatureSpanOfT)' == 'true'" Include="$(BclSourcesRoot)\System\Span.cs" /> - <SystemSources Condition="'$(FeatureSpanOfT)' == 'true'" Include="$(BclSourcesRoot)\System\ReadOnlySpan.cs" /> + <SystemSources Include="$(BclSourcesRoot)\System\ByReference.cs" /> + <SystemSources Include="$(BclSourcesRoot)\System\Span.cs" /> + <SystemSources Include="$(BclSourcesRoot)\System\ReadOnlySpan.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> <SystemSources Include="$(BclSourcesRoot)\System\TimeZoneInfo.Unix.cs" /> diff --git a/src/mscorlib/src/System.Private.CoreLib.txt b/src/mscorlib/src/System.Private.CoreLib.txt index 9548c38613..eea64a9a29 100644 --- a/src/mscorlib/src/System.Private.CoreLib.txt +++ b/src/mscorlib/src/System.Private.CoreLib.txt @@ -590,10 +590,8 @@ Argument_PreAllocatedAlreadyAllocated = 'preAllocated' is already in use. Argument_NativeOverlappedWrongBoundHandle = 'overlapped' was not allocated by this ThreadPoolBoundHandle instance. Argument_NativeOverlappedAlreadyFree = 'overlapped' has already been freed. Argument_AlreadyBoundOrSyncHandle = 'handle' has already been bound to the thread pool, or was not opened for asynchronous I/O. -#if FEATURE_SPAN_OF_T Argument_InvalidTypeWithPointersNotSupported = Cannot use type '{0}'. Only value types without pointers or references are supported. Argument_DestinationTooShort = Destination is too short. -#endif // FEATURE_SPAN_OF_T ; ; ===================================================== @@ -1432,10 +1430,8 @@ NotSupported_WindowsPhone = {0} is not supported. NotSupported_AssemblyLoadCodeBase = Assembly.Load with a Codebase is not supported. NotSupported_AssemblyLoadFromHash = Assembly.LoadFrom with hashValue is not supported. #endif -#if FEATURE_SPAN_OF_T NotSupported_CannotCallEqualsOnSpan = Equals() on Span and ReadOnlySpan is not supported. Use operator== instead. NotSupported_CannotCallGetHashCodeOnSpan = GetHashCode() on Span and ReadOnlySpan is not supported. -#endif // FEATURE_SPAN_OF_T ; TypeLoadException TypeLoad_ResolveType = Could not resolve type '{0}'. diff --git a/src/mscorlib/src/System/Runtime/CompilerServices/jithelpers.cs b/src/mscorlib/src/System/Runtime/CompilerServices/jithelpers.cs index c1346f7527..080e42f46f 100644 --- a/src/mscorlib/src/System/Runtime/CompilerServices/jithelpers.cs +++ b/src/mscorlib/src/System/Runtime/CompilerServices/jithelpers.cs @@ -216,7 +216,6 @@ namespace System.Runtime.CompilerServices { extern static bool IsAddressInStack(IntPtr ptr); #endif -#if FEATURE_SPAN_OF_T static internal bool ByRefLessThan<T>(ref T refA, ref T refB) { // The body of this function will be replaced by the EE with unsafe code!!! @@ -239,6 +238,5 @@ namespace System.Runtime.CompilerServices { typeof(ArrayPinningHelper).ToString(); // Type used by the actual method body throw new InvalidOperationException(); } -#endif // FEATURE_SPAN_OF_T } } diff --git a/src/mscorlib/src/System/String.cs b/src/mscorlib/src/System/String.cs index f9162ff528..27758b7cf5 100644 --- a/src/mscorlib/src/System/String.cs +++ b/src/mscorlib/src/System/String.cs @@ -842,10 +842,8 @@ namespace System { } } -#if FEATURE_SPAN_OF_T internal ref char GetFirstCharRef() { return ref m_firstChar; } -#endif } } diff --git a/src/mscorlib/src/System/ThrowHelper.cs b/src/mscorlib/src/System/ThrowHelper.cs index a534dec818..f487bf6b45 100644 --- a/src/mscorlib/src/System/ThrowHelper.cs +++ b/src/mscorlib/src/System/ThrowHelper.cs @@ -44,7 +44,6 @@ namespace System { [Pure] internal static class ThrowHelper { -#if FEATURE_SPAN_OF_T internal static void ThrowArrayTypeMismatchException() { throw new ArrayTypeMismatchException(); } @@ -72,7 +71,6 @@ namespace System { internal static void ThrowNotSupportedException_CannotCallGetHashCodeOnSpan() { throw new NotSupportedException(Environment.GetResourceString("NotSupported_CannotCallGetHashCodeOnSpan")); } -#endif internal static void ThrowArgumentOutOfRange_IndexException() { throw GetArgumentOutOfRangeException(ExceptionArgument.index, |