Skip to content

Commit e0849de

Browse files
sanych-sunsanych-sun
authored
CSHARP-1276: Provide Strong-Named Assemblies (#1393)
1 parent acbcd72 commit e0849de

File tree

14 files changed

+66
-58
lines changed

14 files changed

+66
-58
lines changed

‎MongoDB.Driver.snk

596 Bytes
Binary file not shown.

‎benchmarks/MongoDB.Driver.Benchmarks/BenchmarkRunner.cs

+31-26
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,53 @@
1313
* limitations under the License.
1414
*/
1515

16+
using System.CommandLine;
17+
using System.Linq;
1618
using BenchmarkDotNet.Configs;
1719
using BenchmarkDotNet.Running;
1820
using MongoDB.Benchmarks.Exporters;
19-
using NDesk.Options;
2021

2122
namespace MongoDB.Benchmarks
2223
{
2324
public class BenchmarkRunner
2425
{
25-
public static void Main(string[] args)
26+
public static int Main(string[] args)
2627
{
27-
var executingDriverBenchmarks = false;
28-
var exportingToEvergreen = false;
29-
var evergreenOutputFile = "evergreen-results.json"; // default output file name
28+
var rootCommand = new RootCommand("CSharp Driver benchmarks runner");
29+
rootCommand.TreatUnmatchedTokensAsErrors = false;
30+
var evergreenOption = new Option<bool>("--evergreen", () => false);
31+
rootCommand.AddOption(evergreenOption);
32+
var driverBenchmarksOption = new Option<bool>("--driverBenchmarks", () => false);
33+
rootCommand.AddOption(driverBenchmarksOption);
34+
var evergreenOutputFileOption = new Option<string>(["--o", "--output-file"], () => "evergreen-results.json");
35+
rootCommand.AddOption(evergreenOutputFileOption);
3036

31-
var parser = new OptionSet
37+
rootCommand.SetHandler(invocationContext =>
3238
{
33-
{ "evergreen", v => exportingToEvergreen = v != null },
34-
{ "driverBenchmarks", v => executingDriverBenchmarks = v != null },
35-
{ "o|output-file=", v => evergreenOutputFile = v }
36-
};
39+
var evergreenValue = invocationContext.ParseResult.GetValueForOption(evergreenOption);
40+
var driverBenchmarksValue = invocationContext.ParseResult.GetValueForOption(driverBenchmarksOption);
41+
var evergreenOutputFileValue = invocationContext.ParseResult.GetValueForOption(evergreenOutputFileOption);
3742

38-
// the parser will try to parse the options defined above and will return any extra options
39-
var benchmarkSwitcherArgs = parser.Parse(args).ToArray();
43+
var config = DefaultConfig.Instance;
4044

41-
var config = DefaultConfig.Instance;
45+
// use a modified config if running driver benchmarks
46+
if (driverBenchmarksValue)
47+
{
48+
config = config
49+
.WithOption(ConfigOptions.JoinSummary, true)
50+
.AddExporter(new LocalExporter())
51+
.HideColumns("BenchmarkDataSetSize");
52+
}
4253

43-
// use a modified config if running driver benchmarks
44-
if (executingDriverBenchmarks)
45-
{
46-
config = config
47-
.WithOption(ConfigOptions.JoinSummary, true)
48-
.AddExporter(new LocalExporter())
49-
.HideColumns("BenchmarkDataSetSize");
50-
}
54+
if (evergreenValue)
55+
{
56+
config = config.AddExporter(new EvergreenExporter(evergreenOutputFileValue));
57+
}
5158

52-
if (exportingToEvergreen)
53-
{
54-
config = config.AddExporter(new EvergreenExporter(evergreenOutputFile));
55-
}
59+
BenchmarkSwitcher.FromAssembly(typeof(BenchmarkRunner).Assembly).Run(invocationContext.ParseResult.UnmatchedTokens.ToArray(), config);
60+
});
5661

57-
BenchmarkSwitcher.FromAssembly(typeof(BenchmarkRunner).Assembly).Run(benchmarkSwitcherArgs, config);
62+
return rootCommand.Invoke(args);
5863
}
5964
}
6065
}

