提交 0106522a 编写于 作者: J Jared Parsons 提交者: Tomas Matousek

Emit now multi-targetting net461 and netcoreapp2.0

上级 5fbba207
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NET461
using System;
using System.Collections.Immutable;
using System.IO;
......@@ -2471,3 +2471,5 @@ public void ConsistentErrorMessageWhenProvidingEmptyKeyFile_PublicSign()
#endregion
}
}
#endif
......@@ -8,9 +8,9 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.CSharp.UnitTests</RootNamespace>
<AssemblyName>Roslyn.Compilers.CSharp.Emit.UnitTests</AssemblyName>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifier>$(RoslynDesktopRuntimeIdentifier)</RuntimeIdentifier>
<RoslynProjectType>UnitTest</RoslynProjectType>
<TargetFrameworks>$(RoslynPortableTargetFrameworks)</TargetFrameworks>
<RoslynProjectType>UnitTestPortable</RoslynProjectType>
<RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup Label="Project References">
......@@ -35,13 +35,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpVersion)" />
<PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
<PackageReference Include="xunit" Version="$(xunitVersion)" />
<PackageReference Include="xunit.analyzers" Version="$(xunitanalyzersVersion)" />
......
......@@ -14,7 +14,6 @@
using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using Xunit;
using static Roslyn.Test.Utilities.SigningTestHelpers;
using static TestResources.NetFX.ValueTuple;
namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen
......@@ -21329,7 +21328,7 @@ public class A
}";
var signedDllOptions = TestOptions.ReleaseDll.
WithCryptoKeyFile(SigningTestHelpers.KeyPairFile).
WithStrongNameProvider(s_defaultDesktopProvider);
WithStrongNameProvider(SigningTestHelpers.s_defaultDesktopProvider);
var comp0v1 = CreateCompilationWithMscorlib40(source0v1, assemblyName: "A", options: signedDllOptions);
comp0v1.VerifyDiagnostics();
var ref0v1 = comp0v1.EmitToImageReference();
......
......@@ -11,7 +11,6 @@
using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit;
using Microsoft.CodeAnalysis.Test.Utilities;
using Microsoft.CodeAnalysis.Text;
using Microsoft.CSharp.RuntimeBinder;
using Roslyn.Test.Utilities;
using Xunit;
......
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NET461
using System;
using System.Collections.Immutable;
......@@ -5046,3 +5047,5 @@ public void CompileAndVerifyModuleIncludesAllModules()
}
}
}
#endif
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NET461
using System.Collections.Immutable;
using System.IO;
......@@ -70,3 +71,4 @@ class C
}
}
}
#endif
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NET461
using System.Collections.Immutable;
using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
using Microsoft.CodeAnalysis.Test.Utilities;
......@@ -788,3 +790,4 @@ public static void M(string s)
}
}
}
#endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册