Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
cbebb295
R
runtime
项目概览
dotNET Platform
/
runtime
11 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
cbebb295
编写于
12月 20, 2021
作者:
M
Michal Strehovský
提交者:
GitHub
12月 20, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix managed CoreCLR build on Android (#63002)
上级
a891aed8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
3 deletion
+13
-3
src/coreclr/nativeaot/System.Private.CoreLib/src/Resources/Strings.resx
...tiveaot/System.Private.CoreLib/src/Resources/Strings.resx
+12
-0
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
...ivate.CoreLib/src/System.Private.CoreLib.Shared.projitems
+1
-0
src/libraries/System.Private.CoreLib/src/System/Environment.Android.cs
.../System.Private.CoreLib/src/System/Environment.Android.cs
+0
-0
src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
...mono/System.Private.CoreLib/System.Private.CoreLib.csproj
+0
-3
未找到文件。
src/coreclr/nativeaot/System.Private.CoreLib/src/Resources/Strings.resx
浏览文件 @
cbebb295
...
...
@@ -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>
...
...
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
浏览文件 @
cbebb295
...
...
@@ -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'" />
...
...
src/
mono
/System.Private.CoreLib/src/System/Environment.Android.cs
→
src/
libraries
/System.Private.CoreLib/src/System/Environment.Android.cs
浏览文件 @
cbebb295
文件已移动
src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
浏览文件 @
cbebb295
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录