Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
de323041
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
de323041
编写于
7月 13, 2015
作者:
T
Tomáš Matoušek
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3907 from tmat/MDR110
Update System.Reflection.Metadata to 1.1.0-alpha-00008
上级
cedbe7b8
b07d06c6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
17 addition
and
11 deletion
+17
-11
.nuget/packages.config
.nuget/packages.config
+1
-1
build/Targets/VSL.Settings.targets
build/Targets/VSL.Settings.targets
+2
-2
src/Compilers/CSharp/Test/Emit/Emit/EmitMetadata.cs
src/Compilers/CSharp/Test/Emit/Emit/EmitMetadata.cs
+3
-6
src/Compilers/VisualBasic/Portable/Emit/TypeParameterSymbolAdapter.vb
...s/VisualBasic/Portable/Emit/TypeParameterSymbolAdapter.vb
+2
-2
src/VisualStudio/Core/Def/Implementation/EditAndContinue/VsENCRebuildableProjectImpl.cs
...ementation/EditAndContinue/VsENCRebuildableProjectImpl.cs
+1
-0
src/VisualStudio/Setup/AssemblyRedirects.cs
src/VisualStudio/Setup/AssemblyRedirects.cs
+8
-0
未找到文件。
.nuget/packages.config
浏览文件 @
de323041
...
...
@@ -4,7 +4,7 @@
<
package
id
=
"Microsoft.Net.Compilers"
version
=
"1.0.0-rc3-20150616-02"
targetFramework
=
"net45"
/>
<
package
id
=
"Microsoft.Net.RoslynDiagnostics"
version
=
"1.0.0-rc3-20150616-02"
targetFramework
=
"net45"
/>
<
package
id
=
"System.Collections.Immutable"
version
=
"1.1.36"
targetFramework
=
"net45"
/>
<
package
id
=
"System.Reflection.Metadata"
version
=
"1.
0.21
"
targetFramework
=
"net45"
/>
<
package
id
=
"System.Reflection.Metadata"
version
=
"1.
1.0-alpha-00008
"
targetFramework
=
"net45"
/>
<
package
id
=
"Microsoft.DotNet.BuildTools"
version
=
"1.0.25-prerelease-00056"
/>
<
package
id
=
"FakeSign"
version
=
"0.9.2"
targetFramework
=
"net45"
/>
<
package
id
=
"dnx-coreclr-win-x86"
version
=
"1.0.0-beta5-12101"
/>
...
...
build/Targets/VSL.Settings.targets
浏览文件 @
de323041
...
...
@@ -24,11 +24,11 @@
<UseRoslynAnalyzers Condition="'$(UseRoslynAnalyzers)' == ''">true</UseRoslynAnalyzers>
<RoslynSemanticVersion Condition="'$(RoslynSemanticVersion)' == ''">1.1.0</RoslynSemanticVersion>
<SystemReflectionMetadataAssemblyVersion Condition="'$(SystemReflectionMetadataAssemblyVersion)' == ''">1.
0.21
</SystemReflectionMetadataAssemblyVersion>
<SystemReflectionMetadataAssemblyVersion Condition="'$(SystemReflectionMetadataAssemblyVersion)' == ''">1.
1.0
</SystemReflectionMetadataAssemblyVersion>
<SystemCollectionsImmutableAssemblyVersion Condition="'$(SystemCollectionsImmutableAssemblyVersion)' == ''">1.1.36</SystemCollectionsImmutableAssemblyVersion>
<NuGetCommandLineAssemblyVersion Condition="'$(NuGetCommandLineAssemblyVersion)' == ''">2.8.5</NuGetCommandLineAssemblyVersion>
<MicrosoftCompositionAssemblyVersion Condition="'$(MicrosoftCompositionAssemblyVersion)' == ''">1.0.27</MicrosoftCompositionAssemblyVersion>
<SystemReflectionMetadataVersion>$(SystemReflectionMetadataAssemblyVersion)</SystemReflectionMetadataVersion>
<SystemReflectionMetadataVersion>$(SystemReflectionMetadataAssemblyVersion)
-alpha-00008
</SystemReflectionMetadataVersion>
<SystemCollectionsImmutableVersion>$(SystemCollectionsImmutableAssemblyVersion)</SystemCollectionsImmutableVersion>
<NuGetCommandLineVersion>$(NuGetCommandLineAssemblyVersion)</NuGetCommandLineVersion>
<MicrosoftCompositionVersion>$(MicrosoftCompositionAssemblyVersion)</MicrosoftCompositionVersion>
...
...
src/Compilers/CSharp/Test/Emit/Emit/EmitMetadata.cs
浏览文件 @
de323041
...
...
@@ -2298,8 +2298,7 @@ public unsafe void PEHeaders1()
var
sections
=
peHeaders
.
SectionHeaders
;
Assert
.
Equal
(
2
,
sections
.
Length
);
// TODO: bug in the reader, should return ".text". Fixed in vNext. https://github.com/dotnet/corefx/issues/1805
Assert
.
Equal
(
".text\0\0\0"
,
sections
[
0
].
Name
);
Assert
.
Equal
(
".text"
,
sections
[
0
].
Name
);
Assert
.
Equal
(
0
,
sections
[
0
].
NumberOfLineNumbers
);
Assert
.
Equal
(
0
,
sections
[
0
].
NumberOfRelocations
);
Assert
.
Equal
(
0
,
sections
[
0
].
PointerToLineNumbers
);
...
...
@@ -2310,8 +2309,7 @@ public unsafe void PEHeaders1()
Assert
.
Equal
(
0x2000
,
sections
[
0
].
VirtualAddress
);
Assert
.
Equal
(
872
,
sections
[
0
].
VirtualSize
);
// TODO: bug in the reader, should return ".reloc". Fixed in vNext. https://github.com/dotnet/corefx/issues/1805
Assert
.
Equal
(
".reloc\0\0"
,
sections
[
1
].
Name
);
Assert
.
Equal
(
".reloc"
,
sections
[
1
].
Name
);
Assert
.
Equal
(
0
,
sections
[
1
].
NumberOfLineNumbers
);
Assert
.
Equal
(
0
,
sections
[
1
].
NumberOfRelocations
);
Assert
.
Equal
(
0
,
sections
[
1
].
PointerToLineNumbers
);
...
...
@@ -2438,8 +2436,7 @@ public void PEHeaders2()
var
sections
=
peHeaders
.
SectionHeaders
;
Assert
.
Equal
(
1
,
sections
.
Length
);
// TODO: bug in the reader, should return ".text". Fixed in vNext. https://github.com/dotnet/corefx/issues/1805
Assert
.
Equal
(
".text\0\0\0"
,
sections
[
0
].
Name
);
Assert
.
Equal
(
".text"
,
sections
[
0
].
Name
);
Assert
.
Equal
(
0
,
sections
[
0
].
NumberOfLineNumbers
);
Assert
.
Equal
(
0
,
sections
[
0
].
NumberOfRelocations
);
Assert
.
Equal
(
0
,
sections
[
0
].
PointerToLineNumbers
);
...
...
src/Compilers/VisualBasic/Portable/Emit/TypeParameterSymbolAdapter.vb
浏览文件 @
de323041
...
...
@@ -31,8 +31,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Return
Nothing
End
Function
Private
Function
ITypeReferenceTypeCode
(
context
As
EmitContext
)
As
PrimitiveTypeCode
Implements
ITypeReference
.
TypeCode
Return
PrimitiveTypeCode
.
NotPrimitive
Private
Function
ITypeReferenceTypeCode
(
context
As
EmitContext
)
As
Cci
.
PrimitiveTypeCode
Implements
ITypeReference
.
TypeCode
Return
Cci
.
PrimitiveTypeCode
.
NotPrimitive
End
Function
Private
ReadOnly
Property
ITypeReferenceTypeDef
As
TypeDefinitionHandle
Implements
ITypeReference
.
TypeDef
...
...
src/VisualStudio/Core/Def/Implementation/EditAndContinue/VsENCRebuildableProjectImpl.cs
浏览文件 @
de323041
...
...
@@ -30,6 +30,7 @@
using
ShellInterop
=
Microsoft
.
VisualStudio
.
Shell
.
Interop
;
using
VsTextSpan
=
Microsoft
.
VisualStudio
.
TextManager
.
Interop
.
TextSpan
;
using
VsThreading
=
Microsoft
.
VisualStudio
.
Threading
;
using
Document
=
Microsoft
.
CodeAnalysis
.
Document
;
namespace
Microsoft.VisualStudio.LanguageServices.Implementation.EditAndContinue
{
...
...
src/VisualStudio/Setup/AssemblyRedirects.cs
浏览文件 @
de323041
...
...
@@ -162,6 +162,14 @@
PublicKeyToken
=
Constants
.
PublicKeyToken
,
GenerateCodeBase
=
false
)]
[
assembly
:
ProvideBindingRedirection
(
AssemblyName
=
"System.Reflection.Metadata"
,
OldVersionLowerBound
=
"1.0.0.0"
,
OldVersionUpperBound
=
"1.0.99.0"
,
NewVersion
=
"1.1.0.0"
,
PublicKeyToken
=
"b03f5f7f11d50a3a"
,
GenerateCodeBase
=
false
)]
internal
class
Constants
{
public
const
string
OldVersionLowerBound
=
"0.7.0.0"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录