Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
1ac8df9c
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,发现更多精彩内容 >>
提交
1ac8df9c
编写于
1月 05, 2016
作者:
A
Andy Gocke
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move resource string from C# to VB, where it was supposed to be, and use proper test methods
上级
440b3961
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
30 addition
and
19 deletion
+30
-19
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
+0
-9
src/Compilers/CSharp/Portable/CSharpResources.resx
src/Compilers/CSharp/Portable/CSharpResources.resx
+2
-5
src/Compilers/VisualBasic/Portable/VBResources.Designer.vb
src/Compilers/VisualBasic/Portable/VBResources.Designer.vb
+9
-0
src/Compilers/VisualBasic/Portable/VBResources.resx
src/Compilers/VisualBasic/Portable/VBResources.resx
+3
-0
src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb
...t/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb
+16
-5
未找到文件。
src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
浏览文件 @
1ac8df9c
...
...
@@ -7216,15 +7216,6 @@ internal class CSharpResources {
}
}
/// <summary>
/// Looks up a localized string similar to Public sign was specified and requires a public key, but no public key was specified.
/// </summary>
internal static string ERR_PublicSignNoKey {
get {
return ResourceManager.GetString("ERR_PublicSignNoKey", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The range variable '{0}' has already been declared.
/// </summary>
...
...
src/Compilers/CSharp/Portable/CSharpResources.resx
浏览文件 @
1ac8df9c
...
...
@@ -3794,8 +3794,8 @@ You should consider suppressing the warning only if you're sure that you don't w
<data
name=
"ERR_SignButNoPrivateKey"
xml:space=
"preserve"
>
<value>
Key file '{0}' is missing the private key needed for signing
</value>
</data>
<data
name=
"ERR_PublicSignNoKey"
xml:space=
"preserve"
>
<value>
Public sign
was specified and requires a public key, but no public key was specified
</value>
<data
name=
"ERR_PublicSign
But
NoKey"
xml:space=
"preserve"
>
<value>
Public sign
ing was specified and requires a public key, but no public key was specified.
</value>
</data>
<data
name=
"WRN_DelaySignButNoKey"
xml:space=
"preserve"
>
<value>
Delay signing was specified and requires a public key, but no public key was specified
</value>
...
...
@@ -4666,9 +4666,6 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
<data
name=
"ERR_InvalidPathMap"
xml:space=
"preserve"
>
<value>
The pathmap option was incorrectly formatted.
</value>
</data>
<data
name=
"ERR_PublicSignButNoKey"
xml:space=
"preserve"
>
<value>
Public signing was specified and requires a public key, but no public key was specified.
</value>
</data>
<data
name=
"ERR_InvalidReal"
xml:space=
"preserve"
>
<value>
Invalid real literal.
</value>
</data>
...
...
src/Compilers/VisualBasic/Portable/VBResources.Designer.vb
浏览文件 @
1ac8df9c
...
...
@@ -9144,6 +9144,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Public sign was specified and requires a public key, but no public key was specified.
'''</summary>
Friend ReadOnly Property ERR_PublicSignNoKey() As String
Get
Return ResourceManager.GetString("ERR_PublicSignNoKey", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to ':' is not allowed. XML qualified names cannot be used in this context..
'''</summary>
...
...
src/Compilers/VisualBasic/Portable/VBResources.resx
浏览文件 @
1ac8df9c
...
...
@@ -4295,6 +4295,9 @@
<data
name=
"ERR_FriendRefSigningMismatch"
xml:space=
"preserve"
>
<value>
Friend access was granted by '{0}', but the strong name signing state of the output assembly does not match that of the granting assembly.
</value>
</data>
<data
name=
"ERR_PublicSignNoKey"
xml:space=
"preserve"
>
<value>
Public sign was specified and requires a public key, but no public key was specified
</value>
</data>
<data
name=
"WRN_DelaySignButNoKey"
xml:space=
"preserve"
>
<value>
Delay signing was specified and requires a public key, but no public key was specified.
</value>
</data>
...
...
src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb
浏览文件 @
1ac8df9c
...
...
@@ -1664,7 +1664,11 @@ End Class
</file>
</compilation>, options:=options
)
comp.VerifyDiagnostics(Diagnostic(ERRID.ERR_PublicSignNoKey).WithLocation(1, 1))
AssertTheseDiagnostics(comp,
<errors>
BC37254: Public sign was specified and requires a public key, but no public key was specified
</errors>)
Assert.True(comp.Options.PublicSign)
Assert.True(comp.Assembly.PublicKey.IsDefaultOrEmpty)
End Sub
...
...
@@ -1731,8 +1735,11 @@ End Class
Dim options = TestOptions.ReleaseDll.WithCryptoKeyFile(snk.Path).WithPublicSign(True)
Dim comp = CreateCompilationWithMscorlib(source, options:=options)
comp.VerifyDiagnostics(
Diagnostic(ERRID.ERR_CmdOptionConflictsSource).WithArguments("
System
.
Reflection
.
AssemblyDelaySignAttribute
", "
PublicSign
").WithLocation(1, 1))
AssertTheseDiagnostics(comp,
<errors>
BC37207: Attribute 'System.Reflection.AssemblyDelaySignAttribute' given in a source file conflicts with option 'PublicSign'.
</errors>)
Assert.True(comp.Options.PublicSign)
End Sub
<Fact>
...
...
@@ -1751,9 +1758,13 @@ End Class
options:=options
)
comp.VerifyDiagnostics(
Diagnostic(ERRID.ERR_MutuallyExclusiveOptions).WithArguments("
PublicSign
", "
DelaySign
").WithLocation(1, 1))
AssertTheseDiagnostics(comp,
<errors>
BC2046: Compilation options 'PublicSign' and 'DelaySign' can't both be specified at the same time.
</errors>)
Assert.True(comp.Options.PublicSign)
Assert.True(comp.Options.DelaySign)
End Sub
<Fact, WorkItem(769840, "
DevDiv
")>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录