Remove use of InternalsVisibleTo
Ensure the tests validate the correct error code is sent, not that the correct internal variable was used return the error code.
Rob Mensching committed
Feb 14, 2022 at 13:52 UTC
18c8a4eedb907b56abdd92963fffde9f59e9dae2
3 files changed
+5
-17
src/wix/WixToolset.Core/WixToolset.Core.csproj
-12
@@ -14,18 +14,6 @@
14
<GitThisAssembly>true</GitThisAssembly>
15
</PropertyGroup>
16
17
- <ItemGroup>
18
- <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
19
- <_Parameter1>WixToolset.Core.TestPackage, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a9967ec28982f42ee51a47dd5204315975a6ed69294b982146a99a70130a2fa13e226aaddde14c17d1bf3af69e8956d69a86585e74d208efcc5ac98a0686055327b2e87960d3c39bf3a6bc1e572863327d19dbf4fd2616dda124dbea260755a2d1d39d3cf1049ea526493eb2bf996b8ad985e3012308529e5b9b0f5cd5fa04bd</_Parameter1>
20
- </AssemblyAttribute>
21
- <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
22
- <_Parameter1>WixToolsetTest.Core.Burn, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a9967ec28982f42ee51a47dd5204315975a6ed69294b982146a99a70130a2fa13e226aaddde14c17d1bf3af69e8956d69a86585e74d208efcc5ac98a0686055327b2e87960d3c39bf3a6bc1e572863327d19dbf4fd2616dda124dbea260755a2d1d39d3cf1049ea526493eb2bf996b8ad985e3012308529e5b9b0f5cd5fa04bd</_Parameter1>
23
- </AssemblyAttribute>
24
- <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
25
- <_Parameter1>WixToolsetTest.CoreIntegration, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a9967ec28982f42ee51a47dd5204315975a6ed69294b982146a99a70130a2fa13e226aaddde14c17d1bf3af69e8956d69a86585e74d208efcc5ac98a0686055327b2e87960d3c39bf3a6bc1e572863327d19dbf4fd2616dda124dbea260755a2d1d39d3cf1049ea526493eb2bf996b8ad985e3012308529e5b9b0f5cd5fa04bd</_Parameter1>
26
- </AssemblyAttribute>
27
- </ItemGroup>
28
-
17
<ItemGroup>
18
<ProjectReference Include="..\WixToolset.Core.Native\WixToolset.Core.Native.csproj" />
19
</ItemGroup>
src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+4
-4
@@ -441,7 +441,7 @@ namespace WixToolsetTest.CoreIntegration
441
"-o", exePath,
442
});
443
444
- Assert.Equal((int)LinkerErrors.Ids.OrphanedPayload, result.ExitCode);
444
+ Assert.Equal(7000, result.ExitCode);
445
}
446
}
447
@@ -468,7 +468,7 @@ namespace WixToolsetTest.CoreIntegration
468
"-o", exePath,
469
});
470
471
- Assert.Equal((int)LinkerErrors.Ids.PackageInMultipleContainers, result.ExitCode);
471
+ Assert.Equal(7001, result.ExitCode);
472
}
473
}
474
@@ -494,7 +494,7 @@ namespace WixToolsetTest.CoreIntegration
494
"-o", exePath,
495
});
496
497
- Assert.Equal((int)LinkerErrors.Ids.UnscheduledChainPackage, result.ExitCode);
497
+ Assert.Equal(7003, result.ExitCode);
498
}
499
}
500
@@ -520,7 +520,7 @@ namespace WixToolsetTest.CoreIntegration
520
"-o", exePath,
521
});
522
523
- Assert.Equal((int)LinkerErrors.Ids.UnscheduledRollbackBoundary, result.ExitCode);
523
+ Assert.Equal(7004, result.ExitCode);
524
}
525
}
526
}
src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
+1
-1
@@ -140,7 +140,7 @@ namespace WixToolsetTest.CoreIntegration
140
"-o", bundlePath,
141
});
142
143
- Assert.Equal((int)LinkerErrors.Ids.PayloadSharedWithBA, result.ExitCode);
143
+ Assert.Equal(7002, result.ExitCode);
144
}
145
}
146