mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2137 from dotnet/pakrym/redirects

Browse source 
Handle duplicated assemblies in binding redirects
This commit is contained in:
Pavel Krymets 2016-03-30 15:35:15 -07:00
commit d3289d916f
4 changed files with 93 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

59
test/dotnet-compile.UnitTests/BindingRedirectGeneratorTests.cs Normal file
View file

@ -0,0 +1,59 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.DotNet.Cli.Compiler.Common;
using Xunit;
using FluentAssertions;
using AssemblyReferenceInfo = Microsoft.DotNet.Cli.Compiler.Common.BindingRedirectGenerator.AssemblyReferenceInfo;
using AssemblyIdentity = Microsoft.DotNet.Cli.Compiler.Common.BindingRedirectGenerator.AssemblyIdentity;
namespace Microsoft.DotNet.Tools.Compiler.Tests
{
public class BindingRedirectGeneratorTests
{
[Fact]
public void ResolvesDuplicatesUsingFirstOccurence()
{
var hash = "01234qwerty";
var redirects = BindingRedirectGenerator.CollectRedirects(new[]
{
new AssemblyReferenceInfo(
new AssemblyIdentity("A", new Version(1, 5), "en-US", hash),
new []
{
new AssemblyIdentity("B", new Version(1, 1), "en-US", hash),
}
),
new AssemblyReferenceInfo(
new AssemblyIdentity("B", new Version(1, 4), "en-US", hash), new AssemblyIdentity[] {}
),
new AssemblyReferenceInfo(
new AssemblyIdentity("B", new Version(1, 5), "en-US", hash), new AssemblyIdentity[] {}
),
new AssemblyReferenceInfo(
new AssemblyIdentity("C", new Version(1, 5), "en-US", hash),
new []
{
new AssemblyIdentity("B", new Version(1, 3), "en-US", hash),
}
)
});
redirects.Should().HaveCount(2);
redirects.Should().Contain(r =>
r.From.Version == new Version(1, 1) &&
r.From.Name == "B" &&
r.To.Version == new Version(1, 4) &&
r.To.Name == "B"
);
redirects.Should().Contain(r =>
r.From.Version == new Version(1, 3) &&
r.From.Name == "B" &&
r.To.Version == new Version(1, 4) &&
r.To.Name == "B"
);
}
}
}

6
test/dotnet-compile.UnitTests/project.json
View file

@ -1,9 +1,15 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.DotNet.Cli.Utils": {
"target": "project"
},
"Microsoft.DotNet.Compiler.Common": {
"target": "project"
},
"dotnet": {
"target": "project"
},