Skip to content

Commit

Permalink
Rename MARVIN to MORYX usings and namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbeuchler
dbeuchler committed Jun 30, 2020
1 parent 2970648 commit 36d5f6c
Show file tree
Hide file tree
Showing 970 changed files with 2,930 additions and 2,467 deletions.
2 changes: 1 addition & 1 deletion GlobalAssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyProduct("MARVIN Platform")]
[assembly: AssemblyProduct("MORYX Platform")]
[assembly: AssemblyCompany("PHOENIX CONTACT")]
[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT 2020")]
[assembly: AssemblyTrademark("")]
Expand Down
83 changes: 37 additions & 46 deletions MoryxPlatform.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ VisualStudioVersion = 16.0.29905.134
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartProject", "src\StartProject\StartProject.csproj", "{8441A356-C5A8-41B4-B7EE-D0411664D8AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marvin.Runtime", "src\Marvin.Runtime\Marvin.Runtime.csproj", "{92777E64-9978-40AE-8B90-93ECBBBEFE67}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime", "src\Moryx.Runtime\Moryx.Runtime.csproj", "{92777E64-9978-40AE-8B90-93ECBBBEFE67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Runtime.Kernel", "src\Marvin.Runtime.Kernel\Marvin.Runtime.Kernel.csproj", "{8FF77F62-43C3-40FE-9DFE-01A53FE8A68E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.Kernel", "src\Moryx.Runtime.Kernel\Moryx.Runtime.Kernel.csproj", "{8FF77F62-43C3-40FE-9DFE-01A53FE8A68E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Runtime.Maintenance", "src\Marvin.Runtime.Maintenance\Marvin.Runtime.Maintenance.csproj", "{EB039D46-906F-44BF-AC37-B3B3634A4442}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.Maintenance", "src\Moryx.Runtime.Maintenance\Moryx.Runtime.Maintenance.csproj", "{EB039D46-906F-44BF-AC37-B3B3634A4442}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Runtime.Kernel.Tests", "src\Tests\Marvin.Runtime.Kernel.Tests\Marvin.Runtime.Kernel.Tests.csproj", "{0F2C9C4B-E9B7-43DD-9B25-72402E583D90}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.Kernel.Tests", "src\Tests\Moryx.Runtime.Kernel.Tests\Moryx.Runtime.Kernel.Tests.csproj", "{0F2C9C4B-E9B7-43DD-9B25-72402E583D90}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Runtime.SystemTests", "src\Tests\Marvin.Runtime.SystemTests\Marvin.Runtime.SystemTests.csproj", "{B47E0CB5-A3EC-4ED6-BCBF-9E3BEA6ABF5D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.SystemTests", "src\Tests\Moryx.Runtime.SystemTests\Moryx.Runtime.SystemTests.csproj", "{B47E0CB5-A3EC-4ED6-BCBF-9E3BEA6ABF5D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.DependentTestModule", "src\DependentTestModule\Marvin.DependentTestModule.csproj", "{D8344B1F-9DB3-4E85-9195-6FFFECBF6427}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.DependentTestModule", "src\DependentTestModule\Moryx.DependentTestModule.csproj", "{D8344B1F-9DB3-4E85-9195-6FFFECBF6427}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.TestModule", "src\TestModule\Marvin.TestModule.csproj", "{24ED97AD-6D04-4DC0-AFCB-C911EF0AA738}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestModule", "src\TestModule\Moryx.TestModule.csproj", "{24ED97AD-6D04-4DC0-AFCB-C911EF0AA738}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Tools.Wcf.SystemTests", "src\Tests\Marvin.Tools.Wcf.SystemTests\Marvin.Tools.Wcf.SystemTests.csproj", "{74D4C6FE-2E58-4F31-A915-6CF061C0149B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Tools.Wcf.SystemTests", "src\Tests\Moryx.Tools.Wcf.SystemTests\Moryx.Tools.Wcf.SystemTests.csproj", "{74D4C6FE-2E58-4F31-A915-6CF061C0149B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SystemTests", "SystemTests", "{63266199-BAA4-4463-998A-240E130A197D}"
EndProject
Expand All @@ -29,63 +29,63 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{10B4B5A2
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestTools", "TestTools", "{953AAE25-26C8-4A28-AB08-61BAFE41B22F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.TestTools.UnitTest", "src\Marvin.TestTools.UnitTest\Marvin.TestTools.UnitTest.csproj", "{505DF475-5FF5-47CC-9E3B-BBE16C359F0E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestTools.UnitTest", "src\Moryx.TestTools.UnitTest\Moryx.TestTools.UnitTest.csproj", "{505DF475-5FF5-47CC-9E3B-BBE16C359F0E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Container.TestPlugin", "src\Tests\Marvin.Container.TestPlugin\Marvin.Container.TestPlugin.csproj", "{DD4163B4-1696-4554-961E-DE2A3EB21ECE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Container.TestPlugin", "src\Tests\Moryx.Container.TestPlugin\Moryx.Container.TestPlugin.csproj", "{DD4163B4-1696-4554-961E-DE2A3EB21ECE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Container.TestRootPlugin", "src\Tests\Marvin.Container.TestRootPlugin\Marvin.Container.TestRootPlugin.csproj", "{7615C9F0-91F1-4E05-A424-6D083B8958C5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Container.TestRootPlugin", "src\Tests\Moryx.Container.TestRootPlugin\Moryx.Container.TestRootPlugin.csproj", "{7615C9F0-91F1-4E05-A424-6D083B8958C5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{DAE7DCE8-AB9B-46A8-808D-6C6C0AAB75A2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Model", "src\Marvin.Model\Marvin.Model.csproj", "{478DC949-A0B2-46B4-8645-A7DA92589B76}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Model", "src\Moryx.Model\Moryx.Model.csproj", "{478DC949-A0B2-46B4-8645-A7DA92589B76}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTests", "IntegrationTests", "{8517D209-5BC1-47BD-A7C7-9CF9ADD9F5B6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Communication.Sockets.IntegrationTests", "src\Tests\Marvin.Communication.Sockets.IntegrationTests\Marvin.Communication.Sockets.IntegrationTests.csproj", "{FD2AA3C3-F434-4D4F-88C8-3774B48E1D9D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Communication.Sockets.IntegrationTests", "src\Tests\Moryx.Communication.Sockets.IntegrationTests\Moryx.Communication.Sockets.IntegrationTests.csproj", "{FD2AA3C3-F434-4D4F-88C8-3774B48E1D9D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Container.TestTools", "src\Tests\Marvin.Container.TestTools\Marvin.Container.TestTools.csproj", "{B72AA993-72E5-4D14-BF5E-C2E0E8CF5186}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Container.TestTools", "src\Tests\Moryx.Container.TestTools\Moryx.Container.TestTools.csproj", "{B72AA993-72E5-4D14-BF5E-C2E0E8CF5186}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{0A466330-6ED6-4861-9C94-31B1949CDDB9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Tools.Wcf.Tests", "src\Tests\Marvin.Tools.Wcf.Tests\Marvin.Tools.Wcf.Tests.csproj", "{A4CA7B7C-5417-4FA9-9E0B-76D4CD4663C9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Tools.Wcf.Tests", "src\Tests\Moryx.Tools.Wcf.Tests\Moryx.Tools.Wcf.Tests.csproj", "{A4CA7B7C-5417-4FA9-9E0B-76D4CD4663C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.TestTools.SystemTest", "src\Marvin.TestTools.SystemTest\Marvin.TestTools.SystemTest.csproj", "{D6DC00C6-9358-4839-84C0-44DF018A74DC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestTools.SystemTest", "src\Moryx.TestTools.SystemTest\Moryx.TestTools.SystemTest.csproj", "{D6DC00C6-9358-4839-84C0-44DF018A74DC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Tools.Wcf", "src\Marvin.Tools.Wcf\Marvin.Tools.Wcf.csproj", "{05761BAE-8649-470D-9A8A-5C7E9D1A2F3A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Tools.Wcf", "src\Moryx.Tools.Wcf\Moryx.Tools.Wcf.csproj", "{05761BAE-8649-470D-9A8A-5C7E9D1A2F3A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ManualTests", "ManualTests", "{A9C375AE-201D-46CE-9282-387026C0B2F6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{DE7526FF-6D25-4643-9AA3-C24253901C8C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Runtime.Tests", "src\Tests\Marvin.Runtime.Tests\Marvin.Runtime.Tests.csproj", "{7448728C-9965-4874-A2E9-7BAB37E42963}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.Tests", "src\Tests\Moryx.Runtime.Tests\Moryx.Runtime.Tests.csproj", "{7448728C-9965-4874-A2E9-7BAB37E42963}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Model.Tests", "src\Tests\Marvin.Model.Tests\Marvin.Model.Tests.csproj", "{BA61840C-9E77-4454-88E2-7CA4E98EE4BD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Model.Tests", "src\Tests\Moryx.Model.Tests\Moryx.Model.Tests.csproj", "{BA61840C-9E77-4454-88E2-7CA4E98EE4BD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Model", "Model", "{74112169-6672-4907-A187-F055111940A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Model.PostgreSQL", "src\Marvin.Model.PostgreSQL\Marvin.Model.PostgreSQL.csproj", "{70964330-F80E-4E1E-A33B-2021BDE37B2F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Model.PostgreSQL", "src\Moryx.Model.PostgreSQL\Moryx.Model.PostgreSQL.csproj", "{70964330-F80E-4E1E-A33B-2021BDE37B2F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Model.InMemory", "src\Marvin.Model.InMemory\Marvin.Model.InMemory.csproj", "{A734BE85-33DC-4117-BD9C-B5D5B31102E3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Model.InMemory", "src\Moryx.Model.InMemory\Moryx.Model.InMemory.csproj", "{A734BE85-33DC-4117-BD9C-B5D5B31102E3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlTest", "src\Tests\NpgsqlTest\NpgsqlTest.csproj", "{C48A8596-6AE0-457D-987D-2FA3C9B51751}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.TestTools.Test.Model", "src\Marvin.TestTools.Test.Model\Marvin.TestTools.Test.Model.csproj", "{29F12AD7-18DC-4DC3-B97F-BC773AC4C0EB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestTools.Test.Model", "src\Moryx.TestTools.Test.Model\Moryx.TestTools.Test.Model.csproj", "{29F12AD7-18DC-4DC3-B97F-BC773AC4C0EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.TestTools.Test.Inheritance.Model", "src\Marvin.TestTools.Test.Inheritance.Model\Marvin.TestTools.Test.Inheritance.Model.csproj", "{CBF4C42B-488D-44AF-9C60-3CD2C2AA955E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestTools.Test.Inheritance.Model", "src\Moryx.TestTools.Test.Inheritance.Model\Moryx.TestTools.Test.Inheritance.Model.csproj", "{CBF4C42B-488D-44AF-9C60-3CD2C2AA955E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marvin", "src\Marvin\Marvin.csproj", "{7CD728A5-8FDD-4178-9CA4-3CD37512DA24}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx", "src\Moryx\Moryx.csproj", "{7CD728A5-8FDD-4178-9CA4-3CD37512DA24}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marvin.Tests", "src\Tests\Marvin.Tests\Marvin.Tests.csproj", "{9CA8EB0B-E8F3-49B4-9948-92A36F32F334}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Tests", "src\Tests\Moryx.Tests\Moryx.Tests.csproj", "{9CA8EB0B-E8F3-49B4-9948-92A36F32F334}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marvin.Container", "src\Marvin.Container\Marvin.Container.csproj", "{9DEDE968-06EB-4339-8C82-28B418BA1A44}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Container", "src\Moryx.Container\Moryx.Container.csproj", "{9DEDE968-06EB-4339-8C82-28B418BA1A44}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marvin.Container.Tests", "src\Tests\Marvin.Container.Tests\Marvin.Container.Tests.csproj", "{4FBD4612-B024-4991-BDD5-2BF980D124EA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Container.Tests", "src\Tests\Moryx.Container.Tests\Moryx.Container.Tests.csproj", "{4FBD4612-B024-4991-BDD5-2BF980D124EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marvin.Workflows.Benchmark", "src\Tests\Marvin.Workflows.Benchmark\Marvin.Workflows.Benchmark.csproj", "{91EEF547-A6B5-449F-BF2A-BF8C09D0477E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Workflows.Benchmark", "src\Tests\Moryx.Workflows.Benchmark\Moryx.Workflows.Benchmark.csproj", "{91EEF547-A6B5-449F-BF2A-BF8C09D0477E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marvin.Communication.Serial", "src\Marvin.Communication.Serial\Marvin.Communication.Serial.csproj", "{8C6AF3D0-23C5-4EAD-8831-3EC36BBA01DD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Communication.Serial", "src\Moryx.Communication.Serial\Moryx.Communication.Serial.csproj", "{8C6AF3D0-23C5-4EAD-8831-3EC36BBA01DD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marvin.Runtime.WinService", "src\Marvin.Runtime.WinService\Marvin.Runtime.WinService.csproj", "{45BF2368-B7C9-42A1-9587-F3B3EADE4A67}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.WinService", "src\Moryx.Runtime.WinService\Moryx.Runtime.WinService.csproj", "{45BF2368-B7C9-42A1-9587-F3B3EADE4A67}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -667,24 +667,15 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{92777E64-9978-40AE-8B90-93ECBBBEFE67} = {2ECB09EF-EDF2-4D2C-A8AE-893875726563}
{12DBB67A-E0A8-413A-8C1B-A4CAE57A9AFB} = {2ECB09EF-EDF2-4D2C-A8AE-893875726563}
{8FF77F62-43C3-40FE-9DFE-01A53FE8A68E} = {2ECB09EF-EDF2-4D2C-A8AE-893875726563}
{2ECB09EF-EDF2-4D2C-A8AE-893875726563} = {7DCDBDA5-4163-41EA-B24E-9316DFB9F354}
{06BE0C35-02E3-4853-85BC-3D931345745D} = {7DCDBDA5-4163-41EA-B24E-9316DFB9F354}
{3331E7CC-0FFE-4D19-ACEF-3C4A3C2333DC} = {7DCDBDA5-4163-41EA-B24E-9316DFB9F354}
{7448728C-9965-4874-A2E9-7BAB37E42963} = {3DEA9999-9C7A-43BA-BD54-78AF8BB386D6}
{EB039D46-906F-44BF-AC37-B3B3634A4442} = {06BE0C35-02E3-4853-85BC-3D931345745D}
{0F2C9C4B-E9B7-43DD-9B25-72402E583D90} = {3DEA9999-9C7A-43BA-BD54-78AF8BB386D6}
{92777E64-9978-40AE-8B90-93ECBBBEFE67} = {7DCDBDA5-4163-41EA-B24E-9316DFB9F354}
{8FF77F62-43C3-40FE-9DFE-01A53FE8A68E} = {7DCDBDA5-4163-41EA-B24E-9316DFB9F354}
{EB039D46-906F-44BF-AC37-B3B3634A4442} = {DE7526FF-6D25-4643-9AA3-C24253901C8C}
{0F2C9C4B-E9B7-43DD-9B25-72402E583D90} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
{B47E0CB5-A3EC-4ED6-BCBF-9E3BEA6ABF5D} = {63266199-BAA4-4463-998A-240E130A197D}
{D8344B1F-9DB3-4E85-9195-6FFFECBF6427} = {DAE7DCE8-AB9B-46A8-808D-6C6C0AAB75A2}
{24ED97AD-6D04-4DC0-AFCB-C911EF0AA738} = {DAE7DCE8-AB9B-46A8-808D-6C6C0AAB75A2}
{74D4C6FE-2E58-4F31-A915-6CF061C0149B} = {63266199-BAA4-4463-998A-240E130A197D}
{63266199-BAA4-4463-998A-240E130A197D} = {3331E7CC-0FFE-4D19-ACEF-3C4A3C2333DC}
{3DEA9999-9C7A-43BA-BD54-78AF8BB386D6} = {3331E7CC-0FFE-4D19-ACEF-3C4A3C2333DC}
{3BC04A3B-24D6-4E33-989D-33366C47DC48} = {93899710-0B27-4CC5-95F4-71223862F2C9}
{3F2A7079-D56B-439C-A980-FA479364EDCD} = {93899710-0B27-4CC5-95F4-71223862F2C9}
{10B4B5A2-3914-48B9-9304-C31338A6D980} = {93899710-0B27-4CC5-95F4-71223862F2C9}
{63266199-BAA4-4463-998A-240E130A197D} = {10B4B5A2-3914-48B9-9304-C31338A6D980}
{505DF475-5FF5-47CC-9E3B-BBE16C359F0E} = {953AAE25-26C8-4A28-AB08-61BAFE41B22F}
{DD4163B4-1696-4554-961E-DE2A3EB21ECE} = {DAE7DCE8-AB9B-46A8-808D-6C6C0AAB75A2}
{7615C9F0-91F1-4E05-A424-6D083B8958C5} = {DAE7DCE8-AB9B-46A8-808D-6C6C0AAB75A2}
Expand All @@ -710,8 +701,8 @@ Global
{45BF2368-B7C9-42A1-9587-F3B3EADE4A67} = {7DCDBDA5-4163-41EA-B24E-9316DFB9F354}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
RESX_TaskErrorCategory = Message
RESX_ShowErrorsInErrorList = True
SolutionGuid = {36EFC961-F4E7-49DC-A36A-99594FFB8243}
RESX_ShowErrorsInErrorList = True
RESX_TaskErrorCategory = Message
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions MoryxPlatform.sln.DotSettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=browsable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=initializable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=initializables/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=MORYX/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Npgsql/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Postgre/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Workflows/@EntryIndexedValue">True</s:Boolean>
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

MARVIN Platform
MORYX Platform
===============
Copyright (c) 2012-2020, Phoenix Contact GmbH & Co. KG

Expand Down
Loading

0 comments on commit 36d5f6c

Please sign in to comment.