Index: Ringtoets.sln =================================================================== diff -u -r6fa2894cc05c07064f544e3f61c53d5611845340 -r9c07cee1e1a14a24e2d949bf9b32f294f0988f1f --- Ringtoets.sln (.../Ringtoets.sln) (revision 6fa2894cc05c07064f544e3f61c53d5611845340) +++ Ringtoets.sln (.../Ringtoets.sln) (revision 9c07cee1e1a14a24e2d949bf9b32f294f0988f1f) @@ -1472,11 +1472,6 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.IO.TestUtil.Test", "Ringtoets\Common\test\Ringtoets.Common.IO.TestUtil.Test\Ringtoets.Common.IO.TestUtil.Test.csproj", "{2F270B08-018A-44A7-875A-3E9B4DC3294A}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.IO.TestUtil", "Ringtoets\Common\test\Ringtoets.Common.IO.TestUtil\Ringtoets.Common.IO.TestUtil.csproj", "{33508D7C-1602-4C0D-8503-73AAE98C19E5}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} @@ -3717,14 +3712,6 @@ {3DEC1E30-0804-4BC9-8D04-4D7B4854E21B}.Release|x86.Build.0 = Release|x86 {3DEC1E30-0804-4BC9-8D04-4D7B4854E21B}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {3DEC1E30-0804-4BC9-8D04-4D7B4854E21B}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.CreateInstaller|x86.ActiveCfg = Release|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.Debug|x86.ActiveCfg = Debug|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.Debug|x86.Build.0 = Debug|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.Release|x86.ActiveCfg = Release|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.Release|x86.Build.0 = Release|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {2F270B08-018A-44A7-875A-3E9B4DC3294A}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {33508D7C-1602-4C0D-8503-73AAE98C19E5}.CreateInstaller|x86.ActiveCfg = Release|x86 {33508D7C-1602-4C0D-8503-73AAE98C19E5}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 {33508D7C-1602-4C0D-8503-73AAE98C19E5}.Debug|x86.ActiveCfg = Debug|x86 @@ -4055,7 +4042,6 @@ {408F6A6B-7BF7-4F59-A5D4-893A777921D3} = {EE8D5A6C-4871-452A-A69B-F04E374D715E} {AA3AB46F-1664-40C4-A620-A12513184BD4} = {79419C3E-046C-4DC1-8C69-F14911F22C75} {3DEC1E30-0804-4BC9-8D04-4D7B4854E21B} = {1C1E8754-CF61-4858-9CEE-3E5DE344474F} - {2F270B08-018A-44A7-875A-3E9B4DC3294A} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F} {33508D7C-1602-4C0D-8503-73AAE98C19E5} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F} EndGlobalSection GlobalSection(TextTemplating) = postSolution Index: Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs =================================================================== diff -u -r19c6f79760da1309b849ed421990431f969c4f78 -r9c07cee1e1a14a24e2d949bf9b32f294f0988f1f --- Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs (.../CalculationConfigurationReader.cs) (revision 19c6f79760da1309b849ed421990431f969c4f78) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs (.../CalculationConfigurationReader.cs) (revision 9c07cee1e1a14a24e2d949bf9b32f294f0988f1f) @@ -167,14 +167,11 @@ throw new ArgumentException($"'{nameof(mainSchemaDefinition)}' does not reference the default schema '{defaultSchemaName}'."); } - var combinedXmlSchemaDefinition = new CombinedXmlSchemaDefinition( - mainSchemaDefinition, - nestedSchemaDefinitions.Concat(new[] - { - new KeyValuePair(defaultSchemaName, Resources.ConfiguratieSchema) - }) - .ToDictionary(kv => kv.Key, kv => kv.Value)); + IDictionary extendedNestedSchemaDefinitions = new Dictionary(nestedSchemaDefinitions); + extendedNestedSchemaDefinitions.Add(defaultSchemaName, Resources.ConfiguratieSchema); + var combinedXmlSchemaDefinition = new CombinedXmlSchemaDefinition(mainSchemaDefinition, extendedNestedSchemaDefinitions); + try { combinedXmlSchemaDefinition.Validate(document); Fisheye: Tag 9c07cee1e1a14a24e2d949bf9b32f294f0988f1f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9c07cee1e1a14a24e2d949bf9b32f294f0988f1f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/Ringtoets.Common.IO.TestUtil.Test.csproj'. Fisheye: No comparison available. Pass `N' to diff?