Fixed a build issue

上级 8f982636
......@@ -22,7 +22,7 @@ public class SymbolEquivalenceComparerTests
public static readonly CS.CSharpCompilationOptions CSharpDllOptions = new CS.CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
public static readonly CS.CSharpCompilationOptions CSharpSignedDllOptions = new CS.CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).
WithCryptoKeyFile(SigningTestHelpers.KeyPairFile).
WithStrongNameProvider(s_defaultDesktopProvider);
WithStrongNameProvider(DefaultDesktopStrongNameProvider);
[Fact]
public async Task TestArraysAreEquivalent()
......
......@@ -374,7 +374,7 @@ using IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute;
<Project Language="C#" CommonReferences="true" AssemblyName="ClassLibrary1">
<CompilationOptions
CryptoKeyFile=<%= SigningTestHelpers.PublicKeyFile %>
StrongNameProvider=<%= SigningTestHelpers.s_defaultDesktopProvider.GetType().AssemblyQualifiedName %>/>
StrongNameProvider=<%= SigningTestHelpers.DefaultDesktopStrongNameProvider.GetType().AssemblyQualifiedName %>/>
</Project>
<Project Language="C#" CommonReferences="true" AssemblyName="TestAssembly">
<Document>
......@@ -397,7 +397,7 @@ using IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute;
<Workspace>
<Project Language="C#" CommonReferences="true" AssemblyName="ClassLibrary1">
<CompilationOptions
StrongNameProvider=<%= SigningTestHelpers.s_defaultDesktopProvider.GetType().AssemblyQualifiedName %>/>
StrongNameProvider=<%= SigningTestHelpers.DefaultDesktopStrongNameProvider.GetType().AssemblyQualifiedName %>/>
<Document>
[assembly: System.Reflection.AssemblyKeyFile("<%= SigningTestHelpers.PublicKeyFile.Replace("\", "\\") %>")]
</Document>
......@@ -424,7 +424,7 @@ using IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute;
<Project Language="C#" CommonReferences="true" AssemblyName="ClassLibrary1">
<CompilationOptions
CryptoKeyFile=<%= SigningTestHelpers.PublicKeyFile %>
StrongNameProvider=<%= SigningTestHelpers.s_defaultDesktopProvider.GetType().AssemblyQualifiedName %>
StrongNameProvider=<%= SigningTestHelpers.DefaultDesktopStrongNameProvider.GetType().AssemblyQualifiedName %>
DelaySign="True"/>
</Project>
<Project Language="C#" CommonReferences="true" AssemblyName="TestAssembly">
......
......@@ -352,7 +352,7 @@ Imports IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute
<Project Language="Visual Basic" CommonReferences="true" AssemblyName="ClassLibrary1">
<CompilationOptions
CryptoKeyFile=<%= SigningTestHelpers.PublicKeyFile %>
StrongNameProvider=<%= SigningTestHelpers.s_defaultDesktopProvider.GetType().AssemblyQualifiedName %>/>
StrongNameProvider=<%= SigningTestHelpers.DefaultDesktopStrongNameProvider.GetType().AssemblyQualifiedName %>/>
</Project>
<Project Language="Visual Basic" CommonReferences="true" AssemblyName="TestAssembly">
<Document><![CDATA[
......@@ -375,7 +375,7 @@ Imports IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute
<Workspace>
<Project Language="Visual Basic" CommonReferences="true" AssemblyName="ClassLibrary1">
<CompilationOptions
StrongNameProvider=<%= SigningTestHelpers.s_defaultDesktopProvider.GetType().AssemblyQualifiedName %>/>
StrongNameProvider=<%= SigningTestHelpers.DefaultDesktopStrongNameProvider.GetType().AssemblyQualifiedName %>/>
<Document>
&lt;Assembly: System.Reflection.AssemblyKeyFile("<%= SigningTestHelpers.PublicKeyFile %>")&gt;
</Document>
......@@ -402,7 +402,7 @@ Imports IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute
<Project Language="Visual Basic" CommonReferences="true" AssemblyName="ClassLibrary1">
<CompilationOptions
CryptoKeyFile=<%= SigningTestHelpers.PublicKeyFile %>
StrongNameProvider=<%= SigningTestHelpers.s_defaultDesktopProvider.GetType().AssemblyQualifiedName %>/>
StrongNameProvider=<%= SigningTestHelpers.DefaultDesktopStrongNameProvider.GetType().AssemblyQualifiedName %>/>
DelaySign="True"
/>
</Project>
......
......@@ -535,7 +535,7 @@ private static CompilationOptions CreateCompilationOptions(TestWorkspace workspa
// Activator.CreateInstance does not work with this.
if (type == typeof(DesktopStrongNameProvider))
{
strongNameProvider = SigningTestHelpers.s_defaultDesktopProvider;
strongNameProvider = SigningTestHelpers.DefaultDesktopStrongNameProvider;
}
else
{
......
......@@ -5578,9 +5578,8 @@ void verify(string expr)
[Fact]
public void UseSiteWarning()
{
var signedDllOptions = TestOptions.ReleaseDll.
WithCryptoKeyFile(SigningTestHelpers.KeyPairFile).
WithStrongNameProvider(s_defaultDesktopProvider);
var signedDllOptions = TestOptions.SigningReleaseDll.
WithCryptoKeyFile(SigningTestHelpers.KeyPairFile);
var libBTemplate = @"
[assembly: System.Reflection.AssemblyVersion(""{0}.0.0.0"")]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册