diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-11-30 19:49:50 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-12-01 00:43:19 +0300 |
| commit | 2c55eedacd44a9b115a59480f359a27f588599bd (patch) | |
| tree | 118830eba77a0d357db3f32354a699ba439870dc /src/System.Private.CoreLib | |
| parent | 87fc116236d67b0c1cb9c1e5241078c48d877d23 (diff) | |
Move McgIntrinsicsAttribute under Common
Diffstat (limited to 'src/System.Private.CoreLib')
| -rw-r--r-- | src/System.Private.CoreLib/src/Interop/Interop.manual.cs | 12 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/src/System.Private.CoreLib.csproj | 9 |
2 files changed, 7 insertions, 14 deletions
diff --git a/src/System.Private.CoreLib/src/Interop/Interop.manual.cs b/src/System.Private.CoreLib/src/Interop/Interop.manual.cs index 8319d9d12..0f26ef0a8 100644 --- a/src/System.Private.CoreLib/src/Interop/Interop.manual.cs +++ b/src/System.Private.CoreLib/src/Interop/Interop.manual.cs @@ -1052,15 +1052,3 @@ internal partial class Interop #endif } } - -namespace System.Runtime.InteropServices -{ - // - // We have hand-written code in System.Private.CoreLib that depends on McgIntrinsicsAttribute - // - [AttributeUsageAttribute(AttributeTargets.Method | AttributeTargets.Class)] - internal class McgIntrinsicsAttribute : Attribute - { - } -} - diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj index 96bf8ceb5..cc2ee1aea 100644 --- a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj @@ -486,7 +486,6 @@ <Compile Include="System\Globalization\CalendarData.Win32.cs" /> <Compile Condition="'$(IsProjectNLibrary)' == 'true'" Include="System\Environment.EnvironmentVariables.UWP.cs" /> - <!-- For CoreRT we have a different implementation --> <Compile Condition="'$(IsProjectNLibrary)' != 'true'" Include="System\Environment.EnvironmentVariables.Win32.cs" /> <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.Environment.cs" /> </ItemGroup> @@ -497,7 +496,6 @@ <Compile Include="System\Globalization\CultureData.Dummy.cs" /> <Compile Include="System\Globalization\TextInfo.Dummy.cs" /> <Compile Include="System\Globalization\CalendarData.Dummy.cs" /> - <!-- For CoreRT we have a different implementation --> <Compile Include="System\Environment.EnvironmentVariables.Unix.cs" /> <Compile Include="..\..\Common\src\Interop\Unix\System.Private.CoreLib.Native\Interop.Environment.cs" /> <Compile Include="..\..\Common\src\Interop\Unix\System.Private.CoreLib.Native\Interop.StringHelper.cs" /> @@ -521,12 +519,19 @@ <Compile Include="..\..\Common\src\System\Diagnostics\Debug.cs" /> <Compile Include="..\..\Common\src\System\Globalization\FormatProvider.Number.cs" /> <Compile Include="..\..\Common\src\System\Runtime\CompilerServices\DeveloperExperienceModeOnlyAttribute.cs" /> + <Compile Include="..\..\Common\src\System\Runtime\InteropServices\McgIntrinsicsAttribute.cs" /> <Compile Include="..\..\Common\src\System\NotImplemented.cs" /> <Compile Include="..\..\Common\src\System\CommonRuntimeTypes.cs" /> <Compile Include="..\..\Common\src\System\__HResults.cs" /> <Compile Include="CoverageSupport.cs" /> </ItemGroup> + + <ItemGroup> + <Compile Include="$(BaseIntermediateOutputPath)\Native\$(BinDirOSGroup).$(BinDirPlatform).$(BinDirConfiguration)\Runtime\Full\AsmOffsets.cs" /> + </ItemGroup> + + <ItemGroup> <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" > <LogicalName>Resources.$(AssemblyName).rd.xml</LogicalName> |