Skip to content

Commit 8c5db6a

Browse files
jaredparjaredpar
committed
more
1 parent c574f08 commit 8c5db6a

File tree

9 files changed

+23
-18
lines changed

9 files changed

+23
-18
lines changed

‎src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenExprLambdaTests.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -2460,14 +2460,15 @@ .maxstack 7
24602460
}
24612461
");
24622462

2463-
var comp45 = CreateCompilationWithMscorlib45(
2463+
var comp = CreateCompilationWithMscorlib45(
24642464
new[] { text, ExpressionTestLibrary },
24652465
new[] { ExpressionAssemblyRef },
24662466
options: TestOptions.ReleaseExe);
2467+
comp.MakeMemberMissing(SpecialMember.System_Array__Empty);
24672468

24682469
// no use Array.Empty here since it is not available
24692470
CompileAndVerify(
2470-
comp45,
2471+
comp,
24712472
expectedOutput: expectedOutput).
24722473
VerifyIL("Test.Main",
24732474
@"

‎src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -16232,8 +16232,7 @@ public static void Main(string[] args)
1623216232
}
1623316233
}
1623416234
";
16235-
CompileAndVerifyWithMscorlib40(source, references: new[] { SystemRef, SystemCoreRef },
16236-
expectedOutput: "0");
16235+
CompileAndVerify(source, targetFramework: TargetFramework.NetFramework, expectedOutput: "0");
1623716236
}
1623816237

1623916238
[Fact, WorkItem(9703, "https://github.com/dotnet/roslyn/issues/9703")]

‎src/Compilers/CSharp/Test/Emit2/Attributes/InternalsVisibleToAndStrongNameTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -2091,6 +2091,7 @@ void TestET()
20912091
var ref2 = new CSharpCompilationReference(comp2);
20922092

20932093
var comp3 = CreateCompilationWithMscorlib45(source3, new[] { SystemCoreRef, ref1, ref2 }, options: TestOptions.SigningReleaseDll, assemblyName: "asm3", parseOptions: parseOptions);
2094+
comp3.MakeMemberMissing(SpecialMember.System_Array__Empty);
20942095
comp3.VerifyDiagnostics();
20952096

20962097
// Note: calls B.M, not A.M, since asm1 is not accessible.
@@ -2213,6 +2214,7 @@ void TestET()
22132214
var ref3 = new CSharpCompilationReference(comp3);
22142215

22152216
var comp4 = CreateCompilationWithMscorlib45(source4, new[] { SystemCoreRef, ref1, ref2, ref3 }, options: TestOptions.SigningReleaseDll, assemblyName: "asm4", parseOptions: parseOptions);
2217+
comp4.MakeMemberMissing(SpecialMember.System_Array__Empty);
22162218
comp4.VerifyDiagnostics();
22172219

22182220
// Note: calls C.M, not A.M, since asm2 is not accessible (stops search).

‎src/Compilers/CSharp/Test/Emit2/Semantics/CollectionExpressionTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11185,7 +11185,7 @@ .maxstack 1
1118511185

1118611186
[CombinatorialData]
1118711187
[Theory]
11188-
public void ArrayEmpty_02([CombinatorialValues(TargetFramework.Mscorlib45Extended, TargetFramework.Net80)] TargetFramework targetFramework)
11188+
public void ArrayEmpty_02([CombinatorialValues(TargetFramework.Mscorlib40, TargetFramework.Net80)] TargetFramework targetFramework)
1118911189
{
1119011190
if (!ExecutionConditionUtil.IsCoreClr && targetFramework == TargetFramework.Net80) return;
1119111191

@@ -11215,7 +11215,7 @@ static void Main()
1121511215
targetFramework: targetFramework,
1121611216
expectedOutput: "[], [], [], [], [], [], ");
1121711217

