Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
4a200d18
R
runtime
项目概览
dotNET Platform
/
runtime
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
4a200d18
编写于
12月 03, 2020
作者:
J
Jeremy Koritzinsky
提交者:
GitHub
12月 03, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Various fixes in Microsoft.NETCore.App packs (#45566)
上级
8baa2636
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
43 addition
and
168 deletion
+43
-168
eng/Version.Details.xml
eng/Version.Details.xml
+4
-0
global.json
global.json
+1
-1
src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
...aller/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+36
-167
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
...crosoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
+1
-0
src/libraries/NetCoreAppLibrary.props
src/libraries/NetCoreAppLibrary.props
+1
-0
未找到文件。
eng/Version.Details.xml
浏览文件 @
4a200d18
...
...
@@ -70,6 +70,10 @@
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
6d8efa00a7dd2d15e07df673a83cecb8a0a3031f
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.SharedFramework.Sdk"
Version=
"6.0.0-beta.20602.5"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
d4dc3682cbad0314b6f138017411ee03ea51096b
</Sha>
</Dependency>
<Dependency
Name=
"optimization.windows_nt-x64.IBC.CoreFx"
Version=
"99.99.99-master-20200806.6"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
</Uri>
<Sha>
f69d7fc09c4fdb9e9427741b9a176e867dab577f
</Sha>
...
...
global.json
浏览文件 @
4a200d18
...
...
@@ -16,7 +16,7 @@
"Microsoft.DotNet.Arcade.Sdk"
:
"6.0.0-beta.20601.2"
,
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk"
:
"6.0.0-beta.20601.2"
,
"Microsoft.DotNet.Helix.Sdk"
:
"6.0.0-beta.20601.2"
,
"Microsoft.DotNet.SharedFramework.Sdk"
:
"6.0.0-beta.20
55
2.5"
,
"Microsoft.DotNet.SharedFramework.Sdk"
:
"6.0.0-beta.20
60
2.5"
,
"Microsoft.NET.Sdk.IL"
:
"6.0.0-alpha.1.20557.2"
,
"Microsoft.Build.NoTargets"
:
"2.0.1"
,
"Microsoft.Build.Traversal"
:
"2.1.1"
...
...
src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
浏览文件 @
4a200d18
...
...
@@ -62,7 +62,43 @@
<MicrosoftDiaSymReaderNativeFileVersion>14.12.25830.2</MicrosoftDiaSymReaderNativeFileVersion>
</PropertyGroup>
<Import Project="$(LibrariesProjectRoot)NetCoreAppLibrary.props" />
<ItemGroup>
<!-- Libraries specified in NetCoreAppLibrary.props -->
<PlatformManifestFileEntry Include="@(NetCoreAppLibrary->'%(Identity).dll')" />
<PlatformManifestFileEntry Include="@(NetCoreAppLibraryNoReference->'%(Identity).dll')" />
<!-- Shim libraries -->
<PlatformManifestFileEntry Include="mscorlib.dll" />
<PlatformManifestFileEntry Include="netstandard.dll" />
<PlatformManifestFileEntry Include="WindowsBase.dll" />
<PlatformManifestFileEntry Include="Microsoft.VisualBasic.dll" />
<PlatformManifestFileEntry Include="System.ComponentModel.DataAnnotations.dll" />
<PlatformManifestFileEntry Include="System.Configuration.dll" />
<PlatformManifestFileEntry Include="System.Core.dll" />
<PlatformManifestFileEntry Include="System.Data.dll" />
<PlatformManifestFileEntry Include="System.dll" />
<PlatformManifestFileEntry Include="System.Drawing.dll" />
<PlatformManifestFileEntry Include="System.IO.Compression.FileSystem.dll" />
<PlatformManifestFileEntry Include="System.Net.dll" />
<PlatformManifestFileEntry Include="System.Numerics.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Serialization.dll" />
<PlatformManifestFileEntry Include="System.Security.dll" />
<PlatformManifestFileEntry Include="System.ServiceModel.Web.dll" />
<PlatformManifestFileEntry Include="System.ServiceProcess.dll" />
<PlatformManifestFileEntry Include="System.Transactions.dll" />
<PlatformManifestFileEntry Include="System.Web.dll" />
<PlatformManifestFileEntry Include="System.Windows.dll" />
<PlatformManifestFileEntry Include="System.Xml.dll" />
<PlatformManifestFileEntry Include="System.Xml.Linq.dll" />
<PlatformManifestFileEntry Include="System.Xml.Serialization.dll" />
<!-- Private libraries -->
<PlatformManifestFileEntry Include="System.Private.CoreLib.dll" />
<PlatformManifestFileEntry Include="System.Private.DataContractSerialization.dll" />
<PlatformManifestFileEntry Include="System.Private.Uri.dll" />
<PlatformManifestFileEntry Include="System.Private.Xml.dll" />
<PlatformManifestFileEntry Include="System.Private.Xml.Linq.dll" />
<!-- Native libraries -->
<PlatformManifestFileEntry Include="libSystem.Globalization.Native.dylib" IsNative="true" />
<PlatformManifestFileEntry Include="libSystem.Globalization.Native.so" IsNative="true" />
<PlatformManifestFileEntry Include="libSystem.IO.Compression.Native.a" IsNative="true" />
...
...
@@ -142,174 +178,7 @@
<PlatformManifestFileEntry Include="api-ms-win-crt-utility-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
<PlatformManifestFileEntry Include="API-MS-Win-core-xstate-l2-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
<PlatformManifestFileEntry Include="ucrtbase.dll" IsNative="true" />
<PlatformManifestFileEntry Include="System.Private.CoreLib.dll" />
<PlatformManifestFileEntry Include="Microsoft.CSharp.dll" />
<PlatformManifestFileEntry Include="Microsoft.VisualBasic.dll" />
<PlatformManifestFileEntry Include="Microsoft.Win32.Primitives.dll" />
<PlatformManifestFileEntry Include="Microsoft.Win32.Registry.dll" />
<PlatformManifestFileEntry Include="mscorlib.dll" />
<PlatformManifestFileEntry Include="netstandard.dll" />
<PlatformManifestFileEntry Include="System.AppContext.dll" />
<PlatformManifestFileEntry Include="System.Buffers.dll" />
<PlatformManifestFileEntry Include="System.Collections.Concurrent.dll" />
<PlatformManifestFileEntry Include="System.Collections.dll" />
<PlatformManifestFileEntry Include="System.Collections.Immutable.dll" />
<PlatformManifestFileEntry Include="System.Collections.NonGeneric.dll" />
<PlatformManifestFileEntry Include="System.Collections.Specialized.dll" />
<PlatformManifestFileEntry Include="System.ComponentModel.Annotations.dll" />
<PlatformManifestFileEntry Include="System.ComponentModel.DataAnnotations.dll" />
<PlatformManifestFileEntry Include="System.ComponentModel.dll" />
<PlatformManifestFileEntry Include="System.ComponentModel.EventBasedAsync.dll" />
<PlatformManifestFileEntry Include="System.ComponentModel.Primitives.dll" />
<PlatformManifestFileEntry Include="System.ComponentModel.TypeConverter.dll" />
<PlatformManifestFileEntry Include="System.Configuration.dll" />
<PlatformManifestFileEntry Include="System.Console.dll" />
<PlatformManifestFileEntry Include="System.Core.dll" />
<PlatformManifestFileEntry Include="System.Data.Common.dll" />
<PlatformManifestFileEntry Include="System.Data.DataSetExtensions.dll" />
<PlatformManifestFileEntry Include="System.Data.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.Contracts.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.Debug.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.DiagnosticSource.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.FileVersionInfo.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.Process.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.StackTrace.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.TextWriterTraceListener.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.Tools.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.TraceSource.dll" />
<PlatformManifestFileEntry Include="System.Diagnostics.Tracing.dll" />
<PlatformManifestFileEntry Include="System.dll" />
<PlatformManifestFileEntry Include="System.Drawing.dll" />
<PlatformManifestFileEntry Include="System.Drawing.Primitives.dll" />
<PlatformManifestFileEntry Include="System.Dynamic.Runtime.dll" />
<PlatformManifestFileEntry Include="System.Formats.Asn1.dll" />
<PlatformManifestFileEntry Include="System.Globalization.Calendars.dll" />
<PlatformManifestFileEntry Include="System.Globalization.dll" />
<PlatformManifestFileEntry Include="System.Globalization.Extensions.dll" />
<PlatformManifestFileEntry Include="System.IO.Compression.Brotli.dll" />
<PlatformManifestFileEntry Include="System.IO.Compression.dll" />
<PlatformManifestFileEntry Include="System.IO.Compression.FileSystem.dll" />
<PlatformManifestFileEntry Include="System.IO.Compression.ZipFile.dll" />
<PlatformManifestFileEntry Include="System.IO.dll" />
<PlatformManifestFileEntry Include="System.IO.FileSystem.AccessControl.dll" />
<PlatformManifestFileEntry Include="System.IO.FileSystem.dll" />
<PlatformManifestFileEntry Include="System.IO.FileSystem.DriveInfo.dll" />
<PlatformManifestFileEntry Include="System.IO.FileSystem.Primitives.dll" />
<PlatformManifestFileEntry Include="System.IO.FileSystem.Watcher.dll" />
<PlatformManifestFileEntry Include="System.IO.IsolatedStorage.dll" />
<PlatformManifestFileEntry Include="System.IO.MemoryMappedFiles.dll" />
<PlatformManifestFileEntry Include="System.IO.Pipelines.dll" />
<PlatformManifestFileEntry Include="System.IO.Pipes.AccessControl.dll" />
<PlatformManifestFileEntry Include="System.IO.Pipes.dll" />
<PlatformManifestFileEntry Include="System.IO.UnmanagedMemoryStream.dll" />
<PlatformManifestFileEntry Include="System.Linq.dll" />
<PlatformManifestFileEntry Include="System.Linq.Expressions.dll" />
<PlatformManifestFileEntry Include="System.Linq.Parallel.dll" />
<PlatformManifestFileEntry Include="System.Linq.Queryable.dll" />
<PlatformManifestFileEntry Include="System.Memory.dll" />
<PlatformManifestFileEntry Include="System.Net.dll" />
<PlatformManifestFileEntry Include="System.Net.Connections.dll" />
<PlatformManifestFileEntry Include="System.Net.Http.dll" />
<PlatformManifestFileEntry Include="System.Net.Http.Json.dll" />
<PlatformManifestFileEntry Include="System.Net.HttpListener.dll" />
<PlatformManifestFileEntry Include="System.Net.Mail.dll" />
<PlatformManifestFileEntry Include="System.Net.NameResolution.dll" />
<PlatformManifestFileEntry Include="System.Net.NetworkInformation.dll" />
<PlatformManifestFileEntry Include="System.Net.Ping.dll" />
<PlatformManifestFileEntry Include="System.Net.Quic.dll" />
<PlatformManifestFileEntry Include="System.Net.Primitives.dll" />
<PlatformManifestFileEntry Include="System.Net.Requests.dll" />
<PlatformManifestFileEntry Include="System.Net.Security.dll" />
<PlatformManifestFileEntry Include="System.Net.ServicePoint.dll" />
<PlatformManifestFileEntry Include="System.Net.Sockets.dll" />
<PlatformManifestFileEntry Include="System.Net.WebClient.dll" />
<PlatformManifestFileEntry Include="System.Net.WebHeaderCollection.dll" />
<PlatformManifestFileEntry Include="System.Net.WebProxy.dll" />
<PlatformManifestFileEntry Include="System.Net.WebSockets.Client.dll" />
<PlatformManifestFileEntry Include="System.Net.WebSockets.dll" />
<PlatformManifestFileEntry Include="System.Numerics.dll" />
<PlatformManifestFileEntry Include="System.Numerics.Vectors.dll" />
<PlatformManifestFileEntry Include="System.ObjectModel.dll" />
<PlatformManifestFileEntry Include="System.Private.DataContractSerialization.dll" />
<PlatformManifestFileEntry Include="System.Private.Uri.dll" />
<PlatformManifestFileEntry Include="System.Private.Xml.dll" />
<PlatformManifestFileEntry Include="System.Private.Xml.Linq.dll" />
<PlatformManifestFileEntry Include="System.Reflection.DispatchProxy.dll" />
<PlatformManifestFileEntry Include="System.Reflection.dll" />
<PlatformManifestFileEntry Include="System.Reflection.Emit.dll" />
<PlatformManifestFileEntry Include="System.Reflection.Emit.ILGeneration.dll" />
<PlatformManifestFileEntry Include="System.Reflection.Emit.Lightweight.dll" />
<PlatformManifestFileEntry Include="System.Reflection.Extensions.dll" />
<PlatformManifestFileEntry Include="System.Reflection.Metadata.dll" />
<PlatformManifestFileEntry Include="System.Reflection.Primitives.dll" />
<PlatformManifestFileEntry Include="System.Reflection.TypeExtensions.dll" />
<PlatformManifestFileEntry Include="System.Resources.Reader.dll" />
<PlatformManifestFileEntry Include="System.Resources.ResourceManager.dll" />
<PlatformManifestFileEntry Include="System.Resources.Writer.dll" />
<PlatformManifestFileEntry Include="System.Runtime.CompilerServices.Unsafe.dll" />
<PlatformManifestFileEntry Include="System.Runtime.CompilerServices.VisualC.dll" />
<PlatformManifestFileEntry Include="System.Runtime.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Extensions.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Handles.dll" />
<PlatformManifestFileEntry Include="System.Runtime.InteropServices.dll" />
<PlatformManifestFileEntry Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Intrinsics.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Loader.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Numerics.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Serialization.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Serialization.Formatters.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Serialization.Json.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Serialization.Primitives.dll" />
<PlatformManifestFileEntry Include="System.Runtime.Serialization.Xml.dll" />
<PlatformManifestFileEntry Include="System.Security.AccessControl.dll" />
<PlatformManifestFileEntry Include="System.Security.Claims.dll" />
<PlatformManifestFileEntry Include="System.Security.Cryptography.Algorithms.dll" />
<PlatformManifestFileEntry Include="System.Security.Cryptography.Cng.dll" />
<PlatformManifestFileEntry Include="System.Security.Cryptography.Csp.dll" />
<PlatformManifestFileEntry Include="System.Security.Cryptography.Encoding.dll" />
<PlatformManifestFileEntry Include="System.Security.Cryptography.OpenSsl.dll" />
<PlatformManifestFileEntry Include="System.Security.Cryptography.Primitives.dll" />
<PlatformManifestFileEntry Include="System.Security.Cryptography.X509Certificates.dll" />
<PlatformManifestFileEntry Include="System.Security.dll" />
<PlatformManifestFileEntry Include="System.Security.Principal.dll" />
<PlatformManifestFileEntry Include="System.Security.Principal.Windows.dll" />
<PlatformManifestFileEntry Include="System.Security.SecureString.dll" />
<PlatformManifestFileEntry Include="System.ServiceModel.Web.dll" />
<PlatformManifestFileEntry Include="System.ServiceProcess.dll" />
<PlatformManifestFileEntry Include="System.Text.Encoding.CodePages.dll" />
<PlatformManifestFileEntry Include="System.Text.Encoding.dll" />
<PlatformManifestFileEntry Include="System.Text.Encoding.Extensions.dll" />
<PlatformManifestFileEntry Include="System.Text.Encodings.Web.dll" />
<PlatformManifestFileEntry Include="System.Text.Json.dll" />
<PlatformManifestFileEntry Include="System.Text.RegularExpressions.dll" />
<PlatformManifestFileEntry Include="System.Threading.Channels.dll" />
<PlatformManifestFileEntry Include="System.Threading.dll" />
<PlatformManifestFileEntry Include="System.Threading.Overlapped.dll" />
<PlatformManifestFileEntry Include="System.Threading.Tasks.Dataflow.dll" />
<PlatformManifestFileEntry Include="System.Threading.Tasks.dll" />
<PlatformManifestFileEntry Include="System.Threading.Tasks.Extensions.dll" />
<PlatformManifestFileEntry Include="System.Threading.Tasks.Parallel.dll" />
<PlatformManifestFileEntry Include="System.Threading.Thread.dll" />
<PlatformManifestFileEntry Include="System.Threading.ThreadPool.dll" />
<PlatformManifestFileEntry Include="System.Threading.Timer.dll" />
<PlatformManifestFileEntry Include="System.Transactions.dll" />
<PlatformManifestFileEntry Include="System.Transactions.Local.dll" />
<PlatformManifestFileEntry Include="System.ValueTuple.dll" />
<PlatformManifestFileEntry Include="System.Web.dll" />
<PlatformManifestFileEntry Include="System.Web.HttpUtility.dll" />
<PlatformManifestFileEntry Include="System.Windows.dll" />
<PlatformManifestFileEntry Include="System.Xml.dll" />
<PlatformManifestFileEntry Include="System.Xml.Linq.dll" />
<PlatformManifestFileEntry Include="System.Xml.ReaderWriter.dll" />
<PlatformManifestFileEntry Include="System.Xml.Serialization.dll" />
<PlatformManifestFileEntry Include="System.Xml.XDocument.dll" />
<PlatformManifestFileEntry Include="System.Xml.XmlDocument.dll" />
<PlatformManifestFileEntry Include="System.Xml.XmlSerializer.dll" />
<PlatformManifestFileEntry Include="System.Xml.XPath.dll" />
<PlatformManifestFileEntry Include="System.Xml.XPath.XDocument.dll" />
<PlatformManifestFileEntry Include="WindowsBase.dll" />
<PlatformManifestFileEntry Include="clrcompression.dll" IsNative="true" />
<PlatformManifestFileEntry Include="Microsoft.VisualBasic.Core.dll" />
<PlatformManifestFileEntry Include="createdump.exe" IsNative="true" />
<PlatformManifestFileEntry Include="createdump" IsNative="true" />
<PlatformManifestFileEntry Include="libcoreclrtraceptprovider.so" IsNative="true" />
...
...
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj
浏览文件 @
4a200d18
...
...
@@ -11,6 +11,7 @@
<SymbolsArchiveName>dotnet-runtime-symbols</SymbolsArchiveName>
<VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName>
<UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
<IncludeFallbacksInDepsFile>true</IncludeFallbacksInDepsFile>
<GetSharedFrameworkFilesForReadyToRunDependsOn>
AddRuntimeFilesToPackage;
AddFrameworkFilesToPackage
...
...
src/libraries/NetCoreAppLibrary.props
浏览文件 @
4a200d18
...
...
@@ -158,5 +158,6 @@
<!-- Make NetCoreAppLibrary available as an item. -->
<ItemGroup>
<NetCoreAppLibrary Include="$(NetCoreAppLibrary)" />
<NetCoreAppLibraryNoReference Include="$(NetCoreAppLibraryNoReference)" />
</ItemGroup>
</Project>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录