‎benchmarks/MongoDB.Driver.Benchmarks/MongoDB.Driver.Benchmarks.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
<NoWarn>NU1701,CA1001</NoWarn>
2121
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2222
<IsPackable>false</IsPackable>
23+
<SignAssembly>true</SignAssembly>
24+
<AssemblyOriginatorKeyFile>..\..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>
2325
</PropertyGroup>
2426

2527
<ItemGroup>
2628
<PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
27-
<PackageReference Include="NDesk.Options" Version="0.2.1" />
29+
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
2830
</ItemGroup>
2931

3032
<ItemGroup>

‎src/Directory.Build.props

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2828
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2929
<EmbedUntrackedSources>true</EmbedUntrackedSources>
30+
<SignAssembly>true</SignAssembly>
31+
<AssemblyOriginatorKeyFile>..\..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>
3032
</PropertyGroup>
3133

3234
<PropertyGroup Condition="'$(Version)'==''">

‎src/MongoDB.Bson/Properties/AssemblyInfo.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@
2626
// as Xamarin.iOS/Xamarin.Mac.
2727
[assembly: Preserve(AllMembers = true)]
2828

29-
[assembly: InternalsVisibleTo("MongoDB.Bson.Tests")]
29+
[assembly: InternalsVisibleTo("MongoDB.Bson.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
30+
[assembly: InternalsVisibleTo("MongoDB.Analyzer.MQLGenerator, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]

‎src/MongoDB.Bson/Serialization/TypeNameDiscriminator.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@ public static string GetDiscriminator(Type type)
145145
if (match.Success)
146146
{
147147
var publicKeyToken = match.Groups["token"].Value;
148-
if (publicKeyToken == "null")
148+
if (publicKeyToken == "null" ||
149+
// MongoDB's assemblies should use "type name, assembly name" discriminator format for backward compatibility
150+
(assembly.FullName.StartsWith("MongoDB") && publicKeyToken == "94992a530f44e321"))
149151
{
150152
var dllName = match.Groups["dll"].Value;
151153
assemblyName = dllName;

‎src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.100.14" />
2929
<PackageReference Include="DnsClient" Version="1.6.1" />
3030
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
31-
<PackageReference Include="MongoDB.Libmongocrypt" Version="1.10.0" />
31+
<PackageReference Include="MongoDB.Libmongocrypt" Version="1.11.0" />
3232
<PackageReference Include="SharpCompress" Version="0.30.1" />
3333
<PackageReference Include="Snappier" Version="1.0.0" />
3434
<PackageReference Include="ZstdSharp.Port" Version="0.7.3" />

‎src/MongoDB.Driver.Core/Properties/AssemblyInfo.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
// Required for most of the reflection usage in Xamarin.iOS/Xamarin.Mac.
2626
[assembly: Preserve(AllMembers = true)]
2727

28-
[assembly: InternalsVisibleTo("MongoDB.Driver")]
29-
[assembly: InternalsVisibleTo("MongoDB.Driver.TestHelpers")]
30-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy")]
31-
[assembly: InternalsVisibleTo("MongoDB.Driver.Core.FunctionalTests")]
32-
[assembly: InternalsVisibleTo("MongoDB.Driver.Core.TestHelpers")]
33-
[assembly: InternalsVisibleTo("MongoDB.Driver.Core.Tests")]
34-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.Tests")]
35-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.TestHelpers")]
36-
[assembly: InternalsVisibleTo("MongoDB.Driver.Tests")]
37-
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
28+
[assembly: InternalsVisibleTo("MongoDB.Driver, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
29+
[assembly: InternalsVisibleTo("MongoDB.Driver.TestHelpers, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
30+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
31+
[assembly: InternalsVisibleTo("MongoDB.Driver.Core.TestHelpers, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
32+
[assembly: InternalsVisibleTo("MongoDB.Driver.Core.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
33+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
34+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.TestHelpers, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
35+
[assembly: InternalsVisibleTo("MongoDB.Driver.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
36+
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
37+
[assembly: InternalsVisibleTo("MongoDB.Analyzer.MQLGenerator, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]

‎src/MongoDB.Driver.GridFS/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
// Required for most of the reflection usage in Xamarin.iOS/Xamarin.Mac.
2626
[assembly: Preserve(AllMembers = true)]
2727

28-
[assembly: InternalsVisibleTo("MongoDB.Driver.GridFS.Tests")]
28+
[assembly: InternalsVisibleTo("MongoDB.Driver.GridFS.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]

‎src/MongoDB.Driver.Legacy/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
// Required for most of the reflection usage in Xamarin.iOS/Xamarin.Mac.
2626
[assembly: Preserve(AllMembers = true)]
2727

28-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.TestHelpers")]
29-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.Tests")]
28+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.TestHelpers, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
29+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]

‎src/MongoDB.Driver/MongoDB.Driver.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
23-
<PackageReference Include="MongoDB.Libmongocrypt" Version="1.10.0" />
23+
<PackageReference Include="MongoDB.Libmongocrypt" Version="1.11.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src/MongoDB.Driver/Properties/AssemblyInfo.cs

+8-7
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
// Required for most of the reflection usage in Xamarin.iOS/Xamarin.Mac.
2626
[assembly: Preserve(AllMembers = true)]
2727

28-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy")]
29-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.TestHelpers")]
30-
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.Tests")]
31-
[assembly: InternalsVisibleTo("MongoDB.Driver.Tests")]
32-
[assembly: InternalsVisibleTo("MongoDB.Driver.TestHelpers")]
33-
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
34-
[assembly: InternalsVisibleTo("MongoDB.Driver.Benchmarks")]
28+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
29+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.TestHelpers, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
30+
[assembly: InternalsVisibleTo("MongoDB.Driver.Legacy.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
31+
[assembly: InternalsVisibleTo("MongoDB.Driver.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
32+
[assembly: InternalsVisibleTo("MongoDB.Driver.TestHelpers, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
33+
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
34+
[assembly: InternalsVisibleTo("MongoDB.Driver.Benchmarks, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
35+
[assembly: InternalsVisibleTo("MongoDB.Analyzer.MQLGenerator, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
3536

‎tests/BuildProps/Tests.Build.props

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<StandardTargetFrameworks>netstandard2.0;netstandard2.1</StandardTargetFrameworks>
1212
<StandardTargetFrameworks Condition="'$(IsWindows)'=='true'">$(StandardTargetFrameworks);net472</StandardTargetFrameworks>
1313
<IsPackable>false</IsPackable>
14+
<SignAssembly>true</SignAssembly>
15+
<AssemblyOriginatorKeyFile>..\..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>
1416
</PropertyGroup>
1517

1618
<PropertyGroup>

‎tests/MongoDB.Bson.Tests/Jira/CSharp515Tests.cs

-7
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,7 @@ public S(IList<T> list)
4343
}
4444
}
4545

46-
#if NET472
47-
private static readonly AssemblyName __assemblyName = Assembly.GetExecutingAssembly().GetName();
48-
private static readonly bool __assemblyIsSigned = __assemblyName.GetPublicKey().Length > 0;
49-
private static readonly string __discriminatorAssemblyName = __assemblyIsSigned ? __assemblyName.FullName : __assemblyName.Name;
50-
#else
5146
private static readonly string __discriminatorAssemblyName = "MongoDB.Bson.Tests";
52-
#endif
53-
5447
private string _jsonTemplate = ("{ '_id' : 1, 'R' : #V, 'S' : #V, 'RS' : { '_t' : 'S`1', '_v' : #V }, 'OR' : { '_t' : 'System.Collections.ObjectModel.ReadOnlyCollection`1[System.Int32]', '_v' : #V }, 'OS' : { '_t' : 'MongoDB.Bson.Tests.Jira.CSharp515.CSharp515Tests+S`1[System.Int32], " + __discriminatorAssemblyName + "', '_v' : #V } }").Replace("'", "\"");
5548

5649
[Fact]

0 commit comments

Comments
 (0)