11218-
string expectedIL = (targetFramework == TargetFramework.Mscorlib45Extended) ?
11218+
string expectedIL = (targetFramework == TargetFramework.Mscorlib40) ?
1121911219
"""
1122011220
{
1122111221
// Code size 7 (0x7)

‎src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -2316,11 +2316,11 @@ public void AppConfig2()
23162316
options: TestOptions.ReleaseDll.WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default));
23172317

23182318
c1.VerifyDiagnostics(
2319-
// error CS1703: Multiple assemblies with equivalent identity have been imported: 'System.dll' and 'System.v5.0.5.0_silverlight.dll'. Remove one of the duplicate references.
2320-
Diagnostic(ErrorCode.ERR_DuplicateImport).WithArguments("System.dll (net451)", "System.v5.0.5.0_silverlight.dll"),
2321-
// error CS7069: Reference to type 'System.Runtime.Versioning.FrameworkName' claims it is defined in 'System', but it could not be found
2322-
Diagnostic(ErrorCode.ERR_MissingTypeInAssembly, "C.Goo").WithArguments(
2323-
"System.Runtime.Versioning.FrameworkName", "System"));
2319+
// error CS1703: Multiple assemblies with equivalent identity have been imported: 'System (net461)' and 'System.v5.0.5.0_silverlight.dll'. Remove one of the duplicate references.
2320+
Diagnostic(ErrorCode.ERR_DuplicateImport).WithArguments("System (net461)", "System.v5.0.5.0_silverlight.dll").WithLocation(1, 1),
2321+
// (1,52): error CS7069: Reference to type 'FrameworkName' claims it is defined in 'System', but it could not be found
2322+
// class A { public static void Main(string[] args) { C.Goo(); } }
2323+
Diagnostic(ErrorCode.ERR_MissingTypeInAssembly, "C.Goo").WithArguments("System.Runtime.Versioning.FrameworkName", "System").WithLocation(1, 52));
23242324

23252325
var appConfig = new MemoryStream(Encoding.UTF8.GetBytes(
23262326
@"<?xml version=""1.0"" encoding=""utf-8"" ?>

‎src/Compilers/CSharp/Test/Symbol/Compilation/ReferenceManagerTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3195,8 +3195,8 @@ public void MissingAssemblyResolution_Supersession_FxUnification()
31953195

31963196
resolverC.VerifyResolutionAttempts(
31973197
"B -> System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
3198-
"System.dll (net451) -> System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
3199-
"System.dll (net451) -> System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
3198+
"System (net461) -> System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
3199+
"System (net461) -> System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
32003200
"A -> System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
32013201
"System.dll (net20) -> System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
32023202
"System.dll (net20) -> System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");

‎src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@ Imports Undefined
15951595

15961596
<Fact()>
15971597
Public Sub AmbiguousNamespaces_01()
1598-
Dim compilation = CompilationUtils.CreateCompilation(
1598+
Dim compilation = CompilationUtils.CreateEmptyCompilation(
15991599
<compilation>
16001600
<file name="a.vb">
16011601
Imports System
@@ -1607,7 +1607,7 @@ Module Module1
16071607
End Sub
16081608
End Module
16091609
</file>
1610-
</compilation>, targetFramework:=TargetFramework.NetFramework)
1610+
</compilation>, references:={Net461.References.mscorlib, Net461.References.System, Net461.References.MicrosoftVisualBasic, Net461.References.SystemWindowsForms})
16111611

16121612
CompilationUtils.AssertNoDiagnostics(compilation)
16131613

‎src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1260,11 +1260,11 @@ End Class]]>
12601260

12611261
Dim asmFileAttr = DirectCast(refNS.GetTypeMembers("AssemblyFileVersionAttribute").Single(), NamedTypeSymbol)
12621262
Dim attr1 = assemblies(0).GetAttribute(asmFileAttr)
1263-
Assert.Equal("4.0.30319.18408", attr1.CommonConstructorArguments(0).Value)
1263+
Assert.Equal("4.6.1055.0", attr1.CommonConstructorArguments(0).Value)
12641264

12651265
Dim asmInfoAttr = DirectCast(refNS.GetTypeMembers("AssemblyInformationalVersionAttribute").Single(), NamedTypeSymbol)
12661266
attr1 = assemblies(0).GetAttribute(asmInfoAttr)
1267-
Assert.Equal("4.0.30319.18408", attr1.CommonConstructorArguments(0).Value)
1267+
Assert.Equal("4.6.1055.0", attr1.CommonConstructorArguments(0).Value)
12681268
End Sub
12691269

12701270
<WorkItem(539996, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/539996")>

‎src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/SymbolErrorTests.vb

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
Imports System.Collections.Immutable
66
Imports System.Xml.Linq
7+
Imports Basic.Reference.Assemblies
78
Imports Microsoft.CodeAnalysis.Test.Utilities
89
Imports Microsoft.CodeAnalysis.VisualBasic
910
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
@@ -6712,8 +6713,10 @@ BC30645: Attribute 'WebMethod' cannot be applied to a method with optional param
67126713
]]></errors>)
67136714
End Sub
67146715

6715-
<Fact()>
6716+
' PROTOTYPE: disabling while I get a new version of the DLLs
6717+
<Fact(Skip:="Need to get a new version of ref assemblies that have enterprise services")>
67166718
Public Sub BC30645ERR_InvalidOptionalParameterUsage1b()
6719+
' Dim references = {Net461.References.mscorlib, Net461.References.MicrosoftVisualBasic, Net461.References.SystemWebServices, Net461.References.System
67176720
Dim compilation1 = CompilationUtils.CreateCompilation(
67186721
<compilation name="InvalidOptionalParameterUsage1b">
67196722
<file name="a.vb"><![CDATA[

0 commit comments

Comments
 (0)