Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 a2379e04 编写于 作者: C Charles Stoner 提交者： GitHub
浏览文件
操作

Update TestResources to 2.0.17 (#36011)

上级 ff0359d9
隐藏空白更改
内联 并排
Showing with 35 addition and 29 deletion
eng/Versions.props
浏览文件 @ a2379e04
......@@ -44,7 +44,7 @@
<MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>$(CodeStyleAnalyzerVersion)</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisElfieVersion>0.10.6</MicrosoftCodeAnalysisElfieVersion>
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.15</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.17</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
<MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisVisualBasicCodeFixTestingXUnitVersion>
<MicrosoftCodeAnalysisVisualBasicCodeStyleVersion>$(CodeStyleAnalyzerVersion)</MicrosoftCodeAnalysisVisualBasicCodeStyleVersion>
<MicrosoftCodeAnalysisFlowAnalysisUtilitiesVersion>2.9.3-beta1.19271.2+23ca1e2d</MicrosoftCodeAnalysisFlowAnalysisUtilitiesVersion>
......
src/Compilers/CSharp/Test/Symbol/Symbols/CorLibrary/CorTypes.cs
浏览文件 @ a2379e04
......@@ -44,7 +44,7 @@ public void MissingCorLib()
[Fact]
public void PresentCorLib()
{
var assemblies = MetadataTestHelpers.GetSymbolsForReferences(new[] { TestReferences.NetStandard30.SystemRuntimeRef });
var assemblies = MetadataTestHelpers.GetSymbolsForReferences(new[] { TestReferences.NetCoreApp30.SystemRuntimeRef });
MetadataOrSourceAssemblySymbol msCorLibRef = (MetadataOrSourceAssemblySymbol)assemblies[0];
......@@ -57,7 +57,7 @@ public void PresentCorLib()
Assert.False(msCorLibRef.KeepLookingForDeclaredSpecialTypes);
assemblies = MetadataTestHelpers.GetSymbolsForReferences(mrefs: new[] { MetadataReference.CreateFromImage(TestResources.NetFX.netstandard30.System_Runtime.AsImmutableOrNull()) });
assemblies = MetadataTestHelpers.GetSymbolsForReferences(mrefs: new[] { MetadataReference.CreateFromImage(TestResources.NetFX.netcoreapp30.System_Runtime.AsImmutableOrNull()) });
msCorLibRef = (MetadataOrSourceAssemblySymbol)assemblies[0];
Assert.True(msCorLibRef.KeepLookingForDeclaredSpecialTypes);
......
src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
浏览文件 @ a2379e04
......@@ -10014,7 +10014,8 @@ void I1.M1()
foreach (var reference in new[] { compilation2.ToMetadataReference(), compilation2.EmitToImageReference() })
{
var compilation3 = CreateCompilation(source2, new[] { reference }, options: TestOptions.DebugExe,
parseOptions: TestOptions.Regular);
parseOptions: TestOptions.Regular,
targetFramework: TargetFramework.StandardLatest);
compilation3.VerifyDiagnostics();
......@@ -10074,7 +10075,8 @@ void I1.M1()
foreach (var reference in new[] { compilation2.ToMetadataReference(), compilation2.EmitToImageReference() })
{
var compilation3 = CreateCompilation(source2, new[] { reference }, options: TestOptions.DebugExe,
parseOptions: TestOptions.Regular);
parseOptions: TestOptions.Regular,
targetFramework: TargetFramework.StandardLatest);
compilation3.VerifyDiagnostics();
......@@ -10134,7 +10136,8 @@ void I1.M1()
foreach (var reference in new[] { compilation2.ToMetadataReference(), compilation2.EmitToImageReference() })
{
var compilation3 = CreateCompilation(source2, new[] { reference }, options: TestOptions.DebugExe,
parseOptions: TestOptions.Regular);
parseOptions: TestOptions.Regular,
targetFramework: TargetFramework.StandardLatest);
compilation3.VerifyDiagnostics(
// (10,13): error CS0122: 'I1.M1()' is inaccessible due to its protection level
......@@ -29713,7 +29716,7 @@ static void Main()
var compilation1 = CreateCompilation(source1, options: TestOptions.DebugExe,
parseOptions: TestOptions.Regular,
targetFramework: TargetFramework.NetStandardLatest,
references: new[] { TestReferences.NetStandard30.SystemThreadingTasksRef });
references: new[] { TestReferences.NetCoreApp30.SystemThreadingTasksRef });
Assert.True(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation);
compilation1.VerifyDiagnostics();
......@@ -39514,7 +39517,8 @@ static void Main()
(comp0:compilation0.EmitToImageReference(), comp1:compilation1.EmitToImageReference()) })
{
var compilation2 = CreateCompilation(source2, options: TestOptions.DebugExe,
parseOptions: TestOptions.Regular);
parseOptions: TestOptions.Regular,
targetFramework: TargetFramework.StandardLatest);
compilation2 = compilation2.AddReferences(refs.comp0);
CompileAndVerify(compilation2, verify: VerifyOnMonoOrCoreClr, expectedOutput: !ExecutionConditionUtil.IsMonoOrCoreClr ? null :
......@@ -39531,7 +39535,8 @@ remove E4
");
var compilation3 = CreateCompilation(source3, options: TestOptions.DebugExe,
parseOptions: TestOptions.Regular);
parseOptions: TestOptions.Regular,
targetFramework: TargetFramework.StandardLatest);
compilation3 = compilation3.AddReferences(refs.comp1);
CompileAndVerify(compilation3, verify: VerifyOnMonoOrCoreClr, expectedOutput: !ExecutionConditionUtil.IsMonoOrCoreClr ? null :
......@@ -42795,7 +42800,7 @@ public void RuntimeFeature_01()
public void RuntimeFeature_02()
{
var compilation1 = CreateCompilation("", options: TestOptions.DebugDll,
references: new[] { TestReferences.NetStandard30.SystemRuntimeRef },
references: new[] { TestReferences.NetCoreApp30.SystemRuntimeRef },
targetFramework: TargetFramework.Empty);
Assert.True(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation);
......@@ -43993,11 +43998,11 @@ public interface ITest33
foreach (var reference1 in new[] { piaCompilation.ToMetadataReference(embedInteropTypes: true), piaCompilation.EmitToImageReference(embedInteropTypes: true) })
{
var compilation1 = CreateCompilation(consumer1, options: TestOptions.ReleaseDll, references: new[] { reference1, attributesRef });
var compilation1 = CreateCompilation(consumer1, options: TestOptions.ReleaseDll, references: new[] { reference1, attributesRef }, targetFramework: TargetFramework.StandardLatest);
foreach (var reference2 in new[] { compilation1.ToMetadataReference(), compilation1.EmitToImageReference() })
{
var compilation2 = CreateCompilation(consumer2, options: TestOptions.ReleaseExe, references: new[] { reference2, pia2Refernce });
var compilation2 = CreateCompilation(consumer2, options: TestOptions.ReleaseExe, references: new[] { reference2, pia2Refernce }, targetFramework: TargetFramework.StandardLatest);
CompileAndVerify(compilation2, expectedOutput: "Test.M1");
}
}
src/Compilers/Core/CodeAnalysisTest/CorLibTypesTests.cs
浏览文件 @ a2379e04
......@@ -61,7 +61,7 @@ public void SpecialTypeIsValueType()
var comp = CSharp.CSharpCompilation.Create(
"c",
options: new CSharp.CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary),
references: new[] { TestReferences.NetStandard30.SystemRuntimeRef });
references: new[] { TestReferences.NetCoreApp30.SystemRuntimeRef });
for (var specialType = SpecialType.None + 1; specialType <= SpecialType.Count; specialType++)
{
......
src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/CorTypes.vb
浏览文件 @ a2379e04
......@@ -31,7 +31,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.CorLibrary
<Fact()>
Public Sub PresentCorLib()
Dim assemblies = MetadataTestHelpers.GetSymbolsForReferences({TestReferences.NetStandard30.SystemRuntimeRef})
Dim assemblies = MetadataTestHelpers.GetSymbolsForReferences({TestReferences.NetCoreApp30.SystemRuntimeRef})
Dim msCorLibRef As MetadataOrSourceAssemblySymbol = DirectCast(assemblies(0), MetadataOrSourceAssemblySymbol)
For i As Integer = 1 To SpecialType.Count
......@@ -42,7 +42,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.CorLibrary
Assert.False(msCorLibRef.KeepLookingForDeclaredSpecialTypes)
assemblies = MetadataTestHelpers.GetSymbolsForReferences({MetadataReference.CreateFromImage(TestResources.NetFX.netstandard30.System_Runtime)})
assemblies = MetadataTestHelpers.GetSymbolsForReferences({MetadataReference.CreateFromImage(TestResources.NetFX.netcoreapp30.System_Runtime)})
msCorLibRef = DirectCast(assemblies(0), MetadataOrSourceAssemblySymbol)
Assert.True(msCorLibRef.KeepLookingForDeclaredSpecialTypes)
......
src/Test/Utilities/Portable/Mocks/TestReferences.cs
浏览文件 @ a2379e04
......@@ -283,40 +283,40 @@ public static class NetStandard20
public static PortableExecutableReference MicrosoftVisualBasicRef => s_microsoftVisualBasic.Value;
}
public static class NetStandard30
public static class NetCoreApp30
{
private static readonly Lazy<PortableExecutableReference> s_netstandard = new Lazy<PortableExecutableReference>(
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard30.netstandard).GetReference(display: "netstandard.dll (netstandard 3.0 ref)"),
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netcoreapp30.netstandard).GetReference(display: "netstandard.dll (netstandard 3.0 ref)"),
LazyThreadSafetyMode.PublicationOnly);
public static PortableExecutableReference NetStandard => s_netstandard.Value;
private static readonly Lazy<PortableExecutableReference> s_mscorlib = new Lazy<PortableExecutableReference>(
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard30.mscorlib).GetReference(display: "mscorlib.dll (netstandard 3.0 ref)"),
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netcoreapp30.mscorlib).GetReference(display: "mscorlib.dll (netstandard 3.0 ref)"),
LazyThreadSafetyMode.PublicationOnly);
public static PortableExecutableReference MscorlibRef => s_mscorlib.Value;
private static readonly Lazy<PortableExecutableReference> s_systemRuntime = new Lazy<PortableExecutableReference>(
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard30.System_Runtime).GetReference(display: "System.Runtime.dll (netstandard 3.0 ref)"),
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netcoreapp30.System_Runtime).GetReference(display: "System.Runtime.dll (netstandard 3.0 ref)"),
LazyThreadSafetyMode.PublicationOnly);
public static PortableExecutableReference SystemRuntimeRef => s_systemRuntime.Value;
private static readonly Lazy<PortableExecutableReference> s_systemCore = new Lazy<PortableExecutableReference>(
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard30.System_Core).GetReference(display: "System.Core.dll (netstandard 3.0 ref)"),
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netcoreapp30.System_Core).GetReference(display: "System.Core.dll (netstandard 3.0 ref)"),
LazyThreadSafetyMode.PublicationOnly);
public static PortableExecutableReference SystemCoreRef => s_systemCore.Value;
private static readonly Lazy<PortableExecutableReference> s_systemDynamicRuntime = new Lazy<PortableExecutableReference>(
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard30.System_Dynamic_Runtime).GetReference(display: "System.Dynamic.Runtime.dll (netstandard 3.0 ref)"),
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netcoreapp30.System_Dynamic_Runtime).GetReference(display: "System.Dynamic.Runtime.dll (netstandard 3.0 ref)"),
LazyThreadSafetyMode.PublicationOnly);
public static PortableExecutableReference SystemDynamicRuntimeRef => s_systemDynamicRuntime.Value;
private static readonly Lazy<PortableExecutableReference> s_systemConsole = new Lazy<PortableExecutableReference>(
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard30.System_Console).GetReference(display: "System.Console.dll (netstandard 3.0 ref)"),
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netcoreapp30.System_Console).GetReference(display: "System.Console.dll (netstandard 3.0 ref)"),
LazyThreadSafetyMode.PublicationOnly);
public static PortableExecutableReference SystemConsoleRef => s_systemConsole.Value;
private static readonly Lazy<PortableExecutableReference> s_system_Threading_Tasks = new Lazy<PortableExecutableReference>(
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netstandard30.System_Threading_Tasks).GetReference(display: "System.Threading.Tasks.dll (netstandard 3.0)"),
() => AssemblyMetadata.CreateFromImage(TestResources.NetFX.netcoreapp30.System_Threading_Tasks).GetReference(display: "System.Threading.Tasks.dll (netstandard 3.0)"),
LazyThreadSafetyMode.PublicationOnly);
public static PortableExecutableReference SystemThreadingTasksRef => s_system_Threading_Tasks.Value;
}
......
src/Test/Utilities/Portable/TargetFrameworkUtil.cs
浏览文件 @ a2379e04
......@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Test.Utilities;
using static TestReferences;
......@@ -18,8 +17,8 @@ public enum TargetFramework
Empty,
NetStandard20,
NetStandard30,
NetStandardLatest = NetStandard30,
NetCoreApp30,
NetStandardLatest = NetCoreApp30,
WinRT,
/// <summary>
......@@ -27,8 +26,8 @@ public enum TargetFramework
/// API set across destkop and coreclr
/// </summary>
Standard,
StandardLatest,
StandardAndCSharp,
StandardAndVBRuntime,
/// <summary>
......@@ -81,9 +80,10 @@ public static class TargetFrameworkUtil
public static ImmutableArray<MetadataReference> Mscorlib461References => ImmutableArray.Create<MetadataReference>(Net461.mscorlibRef);
public static ImmutableArray<MetadataReference> Mscorlib461ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.mscorlibRef, Net461.SystemRef, Net461.SystemCoreRef, Net461.SystemValueTupleRef, Net461.SystemRuntimeRef, Net461.netstandardRef);
public static ImmutableArray<MetadataReference> NetStandard20References => ImmutableArray.Create<MetadataReference>(NetStandard20.NetStandard, NetStandard20.MscorlibRef, NetStandard20.SystemRuntimeRef, NetStandard20.SystemCoreRef, NetStandard20.SystemDynamicRuntimeRef);
public static ImmutableArray<MetadataReference> NetStandard30References => ImmutableArray.Create<MetadataReference>(NetStandard30.NetStandard, NetStandard30.MscorlibRef, NetStandard30.SystemRuntimeRef, NetStandard30.SystemCoreRef, NetStandard30.SystemDynamicRuntimeRef, NetStandard30.SystemConsoleRef);
public static ImmutableArray<MetadataReference> NetCoreApp30References => ImmutableArray.Create<MetadataReference>(NetCoreApp30.NetStandard, NetCoreApp30.MscorlibRef, NetCoreApp30.SystemRuntimeRef, NetCoreApp30.SystemCoreRef, NetCoreApp30.SystemDynamicRuntimeRef, NetCoreApp30.SystemConsoleRef);
public static ImmutableArray<MetadataReference> WinRTReferences => ImmutableArray.Create(TestBase.WinRtRefs);
public static ImmutableArray<MetadataReference> StandardReferences => RuntimeUtilities.IsCoreClrRuntime ? NetStandard20References : Mscorlib46ExtendedReferences;
public static ImmutableArray<MetadataReference> StandardLatestReferences => RuntimeUtilities.IsCoreClrRuntime ? NetCoreApp30References : Mscorlib46ExtendedReferences;
public static ImmutableArray<MetadataReference> StandardAndCSharpReferences => StandardReferences.Add(StandardCSharpReference);
public static ImmutableArray<MetadataReference> StandardAndVBRuntimeReferences => RuntimeUtilities.IsCoreClrRuntime ? NetStandard20References.Add(NetStandard20.MicrosoftVisualBasicRef) : Mscorlib46ExtendedReferences.Add(TestBase.MsvbRef_v4_0_30319_17929);
public static ImmutableArray<MetadataReference> StandardCompatReferences => RuntimeUtilities.IsCoreClrRuntime ? NetStandard20References : Mscorlib40References;
......@@ -107,9 +107,10 @@ public static ImmutableArray<MetadataReference> GetReferences(TargetFramework tf
case TargetFramework.Mscorlib461: return Mscorlib46References;
case TargetFramework.Mscorlib461Extended: return Mscorlib461ExtendedReferences;
case TargetFramework.NetStandard20: return NetStandard20References;
case TargetFramework.NetStandard30: return NetStandard30References;
case TargetFramework.NetCoreApp30: return NetCoreApp30References;
case TargetFramework.WinRT: return WinRTReferences;
case TargetFramework.Standard: return StandardReferences;
case TargetFramework.StandardLatest: return StandardLatestReferences;
case TargetFramework.StandardAndCSharp: return StandardAndCSharpReferences;
case TargetFramework.StandardAndVBRuntime: return StandardAndVBRuntimeReferences;
case TargetFramework.StandardCompat: return StandardCompatReferences;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或