Index: Riskeer.sln =================================================================== diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r781a97409ffc49e5b666a7856f633f46178056df --- Riskeer.sln (.../Riskeer.sln) (revision 434415295de74c310ce6d3cdd0100c28838cf9ea) +++ Riskeer.sln (.../Riskeer.sln) (revision 781a97409ffc49e5b666a7856f633f46178056df) @@ -243,11 +243,6 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Integration.Test", "Core\Common\test\Core.Common.Integration.Test\Core.Common.Integration.Test.csproj", "{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Application.Riskeer.Setup", "Application\Riskeer\src\Application.Riskeer.Setup\Application.Riskeer.Setup.wixproj", "{3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Base.Test", "Core\Common\test\Core.Common.Base.Test\Core.Common.Base.Test.csproj", "{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}" @@ -260,11 +255,6 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Gui.Test", "Core\Common\test\Core.Common.Gui.Test\Core.Common.Gui.Test.csproj", "{D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{11FE8C37-49EB-4FF2-8583-DABC9816FFC8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{14E296C8-B6B9-458A-A402-68E8A0F9B97C}" @@ -316,11 +306,6 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Gui.TestUtil", "Core\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj", "{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Controls.Test", "Core\Common\test\Core.Common.Controls.Test\Core.Common.Controls.Test.csproj", "{A8CE1456-1880-4FC8-84B3-D618EA88F384}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} @@ -1770,9 +1755,14 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Gui", "Core\Gui\src\Core.Gui\Core.Gui.csproj", "{FE63A65E-C5AF-456D-A786-912F9B7E26A1}" ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Gui.Test", "Core\Gui\test\Core.Gui.Test\Core.Gui.Test.csproj", "{D0C7032E-5730-46D1-A06F-7C4F06BA590A}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -1918,12 +1908,6 @@ {D783543B-46A1-4848-A812-AF5A5259ED7E}.Release|x86.Build.0 = Release|x86 {D783543B-46A1-4848-A812-AF5A5259ED7E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {D783543B-46A1-4848-A812-AF5A5259ED7E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.Debug|x86.ActiveCfg = Debug|x86 - {A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.Debug|x86.Build.0 = Debug|x86 - {A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.Release|x86.ActiveCfg = Release|x86 - {A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.Release|x86.Build.0 = Release|x86 - {A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}.Debug|x86.ActiveCfg = Debug|x86 {3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}.Release|x86.ActiveCfg = Release|x86 {3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}.ReleaseForCodeCoverage|x86.ActiveCfg = Release|x86 @@ -1939,12 +1923,6 @@ {813FFA92-1F3F-462B-B596-5919334007A9}.Release|x86.Build.0 = Release|x86 {813FFA92-1F3F-462B-B596-5919334007A9}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {813FFA92-1F3F-462B-B596-5919334007A9}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}.Debug|x86.ActiveCfg = Debug|x86 - {D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}.Debug|x86.Build.0 = Debug|x86 - {D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}.Release|x86.ActiveCfg = Release|x86 - {D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}.Release|x86.Build.0 = Release|x86 - {D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {11F1F874-45AF-43E4-8AE5-15A5C9593E28}.Debug|x86.ActiveCfg = Debug|x86 {11F1F874-45AF-43E4-8AE5-15A5C9593E28}.Debug|x86.Build.0 = Debug|x86 {11F1F874-45AF-43E4-8AE5-15A5C9593E28}.Release|x86.ActiveCfg = Release|x86 @@ -1999,12 +1977,6 @@ {D4200F43-3F72-4F42-AF0A-8CED416A38EC}.Release|x86.Build.0 = Release|x86 {D4200F43-3F72-4F42-AF0A-8CED416A38EC}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {D4200F43-3F72-4F42-AF0A-8CED416A38EC}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}.Debug|x86.ActiveCfg = Debug|x86 - {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}.Debug|x86.Build.0 = Debug|x86 - {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}.Release|x86.ActiveCfg = Release|x86 - {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}.Release|x86.Build.0 = Release|x86 - {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {A8CE1456-1880-4FC8-84B3-D618EA88F384}.Debug|x86.ActiveCfg = Debug|x86 {A8CE1456-1880-4FC8-84B3-D618EA88F384}.Debug|x86.Build.0 = Debug|x86 {A8CE1456-1880-4FC8-84B3-D618EA88F384}.Release|x86.ActiveCfg = Release|x86 @@ -3601,6 +3573,12 @@ {FE63A65E-C5AF-456D-A786-912F9B7E26A1}.Release|x86.Build.0 = Release|x86 {FE63A65E-C5AF-456D-A786-912F9B7E26A1}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {FE63A65E-C5AF-456D-A786-912F9B7E26A1}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 + {D0C7032E-5730-46D1-A06F-7C4F06BA590A}.Debug|x86.ActiveCfg = Debug|x86 + {D0C7032E-5730-46D1-A06F-7C4F06BA590A}.Debug|x86.Build.0 = Debug|x86 + {D0C7032E-5730-46D1-A06F-7C4F06BA590A}.Release|x86.ActiveCfg = Release|x86 + {D0C7032E-5730-46D1-A06F-7C4F06BA590A}.Release|x86.Build.0 = Release|x86 + {D0C7032E-5730-46D1-A06F-7C4F06BA590A}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 + {D0C7032E-5730-46D1-A06F-7C4F06BA590A}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3641,11 +3619,9 @@ {E4B0E068-F1A3-47BA-965F-0EC1E78E530A} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {9A5C8069-520E-49D3-AA62-E8FB19614A27} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {D783543B-46A1-4848-A812-AF5A5259ED7E} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} - {A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531} {3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E} = {39EB5D07-C076-484C-9621-B34C4E5BF64C} {FAFDB463-9612-41F4-B3DD-FF9C6E7023BA} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531} {813FFA92-1F3F-462B-B596-5919334007A9} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} - {D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531} {11FE8C37-49EB-4FF2-8583-DABC9816FFC8} = {05D133D6-D7D8-4872-9B53-2753DD3F8BF9} {14E296C8-B6B9-458A-A402-68E8A0F9B97C} = {11FE8C37-49EB-4FF2-8583-DABC9816FFC8} {88E04195-C43E-40D3-B5F2-3A25E1E79E03} = {11FE8C37-49EB-4FF2-8583-DABC9816FFC8} @@ -3658,7 +3634,6 @@ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB} = {88E04195-C43E-40D3-B5F2-3A25E1E79E03} {886FDBE5-7065-4AB9-A894-869DBFD4E440} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F} {D4200F43-3F72-4F42-AF0A-8CED416A38EC} = {0590D3BB-EB3E-4B53-BD64-1725E1CBB1F4} - {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531} {A8CE1456-1880-4FC8-84B3-D618EA88F384} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531} {7BABA02F-4809-43D2-93E5-DA9ED69BDDE2} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F} {1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E} @@ -3985,6 +3960,7 @@ {8BE49C65-DD09-4890-82B1-5216BF13E757} = {94E919CC-F375-485D-A849-3CE3FCC9B2C3} {F73AF5D7-DDD9-4A48-A171-037817B59056} = {94E919CC-F375-485D-A849-3CE3FCC9B2C3} {FE63A65E-C5AF-456D-A786-912F9B7E26A1} = {8BE49C65-DD09-4890-82B1-5216BF13E757} + {D0C7032E-5730-46D1-A06F-7C4F06BA590A} = {F73AF5D7-DDD9-4A48-A171-037817B59056} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {039D31AA-B517-4354-B8CD-0B2B826D0B1F}