diff --git a/.build/BuildToolkit.ps1 b/.build/BuildToolkit.ps1 index 591868170..025e35c16 100644 --- a/.build/BuildToolkit.ps1 +++ b/.build/BuildToolkit.ps1 @@ -36,12 +36,6 @@ $global:NunitCli = "$BuildTools\NUnit.ConsoleRunner.$NunitVersion\tools\nunit3-c $global:ReportGeneratorCli = "$BuildTools\ReportGenerator.$ReportGeneratorVersion\tools\net47\ReportGenerator.exe"; $global:DocFxCli = "$BuildTools\docfx.console.$DocFxVersion\tools\docfx.exe"; -# Global Variables -$global:AssemblyVersion = ""; -$global:AssemblyFileVersion = ""; -$global:AssemblyInformationalVersion = "" -$global:PackageVersion = ""; - # Git $global:GitCommitHash = ""; @@ -106,11 +100,22 @@ function Invoke-Initialize([string]$Version = "1.0.0", [bool]$Cleanup = $False) $env:MORYX_PACKAGE_TARGET = ""; } - $global:AssemblyVersion = $Version; - $global:AssemblyFileVersion = $Version; - $global:AssemblyInformationalVersion = $Version; - $global:PackageVersion = $Version; + if (-not $env:MORYX_ASSEMBLY_VERSION) { + $env:MORYX_ASSEMBLY_VERSION = $Version; + } + + if (-not $env:MORYX_FILE_VERSION) { + $env:MORYX_FILE_VERSION = $Version; + } + + if (-not $env:MORYX_INFORMATIONAL_VERSION) { + $env:MORYX_INFORMATIONAL_VERSION = $Version; + } + if (-not $env:MORYX_PACKAGE_VERSION) { + $env:MORYX_PACKAGE_VERSION = $Version; + } + Set-Version $Version; # Printing Variables @@ -120,10 +125,6 @@ function Invoke-Initialize([string]$Version = "1.0.0", [bool]$Cleanup = $False) Write-Variable "NunitReportsDir" $NunitReportsDir; Write-Step "Printing global scope" - Write-Variable "AssemblyVersion" $global:AssemblyVersion; - Write-Variable "AssemblyFileVersion" $global:AssemblyFileVersion; - Write-Variable "AssemblyInformationalVersion" $global:AssemblyInformationalVersion; - Write-Variable "PackageVersion" $global:PackageVersion; Write-Variable "OpenCoverCli" $global:OpenCoverCli; Write-Variable "NUnitCli" $global:NUnitCli; Write-Variable "ReportGeneratorCli" $global:ReportGeneratorCli; @@ -140,6 +141,12 @@ function Invoke-Initialize([string]$Version = "1.0.0", [bool]$Cleanup = $False) Write-Variable "MORYX_NUGET_VERBOSITY" $env:MORYX_NUGET_VERBOSITY; Write-Variable "MORYX_PACKAGE_TARGET" $env:MORYX_PACKAGE_TARGET; + Write-Variable "MORYX_ASSEMBLY_VERSION" $env:MORYX_ASSEMBLY_VERSION; + Write-Variable "MORYX_FILE_VERSION" $env:MORYX_FILE_VERSION; + Write-Variable "MORYX_INFORMATIONAL_VERSION" $env:MORYX_INFORMATIONAL_VERSION; + Write-Variable "MORYX_PACKAGE_VERSION" $env:MORYX_PACKAGE_VERSION; + + # Cleanp if ($Cleanup) { Write-Step "Cleanup" @@ -349,6 +356,15 @@ function Get-CsprojIsNetCore($csprojFile) { return $false; } +function Get-CsprojIsSdkProject($csprojFile) { + [xml]$csprojContent = Get-Content $csprojFile.FullName + $sdkProject = $csprojContent.Project.Sdk; + if ($null -ne $sdkProject) { + return $true; + } + return $false; +} + function Invoke-CoverReport { Write-Step "Creating cover report. Searching for OpenCover.xml files in $OpenCoverReportsDir." @@ -393,12 +409,41 @@ function Invoke-DocFx($Metadata = [System.IO.Path]::Combine($DocumentationDir, " CopyAndReplaceFolder $docFxDest "$DocumentationArtifcacts\DocFx"; } -function Invoke-Pack($FilePath, [bool]$IsTool = $False, [bool]$IncludeSymbols = $False) { - CreateFolderIfNotExists $NugetPackageArtifacts; +function Invoke-PackSdkProject($ProjectPath, [bool]$IsTool = $False, [bool]$IncludeSymbols = $False) { + # Check if the project should be packed + $csprojFullName = $csprojFile.FullName; + [xml]$csprojContent = Get-Content $csprojFullName + $createPackage = $csprojContent.Project.PropertyGroup.CreatePackage; +; + if ($null -eq $createPackage -or "false" -eq $createPackage) { + return; + } + + $packargs = "--output", "$NugetPackageArtifacts"; + $packargs += "--configuration", "$env:MORYX_BUILD_CONFIG"; + $packargs += "--verbosity", "$env:MORYX_NUGET_VERBOSITY"; + $packargs += "--no-build"; + + + if ($IncludeSymbols) { + $packargs += "--include-symbols"; + } + + & $global:DotNetCli pack "$csprojFullName" @packargs + Invoke-ExitCodeCheck $LastExitCode; +} + +function Invoke-PackFrameworkProject($ProjectPath, [bool]$IsTool = $False, [bool]$IncludeSymbols = $False) { + + # Check if there is a matching nuspec for the proj + $nuspecPath = [IO.Path]::ChangeExtension($ProjectPath, "nuspec") + if(-not (Test-Path $nuspecPath)) { + return; + } $packargs = "-outputdirectory", "$NugetPackageArtifacts"; $packargs += "-includereferencedprojects"; - $packargs += "-Version", "$global:PackageVersion"; + $packargs += "-Version", "$env:MORYX_PACKAGE_VERSION"; $packargs += "-Prop", "Configuration=$env:MORYX_BUILD_CONFIG"; $packargs += "-Verbosity", "$env:MORYX_NUGET_VERBOSITY"; @@ -411,24 +456,26 @@ function Invoke-Pack($FilePath, [bool]$IsTool = $False, [bool]$IncludeSymbols = } # Call nuget with default arguments plus optional - & $global:NugetCli pack "$FilePath" @packargs + & $global:NugetCli pack "$nuspecPath" @packargs Invoke-ExitCodeCheck $LastExitCode; } +function Invoke-Pack($ProjectPath, [bool]$IsTool = $False, [bool]$IncludeSymbols = $False) { + CreateFolderIfNotExists $NugetPackageArtifacts; + + if (Get-CsprojIsSdkProject($ProjectPath)) { + Invoke-PackSdkProject $ProjectPath $IsTool $IncludeSymbols; + } + else { + Invoke-PackFrameworkProject $ProjectPath $IsTool $IncludeSymbols; + } +} + function Invoke-PackAll([switch]$Symbols = $False) { - Write-Host "Looking for .nuspec files..." - # Look for nuspec in this directory - foreach ($nuspecFile in Get-ChildItem $RootPath -Recurse -Filter *.nuspec) { - $nuspecPath = $nuspecFile.FullName - Write-Host "Packing $nuspecPath" -ForegroundColor Green - - # Check if there is a matching proj for the nuspec - $projectPath = [IO.Path]::ChangeExtension($nuspecPath, "csproj") - if(Test-Path $projectPath) { - Invoke-Pack -FilePath $projectPath -IncludeSymbols $Symbols - } else { - Invoke-Pack -FilePath $nuspecPath -IncludeSymbols $Symbols - } + Write-Host "Looking for .csproj files..." + # Look for csproj in this directory + foreach ($csprojFile in Get-ChildItem $RootPath -Recurse -Filter *.csproj) { + Invoke-Pack -ProjectPath $csprojFile -IncludeSymbols $Symbols } } @@ -473,15 +520,15 @@ function Set-Version ([string]$MajorMinorPatch) { $mmp = $majorGroup.Value + "." + $minorGroup.Value + "." + $patchGroup.Value; # Check if it is a pre release - $global:AssemblyVersion = $majorGroup.Value + ".0.0.0" # 3.0.0.0 - $global:AssemblyFileVersion = $mmp + "." + $env:MORYX_BUILDNUMBER; # 3.1.2.42 + $env:MORYX_ASSEMBLY_VERSION = $majorGroup.Value + ".0.0.0" # 3.0.0.0 + $env:MORYX_FILE_VERSION = $mmp + "." + $env:MORYX_BUILDNUMBER; # 3.1.2.42 if ($preReleaseGroup.Success) { - $global:AssemblyInformationalVersion = $mmp + "-" + $preReleaseGroup.Value + "+" + $global:GitCommitHash; # 3.1.2-beta.1+d95a996ed5ba14a1421dafeb844a56ab08211ead - $global:PackageVersion = $mmp + "-" + $preReleaseGroup.Value; + $env:MORYX_INFORMATIONAL_VERSION = $mmp + "-" + $preReleaseGroup.Value + "+" + $global:GitCommitHash; # 3.1.2-beta.1+d95a996ed5ba14a1421dafeb844a56ab08211ead + $env:MORYX_PACKAGE_VERSION = $mmp + "-" + $preReleaseGroup.Value; } else { - $global:AssemblyInformationalVersion = $mmp + "+" + $global:GitCommitHash; # 3.1.2+d95a996ed5ba14a1421dafeb844a56ab08211ead - $global:PackageVersion = $mmp; + $env:MORYX_INFORMATIONAL_VERSION = $mmp + "+" + $global:GitCommitHash; # 3.1.2+d95a996ed5ba14a1421dafeb844a56ab08211ead + $env:MORYX_PACKAGE_VERSION = $mmp; } } @@ -534,16 +581,16 @@ function Set-AssemblyVersion([string]$InputFile) { exit 1; } - Write-Host "Applying assembly info of $($file.FullName) -> $global:AssemblyVersion "; + Write-Host "Applying assembly info of $($file.FullName) -> $env:MORYX_ASSEMBLY_VERSION "; $assemblyVersionPattern = 'AssemblyVersion\("[0-9]+(\.([0-9]+)){3}"\)'; - $assemblyVersion = 'AssemblyVersion("' + $global:AssemblyVersion + '")'; + $assemblyVersion = 'AssemblyVersion("' + $env:MORYX_ASSEMBLY_VERSION + '")'; $assemblyFileVersionPattern = 'AssemblyFileVersion\("[0-9]+(\.([0-9]+)){3}"\)'; - $assemblyFileVersion = 'AssemblyFileVersion("' + $global:AssemblyFileVersion + '")'; + $assemblyFileVersion = 'AssemblyFileVersion("' + $env:MORYX_FILE_VERSION + '")'; $assemblyInformationalVersionPattern = 'AssemblyInformationalVersion\("[0-9]+(\.([0-9]+)){3}"\)'; - $assemblyInformationalVersion = 'AssemblyInformationalVersion("' + $global:AssemblyInformationalVersion + '")'; + $assemblyInformationalVersion = 'AssemblyInformationalVersion("' + $env:MORYX_INFORMATIONAL_VERSION + '")'; $assemblyConfigurationPattern = 'AssemblyConfiguration\("\w+"\)'; $assemblyConfiguration = 'AssemblyConfiguration("' + $env:MORYX_BUILD_CONFIG + '")'; @@ -583,10 +630,10 @@ function Set-VsixManifestVersion([string]$VsixManifest) { } [xml]$manifestContent = Get-Content $file - $manifestContent.PackageManifest.Metadata.Identity.Version = $global:AssemblyVersion + $manifestContent.PackageManifest.Metadata.Identity.Version = $env:MORYX_ASSEMBLY_VERSION $manifestContent.Save($VsixManifest) - Write-Host "Version $global:AssemblyVersion applied to $VsixManifest!" + Write-Host "Version $env:MORYX_ASSEMBLY_VERSION applied to $VsixManifest!" } function Set-VsTemplateVersion([string]$VsTemplate) { @@ -600,11 +647,11 @@ function Set-VsTemplateVersion([string]$VsTemplate) { $versionRegex = "(\d+)\.(\d+)\.(\d+)\.(\d+)" - $wizardAssemblyStrongName = $templateContent.VSTemplate.WizardExtension.Assembly -replace $versionRegex, $global:AssemblyVersion + $wizardAssemblyStrongName = $templateContent.VSTemplate.WizardExtension.Assembly -replace $versionRegex, $env:MORYX_ASSEMBLY_VERSION $templateContent.VSTemplate.WizardExtension.Assembly = $wizardAssemblyStrongName $templateContent.Save($vsTemplate) - Write-Host "Version $global:AssemblyVersion applied to $VsTemplate!" + Write-Host "Version$env:MORYX_ASSEMBLY_VERSION applied to $VsTemplate!" } function CreateFolderIfNotExists([string]$Folder) { diff --git a/.build/Common.props b/.build/Common.props new file mode 100644 index 000000000..f21a7adc4 --- /dev/null +++ b/.build/Common.props @@ -0,0 +1,39 @@ + + + + + + + + 3.0.0 + $(MORYX_ASSEMBLY_VERSION) + + 3.0.0.0 + $(MORYX_FILE_VERSION) + + 3.0.0.0 + $(MORYX_INFORMATIONAL_VERSION) + + 3.0.0 + $(MORYX_PACKAGE_VERSION) + + PHOENIXCONTACT + PHOENIX CONTACT + MORYX + + $([System.DateTime]::Now.ToString("yyyy")) + Copyright © PHOENIX CONTACT $(CurrentYear) + + git + https://github.com/PHOENIXCONTACT/MORYX-Platform + + https://www.phoenixcontact.com/favicon.ico + https://moryx-industry.net/ + Apache-2.0 + false + true + + true + + + \ No newline at end of file diff --git a/MoryxPlatform.sln b/MoryxPlatform.sln index 6b3a27719..4e034b1d6 100644 --- a/MoryxPlatform.sln +++ b/MoryxPlatform.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29905.134 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartProject.Core", "src\StartProject.Core\StartProject.Core.csproj", "{DE77822B-592E-4192-97F7-EC9ADDAFEAE3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartProject", "src\StartProject\StartProject.csproj", "{8441A356-C5A8-41B4-B7EE-D0411664D8AA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartProject", "src\StartProject\StartProject.csproj", "{8441A356-C5A8-41B4-B7EE-D0411664D8AA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime", "src\Moryx.Runtime\Moryx.Runtime.csproj", "{92777E64-9978-40AE-8B90-93ECBBBEFE67}" EndProject @@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.Kernel.Tests" EndProject 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}") = "Moryx.DependentTestModule", "src\DependentTestModule\Moryx.DependentTestModule.csproj", "{D8344B1F-9DB3-4E85-9195-6FFFECBF6427}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.DependentTestModule", "src\DependentTestModule\Moryx.DependentTestModule.csproj", "{D8344B1F-9DB3-4E85-9195-6FFFECBF6427}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestModule", "src\TestModule\Moryx.TestModule.csproj", "{24ED97AD-6D04-4DC0-AFCB-C911EF0AA738}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.TestModule", "src\TestModule\Moryx.TestModule.csproj", "{24ED97AD-6D04-4DC0-AFCB-C911EF0AA738}" EndProject 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 @@ -31,41 +31,41 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestTools", "TestTools", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.TestTools.UnitTest", "src\Moryx.TestTools.UnitTest\Moryx.TestTools.UnitTest.csproj", "{505DF475-5FF5-47CC-9E3B-BBE16C359F0E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Container.TestPlugin", "src\Tests\Moryx.Container.TestPlugin\Moryx.Container.TestPlugin.csproj", "{DD4163B4-1696-4554-961E-DE2A3EB21ECE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Container.TestPlugin", "src\Tests\Moryx.Container.TestPlugin\Moryx.Container.TestPlugin.csproj", "{DD4163B4-1696-4554-961E-DE2A3EB21ECE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Container.TestRootPlugin", "src\Tests\Moryx.Container.TestRootPlugin\Moryx.Container.TestRootPlugin.csproj", "{7615C9F0-91F1-4E05-A424-6D083B8958C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}") = "Moryx.Model", "src\Moryx.Model\Moryx.Model.csproj", "{478DC949-A0B2-46B4-8645-A7DA92589B76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}") = "Moryx.Communication.Sockets.IntegrationTests", "src\Tests\Moryx.Communication.Sockets.IntegrationTests\Moryx.Communication.Sockets.IntegrationTests.csproj", "{FD2AA3C3-F434-4D4F-88C8-3774B48E1D9D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}") = "Moryx.Container.TestTools", "src\Tests\Moryx.Container.TestTools\Moryx.Container.TestTools.csproj", "{B72AA993-72E5-4D14-BF5E-C2E0E8CF5186}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}") = "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}") = "Moryx.TestTools.SystemTest", "src\Moryx.TestTools.SystemTest\Moryx.TestTools.SystemTest.csproj", "{D6DC00C6-9358-4839-84C0-44DF018A74DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.TestTools.SystemTest", "src\Moryx.TestTools.SystemTest\Moryx.TestTools.SystemTest.csproj", "{D6DC00C6-9358-4839-84C0-44DF018A74DC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Tools.Wcf", "src\Moryx.Tools.Wcf\Moryx.Tools.Wcf.csproj", "{05761BAE-8649-470D-9A8A-5C7E9D1A2F3A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}") = "Moryx.Runtime.Tests", "src\Tests\Moryx.Runtime.Tests\Moryx.Runtime.Tests.csproj", "{7448728C-9965-4874-A2E9-7BAB37E42963}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.Tests", "src\Tests\Moryx.Runtime.Tests\Moryx.Runtime.Tests.csproj", "{7448728C-9965-4874-A2E9-7BAB37E42963}" EndProject 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}") = "Moryx.Model.PostgreSQL", "src\Moryx.Model.PostgreSQL\Moryx.Model.PostgreSQL.csproj", "{70964330-F80E-4E1E-A33B-2021BDE37B2F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Model.PostgreSQL", "src\Moryx.Model.PostgreSQL\Moryx.Model.PostgreSQL.csproj", "{70964330-F80E-4E1E-A33B-2021BDE37B2F}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.TestTools.Test.Model", "src\Moryx.TestTools.Test.Model\Moryx.TestTools.Test.Model.csproj", "{29F12AD7-18DC-4DC3-B97F-BC773AC4C0EB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx", "src\Moryx\Moryx.csproj", "{7CD728A5-8FDD-4178-9CA4-3CD37512DA24}" EndProject @@ -79,17 +79,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Workflows.Benchmark", EndProject 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}") = "Moryx.Runtime.WinService", "src\Moryx.Runtime.WinService\Moryx.Runtime.WinService.csproj", "{45BF2368-B7C9-42A1-9587-F3B3EADE4A67}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.WinService", "src\Moryx.Runtime.WinService\Moryx.Runtime.WinService.csproj", "{45BF2368-B7C9-42A1-9587-F3B3EADE4A67}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.Wcf", "src\Moryx.Runtime.Wcf\Moryx.Runtime.Wcf.csproj", "{1CE2D3B1-DE76-4A59-B3CB-76F120624C11}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.Wcf", "src\Moryx.Runtime.Wcf\Moryx.Runtime.Wcf.csproj", "{1CE2D3B1-DE76-4A59-B3CB-76F120624C11}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.SmokeTest", "src\Moryx.Runtime.SmokeTest\Moryx.Runtime.SmokeTest.csproj", "{F297C67F-AA7C-4687-912E-5970022165F9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.SmokeTest", "src\Moryx.Runtime.SmokeTest\Moryx.Runtime.SmokeTest.csproj", "{F297C67F-AA7C-4687-912E-5970022165F9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Model.InMemory", "src\Moryx.Model.InMemory\Moryx.Model.InMemory.csproj", "{21C94DE5-A774-4474-8C31-DB483D49710E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Model.InMemory", "src\Moryx.Model.InMemory\Moryx.Model.InMemory.csproj", "{21C94DE5-A774-4474-8C31-DB483D49710E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.DbUpdate", "src\Moryx.Runtime.DbUpdate\Moryx.Runtime.DbUpdate.csproj", "{5A9EDBD2-FFFE-4B87-9139-3D6C9265758A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.DbUpdate", "src\Moryx.Runtime.DbUpdate\Moryx.Runtime.DbUpdate.csproj", "{5A9EDBD2-FFFE-4B87-9139-3D6C9265758A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Runtime.Maintenance", "src\Moryx.Runtime.Maintenance\Moryx.Runtime.Maintenance.csproj", "{EB039D46-906F-44BF-AC37-B3B3634A4442}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.Maintenance", "src\Moryx.Runtime.Maintenance\Moryx.Runtime.Maintenance.csproj", "{EB039D46-906F-44BF-AC37-B3B3634A4442}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C6E0E82D-CE66-4B0F-8010-9FDEE801A312}" + ProjectSection(SolutionItems) = preProject + .build\Common.props = .build\Common.props + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -743,8 +748,8 @@ Global {EB039D46-906F-44BF-AC37-B3B3634A4442} = {DE7526FF-6D25-4643-9AA3-C24253901C8C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - RESX_TaskErrorCategory = Message - RESX_ShowErrorsInErrorList = True SolutionGuid = {36EFC961-F4E7-49DC-A36A-99594FFB8243} + RESX_ShowErrorsInErrorList = True + RESX_TaskErrorCategory = Message EndGlobalSection EndGlobal diff --git a/src/DependentTestModule/Moryx.DependentTestModule.csproj b/src/DependentTestModule/Moryx.DependentTestModule.csproj index 7a4615bc0..4ae66bb1b 100644 --- a/src/DependentTestModule/Moryx.DependentTestModule.csproj +++ b/src/DependentTestModule/Moryx.DependentTestModule.csproj @@ -1,107 +1,25 @@ - - - + + + + + - Debug - AnyCPU - {D8344B1F-9DB3-4E85-9195-6FFFECBF6427} - Library - Properties - Moryx.DependentTestModule - Moryx.DependentTestModule - v4.6.1 - 512 - + net45 + true + + Moryx Runtime Plugin: DependentTestModule - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - + - - {1ce2d3b1-de76-4a59-b3cb-76f120624c11} - Moryx.Runtime.Wcf - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {92777E64-9978-40AE-8B90-93ECBBBEFE67} - Moryx.Runtime - True - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - - {24ED97AD-6D04-4DC0-AFCB-C911EF0AA738} - Moryx.TestModule - + + - - + + + + + - - - - - - - - - - + \ No newline at end of file diff --git a/src/DependentTestModule/Properties/AssemblyInfo.cs b/src/DependentTestModule/Properties/AssemblyInfo.cs index f4882ac85..85dd17668 100644 --- a/src/DependentTestModule/Properties/AssemblyInfo.cs +++ b/src/DependentTestModule/Properties/AssemblyInfo.cs @@ -1,24 +1,5 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; using Moryx.Modules; -// 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: AssemblyTitle("TestModule")] -[assembly: AssemblyDescription("Moryx Runtime Plugin: TestModule")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f31704fe-753b-45e8-a7fd-adc4bdbaac24")] - - -// Moryx attributes [assembly: Bundle("Moryx.TestModule", "1.0.0.0")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj b/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj index 53c5e281d..1ad3cb9f3 100644 --- a/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj +++ b/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj @@ -1,20 +1,23 @@  + + - netstandard2.0 - false + netstandard2.0;net45 true + Library for serial port communication. + true - + - - + + - + diff --git a/src/Moryx.Communication.Serial/Moryx.Communication.Serial.nuspec b/src/Moryx.Communication.Serial/Moryx.Communication.Serial.nuspec deleted file mode 100644 index 71d781991..000000000 --- a/src/Moryx.Communication.Serial/Moryx.Communication.Serial.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.Communication.Serial/Properties/AssemblyInfo.cs b/src/Moryx.Communication.Serial/Properties/AssemblyInfo.cs deleted file mode 100644 index 91019a709..000000000 --- a/src/Moryx.Communication.Serial/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyDescription("Library for serial port communication")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("dab57c78-aafc-4046-8a03-d45e0f97f6dc")] diff --git a/src/Moryx.Container/Moryx.Container.csproj b/src/Moryx.Container/Moryx.Container.csproj index 19e73fb50..4f7d33ae2 100644 --- a/src/Moryx.Container/Moryx.Container.csproj +++ b/src/Moryx.Container/Moryx.Container.csproj @@ -1,15 +1,14 @@  + + - netstandard2.0 - false + netstandard2.0;net45 true + Handling of container structure. + true - - - - diff --git a/src/Moryx.Container/Moryx.Container.nuspec b/src/Moryx.Container/Moryx.Container.nuspec deleted file mode 100644 index 65fab0578..000000000 --- a/src/Moryx.Container/Moryx.Container.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.Container/Properties/AssemblyInfo.cs b/src/Moryx.Container/Properties/AssemblyInfo.cs index 588e875c6..6b1b9b92c 100644 --- a/src/Moryx.Container/Properties/AssemblyInfo.cs +++ b/src/Moryx.Container/Properties/AssemblyInfo.cs @@ -1,19 +1,3 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using Moryx.Container; - -// 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: AssemblyDescription("Handling of container structure.")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c6b623c5-b31c-4fcd-945e-d66b226e5fb3")] +using Moryx.Container; [assembly: ComponentLoaderIgnore] diff --git a/src/Moryx.Model.InMemory/InMemoryDbContextManager.cs b/src/Moryx.Model.InMemory/InMemoryDbContextManager.cs index e630004f5..ae6f86ff9 100644 --- a/src/Moryx.Model.InMemory/InMemoryDbContextManager.cs +++ b/src/Moryx.Model.InMemory/InMemoryDbContextManager.cs @@ -33,8 +33,11 @@ public InMemoryDbContextManager(string instanceId) } /// +#if HAVE_ARRAY_EMPTY public IReadOnlyCollection Contexts => Array.Empty(); - +#else + public IReadOnlyCollection Contexts => new Type[0]; +#endif /// public IModelConfigurator GetConfigurator(Type contextType) { diff --git a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj b/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj index e11c3534d..18db19e35 100644 --- a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj +++ b/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj @@ -1,73 +1,26 @@ - - - + + + + - Debug - AnyCPU - {21C94DE5-A774-4474-8C31-DB483D49710E} - Library - Properties - Moryx.Model.InMemory - Moryx.Model.InMemory - v4.6.1 - 512 - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Model.InMemory.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Model.InMemory.xml + netstandard2.1;net45 + true + InMemory extension to Moryx.Model. + true + - - - + + + - - Properties\GlobalAssemblyInfo.cs - - - - + + - - - - - - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - - - - 2.2.10 - - - 6.4.4 - - - - \ No newline at end of file + + + HAVE_ARRAY_EMPTY + + + diff --git a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.nuspec b/src/Moryx.Model.InMemory/Moryx.Model.InMemory.nuspec deleted file mode 100644 index e24f6a3a1..000000000 --- a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - - \ No newline at end of file diff --git a/src/Moryx.Model.InMemory/Properties/AssemblyInfo.cs b/src/Moryx.Model.InMemory/Properties/AssemblyInfo.cs deleted file mode 100644 index 51d70ccee..000000000 --- a/src/Moryx.Model.InMemory/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Model.InMemory")] -[assembly: AssemblyDescription("InMemory extension to Moryx.Model")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a734be85-33dc-4117-bd9c-b5d5b31102e3")] diff --git a/src/Moryx.Model.PostgreSQL/Moryx.Model.Npgsql.csproj.DotSettings b/src/Moryx.Model.PostgreSQL/Moryx.Model.Npgsql.csproj.DotSettings deleted file mode 100644 index e0656ba64..000000000 --- a/src/Moryx.Model.PostgreSQL/Moryx.Model.Npgsql.csproj.DotSettings +++ /dev/null @@ -1,7 +0,0 @@ - - True - True - True - True - True - True \ No newline at end of file diff --git a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj b/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj index 21f29ada3..be714cd6c 100644 --- a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj +++ b/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj @@ -1,93 +1,38 @@ - - - + + + + - Debug - AnyCPU - {70964330-F80E-4E1E-A33B-2021BDE37B2F} - Library - Properties - Moryx.Model.PostgreSQL - Moryx.Model.PostgreSQL - v4.6.1 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Model.PostgreSQL.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Model.PostgreSQL.xml + netstandard2.1;net45;net461 + true + EntityFramework DataModel based on Npgsql. + true + - - - - - - - - - + + + - - Properties\GlobalAssemblyInfo.cs - - - - - + + - - - - - Designer - + + + - - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {437a03f2-1a35-41e1-a065-00debdda6e79} - Moryx - + + + - - - 6.4.4 - - - 6.4.1 - - - 4.1.5 - + + + + + + + + - - - \ No newline at end of file + diff --git a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.nuspec b/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.nuspec deleted file mode 100644 index c912542ac..000000000 --- a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.nuspec +++ /dev/null @@ -1,20 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Model.PostgreSQL/Properties/AssemblyInfo.cs b/src/Moryx.Model.PostgreSQL/Properties/AssemblyInfo.cs index 10d04489b..7a170c095 100644 --- a/src/Moryx.Model.PostgreSQL/Properties/AssemblyInfo.cs +++ b/src/Moryx.Model.PostgreSQL/Properties/AssemblyInfo.cs @@ -1,21 +1,5 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; using Moryx; -// 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: AssemblyTitle("Moryx.Model.PostgreSQL")] -[assembly: AssemblyDescription("EntityFramework DataModel based on Npgsql")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("70964330-f80e-4e1e-a33b-2021bde37b2f")] - // Force System.Threading.Tasks.Extensions assembly copied to the output directory [assembly: ForceAssemblyReference(typeof(AsyncMethodBuilderAttribute))] diff --git a/src/Moryx.Model/Moryx.Model.csproj b/src/Moryx.Model/Moryx.Model.csproj index 744eb1c48..ec810657f 100644 --- a/src/Moryx.Model/Moryx.Model.csproj +++ b/src/Moryx.Model/Moryx.Model.csproj @@ -1,121 +1,33 @@ - - - + + + + - Debug - AnyCPU - {478DC949-A0B2-46B4-8645-A7DA92589B76} - Library - Properties - Moryx.Model - Moryx.Model - v4.6.1 - 512 - - - + netstandard2.1;net45 + true + Extended model functionality. + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Model.xml + + + HAVE_APPDOMAIN_DEFINEDYNAMICASSEMBLY - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Model.xml - - - - - - - - + - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - {437a03f2-1a35-41e1-a065-00debdda6e79} - Moryx - + - - - - - Designer - - - - - 6.4.4 - + + + + + + + + - - - \ No newline at end of file + + diff --git a/src/Moryx.Model/Moryx.Model.nuspec b/src/Moryx.Model/Moryx.Model.nuspec deleted file mode 100644 index 963908d48..000000000 --- a/src/Moryx.Model/Moryx.Model.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.Model/Properties/AssemblyInfo.cs b/src/Moryx.Model/Properties/AssemblyInfo.cs deleted file mode 100644 index 5da8594e4..000000000 --- a/src/Moryx.Model/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Model")] -[assembly: AssemblyDescription("Extended model functionality.")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c6b623c5-b31c-4fcd-945e-d66b226e5fb3")] diff --git a/src/Moryx.Model/Repositories/Proxy/RepositoryProxyBuilder.cs b/src/Moryx.Model/Repositories/Proxy/RepositoryProxyBuilder.cs index fa9998b3b..900bf853a 100644 --- a/src/Moryx.Model/Repositories/Proxy/RepositoryProxyBuilder.cs +++ b/src/Moryx.Model/Repositories/Proxy/RepositoryProxyBuilder.cs @@ -26,7 +26,11 @@ public class RepositoryProxyBuilder /// static RepositoryProxyBuilder() { +#if HAVE_APPDOMAIN_DEFINEDYNAMICASSEMBLY var assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(new AssemblyName(AssemblyName), AssemblyBuilderAccess.Run); +#else + var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(AssemblyName), AssemblyBuilderAccess.Run); +#endif ModuleBuilder = assemblyBuilder.DefineDynamicModule(DynamicModuleName); MethodStrategies = new IMethodProxyStrategy[] { diff --git a/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj b/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj index 7804455fb..66868fc5b 100644 --- a/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj +++ b/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj @@ -1,70 +1,22 @@ - - - + + + + - Debug - AnyCPU - {5A9EDBD2-FFFE-4B87-9139-3D6C9265758A} - Library - Properties - Moryx.Runtime.DbUpdate - Moryx.Runtime.DbUpdate - v4.6.1 - 512 - true + netstandard2.0;net45 + true + Runtime RunMode for executing database migrations. + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Runtime.DbUpdate.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Runtime.DbUpdate.xml - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {8ff77f62-43c3-40fe-9dfe-01a53fe8a68e} - Moryx.Runtime.Kernel - - - {7CD728A5-8FDD-4178-9CA4-3CD37512DA24} - Moryx - - + - + + - - 2.8.0 - + + + - - \ No newline at end of file + + diff --git a/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.nuspec b/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.nuspec deleted file mode 100644 index 0ad31865b..000000000 --- a/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.Runtime.DbUpdate/Properties/AssemblyInfo.cs b/src/Moryx.Runtime.DbUpdate/Properties/AssemblyInfo.cs deleted file mode 100644 index 1669663e9..000000000 --- a/src/Moryx.Runtime.DbUpdate/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Runtime.DbUpdate")] -[assembly: AssemblyDescription("Runtime RunMode for executing database migrations")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5a9edbd2-fffe-4b87-9139-3d6c9265758a")] \ No newline at end of file diff --git a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj b/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj index c62f464b7..316ed867c 100644 --- a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj +++ b/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj @@ -1,15 +1,14 @@  + + - netstandard2.0 - false + netstandard2.0;net45 true + Main kernel abstraction for the runtime environment + true - - - - @@ -20,5 +19,4 @@ - diff --git a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.nuspec b/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.nuspec deleted file mode 100644 index 99454e733..000000000 --- a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - - \ No newline at end of file diff --git a/src/Moryx.Runtime.Kernel/Properties/AssemblyInfo.cs b/src/Moryx.Runtime.Kernel/Properties/AssemblyInfo.cs index 263c1e12a..2add3ed1a 100644 --- a/src/Moryx.Runtime.Kernel/Properties/AssemblyInfo.cs +++ b/src/Moryx.Runtime.Kernel/Properties/AssemblyInfo.cs @@ -1,21 +1,4 @@ -using System.Reflection; -using System.Runtime.InteropServices; +using Moryx.Runtime.Kernel; -// 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. -using Moryx.Runtime.Kernel; - -[assembly: AssemblyTitle("Moryx.Runtime.Kernel")] -[assembly: AssemblyDescription("Main kernel abstraction for the runtime environment.")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6dc57e7c-0982-469a-aa3e-acde17d82ea2")] [assembly: KernelBundle] diff --git a/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj b/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj index 3eb398211..e246ac187 100644 --- a/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj +++ b/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj @@ -1,145 +1,23 @@ - - - + + + + - Debug - AnyCPU - {EB039D46-906F-44BF-AC37-B3B3634A4442} - Library - Properties - Moryx.Runtime.Maintenance - Moryx.Runtime.Maintenance - v4.6.1 - 512 - + net45 + true + Core module to maintain the application. It provides config and logging support by default. + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Runtime.Maintenance.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Runtime.Maintenance.xml - - - - - - - - - + - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - {478DC949-A0B2-46B4-8645-A7DA92589B76} - Moryx.Model - - - {1ce2d3b1-de76-4a59-b3cb-76f120624c11} - Moryx.Runtime.Wcf - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {437a03f2-1a35-41e1-a065-00debdda6e79} - Moryx - - - {92777e64-9978-40ae-8b90-93ecbbbefe67} - Moryx.Runtime - True - - - - - + - - - - - - - \ No newline at end of file + diff --git a/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.nuspec b/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.nuspec deleted file mode 100644 index 274c8a313..000000000 --- a/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.nuspec +++ /dev/null @@ -1,15 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - \ No newline at end of file diff --git a/src/Moryx.Runtime.Maintenance/Properties/AssemblyInfo.cs b/src/Moryx.Runtime.Maintenance/Properties/AssemblyInfo.cs index d9780b42c..580091b2f 100644 --- a/src/Moryx.Runtime.Maintenance/Properties/AssemblyInfo.cs +++ b/src/Moryx.Runtime.Maintenance/Properties/AssemblyInfo.cs @@ -1,22 +1,5 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; using Moryx.Modules; -// 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: AssemblyTitle("Moryx.Runtime.Maintenance")] -[assembly: AssemblyDescription("Core module to maintain the application. It provides config and logging support by default.")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d01f6c1f-785f-4bea-a90a-b7adc6cd5578")] - [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: Bundle("Moryx.Runtime", "3.0.0")] diff --git a/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj b/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj index 16bacfcce..2869ae3fc 100644 --- a/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj +++ b/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj @@ -1,78 +1,23 @@ - - - + + + + - Debug - AnyCPU - {F297C67F-AA7C-4687-912E-5970022165F9} - Library - Properties - Moryx.Runtime.SmokeTest - Moryx.Runtime.SmokeTest - v4.6.1 - 512 - true + net45 + true + Runtime RunMode for executing smoke tests. + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Runtime.SmokeTest.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Runtime.SmokeTest.xml - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {8ff77f62-43c3-40fe-9dfe-01a53fe8a68e} - Moryx.Runtime.Kernel - - - {92777e64-9978-40ae-8b90-93ecbbbefe67} - Moryx.Runtime - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - + - + + - - 2.8.0 - + + + + + - - \ No newline at end of file + diff --git a/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.nuspec b/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.nuspec deleted file mode 100644 index 0ad31865b..000000000 --- a/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.Runtime.SmokeTest/Properties/AssemblyInfo.cs b/src/Moryx.Runtime.SmokeTest/Properties/AssemblyInfo.cs deleted file mode 100644 index ec980d5bb..000000000 --- a/src/Moryx.Runtime.SmokeTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Runtime.SmokeTest")] -[assembly: AssemblyDescription("Runtime RunMode for executing smoke tests")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f297c67f-aa7c-4687-912e-5970022165f9")] \ No newline at end of file diff --git a/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj b/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj index 4c82405a6..e40734c8b 100644 --- a/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj +++ b/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj @@ -1,96 +1,22 @@ - - - + + + + - Debug - AnyCPU - {1CE2D3B1-DE76-4A59-B3CB-76F120624C11} - Library - Properties - Moryx.Runtime.Wcf - Moryx.Runtime.Wcf - v4.6.1 - 512 - true + net45 + true + Extensions for the Moryx.Runtime for hosting wcf services. + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Runtime.Wcf.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Runtime.Wcf.xml - - - - - - - - - - - - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - {9dede968-06eb-4339-8c82-28b418ba1a44} - Moryx.Container - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - + - + + - - 5.0.1 - + + + - - \ No newline at end of file + + diff --git a/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.nuspec b/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.nuspec deleted file mode 100644 index 9ab8addae..000000000 --- a/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.Runtime.Wcf/Properties/AssemblyInfo.cs b/src/Moryx.Runtime.Wcf/Properties/AssemblyInfo.cs deleted file mode 100644 index 23cb18092..000000000 --- a/src/Moryx.Runtime.Wcf/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Runtime.Wcf")] -[assembly: AssemblyDescription("Extensions for the Moryx.Runtime for hosting wcf services")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1ce2d3b1-de76-4a59-b3cb-76f120624c11")] \ No newline at end of file diff --git a/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj b/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj index 89fed6104..a7956ed92 100644 --- a/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj +++ b/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj @@ -1,76 +1,27 @@ - - - + + + + - Debug - AnyCPU - {45BF2368-B7C9-42A1-9587-F3B3EADE4A67} - Library - Properties - Moryx.Runtime.WinService - Moryx.Runtime.WinService - v4.6.1 - 512 - true - + net45 + true + Provides runtime mode for running as Windows Service. + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Runtime.WinService.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Runtime.WinService.xml - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - Component - - - - - + - + + - - {8ff77f62-43c3-40fe-9dfe-01a53fe8a68e} - Moryx.Runtime.Kernel - - - {92777e64-9978-40ae-8b90-93ecbbbefe67} - Moryx.Runtime - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - + + + - - 2.8.0 - + + + - - \ No newline at end of file + + diff --git a/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.nuspec b/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.nuspec deleted file mode 100644 index 0ad31865b..000000000 --- a/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.Runtime.WinService/Properties/AssemblyInfo.cs b/src/Moryx.Runtime.WinService/Properties/AssemblyInfo.cs deleted file mode 100644 index a61ec02f9..000000000 --- a/src/Moryx.Runtime.WinService/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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. -using Moryx.Runtime.Kernel; - -[assembly: AssemblyTitle("Moryx.Runtime.WinService")] -[assembly: AssemblyDescription("Provides runtime mode for running as Windows Service.")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6dc57e7c-0982-469a-aa3e-acde17d82ea2")] - -[assembly: KernelBundle] diff --git a/src/Moryx.Runtime/Moryx.Runtime.csproj b/src/Moryx.Runtime/Moryx.Runtime.csproj index 73db58f42..e30f9355b 100644 --- a/src/Moryx.Runtime/Moryx.Runtime.csproj +++ b/src/Moryx.Runtime/Moryx.Runtime.csproj @@ -1,15 +1,14 @@  + + - netstandard2.0 - false + netstandard2.0;net45 true + Contains core interfaces for the runtime environment. + true - - - - diff --git a/src/Moryx.Runtime/Moryx.Runtime.nuspec b/src/Moryx.Runtime/Moryx.Runtime.nuspec deleted file mode 100644 index 274c8a313..000000000 --- a/src/Moryx.Runtime/Moryx.Runtime.nuspec +++ /dev/null @@ -1,15 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - \ No newline at end of file diff --git a/src/Moryx.Runtime/Properties/AssemblyInfo.cs b/src/Moryx.Runtime/Properties/AssemblyInfo.cs deleted file mode 100644 index dc1b61ab3..000000000 --- a/src/Moryx.Runtime/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("Moryx.Runtime")] -[assembly: AssemblyDescription("Contains core interfaces for the runtime environment.")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von -// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("c7fd4673-b904-4bc3-af66-b346d3800e44")] diff --git a/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj b/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj index 71836e7d2..1cb1c22eb 100644 --- a/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj +++ b/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj @@ -1,104 +1,29 @@ - - - + + + + - Debug - AnyCPU - {D6DC00C6-9358-4839-84C0-44DF018A74DC} - Library - Properties - Moryx.TestTools.SystemTest - Moryx.TestTools.SystemTest - v4.6.1 - 512 - - - + net45 + true + + Library with helper classes for SystemTests. + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - + - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - + + - - - Designer - - - - - + + + + + - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {eb039d46-906f-44bf-ac37-b3b3634a4442} - Moryx.Runtime.Maintenance - - - {92777e64-9978-40ae-8b90-93ecbbbefe67} - Moryx.Runtime - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - - - - 12.0.3 - + + - - - - - - + \ No newline at end of file diff --git a/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.nuspec b/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.nuspec deleted file mode 100644 index 699df80df..000000000 --- a/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.TestTools.SystemTest/Properties/AssemblyInfo.cs b/src/Moryx.TestTools.SystemTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 0ab6d6bad..000000000 --- a/src/Moryx.TestTools.SystemTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.TestTools.SystemTest")] -[assembly: AssemblyDescription("Library with helper classes for SystemTests.")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4e6b49fa-ddb1-4bc0-85ba-75c10755fc68")] diff --git a/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.Serialization.Entry.datasource b/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.Serialization.Entry.datasource deleted file mode 100644 index a4fd87f25..000000000 --- a/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.Serialization.Entry.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Serialization.Entry, Moryx, Version=2.5.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.Serialization.Entry1.datasource b/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.Serialization.Entry1.datasource deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DataModel.datasource b/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DataModel.datasource deleted file mode 100644 index 5ac3632d6..000000000 --- a/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DataModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DataModel, Moryx.TestTools.SystemTest.ServiceReferences, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DumpResult.datasource b/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DumpResult.datasource deleted file mode 100644 index 682e31256..000000000 --- a/src/Moryx.TestTools.SystemTest/Properties/DataSources/Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DumpResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.TestTools.SystemTest.ServiceReferences.DatabaseMaintenanceService.DumpResult, Moryx.TestTools.SystemTest.ServiceReferences, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.TestTools.SystemTest/Properties/Settings.Designer.cs b/src/Moryx.TestTools.SystemTest/Properties/Settings.Designer.cs deleted file mode 100644 index f09190a5f..000000000 --- a/src/Moryx.TestTools.SystemTest/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Moryx.TestTools.SystemTest.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/src/Moryx.TestTools.SystemTest/Properties/Settings.settings b/src/Moryx.TestTools.SystemTest/Properties/Settings.settings deleted file mode 100644 index 8e615f25f..000000000 --- a/src/Moryx.TestTools.SystemTest/Properties/Settings.settings +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Moryx.TestTools.Test.Model/Moryx.TestTools.Test.Model.csproj b/src/Moryx.TestTools.Test.Model/Moryx.TestTools.Test.Model.csproj index 490bf86b6..7d064f861 100644 --- a/src/Moryx.TestTools.Test.Model/Moryx.TestTools.Test.Model.csproj +++ b/src/Moryx.TestTools.Test.Model/Moryx.TestTools.Test.Model.csproj @@ -1,95 +1,20 @@ - - - + + + + - Debug - AnyCPU - {29F12AD7-18DC-4DC3-B97F-BC773AC4C0EB} - Library - Properties - Moryx.TestTools.Test.Model - Moryx.TestTools.Test.Model - v4.6.1 - 512 - - - + netstandard2.1;net45 + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + + - - {70964330-f80e-4e1e-a33b-2021bde37b2f} - Moryx.Model.PostgreSQL - - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - + + + - - - 6.4.4 - - - - - - + \ No newline at end of file diff --git a/src/Moryx.TestTools.Test.Model/Properties/AssemblyInfo.cs b/src/Moryx.TestTools.Test.Model/Properties/AssemblyInfo.cs deleted file mode 100644 index 7641997b8..000000000 --- a/src/Moryx.TestTools.Test.Model/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.TestTools.Test.Model")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.TestTools.Test.Model")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("497c8e16-343c-4f8e-8414-b8f24e64b5bf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj b/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj index 19e73fb50..617ed35df 100644 --- a/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj +++ b/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj @@ -1,14 +1,14 @@  + + - netstandard2.0 - false + netstandard2.0;net45 true - - - - + Library with helper classes for UnitTests. + true + diff --git a/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.nuspec b/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.nuspec deleted file mode 100644 index 38228c0c9..000000000 --- a/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - \ No newline at end of file diff --git a/src/Moryx.TestTools.UnitTest/Properties/AssemblyInfo.cs b/src/Moryx.TestTools.UnitTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 5d0760316..000000000 --- a/src/Moryx.TestTools.UnitTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.TestTools.UnitTest")] -[assembly: AssemblyDescription("Library with helper classes for UnitTests.")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6399340a-ecf5-494d-8639-ca7bc9724a55")] diff --git a/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj b/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj index dd8484d57..e990dc390 100644 --- a/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj +++ b/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj @@ -1,113 +1,23 @@ - - - + + + + - Debug - AnyCPU - {05761BAE-8649-470D-9A8A-5C7E9D1A2F3A} - Library - Properties - Moryx.Tools.Wcf - Moryx.Tools.Wcf - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Tools.Wcf.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Tools.Wcf.xml + net45 + true + Wcf integation in Platform. + true + + + + + - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - - - \ No newline at end of file + + diff --git a/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.nuspec b/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.nuspec deleted file mode 100644 index caa25e880..000000000 --- a/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.nuspec +++ /dev/null @@ -1,15 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - \ No newline at end of file diff --git a/src/Moryx.Tools.Wcf/Properties/AssemblyInfo.cs b/src/Moryx.Tools.Wcf/Properties/AssemblyInfo.cs index ed7fe198d..16b42834a 100644 --- a/src/Moryx.Tools.Wcf/Properties/AssemblyInfo.cs +++ b/src/Moryx.Tools.Wcf/Properties/AssemblyInfo.cs @@ -1,18 +1,3 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; -// 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: AssemblyTitle("Moryx.Tools.Wcf")] -[assembly: AssemblyDescription("Wcf integation in Platform")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("05761bae-8649-470d-9a8a-5c7e9d1a2f3a")] [assembly: InternalsVisibleTo("Moryx.Tools.Wcf.Tests")] diff --git a/src/Moryx/Moryx.csproj b/src/Moryx/Moryx.csproj index bb1c2e70b..8557395b0 100644 --- a/src/Moryx/Moryx.csproj +++ b/src/Moryx/Moryx.csproj @@ -1,23 +1,34 @@  + + - netstandard2.0 + netstandard2.0;net45;net461 true - false true + + Root namespace of the MORYX ecosystem + true - - - + + HAVE_TASK_FROMEXCEPTION + + + + HAVE_TASK_FROMEXCEPTION + - - - - + + + + + + + diff --git a/src/Moryx/Moryx.nuspec b/src/Moryx/Moryx.nuspec deleted file mode 100644 index 61c52e1cf..000000000 --- a/src/Moryx/Moryx.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - $id$ - $version$ - $title$ - PHOENIXCONTACT - $author$ - Apache-2.0 - false - https://www.phoenixcontact.com/favicon.ico - - $description$ - - - - - - \ No newline at end of file diff --git a/src/Moryx/Properties/AssemblyInfo.cs b/src/Moryx/Properties/AssemblyInfo.cs index 5a1be9e2c..cc219e561 100644 --- a/src/Moryx/Properties/AssemblyInfo.cs +++ b/src/Moryx/Properties/AssemblyInfo.cs @@ -1,19 +1,3 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyDescription("Root namespace of the MORYX ecosystem")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("dab57c78-aafc-4046-8a03-d45e0f97f6dc")] +using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Moryx.Tests")] diff --git a/src/Moryx/StateMachines/StateBase.cs b/src/Moryx/StateMachines/StateBase.cs index c7ef12c21..9312e511a 100644 --- a/src/Moryx/StateMachines/StateBase.cs +++ b/src/Moryx/StateMachines/StateBase.cs @@ -67,7 +67,13 @@ protected void InvalidState([CallerMemberName]string methodName = "") /// protected Task InvalidStateAsync([CallerMemberName] string methodName = "") { +#if HAVE_TASK_FROMEXCEPTION return Task.FromException(CreateAndLogInvalidStateException(methodName)); +#else + var tcs = new TaskCompletionSource(); + tcs.SetException(CreateAndLogInvalidStateException(methodName)); + return tcs.Task; +#endif } /// @@ -75,7 +81,13 @@ protected Task InvalidStateAsync([CallerMemberName] string methodName = "") /// protected Task InvalidStateAsync([CallerMemberName] string methodName = "") { +#if HAVE_TASK_FROMEXCEPTION return Task.FromException(CreateAndLogInvalidStateException(methodName)); +#else + var tcs = new TaskCompletionSource(); + tcs.SetException(CreateAndLogInvalidStateException(methodName)); + return tcs.Task; +#endif } /// diff --git a/src/StartProject.Core/StartProject.Core.csproj b/src/StartProject.Core/StartProject.Core.csproj index 7fedeccb7..08a06d7e0 100644 --- a/src/StartProject.Core/StartProject.Core.csproj +++ b/src/StartProject.Core/StartProject.Core.csproj @@ -6,11 +6,8 @@ + - - - - diff --git a/src/StartProject/Program.cs b/src/StartProject/Program.cs index 6495a9d7c..ed756374f 100644 --- a/src/StartProject/Program.cs +++ b/src/StartProject/Program.cs @@ -1,5 +1,4 @@ using Moryx.Runtime.Kernel; -using Moryx.Runtime.Wcf; namespace StartProject { diff --git a/src/StartProject/Properties/AssemblyInfo.cs b/src/StartProject/Properties/AssemblyInfo.cs deleted file mode 100644 index 3b1c6bb31..000000000 --- a/src/StartProject/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Start Project")] -[assembly: AssemblyDescription("Runtime test application")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8441a356-c5a8-41b4-b7ee-d0411664d8aa")] diff --git a/src/StartProject/StartProject.csproj b/src/StartProject/StartProject.csproj index 66d62e692..8ce70e277 100644 --- a/src/StartProject/StartProject.csproj +++ b/src/StartProject/StartProject.csproj @@ -1,116 +1,33 @@ - - - + + - Debug - AnyCPU - {8441A356-C5A8-41B4-B7EE-D0411664D8AA} + net45;net461 + true Exe - StartProject - StartProject - v4.6.1 - 512 - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - full - true - bin\Release\ - TRACE - prompt - 4 - true - true + - - - - + + + + + - - Properties\GlobalAssemblyInfo.cs - - - + + + + + + + + + - - Designer + + PreserveNewest - - Always - - - - - {d8344b1f-9db3-4e85-9195-6fffecbf6427} - Moryx.DependentTestModule - - - {eb039d46-906f-44bf-ac37-b3b3634a4442} - Moryx.Runtime.Maintenance - - - {1ce2d3b1-de76-4a59-b3cb-76f120624c11} - Moryx.Runtime.Wcf - - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {5a9edbd2-fffe-4b87-9139-3d6c9265758a} - Moryx.Runtime.DbUpdate - - - {f297c67f-aa7c-4687-912e-5970022165f9} - Moryx.Runtime.SmokeTest - - - {45bf2368-b7c9-42a1-9587-f3b3eade4a67} - Moryx.Runtime.WinService - - - {29f12ad7-18dc-4dc3-b97f-bc773ac4c0eb} - Moryx.TestTools.Test.Model - - - {8ff77f62-43c3-40fe-9dfe-01a53fe8a68e} - Moryx.Runtime.Kernel - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - - {24ed97ad-6d04-4dc0-afcb-c911ef0aa738} - Moryx.TestModule - - - - - 3.4.1 - - - 2.0.8 - - - 4.7.1 - - + \ No newline at end of file diff --git a/src/TestModule/Moryx.TestModule.csproj b/src/TestModule/Moryx.TestModule.csproj index a091f2608..d1f34c046 100644 --- a/src/TestModule/Moryx.TestModule.csproj +++ b/src/TestModule/Moryx.TestModule.csproj @@ -1,135 +1,25 @@ - - - + + + + - Debug - AnyCPU - {24ED97AD-6D04-4DC0-AFCB-C911EF0AA738} - Library - Properties - Moryx.TestModule - Moryx.TestModule - v4.6.1 - 512 - - - + net45 + true + + Moryx Runtime Plugin: TestModule. - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {1ce2d3b1-de76-4a59-b3cb-76f120624c11} - Moryx.Runtime.Wcf - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {29f12ad7-18dc-4dc3-b97f-bc773ac4c0eb} - Moryx.TestTools.Test.Model - - - {92777e64-9978-40ae-8b90-93ecbbbefe67} - Moryx.Runtime - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - + + - - + + + + + + - - - 12.0.3 - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/TestModule/Properties/AssemblyInfo.cs b/src/TestModule/Properties/AssemblyInfo.cs index 95f332227..85dd17668 100644 --- a/src/TestModule/Properties/AssemblyInfo.cs +++ b/src/TestModule/Properties/AssemblyInfo.cs @@ -1,23 +1,5 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; using Moryx.Modules; -// 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: AssemblyTitle("TestModule")] -[assembly: AssemblyDescription("Moryx Runtime Plugin: TestModule")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f31704fe-753b-45e8-a7fd-adc4bdbaac24")] - -// Moryx attributes [assembly: Bundle("Moryx.TestModule", "1.0.0.0")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/src/Tests/Moryx.Container.TestPlugin/Moryx.Container.TestPlugin.csproj b/src/Tests/Moryx.Container.TestPlugin/Moryx.Container.TestPlugin.csproj index 38bbeccf5..27b0b882c 100644 --- a/src/Tests/Moryx.Container.TestPlugin/Moryx.Container.TestPlugin.csproj +++ b/src/Tests/Moryx.Container.TestPlugin/Moryx.Container.TestPlugin.csproj @@ -1,12 +1,17 @@  + + - netstandard2.0 - false + netstandard2.0;net45 + true + + + diff --git a/src/Tests/Moryx.Container.TestPlugin/Properties/AssemblyInfo.cs b/src/Tests/Moryx.Container.TestPlugin/Properties/AssemblyInfo.cs deleted file mode 100644 index 88b859d2c..000000000 --- a/src/Tests/Moryx.Container.TestPlugin/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Runtime.Container.TestPlugin")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.Runtime.Container.TestPlugin")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c824990b-e2e8-4140-b70b-58d6750a6cfd")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tests/Moryx.Container.TestRootPlugin/Moryx.Container.TestRootPlugin.csproj b/src/Tests/Moryx.Container.TestRootPlugin/Moryx.Container.TestRootPlugin.csproj index 38bbeccf5..4968eeb65 100644 --- a/src/Tests/Moryx.Container.TestRootPlugin/Moryx.Container.TestRootPlugin.csproj +++ b/src/Tests/Moryx.Container.TestRootPlugin/Moryx.Container.TestRootPlugin.csproj @@ -1,12 +1,17 @@  + + - netstandard2.0 - false + netstandard2.0;net45 + true + + + diff --git a/src/Tests/Moryx.Container.TestRootPlugin/Properties/AssemblyInfo.cs b/src/Tests/Moryx.Container.TestRootPlugin/Properties/AssemblyInfo.cs deleted file mode 100644 index 4a0dc8f9e..000000000 --- a/src/Tests/Moryx.Container.TestRootPlugin/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Runtime.Container.TestRootPlugin")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.Runtime.Container.TestRootPlugin")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0a998931-6e1b-49b3-b061-56cd8aa69033")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tests/Moryx.Container.TestTools/Moryx.Container.TestTools.csproj b/src/Tests/Moryx.Container.TestTools/Moryx.Container.TestTools.csproj index 7975dda3c..5c8fb7cc5 100644 --- a/src/Tests/Moryx.Container.TestTools/Moryx.Container.TestTools.csproj +++ b/src/Tests/Moryx.Container.TestTools/Moryx.Container.TestTools.csproj @@ -1,8 +1,12 @@  + + - netstandard2.0 - false + netstandard2.0;net45 + true + + diff --git a/src/Tests/Moryx.Container.TestTools/Properties/AssemblyInfo.cs b/src/Tests/Moryx.Container.TestTools/Properties/AssemblyInfo.cs deleted file mode 100644 index 8a86d7ad5..000000000 --- a/src/Tests/Moryx.Container.TestTools/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Runtime.Container.TestTools")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.Runtime.Container.TestTools")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("498d558f-14d1-4d72-84bf-18f633aa0ca0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tests/Moryx.Model.Tests/Moryx.Model.Tests.csproj b/src/Tests/Moryx.Model.Tests/Moryx.Model.Tests.csproj index ae957cdff..a9e0869b7 100644 --- a/src/Tests/Moryx.Model.Tests/Moryx.Model.Tests.csproj +++ b/src/Tests/Moryx.Model.Tests/Moryx.Model.Tests.csproj @@ -1,89 +1,23 @@ - - - + + - Debug - AnyCPU - {BA61840C-9E77-4454-88E2-7CA4E98EE4BD} Library - Properties - Moryx.Model.Tests - Moryx.Model.Tests - v4.6.1 - 512 - - - - - - true + netcoreapp3.1 + + full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + - - - - - - - - - - - - - - - - - - - - - - - {21c94de5-a774-4474-8c31-db483d49710e} - Moryx.Model.InMemory - - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {29f12ad7-18dc-4dc3-b97f-bc773ac4c0eb} - Moryx.TestTools.Test.Model - - - - - - - + + + + + - - 3.12.0 - + + + - - - \ No newline at end of file + diff --git a/src/Tests/Moryx.Model.Tests/Properties/AssemblyInfo.cs b/src/Tests/Moryx.Model.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 36c1c7b48..000000000 --- a/src/Tests/Moryx.Model.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.GeneratedModel.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.GeneratedModel.Test")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("26ba1c57-5498-4181-9bba-a770239a7b0b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tests/Moryx.Runtime.SystemTests/Moryx.Runtime.SystemTests.csproj b/src/Tests/Moryx.Runtime.SystemTests/Moryx.Runtime.SystemTests.csproj index 39d109d11..1aefc5921 100644 --- a/src/Tests/Moryx.Runtime.SystemTests/Moryx.Runtime.SystemTests.csproj +++ b/src/Tests/Moryx.Runtime.SystemTests/Moryx.Runtime.SystemTests.csproj @@ -1,112 +1,33 @@ - - - + + + + - Debug - AnyCPU - {B47E0CB5-A3EC-4ED6-BCBF-9E3BEA6ABF5D} - Library - Properties - Moryx.Runtime.SystemTests - Moryx.Runtime.SystemTests - v4.6.1 - 512 - - - + net45 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - + - - {478dc949-a0b2-46b4-8645-a7da92589b76} - Moryx.Model - - - {eb039d46-906f-44bf-ac37-b3b3634a4442} - Moryx.Runtime.Maintenance - - - {29f12ad7-18dc-4dc3-b97f-bc773ac4c0eb} - Moryx.TestTools.Test.Model - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {437a03f2-1a35-41e1-a065-00debdda6e79} - Moryx - - - {8FF77F62-43C3-40FE-9DFE-01A53FE8A68E} - Moryx.Runtime.Kernel - - - {92777e64-9978-40ae-8b90-93ecbbbefe67} - Moryx.Runtime - True - - - {24ed97ad-6d04-4dc0-afcb-c911ef0aa738} - Moryx.TestModule - - - {d6dc00c6-9358-4839-84c0-44df018a74dc} - Moryx.TestTools.SystemTest - + + + - + + + + + + + + + - + + - - 3.12.0 - + - - - - OUTPUT_DIRECTORY="$(OutDir)" - - - - \ No newline at end of file + + diff --git a/src/Tests/Moryx.Runtime.SystemTests/Properties/AssemblyInfo.cs b/src/Tests/Moryx.Runtime.SystemTests/Properties/AssemblyInfo.cs deleted file mode 100644 index e92ff653f..000000000 --- a/src/Tests/Moryx.Runtime.SystemTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Runtime.SystemTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.Runtime.SystemTests")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("fdcfa37f-af95-426a-96be-b0f360a20a20")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tests/Moryx.Tests/Moryx.Tests.csproj b/src/Tests/Moryx.Tests/Moryx.Tests.csproj index 47b12a7d1..abb62dba6 100644 --- a/src/Tests/Moryx.Tests/Moryx.Tests.csproj +++ b/src/Tests/Moryx.Tests/Moryx.Tests.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.0 + netcoreapp3.1 full diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/HelloWorld/ConnectedService.json b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/HelloWorld/ConnectedService.json new file mode 100644 index 000000000..4d2113b56 --- /dev/null +++ b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/HelloWorld/ConnectedService.json @@ -0,0 +1,19 @@ +{ + "ProviderId": "Microsoft.VisualStudio.ConnectedService.Wcf", + "Version": "15.0.40203.910", + "ExtendedData": { + "inputs": [ + "http://localhost/metadata/HelloWorldWcfService" + ], + "collectionTypes": [ + "System.Array", + "System.Collections.Generic.Dictionary`2" + ], + "namespaceMappings": [ + "*, Moryx.Tools.Wcf.SystemTests.HelloWorld" + ], + "sync": true, + "targetFramework": "net45", + "typeReuseMode": "None" + } +} \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/HelloWorld/Reference.cs b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/HelloWorld/Reference.cs new file mode 100644 index 000000000..f39e57ade --- /dev/null +++ b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/HelloWorld/Reference.cs @@ -0,0 +1,383 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Moryx.Tools.Wcf.SystemTests.HelloWorld +{ + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="Moryx.Tools.Wcf.SystemTests.HelloWorld.IHelloWorldWcfService", CallbackContract=typeof(Moryx.Tools.Wcf.SystemTests.HelloWorld.IHelloWorldWcfServiceCallback))] + public interface IHelloWorldWcfService + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Subscribe", ReplyAction="http://tempuri.org/ISessionService/SubscribeResponse")] + void Subscribe(string clientId); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Subscribe", ReplyAction="http://tempuri.org/ISessionService/SubscribeResponse")] + System.Threading.Tasks.Task SubscribeAsync(string clientId); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Heartbeat", ReplyAction="http://tempuri.org/ISessionService/HeartbeatResponse")] + long Heartbeat(long beat); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Heartbeat", ReplyAction="http://tempuri.org/ISessionService/HeartbeatResponse")] + System.Threading.Tasks.Task HeartbeatAsync(long beat); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/ISessionService/Unsubscribe")] + void Unsubscribe(); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/ISessionService/Unsubscribe")] + System.Threading.Tasks.Task UnsubscribeAsync(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/IHelloWorldWcfService/HelloResponse")] + string Hello(string name); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/IHelloWorldWcfService/HelloResponse")] + System.Threading.Tasks.Task HelloAsync(string name); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/IHelloWorldWcfService/ThrowResponse")] + string Throw(string name); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/IHelloWorldWcfService/ThrowResponse")] + System.Threading.Tasks.Task ThrowAsync(string name); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerHelloCallback")] + void TriggerHelloCallback(string name); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerHelloCallback")] + System.Threading.Tasks.Task TriggerHelloCallbackAsync(string name); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerThrowCallback")] + void TriggerThrowCallback(string name); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerThrowCallback")] + System.Threading.Tasks.Task TriggerThrowCallbackAsync(string name); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/DeferredDisconnect")] + void DeferredDisconnect(int waitInMs); + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/DeferredDisconnect")] + System.Threading.Tasks.Task DeferredDisconnectAsync(int waitInMs); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public interface IHelloWorldWcfServiceCallback + { + + [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/HelloCallback")] + void HelloCallback(string message); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/ThrowCallback", ReplyAction="http://tempuri.org/IHelloWorldWcfService/ThrowCallbackResponse")] + string ThrowCallback(string message); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public interface IHelloWorldWcfServiceChannel : Moryx.Tools.Wcf.SystemTests.HelloWorld.IHelloWorldWcfService, System.ServiceModel.IClientChannel + { + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public partial class HelloWorldWcfServiceClientBase : System.ServiceModel.DuplexClientBase, Moryx.Tools.Wcf.SystemTests.HelloWorld.IHelloWorldWcfService + { + + /// + /// Implement this partial method to configure the service endpoint. + /// + /// The endpoint to configure + /// The client credentials + static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials); + + public HelloWorldWcfServiceClientBase(System.ServiceModel.InstanceContext callbackInstance) : + base(callbackInstance, HelloWorldWcfServiceClientBase.GetDefaultBinding(), HelloWorldWcfServiceClientBase.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.NetTcpBinding_IHelloWorldWcfService.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public HelloWorldWcfServiceClientBase(System.ServiceModel.InstanceContext callbackInstance, EndpointConfiguration endpointConfiguration) : + base(callbackInstance, HelloWorldWcfServiceClientBase.GetBindingForEndpoint(endpointConfiguration), HelloWorldWcfServiceClientBase.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public HelloWorldWcfServiceClientBase(System.ServiceModel.InstanceContext callbackInstance, EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(callbackInstance, HelloWorldWcfServiceClientBase.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public HelloWorldWcfServiceClientBase(System.ServiceModel.InstanceContext callbackInstance, EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(callbackInstance, HelloWorldWcfServiceClientBase.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public HelloWorldWcfServiceClientBase(System.ServiceModel.InstanceContext callbackInstance, System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(callbackInstance, binding, remoteAddress) + { + } + + public void Subscribe(string clientId) + { + base.Channel.Subscribe(clientId); + } + + public System.Threading.Tasks.Task SubscribeAsync(string clientId) + { + return base.Channel.SubscribeAsync(clientId); + } + + public long Heartbeat(long beat) + { + return base.Channel.Heartbeat(beat); + } + + public System.Threading.Tasks.Task HeartbeatAsync(long beat) + { + return base.Channel.HeartbeatAsync(beat); + } + + public void Unsubscribe() + { + base.Channel.Unsubscribe(); + } + + public System.Threading.Tasks.Task UnsubscribeAsync() + { + return base.Channel.UnsubscribeAsync(); + } + + public string Hello(string name) + { + return base.Channel.Hello(name); + } + + public System.Threading.Tasks.Task HelloAsync(string name) + { + return base.Channel.HelloAsync(name); + } + + public string Throw(string name) + { + return base.Channel.Throw(name); + } + + public System.Threading.Tasks.Task ThrowAsync(string name) + { + return base.Channel.ThrowAsync(name); + } + + public void TriggerHelloCallback(string name) + { + base.Channel.TriggerHelloCallback(name); + } + + public System.Threading.Tasks.Task TriggerHelloCallbackAsync(string name) + { + return base.Channel.TriggerHelloCallbackAsync(name); + } + + public void TriggerThrowCallback(string name) + { + base.Channel.TriggerThrowCallback(name); + } + + public System.Threading.Tasks.Task TriggerThrowCallbackAsync(string name) + { + return base.Channel.TriggerThrowCallbackAsync(name); + } + + public void DeferredDisconnect(int waitInMs) + { + base.Channel.DeferredDisconnect(waitInMs); + } + + public System.Threading.Tasks.Task DeferredDisconnectAsync(int waitInMs) + { + return base.Channel.DeferredDisconnectAsync(waitInMs); + } + + public virtual System.Threading.Tasks.Task OpenAsync() + { + return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndOpen)); + } + + public virtual System.Threading.Tasks.Task CloseAsync() + { + return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndClose)); + } + + private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.NetTcpBinding_IHelloWorldWcfService)) + { + System.ServiceModel.NetTcpBinding result = new System.ServiceModel.NetTcpBinding(); + result.MaxBufferSize = int.MaxValue; + result.ReaderQuotas = System.Xml.XmlDictionaryReaderQuotas.Max; + result.MaxReceivedMessageSize = int.MaxValue; + result.Security.Mode = System.ServiceModel.SecurityMode.None; + return result; + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.NetTcpBinding_IHelloWorldWcfService)) + { + return new System.ServiceModel.EndpointAddress("net.tcp://pxc-n2488:816/HelloWorldWcfService"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return HelloWorldWcfServiceClientBase.GetBindingForEndpoint(EndpointConfiguration.NetTcpBinding_IHelloWorldWcfService); + } + + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return HelloWorldWcfServiceClientBase.GetEndpointAddress(EndpointConfiguration.NetTcpBinding_IHelloWorldWcfService); + } + + public enum EndpointConfiguration + { + + NetTcpBinding_IHelloWorldWcfService, + } + } + + public class HelloCallbackReceivedEventArgs : System.ComponentModel.AsyncCompletedEventArgs + { + + private object[] results; + + public HelloCallbackReceivedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) + { + this.results = results; + } + + public string message + { + get + { + base.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + public class ThrowCallbackReceivedEventArgs : System.ComponentModel.AsyncCompletedEventArgs + { + + private object[] results; + + public ThrowCallbackReceivedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) + { + this.results = results; + } + + public string message + { + get + { + base.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + public partial class HelloWorldWcfServiceClient : HelloWorldWcfServiceClientBase + { + + public HelloWorldWcfServiceClient(EndpointConfiguration endpointConfiguration) : + this(new HelloWorldWcfServiceClientCallback(), endpointConfiguration) + { + } + + private HelloWorldWcfServiceClient(HelloWorldWcfServiceClientCallback callbackImpl, EndpointConfiguration endpointConfiguration) : + base(new System.ServiceModel.InstanceContext(callbackImpl), endpointConfiguration) + { + callbackImpl.Initialize(this); + } + + public HelloWorldWcfServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + this(new HelloWorldWcfServiceClientCallback(), binding, remoteAddress) + { + } + + private HelloWorldWcfServiceClient(HelloWorldWcfServiceClientCallback callbackImpl, System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(new System.ServiceModel.InstanceContext(callbackImpl), binding, remoteAddress) + { + callbackImpl.Initialize(this); + } + + public HelloWorldWcfServiceClient() : + this(new HelloWorldWcfServiceClientCallback()) + { + } + + private HelloWorldWcfServiceClient(HelloWorldWcfServiceClientCallback callbackImpl) : + base(new System.ServiceModel.InstanceContext(callbackImpl)) + { + callbackImpl.Initialize(this); + } + + public event System.EventHandler HelloCallbackReceived; + + public event System.EventHandler ThrowCallbackReceived; + + private void OnHelloCallbackReceived(object state) + { + if ((this.HelloCallbackReceived != null)) + { + object[] results = ((object[])(state)); + this.HelloCallbackReceived(this, new HelloCallbackReceivedEventArgs(results, null, false, null)); + } + } + + private void OnThrowCallbackReceived(object state) + { + if ((this.ThrowCallbackReceived != null)) + { + object[] results = ((object[])(state)); + this.ThrowCallbackReceived(this, new ThrowCallbackReceivedEventArgs(results, null, false, null)); + } + } + + private class HelloWorldWcfServiceClientCallback : object, IHelloWorldWcfServiceCallback + { + + private HelloWorldWcfServiceClient proxy; + + public void Initialize(HelloWorldWcfServiceClient proxy) + { + this.proxy = proxy; + } + + public void HelloCallback(string message) + { + this.proxy.OnHelloCallbackReceived(new object[] { + message}); + } + + public string ThrowCallback(string message) + { + this.proxy.OnThrowCallbackReceived(new object[] { + message}); + return default(string); + } + } + } +} diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/SimpleHelloWorld/ConnectedService.json b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/SimpleHelloWorld/ConnectedService.json new file mode 100644 index 000000000..182af892b --- /dev/null +++ b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/SimpleHelloWorld/ConnectedService.json @@ -0,0 +1,19 @@ +{ + "ProviderId": "Microsoft.VisualStudio.ConnectedService.Wcf", + "Version": "15.0.40203.910", + "ExtendedData": { + "inputs": [ + "http://localhost/metadata/SimpleHelloWorldWcfService" + ], + "collectionTypes": [ + "System.Array", + "System.Collections.Generic.Dictionary`2" + ], + "namespaceMappings": [ + "*, Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld" + ], + "sync": true, + "targetFramework": "net45", + "typeReuseMode": "None" + } +} \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/SimpleHelloWorld/Reference.cs b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/SimpleHelloWorld/Reference.cs new file mode 100644 index 000000000..7927d872e --- /dev/null +++ b/src/Tests/Moryx.Tools.Wcf.SystemTests/Connected Services/SimpleHelloWorld/Reference.cs @@ -0,0 +1,151 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld +{ + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld.ISimpleHelloWorldWcfService")] + public interface ISimpleHelloWorldWcfService + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/HelloResponse")] + string Hello(string name); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/HelloResponse")] + System.Threading.Tasks.Task HelloAsync(string name); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/ThrowResponse")] + string Throw(string name); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/ThrowResponse")] + System.Threading.Tasks.Task ThrowAsync(string name); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public interface ISimpleHelloWorldWcfServiceChannel : Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld.ISimpleHelloWorldWcfService, System.ServiceModel.IClientChannel + { + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public partial class SimpleHelloWorldWcfServiceClient : System.ServiceModel.ClientBase, Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld.ISimpleHelloWorldWcfService + { + + /// + /// Implement this partial method to configure the service endpoint. + /// + /// The endpoint to configure + /// The client credentials + static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials); + + public SimpleHelloWorldWcfServiceClient() : + base(SimpleHelloWorldWcfServiceClient.GetDefaultBinding(), SimpleHelloWorldWcfServiceClient.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_ISimpleHelloWorldWcfService.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public SimpleHelloWorldWcfServiceClient(EndpointConfiguration endpointConfiguration) : + base(SimpleHelloWorldWcfServiceClient.GetBindingForEndpoint(endpointConfiguration), SimpleHelloWorldWcfServiceClient.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public SimpleHelloWorldWcfServiceClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(SimpleHelloWorldWcfServiceClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public SimpleHelloWorldWcfServiceClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(SimpleHelloWorldWcfServiceClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public SimpleHelloWorldWcfServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) + { + } + + public string Hello(string name) + { + return base.Channel.Hello(name); + } + + public System.Threading.Tasks.Task HelloAsync(string name) + { + return base.Channel.HelloAsync(name); + } + + public string Throw(string name) + { + return base.Channel.Throw(name); + } + + public System.Threading.Tasks.Task ThrowAsync(string name) + { + return base.Channel.ThrowAsync(name); + } + + public virtual System.Threading.Tasks.Task OpenAsync() + { + return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndOpen)); + } + + public virtual System.Threading.Tasks.Task CloseAsync() + { + return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndClose)); + } + + private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ISimpleHelloWorldWcfService)) + { + System.ServiceModel.BasicHttpBinding result = new System.ServiceModel.BasicHttpBinding(); + result.MaxBufferSize = int.MaxValue; + result.ReaderQuotas = System.Xml.XmlDictionaryReaderQuotas.Max; + result.MaxReceivedMessageSize = int.MaxValue; + result.AllowCookies = true; + return result; + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ISimpleHelloWorldWcfService)) + { + return new System.ServiceModel.EndpointAddress("http://pxc-n2488/SimpleHelloWorldWcfService"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return SimpleHelloWorldWcfServiceClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_ISimpleHelloWorldWcfService); + } + + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return SimpleHelloWorldWcfServiceClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_ISimpleHelloWorldWcfService); + } + + public enum EndpointConfiguration + { + + BasicHttpBinding_ISimpleHelloWorldWcfService, + } + } +} diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Moryx.Tools.Wcf.SystemTests.csproj b/src/Tests/Moryx.Tools.Wcf.SystemTests/Moryx.Tools.Wcf.SystemTests.csproj index 8544afeae..86227ffff 100644 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Moryx.Tools.Wcf.SystemTests.csproj +++ b/src/Tests/Moryx.Tools.Wcf.SystemTests/Moryx.Tools.Wcf.SystemTests.csproj @@ -1,161 +1,34 @@ - - - + + + + - Debug - AnyCPU - {74D4C6FE-2E58-4F31-A915-6CF061C0149B} - Library - Properties - Moryx.Tools.Wcf.SystemTests - Moryx.Tools.Wcf.SystemTests - v4.6.1 - 512 - - - + net45 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - True - True - Reference.svcmap - - - True - True - Reference.svcmap - - - - - - {eb039d46-906f-44bf-ac37-b3b3634a4442} - Moryx.Runtime.Maintenance - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {505df475-5ff5-47cc-9e3b-bbe16c359f0e} - Moryx.TestTools.UnitTest - - - {92777E64-9978-40AE-8B90-93ECBBBEFE67} - Moryx.Runtime - True - - - {D8344B1F-9DB3-4E85-9195-6FFFECBF6427} - Moryx.DependentTestModule - - - {7cd728a5-8fdd-4178-9ca4-3cd37512da24} - Moryx - - - {24ED97AD-6D04-4DC0-AFCB-C911EF0AA738} - Moryx.TestModule - - - {d6dc00c6-9358-4839-84c0-44df018a74dc} - Moryx.TestTools.SystemTest - - - {B47E0CB5-A3EC-4ED6-BCBF-9E3BEA6ABF5D} - Moryx.Runtime.SystemTests - - - - - - - - - - Designer - - - Designer - - - - Designer - - - Designer - - - - - - - - - - - - - - - WCF Proxy Generator - Reference.cs - - + - + + + - + + + + + + + + + + - - WCF Proxy Generator - Reference.cs - - - - + + - - 3.12.0 - + - - - \ No newline at end of file + + diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Properties/AssemblyInfo.cs b/src/Tests/Moryx.Tools.Wcf.SystemTests/Properties/AssemblyInfo.cs deleted file mode 100644 index ab0f8ddb3..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Marin.Runtime.Wcf.SystemTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Marin.Runtime.Wcf.SystemTests")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("03c44071-0003-475d-a64c-2ec37c219675")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService.wsdl b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService.wsdl deleted file mode 100644 index 4129a4825..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService.wsdl +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - net.tcp://localhost:816/HelloWorldWcfService - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService.xsd b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService.xsd deleted file mode 100644 index d58e7f39c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService1.xsd b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService1.xsd deleted file mode 100644 index 35e5a2a37..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/HelloWorldWcfService1.xsd +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/Reference.cs b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/Reference.cs deleted file mode 100644 index 3229d404b..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/Reference.cs +++ /dev/null @@ -1,169 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Moryx.Tools.Wcf.SystemTests.HelloWorld { - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="HelloWorld.IHelloWorldWcfService", CallbackContract=typeof(Moryx.Tools.Wcf.SystemTests.HelloWorld.IHelloWorldWcfServiceCallback), SessionMode=System.ServiceModel.SessionMode.Required)] - public interface IHelloWorldWcfService { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Subscribe", ReplyAction="http://tempuri.org/ISessionService/SubscribeResponse")] - void Subscribe(string clientId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Subscribe", ReplyAction="http://tempuri.org/ISessionService/SubscribeResponse")] - System.Threading.Tasks.Task SubscribeAsync(string clientId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Heartbeat", ReplyAction="http://tempuri.org/ISessionService/HeartbeatResponse")] - long Heartbeat(long beat); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISessionService/Heartbeat", ReplyAction="http://tempuri.org/ISessionService/HeartbeatResponse")] - System.Threading.Tasks.Task HeartbeatAsync(long beat); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/ISessionService/Unsubscribe")] - void Unsubscribe(); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/ISessionService/Unsubscribe")] - System.Threading.Tasks.Task UnsubscribeAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/IHelloWorldWcfService/HelloResponse")] - string Hello(string name); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/IHelloWorldWcfService/HelloResponse")] - System.Threading.Tasks.Task HelloAsync(string name); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/IHelloWorldWcfService/ThrowResponse")] - string Throw(string name); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/IHelloWorldWcfService/ThrowResponse")] - System.Threading.Tasks.Task ThrowAsync(string name); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerHelloCallback")] - void TriggerHelloCallback(string name); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerHelloCallback")] - System.Threading.Tasks.Task TriggerHelloCallbackAsync(string name); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerThrowCallback")] - void TriggerThrowCallback(string name); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/TriggerThrowCallback")] - System.Threading.Tasks.Task TriggerThrowCallbackAsync(string name); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/DeferredDisconnect")] - void DeferredDisconnect(int waitInMs); - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/DeferredDisconnect")] - System.Threading.Tasks.Task DeferredDisconnectAsync(int waitInMs); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IHelloWorldWcfServiceCallback { - - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IHelloWorldWcfService/HelloCallback")] - void HelloCallback(string message); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHelloWorldWcfService/ThrowCallback", ReplyAction="http://tempuri.org/IHelloWorldWcfService/ThrowCallbackResponse")] - string ThrowCallback(string message); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IHelloWorldWcfServiceChannel : Moryx.Tools.Wcf.SystemTests.HelloWorld.IHelloWorldWcfService, System.ServiceModel.IClientChannel { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class HelloWorldWcfServiceClient : System.ServiceModel.DuplexClientBase, Moryx.Tools.Wcf.SystemTests.HelloWorld.IHelloWorldWcfService { - - public HelloWorldWcfServiceClient(System.ServiceModel.InstanceContext callbackInstance) : - base(callbackInstance) { - } - - public HelloWorldWcfServiceClient(System.ServiceModel.InstanceContext callbackInstance, string endpointConfigurationName) : - base(callbackInstance, endpointConfigurationName) { - } - - public HelloWorldWcfServiceClient(System.ServiceModel.InstanceContext callbackInstance, string endpointConfigurationName, string remoteAddress) : - base(callbackInstance, endpointConfigurationName, remoteAddress) { - } - - public HelloWorldWcfServiceClient(System.ServiceModel.InstanceContext callbackInstance, string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(callbackInstance, endpointConfigurationName, remoteAddress) { - } - - public HelloWorldWcfServiceClient(System.ServiceModel.InstanceContext callbackInstance, System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(callbackInstance, binding, remoteAddress) { - } - - public void Subscribe(string clientId) { - base.Channel.Subscribe(clientId); - } - - public System.Threading.Tasks.Task SubscribeAsync(string clientId) { - return base.Channel.SubscribeAsync(clientId); - } - - public long Heartbeat(long beat) { - return base.Channel.Heartbeat(beat); - } - - public System.Threading.Tasks.Task HeartbeatAsync(long beat) { - return base.Channel.HeartbeatAsync(beat); - } - - public void Unsubscribe() { - base.Channel.Unsubscribe(); - } - - public System.Threading.Tasks.Task UnsubscribeAsync() { - return base.Channel.UnsubscribeAsync(); - } - - public string Hello(string name) { - return base.Channel.Hello(name); - } - - public System.Threading.Tasks.Task HelloAsync(string name) { - return base.Channel.HelloAsync(name); - } - - public string Throw(string name) { - return base.Channel.Throw(name); - } - - public System.Threading.Tasks.Task ThrowAsync(string name) { - return base.Channel.ThrowAsync(name); - } - - public void TriggerHelloCallback(string name) { - base.Channel.TriggerHelloCallback(name); - } - - public System.Threading.Tasks.Task TriggerHelloCallbackAsync(string name) { - return base.Channel.TriggerHelloCallbackAsync(name); - } - - public void TriggerThrowCallback(string name) { - base.Channel.TriggerThrowCallback(name); - } - - public System.Threading.Tasks.Task TriggerThrowCallbackAsync(string name) { - return base.Channel.TriggerThrowCallbackAsync(name); - } - - public void DeferredDisconnect(int waitInMs) { - base.Channel.DeferredDisconnect(waitInMs); - } - - public System.Threading.Tasks.Task DeferredDisconnectAsync(int waitInMs) { - return base.Channel.DeferredDisconnectAsync(waitInMs); - } - } -} diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/Reference.svcmap b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/Reference.svcmap deleted file mode 100644 index 6e4e2d67e..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/Reference.svcmap +++ /dev/null @@ -1,33 +0,0 @@ - - - - false - true - true - - false - false - false - - - true - Auto - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/configuration.svcinfo b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/configuration.svcinfo deleted file mode 100644 index 5877d7e3a..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/configuration91.svcinfo b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/configuration91.svcinfo deleted file mode 100644 index e098fb3ea..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/HelloWorld/configuration91.svcinfo +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - NetTcpBinding_IHelloWorldWcfService - - - - - - - - - - - - - - - False - - - Buffered - - - OleTransactions - - - StrongWildcard - - - 0 - - - - - - 65536 - - - 0 - - - - - - False - - - System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - System.ServiceModel.Configuration.StandardBindingOptionalReliableSessionElement - - - True - - - 00:10:00 - - - False - - - System.ServiceModel.Configuration.NetTcpSecurityElement - - - None - - - System.ServiceModel.Configuration.TcpTransportSecurityElement - - - Windows - - - EncryptAndSign - - - System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement - - - Never - - - TransportSelected - - - (Collection) - - - Tls, Tls11, Tls12 - - - System.ServiceModel.Configuration.MessageSecurityOverTcpElement - - - Windows - - - Default - - - - - - - - - net.tcp://localhost:816/HelloWorldWcfService - - - - - - netTcpBinding - - - NetTcpBinding_IHelloWorldWcfService - - - HelloWorld.IHelloWorldWcfService - - - System.ServiceModel.Configuration.AddressHeaderCollectionElement - - - <Header /> - - - System.ServiceModel.Configuration.IdentityElement - - - System.ServiceModel.Configuration.UserPrincipalNameElement - - - - - - System.ServiceModel.Configuration.ServicePrincipalNameElement - - - - - - System.ServiceModel.Configuration.DnsElement - - - - - - System.ServiceModel.Configuration.RsaElement - - - - - - System.ServiceModel.Configuration.CertificateElement - - - - - - System.ServiceModel.Configuration.CertificateReferenceElement - - - My - - - LocalMachine - - - FindBySubjectDistinguishedName - - - - - - False - - - NetTcpBinding_IHelloWorldWcfService - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/Reference.cs b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/Reference.cs deleted file mode 100644 index faa6e7754..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/Reference.cs +++ /dev/null @@ -1,74 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld { - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="SimpleHelloWorld.ISimpleHelloWorldWcfService")] - public interface ISimpleHelloWorldWcfService { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/HelloResponse")] - string Hello(string name); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Hello", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/HelloResponse")] - System.Threading.Tasks.Task HelloAsync(string name); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/ThrowResponse")] - string Throw(string name); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISimpleHelloWorldWcfService/Throw", ReplyAction="http://tempuri.org/ISimpleHelloWorldWcfService/ThrowResponse")] - System.Threading.Tasks.Task ThrowAsync(string name); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface ISimpleHelloWorldWcfServiceChannel : Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld.ISimpleHelloWorldWcfService, System.ServiceModel.IClientChannel { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class SimpleHelloWorldWcfServiceClient : System.ServiceModel.ClientBase, Moryx.Tools.Wcf.SystemTests.SimpleHelloWorld.ISimpleHelloWorldWcfService { - - public SimpleHelloWorldWcfServiceClient() { - } - - public SimpleHelloWorldWcfServiceClient(string endpointConfigurationName) : - base(endpointConfigurationName) { - } - - public SimpleHelloWorldWcfServiceClient(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public SimpleHelloWorldWcfServiceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public SimpleHelloWorldWcfServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(binding, remoteAddress) { - } - - public string Hello(string name) { - return base.Channel.Hello(name); - } - - public System.Threading.Tasks.Task HelloAsync(string name) { - return base.Channel.HelloAsync(name); - } - - public string Throw(string name) { - return base.Channel.Throw(name); - } - - public System.Threading.Tasks.Task ThrowAsync(string name) { - return base.Channel.ThrowAsync(name); - } - } -} diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/Reference.svcmap b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/Reference.svcmap deleted file mode 100644 index 2dc3a5b9f..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/Reference.svcmap +++ /dev/null @@ -1,33 +0,0 @@ - - - - false - true - true - - false - false - false - - - true - Auto - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService.wsdl b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService.wsdl deleted file mode 100644 index 0854fddda..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService.wsdl +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService.xsd b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService.xsd deleted file mode 100644 index d58e7f39c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService1.xsd b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService1.xsd deleted file mode 100644 index 7d7171e98..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/SimpleHelloWorldWcfService1.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/configuration.svcinfo b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/configuration.svcinfo deleted file mode 100644 index 305090602..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/configuration91.svcinfo b/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/configuration91.svcinfo deleted file mode 100644 index 06f73695e..000000000 --- a/src/Tests/Moryx.Tools.Wcf.SystemTests/Service References/SimpleHelloWorld/configuration91.svcinfo +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - BasicHttpBinding_ISimpleHelloWorldWcfService - - - - - - - - - - - - - - - - - - - - - StrongWildcard - - - - - - 65536 - - - - - - - - - System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - System.Text.UTF8Encoding - - - Buffered - - - - - - Text - - - System.ServiceModel.Configuration.BasicHttpSecurityElement - - - None - - - System.ServiceModel.Configuration.HttpTransportSecurityElement - - - None - - - None - - - System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement - - - Never - - - TransportSelected - - - (Collection) - - - - - - System.ServiceModel.Configuration.BasicHttpMessageSecurityElement - - - UserName - - - Default - - - - - - - - - http://localhost/SimpleHelloWorldWcfService - - - - - - basicHttpBinding - - - BasicHttpBinding_ISimpleHelloWorldWcfService - - - SimpleHelloWorld.ISimpleHelloWorldWcfService - - - System.ServiceModel.Configuration.AddressHeaderCollectionElement - - - <Header /> - - - System.ServiceModel.Configuration.IdentityElement - - - System.ServiceModel.Configuration.UserPrincipalNameElement - - - - - - System.ServiceModel.Configuration.ServicePrincipalNameElement - - - - - - System.ServiceModel.Configuration.DnsElement - - - - - - System.ServiceModel.Configuration.RsaElement - - - - - - System.ServiceModel.Configuration.CertificateElement - - - - - - System.ServiceModel.Configuration.CertificateReferenceElement - - - My - - - LocalMachine - - - FindBySubjectDistinguishedName - - - - - - False - - - BasicHttpBinding_ISimpleHelloWorldWcfService - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Connected Services/Logging/ConnectedService.json b/src/Tests/Moryx.Tools.Wcf.Tests/Connected Services/Logging/ConnectedService.json new file mode 100644 index 000000000..5a762e4b8 --- /dev/null +++ b/src/Tests/Moryx.Tools.Wcf.Tests/Connected Services/Logging/ConnectedService.json @@ -0,0 +1,18 @@ +{ + "ProviderId": "Microsoft.VisualStudio.ConnectedService.Wcf", + "Version": "15.0.40203.910", + "ExtendedData": { + "inputs": [ + "http://localhost/metadata/LogMaintenance" + ], + "collectionTypes": [ + "System.Array", + "System.Collections.Generic.Dictionary`2" + ], + "namespaceMappings": [ + "*, Moryx.Tools.Wcf.Tests.Logging" + ], + "targetFramework": "net45", + "typeReuseMode": "None" + } +} \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Connected Services/Logging/Reference.cs b/src/Tests/Moryx.Tools.Wcf.Tests/Connected Services/Logging/Reference.cs new file mode 100644 index 000000000..2c9ecade0 --- /dev/null +++ b/src/Tests/Moryx.Tools.Wcf.Tests/Connected Services/Logging/Reference.cs @@ -0,0 +1,397 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Moryx.Tools.Wcf.Tests.Logging +{ + using System.Runtime.Serialization; + + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="LoggerModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Logging" + + "")] + public partial class LoggerModel : object + { + + private Moryx.Tools.Wcf.Tests.Logging.LogLevel ActiveLevelField; + + private Moryx.Tools.Wcf.Tests.Logging.LoggerModel[] ChildLoggerField; + + private string NameField; + + private Moryx.Tools.Wcf.Tests.Logging.LoggerModel ParentField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Tools.Wcf.Tests.Logging.LogLevel ActiveLevel + { + get + { + return this.ActiveLevelField; + } + set + { + this.ActiveLevelField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Tools.Wcf.Tests.Logging.LoggerModel[] ChildLogger + { + get + { + return this.ChildLoggerField; + } + set + { + this.ChildLoggerField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Tools.Wcf.Tests.Logging.LoggerModel Parent + { + get + { + return this.ParentField; + } + set + { + this.ParentField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="LogLevel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Logging")] + public enum LogLevel : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + Trace = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Debug = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Info = 2, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Warning = 3, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Error = 4, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Fatal = 5, + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="SetLogLevelRequest", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Logging" + + "")] + public partial class SetLogLevelRequest : object + { + + private Moryx.Tools.Wcf.Tests.Logging.LogLevel LevelField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Tools.Wcf.Tests.Logging.LogLevel Level + { + get + { + return this.LevelField; + } + set + { + this.LevelField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="InvocationResponse", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins")] + public partial class InvocationResponse : object + { + + private string ErrorMessageField; + + private string ExceptionTypeField; + + private bool SuccessField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string ErrorMessage + { + get + { + return this.ErrorMessageField; + } + set + { + this.ErrorMessageField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string ExceptionType + { + get + { + return this.ExceptionTypeField; + } + set + { + this.ExceptionTypeField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool Success + { + get + { + return this.SuccessField; + } + set + { + this.SuccessField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="AddAppenderRequest", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Logging" + + "")] + public partial class AddAppenderRequest : object + { + + private Moryx.Tools.Wcf.Tests.Logging.LogLevel MinLevelField; + + private string NameField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Tools.Wcf.Tests.Logging.LogLevel MinLevel + { + get + { + return this.MinLevelField; + } + set + { + this.MinLevelField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="AddAppenderResponse", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Logging" + + "")] + public partial class AddAppenderResponse : object + { + + private int AppenderIdField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public int AppenderId + { + get + { + return this.AppenderIdField; + } + set + { + this.AppenderIdField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="LogMessageModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Logging" + + "")] + public partial class LogMessageModel : object + { + + private string ClassNameField; + + private Moryx.Tools.Wcf.Tests.Logging.LogLevel LogLevelField; + + private Moryx.Tools.Wcf.Tests.Logging.LoggerModel LoggerField; + + private string MessageField; + + private System.DateTime TimestampField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string ClassName + { + get + { + return this.ClassNameField; + } + set + { + this.ClassNameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Tools.Wcf.Tests.Logging.LogLevel LogLevel + { + get + { + return this.LogLevelField; + } + set + { + this.LogLevelField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Tools.Wcf.Tests.Logging.LoggerModel Logger + { + get + { + return this.LoggerField; + } + set + { + this.LoggerField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Message + { + get + { + return this.MessageField; + } + set + { + this.MessageField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public System.DateTime Timestamp + { + get + { + return this.TimestampField; + } + set + { + this.TimestampField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="Moryx.Tools.Wcf.Tests.Logging.ILogMaintenance")] + public interface ILogMaintenance + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/GetAllLoggers", ReplyAction="http://tempuri.org/ILogMaintenance/GetAllLoggersResponse")] + System.Threading.Tasks.Task GetAllLoggersAsync(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/SetLogLevel", ReplyAction="http://tempuri.org/ILogMaintenance/SetLogLevelResponse")] + System.Threading.Tasks.Task SetLogLevelAsync(string loggerName, Moryx.Tools.Wcf.Tests.Logging.SetLogLevelRequest setLogLevelRequest); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/AddAppender", ReplyAction="http://tempuri.org/ILogMaintenance/AddAppenderResponse")] + System.Threading.Tasks.Task AddAppenderAsync(Moryx.Tools.Wcf.Tests.Logging.AddAppenderRequest request); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/RemoveAppender", ReplyAction="http://tempuri.org/ILogMaintenance/RemoveAppenderResponse")] + System.Threading.Tasks.Task RemoveAppenderAsync(string appenderId); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/GetMessages", ReplyAction="http://tempuri.org/ILogMaintenance/GetMessagesResponse")] + System.Threading.Tasks.Task GetMessagesAsync(string appenderId); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public interface ILogMaintenanceChannel : Moryx.Tools.Wcf.Tests.Logging.ILogMaintenance, System.ServiceModel.IClientChannel + { + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public partial class LogMaintenanceClient : System.ServiceModel.ClientBase, Moryx.Tools.Wcf.Tests.Logging.ILogMaintenance + { + + public LogMaintenanceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) + { + } + + public System.Threading.Tasks.Task GetAllLoggersAsync() + { + return base.Channel.GetAllLoggersAsync(); + } + + public System.Threading.Tasks.Task SetLogLevelAsync(string loggerName, Moryx.Tools.Wcf.Tests.Logging.SetLogLevelRequest setLogLevelRequest) + { + return base.Channel.SetLogLevelAsync(loggerName, setLogLevelRequest); + } + + public System.Threading.Tasks.Task AddAppenderAsync(Moryx.Tools.Wcf.Tests.Logging.AddAppenderRequest request) + { + return base.Channel.AddAppenderAsync(request); + } + + public System.Threading.Tasks.Task RemoveAppenderAsync(string appenderId) + { + return base.Channel.RemoveAppenderAsync(appenderId); + } + + public System.Threading.Tasks.Task GetMessagesAsync(string appenderId) + { + return base.Channel.GetMessagesAsync(appenderId); + } + + public virtual System.Threading.Tasks.Task OpenAsync() + { + return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndOpen)); + } + + public virtual System.Threading.Tasks.Task CloseAsync() + { + return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndClose)); + } + } +} diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/LogMaintenanceClientMock.cs b/src/Tests/Moryx.Tools.Wcf.Tests/LogMaintenanceClientMock.cs index ef6d6425e..95e83baab 100644 --- a/src/Tests/Moryx.Tools.Wcf.Tests/LogMaintenanceClientMock.cs +++ b/src/Tests/Moryx.Tools.Wcf.Tests/LogMaintenanceClientMock.cs @@ -1,28 +1,16 @@ // Copyright (c) 2020, Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 +using System.ServiceModel; +using System.ServiceModel.Channels; using Moryx.Tools.Wcf.Tests.Logging; namespace Moryx.Tools.Wcf.Tests { public class LogMaintenanceClientMock : LogMaintenanceClient { - public LogMaintenanceClientMock() { - } - - public LogMaintenanceClientMock(string endpointConfigurationName) : - base(endpointConfigurationName) { - } - - public LogMaintenanceClientMock(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public LogMaintenanceClientMock(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - public LogMaintenanceClientMock(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + public LogMaintenanceClientMock(Binding binding, EndpointAddress remoteAddress) : base(binding, remoteAddress) { } diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/ModuleMaintenanceClientMock.cs b/src/Tests/Moryx.Tools.Wcf.Tests/ModuleMaintenanceClientMock.cs deleted file mode 100644 index 39e682d21..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/ModuleMaintenanceClientMock.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2020, Phoenix Contact GmbH & Co. KG -// Licensed under the Apache License, Version 2.0 - -using Moryx.Tools.Wcf.Tests.Maintenance; - -namespace Moryx.Tools.Wcf.Tests -{ - public class ModuleMaintenanceClientMock : ModuleMaintenanceClient - { - public new void Open() - { - - } - } -} diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Moryx.Tools.Wcf.Tests.csproj b/src/Tests/Moryx.Tools.Wcf.Tests/Moryx.Tools.Wcf.Tests.csproj index 89764725f..f634ffdbf 100644 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Moryx.Tools.Wcf.Tests.csproj +++ b/src/Tests/Moryx.Tools.Wcf.Tests/Moryx.Tools.Wcf.Tests.csproj @@ -1,197 +1,28 @@ - - - + + + + - Debug - AnyCPU - {A4CA7B7C-5417-4FA9-9E0B-76D4CD4663C9} - Library - Properties - Moryx.Tools.Wcf.Tests - Moryx.Tools.Wcf.Tests - v4.6.1 - 512 - - - + net45 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - True - True - Reference.svcmap - - - True - True - Reference.svcmap - - - True - True - Reference.svcmap - - - - - + - - - Reference.svcmap - - - Reference.svcmap - - - WCF Proxy Generator - Reference.cs - - - - - Reference.svcmap - - - Reference.svcmap - - - WCF Proxy Generator - Reference.cs - - - - - - - Designer - - - Designer - - - Designer - - - Designer - - - - Designer - - - Designer - - - Designer - - - Designer - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - WCF Proxy Generator - Reference.cs - - - + + + - + + + + - - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - - - - - - - - {05761bae-8649-470d-9a8a-5c7e9d1a2f3a} - Moryx.Tools.Wcf - - - {7CD728A5-8FDD-4178-9CA4-3CD37512DA24} - Moryx - - - {505df475-5ff5-47cc-9e3b-bbe16c359f0e} - Moryx.TestTools.UnitTest - - - - + + - - 4.4.1 - - - 3.12.0 - + - - - \ No newline at end of file + + diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Properties/AssemblyInfo.cs b/src/Tests/Moryx.Tools.Wcf.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index de8129e11..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("Moryx.Tools.Wcf.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.Tools.Wcf.Tests")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c8fcb2c7-9ace-4e15-8d1c-e3b4d4d065c3")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Properties/DataSources/Moryx.Serialization.Entry.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Properties/DataSources/Moryx.Serialization.Entry.datasource deleted file mode 100644 index a4fd87f25..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Properties/DataSources/Moryx.Serialization.Entry.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Serialization.Entry, Moryx, Version=2.5.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Properties/DataSources/Moryx.Serialization.Entry1.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Properties/DataSources/Moryx.Serialization.Entry1.datasource deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance.wsdl b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance.wsdl deleted file mode 100644 index d26774243..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance.wsdl +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance.xsd deleted file mode 100644 index 5f3c17b1f..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance.xsd +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance1.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance1.xsd deleted file mode 100644 index 427b7ec2d..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance1.xsd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance2.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance2.xsd deleted file mode 100644 index 774e4cc33..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance2.xsd +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance3.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance3.xsd deleted file mode 100644 index d58e7f39c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/DatabaseMaintenance3.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DataModel.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DataModel.datasource deleted file mode 100644 index a013631ef..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DataModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DataModel, Service References.DatabaseMaintenance.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DumpResult.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DumpResult.datasource deleted file mode 100644 index 1f5b95b08..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DumpResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DumpResult, Service References.DatabaseMaintenance.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Reference.cs b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Reference.cs deleted file mode 100644 index 1a0e97e55..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Reference.cs +++ /dev/null @@ -1,780 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Moryx.Tools.Wcf.Tests.DatabaseMaintenance { - using System.Runtime.Serialization; - using System; - - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="DataModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Databa" + - "seMaintenance.Wcf")] - [System.SerializableAttribute()] - public partial class DataModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List BackupsField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel ConfigField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List ScriptsField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List SetupsField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string TargetModelField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Backups { - get { - return this.BackupsField; - } - set { - if ((object.ReferenceEquals(this.BackupsField, value) != true)) { - this.BackupsField = value; - this.RaisePropertyChanged("Backups"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel Config { - get { - return this.ConfigField; - } - set { - if ((object.ReferenceEquals(this.ConfigField, value) != true)) { - this.ConfigField = value; - this.RaisePropertyChanged("Config"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Scripts { - get { - return this.ScriptsField; - } - set { - if ((object.ReferenceEquals(this.ScriptsField, value) != true)) { - this.ScriptsField = value; - this.RaisePropertyChanged("Scripts"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Setups { - get { - return this.SetupsField; - } - set { - if ((object.ReferenceEquals(this.SetupsField, value) != true)) { - this.SetupsField = value; - this.RaisePropertyChanged("Setups"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string TargetModel { - get { - return this.TargetModelField; - } - set { - if ((object.ReferenceEquals(this.TargetModelField, value) != true)) { - this.TargetModelField = value; - this.RaisePropertyChanged("TargetModel"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="DatabaseConfigModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Databa" + - "seMaintenance.Wcf")] - [System.SerializableAttribute()] - public partial class DatabaseConfigModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DatabaseField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PasswordField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int PortField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string SchemaField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string ServerField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string UserField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Database { - get { - return this.DatabaseField; - } - set { - if ((object.ReferenceEquals(this.DatabaseField, value) != true)) { - this.DatabaseField = value; - this.RaisePropertyChanged("Database"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Password { - get { - return this.PasswordField; - } - set { - if ((object.ReferenceEquals(this.PasswordField, value) != true)) { - this.PasswordField = value; - this.RaisePropertyChanged("Password"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int Port { - get { - return this.PortField; - } - set { - if ((this.PortField.Equals(value) != true)) { - this.PortField = value; - this.RaisePropertyChanged("Port"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Schema { - get { - return this.SchemaField; - } - set { - if ((object.ReferenceEquals(this.SchemaField, value) != true)) { - this.SchemaField = value; - this.RaisePropertyChanged("Schema"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Server { - get { - return this.ServerField; - } - set { - if ((object.ReferenceEquals(this.ServerField, value) != true)) { - this.ServerField = value; - this.RaisePropertyChanged("Server"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string User { - get { - return this.UserField; - } - set { - if ((object.ReferenceEquals(this.UserField, value) != true)) { - this.UserField = value; - this.RaisePropertyChanged("User"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="BackupModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Databa" + - "seMaintenance.Wcf")] - [System.SerializableAttribute()] - public partial class BackupModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.DateTime CreationDateField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string FileNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IsForTargetModelField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int SizeField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.DateTime CreationDate { - get { - return this.CreationDateField; - } - set { - if ((this.CreationDateField.Equals(value) != true)) { - this.CreationDateField = value; - this.RaisePropertyChanged("CreationDate"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string FileName { - get { - return this.FileNameField; - } - set { - if ((object.ReferenceEquals(this.FileNameField, value) != true)) { - this.FileNameField = value; - this.RaisePropertyChanged("FileName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsForTargetModel { - get { - return this.IsForTargetModelField; - } - set { - if ((this.IsForTargetModelField.Equals(value) != true)) { - this.IsForTargetModelField = value; - this.RaisePropertyChanged("IsForTargetModel"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int Size { - get { - return this.SizeField; - } - set { - if ((this.SizeField.Equals(value) != true)) { - this.SizeField = value; - this.RaisePropertyChanged("Size"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="ScriptModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Databa" + - "seMaintenance.Wcf")] - [System.SerializableAttribute()] - public partial class ScriptModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IsCreationScriptField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsCreationScript { - get { - return this.IsCreationScriptField; - } - set { - if ((this.IsCreationScriptField.Equals(value) != true)) { - this.IsCreationScriptField = value; - this.RaisePropertyChanged("IsCreationScript"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { - return this.NameField; - } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="SetupModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Databa" + - "seMaintenance.Wcf")] - [System.SerializableAttribute()] - public partial class SetupModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DescriptionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string FullnameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string SetupDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int SortOrderField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Description { - get { - return this.DescriptionField; - } - set { - if ((object.ReferenceEquals(this.DescriptionField, value) != true)) { - this.DescriptionField = value; - this.RaisePropertyChanged("Description"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Fullname { - get { - return this.FullnameField; - } - set { - if ((object.ReferenceEquals(this.FullnameField, value) != true)) { - this.FullnameField = value; - this.RaisePropertyChanged("Fullname"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { - return this.NameField; - } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string SetupData { - get { - return this.SetupDataField; - } - set { - if ((object.ReferenceEquals(this.SetupDataField, value) != true)) { - this.SetupDataField = value; - this.RaisePropertyChanged("SetupData"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int SortOrder { - get { - return this.SortOrderField; - } - set { - if ((this.SortOrderField.Equals(value) != true)) { - this.SortOrderField = value; - this.RaisePropertyChanged("SortOrder"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="DumpResult", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Databa" + - "seMaintenance")] - [System.SerializableAttribute()] - public partial class DumpResult : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DumpNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string MessageField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string DumpName { - get { - return this.DumpNameField; - } - set { - if ((object.ReferenceEquals(this.DumpNameField, value) != true)) { - this.DumpNameField = value; - this.RaisePropertyChanged("DumpName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Message { - get { - return this.MessageField; - } - set { - if ((object.ReferenceEquals(this.MessageField, value) != true)) { - this.MessageField = value; - this.RaisePropertyChanged("Message"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="DatabaseMaintenance.IDatabaseMaintenance")] - public interface IDatabaseMaintenance { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/GetDataModels", ReplyAction="http://tempuri.org/IDatabaseMaintenance/GetDataModelsResponse")] - System.Collections.Generic.List GetDataModels(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/GetDataModels", ReplyAction="http://tempuri.org/IDatabaseMaintenance/GetDataModelsResponse")] - System.Threading.Tasks.Task> GetDataModelsAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/SetAllConfigs", ReplyAction="http://tempuri.org/IDatabaseMaintenance/SetAllConfigsResponse")] - void SetAllConfigs(Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/SetAllConfigs", ReplyAction="http://tempuri.org/IDatabaseMaintenance/SetAllConfigsResponse")] - System.Threading.Tasks.Task SetAllConfigsAsync(Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/SetDatabaseConfig", ReplyAction="http://tempuri.org/IDatabaseMaintenance/SetDatabaseConfigResponse")] - void SetDatabaseConfig(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/SetDatabaseConfig", ReplyAction="http://tempuri.org/IDatabaseMaintenance/SetDatabaseConfigResponse")] - System.Threading.Tasks.Task SetDatabaseConfigAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/TestDatabaseConfig", ReplyAction="http://tempuri.org/IDatabaseMaintenance/TestDatabaseConfigResponse")] - bool TestDatabaseConfig(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/TestDatabaseConfig", ReplyAction="http://tempuri.org/IDatabaseMaintenance/TestDatabaseConfigResponse")] - System.Threading.Tasks.Task TestDatabaseConfigAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/CreateAll", ReplyAction="http://tempuri.org/IDatabaseMaintenance/CreateAllResponse")] - string CreateAll(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/CreateAll", ReplyAction="http://tempuri.org/IDatabaseMaintenance/CreateAllResponse")] - System.Threading.Tasks.Task CreateAllAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/CreateDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/CreateDatabaseResponse")] - string CreateDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/CreateDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/CreateDatabaseResponse")] - System.Threading.Tasks.Task CreateDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/EraseAll", ReplyAction="http://tempuri.org/IDatabaseMaintenance/EraseAllResponse")] - string EraseAll(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/EraseAll", ReplyAction="http://tempuri.org/IDatabaseMaintenance/EraseAllResponse")] - System.Threading.Tasks.Task EraseAllAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/EraseDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/EraseDatabaseResponse")] - string EraseDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/EraseDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/EraseDatabaseResponse")] - System.Threading.Tasks.Task EraseDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/DumpDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/DumpDatabaseResponse")] - Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DumpResult DumpDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/DumpDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/DumpDatabaseResponse")] - System.Threading.Tasks.Task DumpDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/RestoreDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/RestoreDatabaseResponse")] - string RestoreDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.BackupModel backupModel); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/RestoreDatabase", ReplyAction="http://tempuri.org/IDatabaseMaintenance/RestoreDatabaseResponse")] - System.Threading.Tasks.Task RestoreDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.BackupModel backupModel); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/ExecuteSetup", ReplyAction="http://tempuri.org/IDatabaseMaintenance/ExecuteSetupResponse")] - string ExecuteSetup(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.SetupModel setup); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/ExecuteSetup", ReplyAction="http://tempuri.org/IDatabaseMaintenance/ExecuteSetupResponse")] - System.Threading.Tasks.Task ExecuteSetupAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.SetupModel setup); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/ExecuteScript", ReplyAction="http://tempuri.org/IDatabaseMaintenance/ExecuteScriptResponse")] - string ExecuteScript(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel model, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.ScriptModel script); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IDatabaseMaintenance/ExecuteScript", ReplyAction="http://tempuri.org/IDatabaseMaintenance/ExecuteScriptResponse")] - System.Threading.Tasks.Task ExecuteScriptAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel model, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.ScriptModel script); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IDatabaseMaintenanceChannel : Moryx.Tools.Wcf.Tests.DatabaseMaintenance.IDatabaseMaintenance, System.ServiceModel.IClientChannel { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class DatabaseMaintenanceClient : System.ServiceModel.ClientBase, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.IDatabaseMaintenance { - - public DatabaseMaintenanceClient() { - } - - public DatabaseMaintenanceClient(string endpointConfigurationName) : - base(endpointConfigurationName) { - } - - public DatabaseMaintenanceClient(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public DatabaseMaintenanceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public DatabaseMaintenanceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(binding, remoteAddress) { - } - - public System.Collections.Generic.List GetDataModels() { - return base.Channel.GetDataModels(); - } - - public System.Threading.Tasks.Task> GetDataModelsAsync() { - return base.Channel.GetDataModelsAsync(); - } - - public void SetAllConfigs(Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - base.Channel.SetAllConfigs(config); - } - - public System.Threading.Tasks.Task SetAllConfigsAsync(Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.SetAllConfigsAsync(config); - } - - public void SetDatabaseConfig(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - base.Channel.SetDatabaseConfig(targetModel, config); - } - - public System.Threading.Tasks.Task SetDatabaseConfigAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.SetDatabaseConfigAsync(targetModel, config); - } - - public bool TestDatabaseConfig(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.TestDatabaseConfig(targetModel, config); - } - - public System.Threading.Tasks.Task TestDatabaseConfigAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.TestDatabaseConfigAsync(targetModel, config); - } - - public string CreateAll() { - return base.Channel.CreateAll(); - } - - public System.Threading.Tasks.Task CreateAllAsync() { - return base.Channel.CreateAllAsync(); - } - - public string CreateDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.CreateDatabase(targetModel, config); - } - - public System.Threading.Tasks.Task CreateDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.CreateDatabaseAsync(targetModel, config); - } - - public string EraseAll() { - return base.Channel.EraseAll(); - } - - public System.Threading.Tasks.Task EraseAllAsync() { - return base.Channel.EraseAllAsync(); - } - - public string EraseDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.EraseDatabase(targetModel, config); - } - - public System.Threading.Tasks.Task EraseDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.EraseDatabaseAsync(targetModel, config); - } - - public Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DumpResult DumpDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.DumpDatabase(targetModel, config); - } - - public System.Threading.Tasks.Task DumpDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config) { - return base.Channel.DumpDatabaseAsync(targetModel, config); - } - - public string RestoreDatabase(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.BackupModel backupModel) { - return base.Channel.RestoreDatabase(targetModel, config, backupModel); - } - - public System.Threading.Tasks.Task RestoreDatabaseAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.BackupModel backupModel) { - return base.Channel.RestoreDatabaseAsync(targetModel, config, backupModel); - } - - public string ExecuteSetup(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.SetupModel setup) { - return base.Channel.ExecuteSetup(targetModel, config, setup); - } - - public System.Threading.Tasks.Task ExecuteSetupAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel config, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.SetupModel setup) { - return base.Channel.ExecuteSetupAsync(targetModel, config, setup); - } - - public string ExecuteScript(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel model, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.ScriptModel script) { - return base.Channel.ExecuteScript(targetModel, model, script); - } - - public System.Threading.Tasks.Task ExecuteScriptAsync(string targetModel, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.DatabaseConfigModel model, Moryx.Tools.Wcf.Tests.DatabaseMaintenance.ScriptModel script) { - return base.Channel.ExecuteScriptAsync(targetModel, model, script); - } - } -} diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Reference.svcmap b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Reference.svcmap deleted file mode 100644 index 70833d621..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/Reference.svcmap +++ /dev/null @@ -1,37 +0,0 @@ - - - - false - true - true - - false - false - false - - - - - true - Auto - true - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/configuration.svcinfo b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/configuration.svcinfo deleted file mode 100644 index d653836a0..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/configuration91.svcinfo b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/configuration91.svcinfo deleted file mode 100644 index 9d0aa5319..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/DatabaseMaintenance/configuration91.svcinfo +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - BasicHttpBinding_IDatabaseMaintenance - - - - - - - - - - - - - - - - - - - - - StrongWildcard - - - - - - 65536 - - - - - - - - - System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - System.Text.UTF8Encoding - - - Buffered - - - - - - Text - - - System.ServiceModel.Configuration.BasicHttpSecurityElement - - - None - - - System.ServiceModel.Configuration.HttpTransportSecurityElement - - - None - - - None - - - System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement - - - Never - - - TransportSelected - - - (Collection) - - - - - - System.ServiceModel.Configuration.BasicHttpMessageSecurityElement - - - UserName - - - Default - - - - - - - - - http://localhost/DatabaseMaintenance - - - - - - basicHttpBinding - - - BasicHttpBinding_IDatabaseMaintenance - - - DatabaseMaintenance.IDatabaseMaintenance - - - System.ServiceModel.Configuration.AddressHeaderCollectionElement - - - <Header /> - - - System.ServiceModel.Configuration.IdentityElement - - - System.ServiceModel.Configuration.UserPrincipalNameElement - - - - - - System.ServiceModel.Configuration.ServicePrincipalNameElement - - - - - - System.ServiceModel.Configuration.DnsElement - - - - - - System.ServiceModel.Configuration.RsaElement - - - - - - System.ServiceModel.Configuration.CertificateElement - - - - - - System.ServiceModel.Configuration.CertificateReferenceElement - - - My - - - LocalMachine - - - FindBySubjectDistinguishedName - - - - - - False - - - BasicHttpBinding_IDatabaseMaintenance - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance.wsdl b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance.wsdl deleted file mode 100644 index 44d78e366..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance.wsdl +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance.xsd deleted file mode 100644 index 703cbe41c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance.xsd +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance1.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance1.xsd deleted file mode 100644 index d58e7f39c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance1.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance2.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance2.xsd deleted file mode 100644 index 2d2f0d2f3..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance2.xsd +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance3.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance3.xsd deleted file mode 100644 index 106ea6ee7..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/LogMaintenance3.xsd +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Moryx.Tools.Wcf.Tests.Logging.LogMessages.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Moryx.Tools.Wcf.Tests.Logging.LogMessages.datasource deleted file mode 100644 index 860eef9fd..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Moryx.Tools.Wcf.Tests.Logging.LogMessages.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Tools.Wcf.Tests.Logging.LogMessages, Service References.Logging.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel.datasource deleted file mode 100644 index b219aa5fc..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel, Service References.Logging.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Reference.cs b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Reference.cs deleted file mode 100644 index 3078f74ed..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Reference.cs +++ /dev/null @@ -1,423 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Moryx.Tools.Wcf.Tests.Logging { - using System.Runtime.Serialization; - using System; - - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="PluginLoggerModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.LogMai" + - "ntenance.Wcf")] - [System.SerializableAttribute()] - public partial class PluginLoggerModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Logging.LogLevel ActiveLevelField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List ChildLoggerField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel ParentField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Logging.LogLevel ActiveLevel { - get { - return this.ActiveLevelField; - } - set { - if ((this.ActiveLevelField.Equals(value) != true)) { - this.ActiveLevelField = value; - this.RaisePropertyChanged("ActiveLevel"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List ChildLogger { - get { - return this.ChildLoggerField; - } - set { - if ((object.ReferenceEquals(this.ChildLoggerField, value) != true)) { - this.ChildLoggerField = value; - this.RaisePropertyChanged("ChildLogger"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { - return this.NameField; - } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel Parent { - get { - return this.ParentField; - } - set { - if ((object.ReferenceEquals(this.ParentField, value) != true)) { - this.ParentField = value; - this.RaisePropertyChanged("Parent"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="LogLevel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Logging")] - public enum LogLevel : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Trace = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Debug = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Info = 2, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Warning = 3, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Error = 4, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Fatal = 5, - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="LogMessages", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.LogMai" + - "ntenance.Wcf")] - [System.SerializableAttribute()] - public partial class LogMessages : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int AppenderIdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List MessagesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool SuccessfulField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int AppenderId { - get { - return this.AppenderIdField; - } - set { - if ((this.AppenderIdField.Equals(value) != true)) { - this.AppenderIdField = value; - this.RaisePropertyChanged("AppenderId"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Messages { - get { - return this.MessagesField; - } - set { - if ((object.ReferenceEquals(this.MessagesField, value) != true)) { - this.MessagesField = value; - this.RaisePropertyChanged("Messages"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool Successful { - get { - return this.SuccessfulField; - } - set { - if ((this.SuccessfulField.Equals(value) != true)) { - this.SuccessfulField = value; - this.RaisePropertyChanged("Successful"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="LogMessageModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.LogMai" + - "ntenance.Wcf")] - [System.SerializableAttribute()] - public partial class LogMessageModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string ClassNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Logging.LogLevel LogLevelField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel LoggerField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string MessageField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.DateTime TimestampField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string ClassName { - get { - return this.ClassNameField; - } - set { - if ((object.ReferenceEquals(this.ClassNameField, value) != true)) { - this.ClassNameField = value; - this.RaisePropertyChanged("ClassName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Logging.LogLevel LogLevel { - get { - return this.LogLevelField; - } - set { - if ((this.LogLevelField.Equals(value) != true)) { - this.LogLevelField = value; - this.RaisePropertyChanged("LogLevel"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel Logger { - get { - return this.LoggerField; - } - set { - if ((object.ReferenceEquals(this.LoggerField, value) != true)) { - this.LoggerField = value; - this.RaisePropertyChanged("Logger"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Message { - get { - return this.MessageField; - } - set { - if ((object.ReferenceEquals(this.MessageField, value) != true)) { - this.MessageField = value; - this.RaisePropertyChanged("Message"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.DateTime Timestamp { - get { - return this.TimestampField; - } - set { - if ((this.TimestampField.Equals(value) != true)) { - this.TimestampField = value; - this.RaisePropertyChanged("Timestamp"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="Logging.ILogMaintenance")] - public interface ILogMaintenance { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/GetAllPluginLogger", ReplyAction="http://tempuri.org/ILogMaintenance/GetAllPluginLoggerResponse")] - System.Collections.Generic.List GetAllPluginLogger(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/GetAllPluginLogger", ReplyAction="http://tempuri.org/ILogMaintenance/GetAllPluginLoggerResponse")] - System.Threading.Tasks.Task> GetAllPluginLoggerAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/AddRemoteAppender", ReplyAction="http://tempuri.org/ILogMaintenance/AddRemoteAppenderResponse")] - int AddRemoteAppender(string name, Moryx.Tools.Wcf.Tests.Logging.LogLevel minLevel); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/AddRemoteAppender", ReplyAction="http://tempuri.org/ILogMaintenance/AddRemoteAppenderResponse")] - System.Threading.Tasks.Task AddRemoteAppenderAsync(string name, Moryx.Tools.Wcf.Tests.Logging.LogLevel minLevel); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/GetMessages", ReplyAction="http://tempuri.org/ILogMaintenance/GetMessagesResponse")] - Moryx.Tools.Wcf.Tests.Logging.LogMessages GetMessages(int appenderId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/GetMessages", ReplyAction="http://tempuri.org/ILogMaintenance/GetMessagesResponse")] - System.Threading.Tasks.Task GetMessagesAsync(int appenderId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/RemoveRemoteAppender", ReplyAction="http://tempuri.org/ILogMaintenance/RemoveRemoteAppenderResponse")] - void RemoveRemoteAppender(int appenderId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/RemoveRemoteAppender", ReplyAction="http://tempuri.org/ILogMaintenance/RemoveRemoteAppenderResponse")] - System.Threading.Tasks.Task RemoveRemoteAppenderAsync(int appenderId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/SetLogLevel", ReplyAction="http://tempuri.org/ILogMaintenance/SetLogLevelResponse")] - void SetLogLevel(Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel logger, Moryx.Tools.Wcf.Tests.Logging.LogLevel level); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ILogMaintenance/SetLogLevel", ReplyAction="http://tempuri.org/ILogMaintenance/SetLogLevelResponse")] - System.Threading.Tasks.Task SetLogLevelAsync(Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel logger, Moryx.Tools.Wcf.Tests.Logging.LogLevel level); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface ILogMaintenanceChannel : Moryx.Tools.Wcf.Tests.Logging.ILogMaintenance, System.ServiceModel.IClientChannel { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class LogMaintenanceClient : System.ServiceModel.ClientBase, Moryx.Tools.Wcf.Tests.Logging.ILogMaintenance { - - public LogMaintenanceClient() { - } - - public LogMaintenanceClient(string endpointConfigurationName) : - base(endpointConfigurationName) { - } - - public LogMaintenanceClient(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public LogMaintenanceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public LogMaintenanceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(binding, remoteAddress) { - } - - public System.Collections.Generic.List GetAllPluginLogger() { - return base.Channel.GetAllPluginLogger(); - } - - public System.Threading.Tasks.Task> GetAllPluginLoggerAsync() { - return base.Channel.GetAllPluginLoggerAsync(); - } - - public int AddRemoteAppender(string name, Moryx.Tools.Wcf.Tests.Logging.LogLevel minLevel) { - return base.Channel.AddRemoteAppender(name, minLevel); - } - - public System.Threading.Tasks.Task AddRemoteAppenderAsync(string name, Moryx.Tools.Wcf.Tests.Logging.LogLevel minLevel) { - return base.Channel.AddRemoteAppenderAsync(name, minLevel); - } - - public Moryx.Tools.Wcf.Tests.Logging.LogMessages GetMessages(int appenderId) { - return base.Channel.GetMessages(appenderId); - } - - public System.Threading.Tasks.Task GetMessagesAsync(int appenderId) { - return base.Channel.GetMessagesAsync(appenderId); - } - - public void RemoveRemoteAppender(int appenderId) { - base.Channel.RemoveRemoteAppender(appenderId); - } - - public System.Threading.Tasks.Task RemoveRemoteAppenderAsync(int appenderId) { - return base.Channel.RemoveRemoteAppenderAsync(appenderId); - } - - public void SetLogLevel(Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel logger, Moryx.Tools.Wcf.Tests.Logging.LogLevel level) { - base.Channel.SetLogLevel(logger, level); - } - - public System.Threading.Tasks.Task SetLogLevelAsync(Moryx.Tools.Wcf.Tests.Logging.PluginLoggerModel logger, Moryx.Tools.Wcf.Tests.Logging.LogLevel level) { - return base.Channel.SetLogLevelAsync(logger, level); - } - } -} diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Reference.svcmap b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Reference.svcmap deleted file mode 100644 index b30e5da53..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/Reference.svcmap +++ /dev/null @@ -1,37 +0,0 @@ - - - - false - true - true - - false - false - false - - - - - true - Auto - true - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/configuration.svcinfo b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/configuration.svcinfo deleted file mode 100644 index 8456c4a96..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/configuration91.svcinfo b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/configuration91.svcinfo deleted file mode 100644 index 383652c4b..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Logging/configuration91.svcinfo +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - BasicHttpBinding_ILogMaintenance - - - - - - - - - - - - - - - - - - - - - StrongWildcard - - - - - - 65536 - - - - - - - - - System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - System.Text.UTF8Encoding - - - Buffered - - - - - - Text - - - System.ServiceModel.Configuration.BasicHttpSecurityElement - - - None - - - System.ServiceModel.Configuration.HttpTransportSecurityElement - - - None - - - None - - - System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement - - - Never - - - TransportSelected - - - (Collection) - - - - - - System.ServiceModel.Configuration.BasicHttpMessageSecurityElement - - - UserName - - - Default - - - - - - - - - http://localhost/LogMaintenance - - - - - - basicHttpBinding - - - BasicHttpBinding_ILogMaintenance - - - Logging.ILogMaintenance - - - System.ServiceModel.Configuration.AddressHeaderCollectionElement - - - <Header /> - - - System.ServiceModel.Configuration.IdentityElement - - - System.ServiceModel.Configuration.UserPrincipalNameElement - - - - - - System.ServiceModel.Configuration.ServicePrincipalNameElement - - - - - - System.ServiceModel.Configuration.DnsElement - - - - - - System.ServiceModel.Configuration.RsaElement - - - - - - System.ServiceModel.Configuration.CertificateElement - - - - - - System.ServiceModel.Configuration.CertificateReferenceElement - - - My - - - LocalMachine - - - FindBySubjectDistinguishedName - - - - - - False - - - BasicHttpBinding_ILogMaintenance - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance.wsdl b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance.wsdl deleted file mode 100644 index cc275ee55..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance.wsdl +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance.xsd deleted file mode 100644 index 04a74a45c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance.xsd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance1.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance1.xsd deleted file mode 100644 index fb025002c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance1.xsd +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - 0 - - - - - - - - 1 - - - - - - - 3 - - - - - - - - - - - - - - - - 0 - - - - - - - - 1 - - - - - - - 3 - - - - - - - 8 - - - - - - - 10 - - - - - - - 6 - - - - - - - 12 - - - - - - - 4 - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance2.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance2.xsd deleted file mode 100644 index 4dd74bcc0..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance2.xsd +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance3.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance3.xsd deleted file mode 100644 index 2c849b8ac..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance3.xsd +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance5.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance5.xsd deleted file mode 100644 index ced2f9763..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance5.xsd +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance6.xsd b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance6.xsd deleted file mode 100644 index d58e7f39c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/ModuleMaintenance6.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.Config.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.Config.datasource deleted file mode 100644 index 2848f17fb..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.Config.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Tools.Wcf.Tests.Maintenance.Config, Service References.Maintenance.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.DependencyEvaluation.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.DependencyEvaluation.datasource deleted file mode 100644 index b7900a522..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.DependencyEvaluation.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Tools.Wcf.Tests.Maintenance.DependencyEvaluation, Service References.Maintenance.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.ServerModuleModel.datasource b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.ServerModuleModel.datasource deleted file mode 100644 index c0e4eb878..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Moryx.Tools.Wcf.Tests.Maintenance.ServerModuleModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Tools.Wcf.Tests.Maintenance.ServerModuleModel, Service References.Maintenance.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Reference.cs b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Reference.cs deleted file mode 100644 index 468b09edf..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Reference.cs +++ /dev/null @@ -1,1267 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Moryx.Tools.Wcf.Tests.Maintenance { - using System.Runtime.Serialization; - using System; - - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="ServerModuleModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Module" + - "Maintenance.Wcf")] - [System.SerializableAttribute()] - public partial class ServerModuleModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.AssemblyModel AssemblyField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List DependenciesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.FailureBehaviour FailureBehaviourField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.ServerModuleState HealthStateField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List NotificationsField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.ModuleStartBehaviour StartBehaviourField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.AssemblyModel Assembly { - get { - return this.AssemblyField; - } - set { - if ((object.ReferenceEquals(this.AssemblyField, value) != true)) { - this.AssemblyField = value; - this.RaisePropertyChanged("Assembly"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Dependencies { - get { - return this.DependenciesField; - } - set { - if ((object.ReferenceEquals(this.DependenciesField, value) != true)) { - this.DependenciesField = value; - this.RaisePropertyChanged("Dependencies"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.FailureBehaviour FailureBehaviour { - get { - return this.FailureBehaviourField; - } - set { - if ((this.FailureBehaviourField.Equals(value) != true)) { - this.FailureBehaviourField = value; - this.RaisePropertyChanged("FailureBehaviour"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.ServerModuleState HealthState { - get { - return this.HealthStateField; - } - set { - if ((this.HealthStateField.Equals(value) != true)) { - this.HealthStateField = value; - this.RaisePropertyChanged("HealthState"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { - return this.NameField; - } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Notifications { - get { - return this.NotificationsField; - } - set { - if ((object.ReferenceEquals(this.NotificationsField, value) != true)) { - this.NotificationsField = value; - this.RaisePropertyChanged("Notifications"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.ModuleStartBehaviour StartBehaviour { - get { - return this.StartBehaviourField; - } - set { - if ((this.StartBehaviourField.Equals(value) != true)) { - this.StartBehaviourField = value; - this.RaisePropertyChanged("StartBehaviour"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="AssemblyModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Module" + - "Maintenance.Wcf")] - [System.SerializableAttribute()] - public partial class AssemblyModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string BundleField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string VersionField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Bundle { - get { - return this.BundleField; - } - set { - if ((object.ReferenceEquals(this.BundleField, value) != true)) { - this.BundleField = value; - this.RaisePropertyChanged("Bundle"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { - return this.NameField; - } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Version { - get { - return this.VersionField; - } - set { - if ((object.ReferenceEquals(this.VersionField, value) != true)) { - this.VersionField = value; - this.RaisePropertyChanged("Version"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.FlagsAttribute()] - [System.Runtime.Serialization.DataContractAttribute(Name="FailureBehaviour", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Modules")] - public enum FailureBehaviour : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Stop = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - StopAndNotify = 2, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Reincarnate = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - ReincarnateAndNotify = 3, - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.FlagsAttribute()] - [System.Runtime.Serialization.DataContractAttribute(Name="ServerModuleState", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Modules")] - public enum ServerModuleState : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Stopped = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Initializing = 2, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Ready = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Starting = 3, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Running = 8, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Stopping = 10, - - [System.Runtime.Serialization.EnumMemberAttribute()] - BootWarning = 6, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Warning = 12, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Failure = 4, - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="NotificationModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Module" + - "Maintenance.Wcf")] - [System.SerializableAttribute()] - public partial class NotificationModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.SerializableException ExceptionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool ImportantField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.DateTime TimestampField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.SerializableException Exception { - get { - return this.ExceptionField; - } - set { - if ((object.ReferenceEquals(this.ExceptionField, value) != true)) { - this.ExceptionField = value; - this.RaisePropertyChanged("Exception"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool Important { - get { - return this.ImportantField; - } - set { - if ((this.ImportantField.Equals(value) != true)) { - this.ImportantField = value; - this.RaisePropertyChanged("Important"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.DateTime Timestamp { - get { - return this.TimestampField; - } - set { - if ((this.TimestampField.Equals(value) != true)) { - this.TimestampField = value; - this.RaisePropertyChanged("Timestamp"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="ModuleStartBehaviour", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Modules")] - public enum ModuleStartBehaviour : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Auto = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Manual = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - OnDependency = 2, - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="SerializableException", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Module" + - "Maintenance.Wcf")] - [System.SerializableAttribute()] - public partial class SerializableException : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string ExceptionTypeNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.SerializableException InnerExceptionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string MessageField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string StackTraceField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string ExceptionTypeName { - get { - return this.ExceptionTypeNameField; - } - set { - if ((object.ReferenceEquals(this.ExceptionTypeNameField, value) != true)) { - this.ExceptionTypeNameField = value; - this.RaisePropertyChanged("ExceptionTypeName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.SerializableException InnerException { - get { - return this.InnerExceptionField; - } - set { - if ((object.ReferenceEquals(this.InnerExceptionField, value) != true)) { - this.InnerExceptionField = value; - this.RaisePropertyChanged("InnerException"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Message { - get { - return this.MessageField; - } - set { - if ((object.ReferenceEquals(this.MessageField, value) != true)) { - this.MessageField = value; - this.RaisePropertyChanged("Message"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string StackTrace { - get { - return this.StackTraceField; - } - set { - if ((object.ReferenceEquals(this.StackTraceField, value) != true)) { - this.StackTraceField = value; - this.RaisePropertyChanged("StackTrace"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="DependencyEvaluation", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Module" + - "Maintenance.Wcf")] - [System.SerializableAttribute()] - public partial class DependencyEvaluation : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int MaxDependenciesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int MaxDependendsField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int MaxDepthField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int RootModulesField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int MaxDependencies { - get { - return this.MaxDependenciesField; - } - set { - if ((this.MaxDependenciesField.Equals(value) != true)) { - this.MaxDependenciesField = value; - this.RaisePropertyChanged("MaxDependencies"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int MaxDependends { - get { - return this.MaxDependendsField; - } - set { - if ((this.MaxDependendsField.Equals(value) != true)) { - this.MaxDependendsField = value; - this.RaisePropertyChanged("MaxDependends"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int MaxDepth { - get { - return this.MaxDepthField; - } - set { - if ((this.MaxDepthField.Equals(value) != true)) { - this.MaxDepthField = value; - this.RaisePropertyChanged("MaxDepth"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int RootModules { - get { - return this.RootModulesField; - } - set { - if ((this.RootModulesField.Equals(value) != true)) { - this.RootModulesField = value; - this.RaisePropertyChanged("RootModules"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="Config", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Module" + - "Maintenance.Wcf")] - [System.SerializableAttribute()] - public partial class Config : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List EntriesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string ModuleField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Entries { - get { - return this.EntriesField; - } - set { - if ((object.ReferenceEquals(this.EntriesField, value) != true)) { - this.EntriesField = value; - this.RaisePropertyChanged("Entries"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Module { - get { - return this.ModuleField; - } - set { - if ((object.ReferenceEquals(this.ModuleField, value) != true)) { - this.ModuleField = value; - this.RaisePropertyChanged("Module"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="Entry", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] - [System.SerializableAttribute()] - public partial class Entry : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DescriptionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.EntryKey KeyField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List PrototypesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List SubEntriesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.EntryValidation ValidationField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.EntryValue ValueField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Description { - get { - return this.DescriptionField; - } - set { - if ((object.ReferenceEquals(this.DescriptionField, value) != true)) { - this.DescriptionField = value; - this.RaisePropertyChanged("Description"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.EntryKey Key { - get { - return this.KeyField; - } - set { - if ((object.ReferenceEquals(this.KeyField, value) != true)) { - this.KeyField = value; - this.RaisePropertyChanged("Key"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Prototypes { - get { - return this.PrototypesField; - } - set { - if ((object.ReferenceEquals(this.PrototypesField, value) != true)) { - this.PrototypesField = value; - this.RaisePropertyChanged("Prototypes"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List SubEntries { - get { - return this.SubEntriesField; - } - set { - if ((object.ReferenceEquals(this.SubEntriesField, value) != true)) { - this.SubEntriesField = value; - this.RaisePropertyChanged("SubEntries"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.EntryValidation Validation { - get { - return this.ValidationField; - } - set { - if ((object.ReferenceEquals(this.ValidationField, value) != true)) { - this.ValidationField = value; - this.RaisePropertyChanged("Validation"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.EntryValue Value { - get { - return this.ValueField; - } - set { - if ((object.ReferenceEquals(this.ValueField, value) != true)) { - this.ValueField = value; - this.RaisePropertyChanged("Value"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="EntryKey", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] - [System.SerializableAttribute()] - public partial class EntryKey : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string IdentifierField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Identifier { - get { - return this.IdentifierField; - } - set { - if ((object.ReferenceEquals(this.IdentifierField, value) != true)) { - this.IdentifierField = value; - this.RaisePropertyChanged("Identifier"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { - return this.NameField; - } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="EntryValidation", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] - [System.SerializableAttribute()] - public partial class EntryValidation : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IsPasswordField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IsRequiredField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int MaxLenghtField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int MinLenghtField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string RegexField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsPassword { - get { - return this.IsPasswordField; - } - set { - if ((this.IsPasswordField.Equals(value) != true)) { - this.IsPasswordField = value; - this.RaisePropertyChanged("IsPassword"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsRequired { - get { - return this.IsRequiredField; - } - set { - if ((this.IsRequiredField.Equals(value) != true)) { - this.IsRequiredField = value; - this.RaisePropertyChanged("IsRequired"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int MaxLenght { - get { - return this.MaxLenghtField; - } - set { - if ((this.MaxLenghtField.Equals(value) != true)) { - this.MaxLenghtField = value; - this.RaisePropertyChanged("MaxLenght"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int MinLenght { - get { - return this.MinLenghtField; - } - set { - if ((this.MinLenghtField.Equals(value) != true)) { - this.MinLenghtField = value; - this.RaisePropertyChanged("MinLenght"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Regex { - get { - return this.RegexField; - } - set { - if ((object.ReferenceEquals(this.RegexField, value) != true)) { - this.RegexField = value; - this.RaisePropertyChanged("Regex"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="EntryValue", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] - [System.SerializableAttribute()] - public partial class EntryValue : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string CurrentField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DefaultField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IsReadOnlyField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private System.Collections.Generic.List PossibleField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Tools.Wcf.Tests.Maintenance.EntryValueType TypeField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Current { - get { - return this.CurrentField; - } - set { - if ((object.ReferenceEquals(this.CurrentField, value) != true)) { - this.CurrentField = value; - this.RaisePropertyChanged("Current"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Default { - get { - return this.DefaultField; - } - set { - if ((object.ReferenceEquals(this.DefaultField, value) != true)) { - this.DefaultField = value; - this.RaisePropertyChanged("Default"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsReadOnly { - get { - return this.IsReadOnlyField; - } - set { - if ((this.IsReadOnlyField.Equals(value) != true)) { - this.IsReadOnlyField = value; - this.RaisePropertyChanged("IsReadOnly"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public System.Collections.Generic.List Possible { - get { - return this.PossibleField; - } - set { - if ((object.ReferenceEquals(this.PossibleField, value) != true)) { - this.PossibleField = value; - this.RaisePropertyChanged("Possible"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Tools.Wcf.Tests.Maintenance.EntryValueType Type { - get { - return this.TypeField; - } - set { - if ((this.TypeField.Equals(value) != true)) { - this.TypeField = value; - this.RaisePropertyChanged("Type"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="EntryValueType", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] - public enum EntryValueType : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Byte = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Boolean = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Int16 = 2, - - [System.Runtime.Serialization.EnumMemberAttribute()] - UInt16 = 3, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Int32 = 4, - - [System.Runtime.Serialization.EnumMemberAttribute()] - UInt32 = 5, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Int64 = 6, - - [System.Runtime.Serialization.EnumMemberAttribute()] - UInt64 = 7, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Single = 8, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Double = 9, - - [System.Runtime.Serialization.EnumMemberAttribute()] - String = 10, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Enum = 11, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Class = 12, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Collection = 13, - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="ConfigUpdateMode", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Runtime.Maintenance.Plugins.Module" + - "Maintenance.Wcf")] - public enum ConfigUpdateMode : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - OnlySave = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - SaveAndReincarnate = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - UpdateLiveAndSave = 2, - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="Maintenance.IModuleMaintenance")] - public interface IModuleMaintenance { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/GetAll", ReplyAction="http://tempuri.org/IModuleMaintenance/GetAllResponse")] - System.Collections.Generic.List GetAll(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/GetAll", ReplyAction="http://tempuri.org/IModuleMaintenance/GetAllResponse")] - System.Threading.Tasks.Task> GetAllAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/GetDependencyEvaluation", ReplyAction="http://tempuri.org/IModuleMaintenance/GetDependencyEvaluationResponse")] - Moryx.Tools.Wcf.Tests.Maintenance.DependencyEvaluation GetDependencyEvaluation(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/GetDependencyEvaluation", ReplyAction="http://tempuri.org/IModuleMaintenance/GetDependencyEvaluationResponse")] - System.Threading.Tasks.Task GetDependencyEvaluationAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/Start", ReplyAction="http://tempuri.org/IModuleMaintenance/StartResponse")] - void Start(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/Start", ReplyAction="http://tempuri.org/IModuleMaintenance/StartResponse")] - System.Threading.Tasks.Task StartAsync(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/Stop", ReplyAction="http://tempuri.org/IModuleMaintenance/StopResponse")] - void Stop(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/Stop", ReplyAction="http://tempuri.org/IModuleMaintenance/StopResponse")] - System.Threading.Tasks.Task StopAsync(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/Reincarnate", ReplyAction="http://tempuri.org/IModuleMaintenance/ReincarnateResponse")] - void Reincarnate(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/Reincarnate", ReplyAction="http://tempuri.org/IModuleMaintenance/ReincarnateResponse")] - System.Threading.Tasks.Task ReincarnateAsync(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/ConfirmWarning", ReplyAction="http://tempuri.org/IModuleMaintenance/ConfirmWarningResponse")] - void ConfirmWarning(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/ConfirmWarning", ReplyAction="http://tempuri.org/IModuleMaintenance/ConfirmWarningResponse")] - System.Threading.Tasks.Task ConfirmWarningAsync(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/GetConfig", ReplyAction="http://tempuri.org/IModuleMaintenance/GetConfigResponse")] - Moryx.Tools.Wcf.Tests.Maintenance.Config GetConfig(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/GetConfig", ReplyAction="http://tempuri.org/IModuleMaintenance/GetConfigResponse")] - System.Threading.Tasks.Task GetConfigAsync(string moduleName); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/SetConfig", ReplyAction="http://tempuri.org/IModuleMaintenance/SetConfigResponse")] - void SetConfig(Moryx.Tools.Wcf.Tests.Maintenance.Config model, Moryx.Tools.Wcf.Tests.Maintenance.ConfigUpdateMode updateMode); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/SetConfig", ReplyAction="http://tempuri.org/IModuleMaintenance/SetConfigResponse")] - System.Threading.Tasks.Task SetConfigAsync(Moryx.Tools.Wcf.Tests.Maintenance.Config model, Moryx.Tools.Wcf.Tests.Maintenance.ConfigUpdateMode updateMode); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/SetStartBehaviour", ReplyAction="http://tempuri.org/IModuleMaintenance/SetStartBehaviourResponse")] - void SetStartBehaviour(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.ModuleStartBehaviour startBehaviour); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/SetStartBehaviour", ReplyAction="http://tempuri.org/IModuleMaintenance/SetStartBehaviourResponse")] - System.Threading.Tasks.Task SetStartBehaviourAsync(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.ModuleStartBehaviour startBehaviour); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/SetFailureBehaviour", ReplyAction="http://tempuri.org/IModuleMaintenance/SetFailureBehaviourResponse")] - void SetFailureBehaviour(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.FailureBehaviour failureBehaviour); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IModuleMaintenance/SetFailureBehaviour", ReplyAction="http://tempuri.org/IModuleMaintenance/SetFailureBehaviourResponse")] - System.Threading.Tasks.Task SetFailureBehaviourAsync(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.FailureBehaviour failureBehaviour); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IModuleMaintenanceChannel : Moryx.Tools.Wcf.Tests.Maintenance.IModuleMaintenance, System.ServiceModel.IClientChannel { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class ModuleMaintenanceClient : System.ServiceModel.ClientBase, Moryx.Tools.Wcf.Tests.Maintenance.IModuleMaintenance { - - public ModuleMaintenanceClient() { - } - - public ModuleMaintenanceClient(string endpointConfigurationName) : - base(endpointConfigurationName) { - } - - public ModuleMaintenanceClient(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public ModuleMaintenanceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public ModuleMaintenanceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(binding, remoteAddress) { - } - - public System.Collections.Generic.List GetAll() { - return base.Channel.GetAll(); - } - - public System.Threading.Tasks.Task> GetAllAsync() { - return base.Channel.GetAllAsync(); - } - - public Moryx.Tools.Wcf.Tests.Maintenance.DependencyEvaluation GetDependencyEvaluation() { - return base.Channel.GetDependencyEvaluation(); - } - - public System.Threading.Tasks.Task GetDependencyEvaluationAsync() { - return base.Channel.GetDependencyEvaluationAsync(); - } - - public void Start(string moduleName) { - base.Channel.Start(moduleName); - } - - public System.Threading.Tasks.Task StartAsync(string moduleName) { - return base.Channel.StartAsync(moduleName); - } - - public void Stop(string moduleName) { - base.Channel.Stop(moduleName); - } - - public System.Threading.Tasks.Task StopAsync(string moduleName) { - return base.Channel.StopAsync(moduleName); - } - - public void Reincarnate(string moduleName) { - base.Channel.Reincarnate(moduleName); - } - - public System.Threading.Tasks.Task ReincarnateAsync(string moduleName) { - return base.Channel.ReincarnateAsync(moduleName); - } - - public void ConfirmWarning(string moduleName) { - base.Channel.ConfirmWarning(moduleName); - } - - public System.Threading.Tasks.Task ConfirmWarningAsync(string moduleName) { - return base.Channel.ConfirmWarningAsync(moduleName); - } - - public Moryx.Tools.Wcf.Tests.Maintenance.Config GetConfig(string moduleName) { - return base.Channel.GetConfig(moduleName); - } - - public System.Threading.Tasks.Task GetConfigAsync(string moduleName) { - return base.Channel.GetConfigAsync(moduleName); - } - - public void SetConfig(Moryx.Tools.Wcf.Tests.Maintenance.Config model, Moryx.Tools.Wcf.Tests.Maintenance.ConfigUpdateMode updateMode) { - base.Channel.SetConfig(model, updateMode); - } - - public System.Threading.Tasks.Task SetConfigAsync(Moryx.Tools.Wcf.Tests.Maintenance.Config model, Moryx.Tools.Wcf.Tests.Maintenance.ConfigUpdateMode updateMode) { - return base.Channel.SetConfigAsync(model, updateMode); - } - - public void SetStartBehaviour(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.ModuleStartBehaviour startBehaviour) { - base.Channel.SetStartBehaviour(moduleName, startBehaviour); - } - - public System.Threading.Tasks.Task SetStartBehaviourAsync(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.ModuleStartBehaviour startBehaviour) { - return base.Channel.SetStartBehaviourAsync(moduleName, startBehaviour); - } - - public void SetFailureBehaviour(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.FailureBehaviour failureBehaviour) { - base.Channel.SetFailureBehaviour(moduleName, failureBehaviour); - } - - public System.Threading.Tasks.Task SetFailureBehaviourAsync(string moduleName, Moryx.Tools.Wcf.Tests.Maintenance.FailureBehaviour failureBehaviour) { - return base.Channel.SetFailureBehaviourAsync(moduleName, failureBehaviour); - } - } -} diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Reference.svcmap b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Reference.svcmap deleted file mode 100644 index 1f5226aa7..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/Reference.svcmap +++ /dev/null @@ -1,39 +0,0 @@ - - - - false - true - true - - false - false - false - - - - - true - Auto - true - true - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/configuration.svcinfo b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/configuration.svcinfo deleted file mode 100644 index 509e69e1c..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/configuration91.svcinfo b/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/configuration91.svcinfo deleted file mode 100644 index beb592f16..000000000 --- a/src/Tests/Moryx.Tools.Wcf.Tests/Service References/Maintenance/configuration91.svcinfo +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - BasicHttpBinding_IModuleMaintenance - - - - - - - - - - - - - - - - - - - - - StrongWildcard - - - - - - 65536 - - - - - - - - - System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - System.Text.UTF8Encoding - - - Buffered - - - - - - Text - - - System.ServiceModel.Configuration.BasicHttpSecurityElement - - - None - - - System.ServiceModel.Configuration.HttpTransportSecurityElement - - - None - - - None - - - System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement - - - Never - - - TransportSelected - - - (Collection) - - - - - - System.ServiceModel.Configuration.BasicHttpMessageSecurityElement - - - UserName - - - Default - - - - - - - - - http://localhost/ModuleMaintenance - - - - - - basicHttpBinding - - - BasicHttpBinding_IModuleMaintenance - - - Maintenance.IModuleMaintenance - - - System.ServiceModel.Configuration.AddressHeaderCollectionElement - - - <Header /> - - - System.ServiceModel.Configuration.IdentityElement - - - System.ServiceModel.Configuration.UserPrincipalNameElement - - - - - - System.ServiceModel.Configuration.ServicePrincipalNameElement - - - - - - System.ServiceModel.Configuration.DnsElement - - - - - - System.ServiceModel.Configuration.RsaElement - - - - - - System.ServiceModel.Configuration.CertificateElement - - - - - - System.ServiceModel.Configuration.CertificateReferenceElement - - - My - - - LocalMachine - - - FindBySubjectDistinguishedName - - - - - - False - - - BasicHttpBinding_IModuleMaintenance - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tests/Moryx.Tools.Wcf.Tests/app.config b/src/Tests/Moryx.Tools.Wcf.Tests/app.config index 4ab6a428b..5bdf27cbe 100644 --- a/src/Tests/Moryx.Tools.Wcf.Tests/app.config +++ b/src/Tests/Moryx.Tools.Wcf.Tests/app.config @@ -15,16 +15,4 @@ - - - - - - - - - - - - diff --git a/src/Tests/Moryx.Workflows.Benchmark/Moryx.Workflows.Benchmark.csproj b/src/Tests/Moryx.Workflows.Benchmark/Moryx.Workflows.Benchmark.csproj index 3bf51f466..38a4a7d0a 100644 --- a/src/Tests/Moryx.Workflows.Benchmark/Moryx.Workflows.Benchmark.csproj +++ b/src/Tests/Moryx.Workflows.Benchmark/Moryx.Workflows.Benchmark.csproj @@ -1,8 +1,10 @@  + + Exe - netcoreapp3.0 + netcoreapp3.1