未验证 提交 cbebb295 编写于 作者: M Michal Strehovský 提交者: GitHub

Fix managed CoreCLR build on Android (#63002)

上级 a891aed8
......@@ -3247,6 +3247,18 @@
<data name="Arg_MemberInfoNotFound" xml:space="preserve">
<value>A MemberInfo that matches '{0}' could not be found.</value>
</data>
<data name="InvalidOperation_BadTZHeader" xml:space="preserve">
<value>Bad magic in '{0}': Header starts with '{1}' instead of 'tzdata'</value>
</data>
<data name="InvalidOperation_ReadTZError" xml:space="preserve">
<value>Unable to fully read from file '{0}' at offset {1} length {2}; read {3} bytes expected {4}.</value>
</data>
<data name="InvalidOperation_BadIndexLength" xml:space="preserve">
<value>Length in index file less than AndroidTzDataHeader</value>
</data>
<data name="TimeZoneNotFound_ValidTimeZoneFileMissing" xml:space="preserve">
<value>Unable to properly load any time zone data files.</value>
</data>
<data name="NullabilityInfoContext_NotSupported" xml:space="preserve">
<value>NullabilityInfoContext is not supported in the current application because 'System.Reflection.NullabilityInfoContext.IsSupported' is set to false. Set the MSBuild Property 'NullabilityInfoContextSupport' to true in order to enable it.</value>
</data>
......
......@@ -2111,6 +2111,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\DebugProvider.Unix.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\Stopwatch.Unix.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\Tracing\RuntimeEventSourceHelper.Unix.cs" Condition="'$(FeaturePerfTracing)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.Android.cs" Condition="'$(TargetsAndroid)' == 'true'"/>
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.NoRegistry.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.UnixOrBrowser.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.OSVersion.OSX.cs" Condition="'$(IsOSXLike)' == 'true' AND '$(TargetsMacCatalyst)' != 'true'" />
......
......@@ -272,9 +272,6 @@
<Link>Common\Interop\Unix\System.Native\Interop.GetEnviron.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetsAndroid)' == 'true'">
<Compile Include="$(BclSourcesRoot)\System\Environment.Android.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
<Compile Include="$(BclSourcesRoot)\System\Environment.iOS.cs" />
<Compile Include="$(CommonPath)Interop\OSX\System.Native\Interop.SearchPath.cs">
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册