From e94e2bbee645c163f912bb7d0f493e3f5f0cde3f Mon Sep 17 00:00:00 2001 From: Dennis Beuchler Date: Thu, 8 Oct 2020 13:33:15 +0200 Subject: [PATCH] Migrated Moryx.Products.UI.* and Moryx.Resources.UI.* to SDK project style --- AbstractionLayer.UI.sln.DotSettings | 3 +- Build.ps1 | 2 +- .../Moryx.AbstractionLayer.UI.csproj | 176 +- .../Properties/AssemblyInfo.cs | 28 - .../Moryx.Products.UI.Interaction.csproj | 312 +--- .../Moryx.Products.UI.Interaction.nuspec | 18 - .../Import/ImportParameterViewModel.cs | 3 +- .../Products/Import/ImporterViewModel.cs | 16 +- .../Properties/AssemblyInfo.cs | 29 +- src/Moryx.Products.UI.Interaction/app.config | 19 - .../packages.config | 15 - .../ProductService/ConnectedService.json | 18 + .../ProductService/Reference.cs | 1653 +++++++++++++++++ src/Moryx.Products.UI/EntryExtensions.cs | 40 + src/Moryx.Products.UI/IProductServiceModel.cs | 3 +- .../Moryx.Products.UI.csproj | 226 +-- src/Moryx.Products.UI/ProductServiceModel.cs | 1 + .../Properties/AssemblyInfo.cs | 28 - .../Moryx.Serialization.Entry.datasource | 10 - ...ervice.DuplicateProductResponse.datasource | 10 - ...rvice.DuplicateProductResponse1.datasource | 10 - ....ProductService.ImportParameter.datasource | 10 - ...uctService.ProductCustomization.datasource | 10 - ....UI.ProductService.ProductModel.datasource | 10 - ...s.UI.ProductService.RecipeModel.datasource | 10 - ...UI.ProductService.WorkplanModel.datasource | 10 - .../ProductService/ProductInteraction.wsdl | 310 ---- .../ProductService/ProductInteraction31.xsd | 214 --- .../ProductService/ProductInteraction32.xsd | 42 - .../ProductService/ProductInteraction33.xsd | 11 - .../ProductService/ProductInteraction34.xsd | 11 - .../ProductService/ProductInteraction35.xsd | 9 - .../ProductService/ProductInteraction36.xsd | 64 - .../ProductService/ProductInteraction37.xsd | 171 -- .../ProductService/ProductInteraction38.xsd | 72 - .../ProductService/Reference.cs | 1624 ---------------- .../ProductService/Reference.svcmap | 39 - .../ProductService/configuration.svcinfo | 10 - .../ProductService/configuration91.svcinfo | 201 -- .../ViewModels/PartConnectorViewModel.cs | 2 +- .../ViewModels/PartLinkViewModel.cs | 5 +- .../ViewModels/ProductViewModel.cs | 6 +- .../ViewModels/RecipeViewModel.cs | 4 +- .../ViewModels/WorkplanViewModel.cs | 1 + src/Moryx.Products.UI/app.config | 12 - .../Methods/ResourceMethodsAspectViewModel.cs | 6 +- .../Moryx.Resources.UI.Interaction.csproj | 231 +-- .../Moryx.Resources.UI.Interaction.nuspec | 18 - .../Properties/AssemblyInfo.cs | 30 +- .../Moryx.Serialization.Entry.datasource | 10 - .../Moryx.Serialization.Entry1.datasource | 0 .../packages.config | 15 - .../ResourceService/ConnectedService.json | 18 + ...I.ResourceService.ResourceModel.datasource | 10 - ...sourceService.ResourceTypeModel.datasource | 10 - .../ResourceService/Reference.cs | 1265 ++++++++----- .../ResourceService/Reference.svcmap | 37 - .../ResourceService/ResourceInteraction.wsdl | 156 -- .../ResourceService/ResourceInteraction.xsd | 42 - .../ResourceService/ResourceInteraction1.xsd | 104 -- .../ResourceService/ResourceInteraction2.xsd | 87 - .../ResourceService/ResourceInteraction3.xsd | 115 -- .../ResourceService/ResourceInteraction4.xsd | 111 -- .../ResourceService/ResourceInteraction5.xsd | 15 - .../ResourceService/configuration.svcinfo | 10 - .../ResourceService/configuration91.svcinfo | 201 -- .../ConstructorViewModel.cs | 8 +- src/Moryx.Resources.UI/EntryExtensions.cs | 58 + .../IResourceServiceModel.cs | 2 + .../Moryx.Resources.UI.csproj | 193 +- .../Moryx.Resources.UI.nuspec | 14 - .../Properties/AssemblyInfo.cs | 28 - .../Moryx.Serialization.Entry.datasource | 10 - .../ResourceMethodViewModel.cs | 13 +- .../ResourceServiceModel.cs | 4 +- .../ResourceTypeViewModel.cs | 1 - src/Moryx.Resources.UI/ResourceViewModel.cs | 6 +- src/Moryx.Resources.UI/app.config | 25 - src/Moryx.Resources.UI/packages.config | 15 - src/StartProject.UI/StartProject.UI.csproj | 36 +- src/StartProject.UI/packages.config | 16 +- .../Mocks/DialogManagerMock.cs | 16 +- .../Moryx.AbstractionLayer.UI.Tests.csproj | 149 +- .../Properties/AssemblyInfo.cs | 36 - 84 files changed, 2777 insertions(+), 5822 deletions(-) delete mode 100644 src/Moryx.AbstractionLayer.UI/Properties/AssemblyInfo.cs delete mode 100644 src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.nuspec delete mode 100644 src/Moryx.Products.UI.Interaction/app.config delete mode 100644 src/Moryx.Products.UI.Interaction/packages.config create mode 100644 src/Moryx.Products.UI/Connected Services/ProductService/ConnectedService.json create mode 100644 src/Moryx.Products.UI/Connected Services/ProductService/Reference.cs create mode 100644 src/Moryx.Products.UI/EntryExtensions.cs delete mode 100644 src/Moryx.Products.UI/Properties/AssemblyInfo.cs delete mode 100644 src/Moryx.Products.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse1.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ImportParameter.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductCustomization.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductModel.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.RecipeModel.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.WorkplanModel.datasource delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction.wsdl delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction31.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction32.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction33.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction34.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction35.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction36.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction37.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/ProductInteraction38.xsd delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Reference.cs delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/Reference.svcmap delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/configuration.svcinfo delete mode 100644 src/Moryx.Products.UI/Service References/ProductService/configuration91.svcinfo delete mode 100644 src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.nuspec delete mode 100644 src/Moryx.Resources.UI.Interaction/Properties/DataSources/Moryx.Serialization.Entry.datasource delete mode 100644 src/Moryx.Resources.UI.Interaction/Properties/DataSources/Moryx.Serialization.Entry1.datasource delete mode 100644 src/Moryx.Resources.UI.Interaction/packages.config create mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ConnectedService.json delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceModel.datasource delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceTypeModel.datasource delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/Reference.svcmap delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.wsdl delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.xsd delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction1.xsd delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction2.xsd delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction3.xsd delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction4.xsd delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction5.xsd delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/configuration.svcinfo delete mode 100644 src/Moryx.Resources.UI/Connected Services/ResourceService/configuration91.svcinfo create mode 100644 src/Moryx.Resources.UI/EntryExtensions.cs delete mode 100644 src/Moryx.Resources.UI/Moryx.Resources.UI.nuspec delete mode 100644 src/Moryx.Resources.UI/Properties/AssemblyInfo.cs delete mode 100644 src/Moryx.Resources.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource delete mode 100644 src/Moryx.Resources.UI/app.config delete mode 100644 src/Moryx.Resources.UI/packages.config delete mode 100644 src/Tests/Moryx.AbstractionLayer.UI.Tests/Properties/AssemblyInfo.cs diff --git a/AbstractionLayer.UI.sln.DotSettings b/AbstractionLayer.UI.sln.DotSettings index 8eb53006..ee169d37 100644 --- a/AbstractionLayer.UI.sln.DotSettings +++ b/AbstractionLayer.UI.sln.DotSettings @@ -4,4 +4,5 @@ ..\.build\Global.DotSettings True True - 1 \ No newline at end of file + 1 + True \ No newline at end of file diff --git a/Build.ps1 b/Build.ps1 index 1db6e2b2..31827d55 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -33,7 +33,7 @@ if ($Build) { } if ($SmokeTests) { - $runtimePath = "$RootPath\src\StartProject\bin\$env:MORYX_BUILD_CONFIG\StartProject.exe"; + $runtimePath = "$RootPath\src\StartProject\bin\$env:MORYX_BUILD_CONFIG\net45\StartProject.exe"; Invoke-SmokeTest $runtimePath 4 6000 } diff --git a/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.csproj b/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.csproj index 3862110e..90b2ee84 100644 --- a/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.csproj +++ b/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.csproj @@ -1,173 +1,41 @@ - - - + + + + - Debug - AnyCPU - {B9920541-7E0E-4CDE-B195-B18589A2BBB1} - Library - Properties - Moryx.AbstractionLayer.UI - Moryx.AbstractionLayer.UI - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.AbstractionLayer.UI.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.AbstractionLayer.UI.XML + net45 + true + true + Moryx.AbstractionLayer.UI + true + - - ..\..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - True - - - ..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll - - - ..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll - - - ..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll - - - ..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll - - - ..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll - - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll - True - + + - - Properties\GlobalAssemblyInfo.cs - - - AspectConductorView.xaml - - - - AspectConfiguratorView.xaml - - - - - - - - - - EditModeButtonControl.xaml - - - - - - - - - - - - - - - - - - True + + + + + + + True + True Strings.resx - - - - - - - - - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - + - - - + PublicResXFileCodeGenerator Strings.Designer.cs - - \ No newline at end of file diff --git a/src/Moryx.AbstractionLayer.UI/Properties/AssemblyInfo.cs b/src/Moryx.AbstractionLayer.UI/Properties/AssemblyInfo.cs deleted file mode 100644 index e9ef79af..00000000 --- a/src/Moryx.AbstractionLayer.UI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +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.AbstractionLayer.UI")] -[assembly: AssemblyDescription("Moryx.AbstractionLayer.UI")] -[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("b9920541-7e0e-4cde-b195-b18589a2bbb1")] - -// 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.*")] \ No newline at end of file diff --git a/src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.csproj b/src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.csproj index c00c1cff..a28f6899 100644 --- a/src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.csproj +++ b/src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.csproj @@ -1,308 +1,46 @@ - - - + + + + - Debug - AnyCPU - {55DAA8ED-0729-4FF7-B262-E8C0F99022F3} - Library - Properties - Moryx.Products.UI.Interaction - Moryx.Products.UI.Interaction - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Products.UI.Interaction.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Products.UI.Interaction.XML + net45 + true + true + Moryx.Products.UI.Interaction + true + - - ..\..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - True - - - ..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll - - - ..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll - True - - - ..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll - - - ..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll - - - ..\..\packages\Moryx.Controls.3.0.0-dev.32\lib\net461\Moryx.Controls.dll - - - ..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll - - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll - True - + - - Properties\GlobalAssemblyInfo.cs - - - CollectionPartConnectorView.xaml - - - - - - PartsAspectView.xaml - - - - SelectPartLinkDialogView.xaml - - - - SinglePartConnectorPartView.xaml - - - - - PropertiesAspectView.xaml - - - - AddRecipeDialogView.xaml - - - - - RecipesAspectView.xaml - - - - RelationsAspectView.xaml - - - - DefaultDetailsView.xaml - - - - DuplicateProductDialogView.xaml - - - - - - ProductsWorkspaceView.xaml - - - - True - True - Strings.resx - - - DefaultRecipeDetailsView.xaml - - - - EmptyRecipeDetailsView.xaml - - - EmptyDetailsView.xaml - - - - - - - - - - - - - ImportView.xaml - - - - - - - RemoveProductView.xaml - - - - CreateRevisionView.xaml - - - - RevisionsView.xaml - - - - - RecipesWorkspaceView.xaml - - - - - - - - + + + - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - + + + - - {b9920541-7e0e-4cde-b195-b18589a2bbb1} - Moryx.AbstractionLayer.UI - - - {e04d4a2d-70fc-48cf-a412-853ce51d5d40} - Moryx.Products.UI - + + True + True + Strings.resx + + - - - + PublicResXFileCodeGenerator Strings.Designer.cs - - + \ No newline at end of file diff --git a/src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.nuspec b/src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.nuspec deleted file mode 100644 index a4f6ad2f..00000000 --- a/src/Moryx.Products.UI.Interaction/Moryx.Products.UI.Interaction.nuspec +++ /dev/null @@ -1,18 +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.Products.UI.Interaction/Products/Import/ImportParameterViewModel.cs b/src/Moryx.Products.UI.Interaction/Products/Import/ImportParameterViewModel.cs index 977da4cd..cf202b4b 100644 --- a/src/Moryx.Products.UI.Interaction/Products/Import/ImportParameterViewModel.cs +++ b/src/Moryx.Products.UI.Interaction/Products/Import/ImportParameterViewModel.cs @@ -4,8 +4,7 @@ using System; using System.ComponentModel; using Moryx.Controls; -using Moryx.Products.UI.ProductService; -using Moryx.Serialization; +using Entry = Moryx.Serialization.Entry; namespace Moryx.Products.UI.Interaction { diff --git a/src/Moryx.Products.UI.Interaction/Products/Import/ImporterViewModel.cs b/src/Moryx.Products.UI.Interaction/Products/Import/ImporterViewModel.cs index 1e19779a..83d8cf38 100644 --- a/src/Moryx.Products.UI.Interaction/Products/Import/ImporterViewModel.cs +++ b/src/Moryx.Products.UI.Interaction/Products/Import/ImporterViewModel.cs @@ -1,12 +1,12 @@ // Copyright (c) 2020, Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Caliburn.Micro; using Moryx.Controls; using Moryx.Products.UI.ProductService; -using Moryx.Serialization; namespace Moryx.Products.UI.Interaction { @@ -24,7 +24,7 @@ public ImporterViewModel(ProductImporter importer, IProductServiceModel productS CreateParameterViewModel(_importer.Parameters); } - private void CreateParameterViewModel(Entry parameters) + private void CreateParameterViewModel(ProductService.Entry parameters) { if (Parameters != null) { @@ -34,10 +34,10 @@ private void CreateParameterViewModel(Entry parameters) } } - Parameters = new EntryViewModel(new Entry { DisplayName = "Root" }); + Parameters = new EntryViewModel(new Serialization.Entry { DisplayName = "Root" }); foreach (var parameter in parameters.SubEntries) { - var viewModel = new ImportParameterViewModel(parameter.Clone(true)); + var viewModel = new ImportParameterViewModel(parameter.ToSerializationEntry()); viewModel.ValueChanged += OnUpdateTriggerChanged; Parameters.SubEntries.Add(viewModel); } @@ -46,11 +46,11 @@ private void CreateParameterViewModel(Entry parameters) /// /// Update parameters if a was modified /// - private async void OnUpdateTriggerChanged(object sender, Entry importParameter) + private async void OnUpdateTriggerChanged(object sender, Serialization.Entry importParameter) { var parameters = Parameters.Entry; - parameters = await _productServiceModel.UpdateImportParameters(_importer.Name, parameters); - CreateParameterViewModel(parameters); + var updatedParameters = await _productServiceModel.UpdateImportParameters(_importer.Name, parameters.ToServiceEntry()); + CreateParameterViewModel(updatedParameters); } /// @@ -86,7 +86,7 @@ public bool ValidateInput() public Task Import() { var parameters = Parameters.Entry; - return _productServiceModel.ImportProduct(_importer.Name, parameters); + return _productServiceModel.ImportProduct(_importer.Name, parameters.ToServiceEntry()); } } } diff --git a/src/Moryx.Products.UI.Interaction/Properties/AssemblyInfo.cs b/src/Moryx.Products.UI.Interaction/Properties/AssemblyInfo.cs index 1e93238e..cb55e3d1 100644 --- a/src/Moryx.Products.UI.Interaction/Properties/AssemblyInfo.cs +++ b/src/Moryx.Products.UI.Interaction/Properties/AssemblyInfo.cs @@ -1,30 +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.Products.UI.Interaction")] -[assembly: AssemblyDescription("Moryx.Products.UI.Interaction")] -[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("55daa8ed-0729-4ff7-b262-e8c0f99022f3")] - -// 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: InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/src/Moryx.Products.UI.Interaction/app.config b/src/Moryx.Products.UI.Interaction/app.config deleted file mode 100644 index fb4305d9..00000000 --- a/src/Moryx.Products.UI.Interaction/app.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI.Interaction/packages.config b/src/Moryx.Products.UI.Interaction/packages.config deleted file mode 100644 index 6e8d7c50..00000000 --- a/src/Moryx.Products.UI.Interaction/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Connected Services/ProductService/ConnectedService.json b/src/Moryx.Products.UI/Connected Services/ProductService/ConnectedService.json new file mode 100644 index 00000000..b9110020 --- /dev/null +++ b/src/Moryx.Products.UI/Connected Services/ProductService/ConnectedService.json @@ -0,0 +1,18 @@ +{ + "ProviderId": "Microsoft.VisualStudio.ConnectedService.Wcf", + "Version": "15.0.40203.910", + "ExtendedData": { + "inputs": [ + "http://localhost/metadata/ProductInteraction" + ], + "collectionTypes": [ + "System.Array", + "System.Collections.Generic.Dictionary`2" + ], + "namespaceMappings": [ + "*, Moryx.Products.UI.ProductService" + ], + "targetFramework": "net45", + "typeReuseMode": "None" + } +} \ No newline at end of file diff --git a/src/Moryx.Products.UI/Connected Services/ProductService/Reference.cs b/src/Moryx.Products.UI/Connected Services/ProductService/Reference.cs new file mode 100644 index 00000000..b065d390 --- /dev/null +++ b/src/Moryx.Products.UI/Connected Services/ProductService/Reference.cs @@ -0,0 +1,1653 @@ +//------------------------------------------------------------------------------ +// +// 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.Products.UI.ProductService +{ + using System.Runtime.Serialization; + + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="ProductCustomization", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] + public partial class ProductCustomization : object + { + + private Moryx.Products.UI.ProductService.ProductImporter[] ImportersField; + + private Moryx.Products.UI.ProductService.ProductDefinitionModel[] ProductTypesField; + + private Moryx.Products.UI.ProductService.RecipeDefinitionModel[] RecipeTypesField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.ProductImporter[] Importers + { + get + { + return this.ImportersField; + } + set + { + this.ImportersField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.ProductDefinitionModel[] ProductTypes + { + get + { + return this.ProductTypesField; + } + set + { + this.ProductTypesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.RecipeDefinitionModel[] RecipeTypes + { + get + { + return this.RecipeTypesField; + } + set + { + this.RecipeTypesField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="ProductImporter", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] + public partial class ProductImporter : object + { + + private string NameField; + + private Moryx.Products.UI.ProductService.Entry ParametersField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Entry Parameters + { + get + { + return this.ParametersField; + } + set + { + this.ParametersField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="ProductDefinitionModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] + public partial class ProductDefinitionModel : object + { + + private string BaseDefinitionField; + + private string DisplayNameField; + + private string NameField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string BaseDefinition + { + get + { + return this.BaseDefinitionField; + } + set + { + this.BaseDefinitionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string DisplayName + { + get + { + return this.DisplayNameField; + } + set + { + this.DisplayNameField = 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="RecipeDefinitionModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] + public partial class RecipeDefinitionModel : object + { + + private string DisplayNameField; + + private bool HasWorkplansField; + + private string NameField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string DisplayName + { + get + { + return this.DisplayNameField; + } + set + { + this.DisplayNameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool HasWorkplans + { + get + { + return this.HasWorkplansField; + } + set + { + this.HasWorkplansField = 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="Entry", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public partial class Entry : object + { + + private string DescriptionField; + + private string DisplayNameField; + + private string IdentifierField; + + private Moryx.Products.UI.ProductService.Entry[] PrototypesField; + + private Moryx.Products.UI.ProductService.Entry[] SubEntriesField; + + private Moryx.Products.UI.ProductService.EntryValidation ValidationField; + + private Moryx.Products.UI.ProductService.EntryValue ValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Description + { + get + { + return this.DescriptionField; + } + set + { + this.DescriptionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string DisplayName + { + get + { + return this.DisplayNameField; + } + set + { + this.DisplayNameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Identifier + { + get + { + return this.IdentifierField; + } + set + { + this.IdentifierField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Entry[] Prototypes + { + get + { + return this.PrototypesField; + } + set + { + this.PrototypesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Entry[] SubEntries + { + get + { + return this.SubEntriesField; + } + set + { + this.SubEntriesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.EntryValidation Validation + { + get + { + return this.ValidationField; + } + set + { + this.ValidationField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.EntryValue Value + { + get + { + return this.ValueField; + } + set + { + this.ValueField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="EntryValidation", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public partial class EntryValidation : object + { + + private bool IsRequiredField; + + private double MaximumField; + + private double MinimumField; + + private string RegexField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool IsRequired + { + get + { + return this.IsRequiredField; + } + set + { + this.IsRequiredField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public double Maximum + { + get + { + return this.MaximumField; + } + set + { + this.MaximumField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public double Minimum + { + get + { + return this.MinimumField; + } + set + { + this.MinimumField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Regex + { + get + { + return this.RegexField; + } + set + { + this.RegexField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="EntryValue", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public partial class EntryValue : object + { + + private string CurrentField; + + private string DefaultField; + + private bool IsReadOnlyField; + + private string[] PossibleField; + + private Moryx.Products.UI.ProductService.EntryValueType TypeField; + + private Moryx.Products.UI.ProductService.EntryUnitType UnitTypeField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Current + { + get + { + return this.CurrentField; + } + set + { + this.CurrentField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Default + { + get + { + return this.DefaultField; + } + set + { + this.DefaultField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool IsReadOnly + { + get + { + return this.IsReadOnlyField; + } + set + { + this.IsReadOnlyField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string[] Possible + { + get + { + return this.PossibleField; + } + set + { + this.PossibleField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.EntryValueType Type + { + get + { + return this.TypeField; + } + set + { + this.TypeField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.EntryUnitType UnitType + { + get + { + return this.UnitTypeField; + } + set + { + this.UnitTypeField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [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.Runtime.Serialization.EnumMemberAttribute()] + Exception = 14, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Stream = 15, + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="EntryUnitType", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public enum EntryUnitType : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + None = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Password = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + File = 2, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Directory = 3, + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="ProductQuery", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] + public partial class ProductQuery : object + { + + private bool ExcludeDerivedTypesField; + + private string IdentifierField; + + private bool IncludeDeletedField; + + private string NameField; + + private Moryx.Products.UI.ProductService.RecipeFilter RecipeFilterField; + + private short RevisionField; + + private Moryx.Products.UI.ProductService.RevisionFilter RevisionFilterField; + + private Moryx.Products.UI.ProductService.Selector SelectorField; + + private string TypeField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool ExcludeDerivedTypes + { + get + { + return this.ExcludeDerivedTypesField; + } + set + { + this.ExcludeDerivedTypesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Identifier + { + get + { + return this.IdentifierField; + } + set + { + this.IdentifierField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool IncludeDeleted + { + get + { + return this.IncludeDeletedField; + } + set + { + this.IncludeDeletedField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.RecipeFilter RecipeFilter + { + get + { + return this.RecipeFilterField; + } + set + { + this.RecipeFilterField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public short Revision + { + get + { + return this.RevisionField; + } + set + { + this.RevisionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.RevisionFilter RevisionFilter + { + get + { + return this.RevisionFilterField; + } + set + { + this.RevisionFilterField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Selector Selector + { + get + { + return this.SelectorField; + } + set + { + this.SelectorField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Type + { + get + { + return this.TypeField; + } + set + { + this.TypeField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="RecipeFilter", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] + public enum RecipeFilter : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + Unset = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + WithRecipe = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + WithoutRecipes = 2, + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="RevisionFilter", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] + public enum RevisionFilter : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + All = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Latest = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Specific = 2, + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="Selector", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] + public enum Selector : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + Direct = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Parent = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Parts = 2, + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="ProductModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] + public partial class ProductModel : object + { + + private Moryx.Products.UI.ProductService.ProductFile[] FilesField; + + private long IdField; + + private string IdentifierField; + + private string NameField; + + private Moryx.Products.UI.ProductService.PartConnector[] PartsField; + + private Moryx.Products.UI.ProductService.Entry PropertiesField; + + private Moryx.Products.UI.ProductService.RecipeModel[] RecipesField; + + private short RevisionField; + + private Moryx.Products.UI.ProductService.ProductState StateField; + + private string TypeField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.ProductFile[] Files + { + get + { + return this.FilesField; + } + set + { + this.FilesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public long Id + { + get + { + return this.IdField; + } + set + { + this.IdField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Identifier + { + get + { + return this.IdentifierField; + } + set + { + this.IdentifierField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.PartConnector[] Parts + { + get + { + return this.PartsField; + } + set + { + this.PartsField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Entry Properties + { + get + { + return this.PropertiesField; + } + set + { + this.PropertiesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.RecipeModel[] Recipes + { + get + { + return this.RecipesField; + } + set + { + this.RecipesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public short Revision + { + get + { + return this.RevisionField; + } + set + { + this.RevisionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.ProductState State + { + get + { + return this.StateField; + } + set + { + this.StateField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Type + { + get + { + return this.TypeField; + } + set + { + this.TypeField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="ProductFile", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] + public partial class ProductFile : object + { + + private string FileHashField; + + private string FilePathField; + + private string MimeTypeField; + + private string NameField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string FileHash + { + get + { + return this.FileHashField; + } + set + { + this.FileHashField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string FilePath + { + get + { + return this.FilePathField; + } + set + { + this.FilePathField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string MimeType + { + get + { + return this.MimeTypeField; + } + set + { + this.MimeTypeField = 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="PartConnector", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] + public partial class PartConnector : object + { + + private string DisplayNameField; + + private bool IsCollectionField; + + private string NameField; + + private Moryx.Products.UI.ProductService.PartModel[] PartsField; + + private Moryx.Products.UI.ProductService.Entry PropertyTemplatesField; + + private string TypeField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string DisplayName + { + get + { + return this.DisplayNameField; + } + set + { + this.DisplayNameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool IsCollection + { + get + { + return this.IsCollectionField; + } + set + { + this.IsCollectionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.PartModel[] Parts + { + get + { + return this.PartsField; + } + set + { + this.PartsField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Entry PropertyTemplates + { + get + { + return this.PropertyTemplatesField; + } + set + { + this.PropertyTemplatesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Type + { + get + { + return this.TypeField; + } + set + { + this.TypeField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="RecipeModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] + public partial class RecipeModel : object + { + + private Moryx.Products.UI.ProductService.RecipeClassificationModel ClassificationField; + + private long IdField; + + private string NameField; + + private Moryx.Products.UI.ProductService.Entry PropertiesField; + + private int RevisionField; + + private Moryx.Products.UI.ProductService.RecipeState StateField; + + private string TypeField; + + private long WorkplanIdField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.RecipeClassificationModel Classification + { + get + { + return this.ClassificationField; + } + set + { + this.ClassificationField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public long Id + { + get + { + return this.IdField; + } + set + { + this.IdField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Entry Properties + { + get + { + return this.PropertiesField; + } + set + { + this.PropertiesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public int Revision + { + get + { + return this.RevisionField; + } + set + { + this.RevisionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.RecipeState State + { + get + { + return this.StateField; + } + set + { + this.StateField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Type + { + get + { + return this.TypeField; + } + set + { + this.TypeField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public long WorkplanId + { + get + { + return this.WorkplanIdField; + } + set + { + this.WorkplanIdField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="ProductState", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] + public enum ProductState : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + Created = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Released = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Deprecated = 2, + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="PartModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] + public partial class PartModel : object + { + + private long IdField; + + private Moryx.Products.UI.ProductService.ProductModel ProductField; + + private Moryx.Products.UI.ProductService.Entry PropertiesField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public long Id + { + get + { + return this.IdField; + } + set + { + this.IdField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.ProductModel Product + { + get + { + return this.ProductField; + } + set + { + this.ProductField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.Entry Properties + { + get + { + return this.PropertiesField; + } + set + { + this.PropertiesField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="RecipeClassificationModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] + public enum RecipeClassificationModel : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + Unset = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Default = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Alternative = 2, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Intermediate = 3, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Part = 4, + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="RecipeState", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Recipes")] + public enum RecipeState : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + New = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Released = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Revoked = 2, + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="DuplicateProductResponse", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] + public partial class DuplicateProductResponse : object + { + + private Moryx.Products.UI.ProductService.ProductModel DuplicateField; + + private bool IdentityConflictField; + + private bool InvalidSourceField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.ProductModel Duplicate + { + get + { + return this.DuplicateField; + } + set + { + this.DuplicateField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool IdentityConflict + { + get + { + return this.IdentityConflictField; + } + set + { + this.IdentityConflictField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool InvalidSource + { + get + { + return this.InvalidSourceField; + } + set + { + this.InvalidSourceField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="WorkplanModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] + public partial class WorkplanModel : object + { + + private long IdField; + + private string NameField; + + private Moryx.Products.UI.ProductService.WorkplanState StateField; + + private int VersionField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public long Id + { + get + { + return this.IdField; + } + set + { + this.IdField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Products.UI.ProductService.WorkplanState State + { + get + { + return this.StateField; + } + set + { + this.StateField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public int Version + { + get + { + return this.VersionField; + } + set + { + this.VersionField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="WorkplanState", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Workflows")] + public enum WorkplanState : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + New = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Released = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Revoked = 2, + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="Moryx.Products.UI.ProductService.IProductInteraction")] + public interface IProductInteraction + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetCustomization", ReplyAction="http://tempuri.org/IProductInteraction/GetCustomizationResponse")] + System.Threading.Tasks.Task GetCustomizationAsync(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetProducts", ReplyAction="http://tempuri.org/IProductInteraction/GetProductsResponse")] + System.Threading.Tasks.Task GetProductsAsync(Moryx.Products.UI.ProductService.ProductQuery query); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/CreateProduct", ReplyAction="http://tempuri.org/IProductInteraction/CreateProductResponse")] + System.Threading.Tasks.Task CreateProductAsync(string type); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetProductDetails", ReplyAction="http://tempuri.org/IProductInteraction/GetProductDetailsResponse")] + System.Threading.Tasks.Task GetProductDetailsAsync(long id); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/SaveProduct", ReplyAction="http://tempuri.org/IProductInteraction/SaveProductResponse")] + System.Threading.Tasks.Task SaveProductAsync(Moryx.Products.UI.ProductService.ProductModel instance); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/DuplicateProduct", ReplyAction="http://tempuri.org/IProductInteraction/DuplicateProductResponse")] + System.Threading.Tasks.Task DuplicateProductAsync(long sourceId, string identifier, short revisionNo); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/DeleteProduct", ReplyAction="http://tempuri.org/IProductInteraction/DeleteProductResponse")] + System.Threading.Tasks.Task DeleteProductAsync(long id); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/ImportProduct", ReplyAction="http://tempuri.org/IProductInteraction/ImportProductResponse")] + System.Threading.Tasks.Task ImportProductAsync(string importerName, Moryx.Products.UI.ProductService.Entry parametersModel); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/UpdateParameters", ReplyAction="http://tempuri.org/IProductInteraction/UpdateParametersResponse")] + System.Threading.Tasks.Task UpdateParametersAsync(string importer, Moryx.Products.UI.ProductService.Entry currentParameters); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipe", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipeResponse")] + System.Threading.Tasks.Task GetRecipeAsync(long recipeId); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipes", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipesResponse")] + System.Threading.Tasks.Task GetRecipesAsync(long productId); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/CreateRecipe", ReplyAction="http://tempuri.org/IProductInteraction/CreateRecipeResponse")] + System.Threading.Tasks.Task CreateRecipeAsync(string recipeType); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/SaveRecipe", ReplyAction="http://tempuri.org/IProductInteraction/SaveRecipeResponse")] + System.Threading.Tasks.Task SaveRecipeAsync(Moryx.Products.UI.ProductService.RecipeModel recipe); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetWorkplans", ReplyAction="http://tempuri.org/IProductInteraction/GetWorkplansResponse")] + System.Threading.Tasks.Task GetWorkplansAsync(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipeProviderName", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipeProviderNameResponse")] + System.Threading.Tasks.Task GetRecipeProviderNameAsync(); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public interface IProductInteractionChannel : Moryx.Products.UI.ProductService.IProductInteraction, System.ServiceModel.IClientChannel + { + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public partial class ProductInteractionClient : System.ServiceModel.ClientBase, Moryx.Products.UI.ProductService.IProductInteraction + { + + /// + /// 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 ProductInteractionClient() : + base(ProductInteractionClient.GetDefaultBinding(), ProductInteractionClient.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_IProductInteraction.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public ProductInteractionClient(EndpointConfiguration endpointConfiguration) : + base(ProductInteractionClient.GetBindingForEndpoint(endpointConfiguration), ProductInteractionClient.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public ProductInteractionClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(ProductInteractionClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public ProductInteractionClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(ProductInteractionClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public ProductInteractionClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) + { + } + + public System.Threading.Tasks.Task GetCustomizationAsync() + { + return base.Channel.GetCustomizationAsync(); + } + + public System.Threading.Tasks.Task GetProductsAsync(Moryx.Products.UI.ProductService.ProductQuery query) + { + return base.Channel.GetProductsAsync(query); + } + + public System.Threading.Tasks.Task CreateProductAsync(string type) + { + return base.Channel.CreateProductAsync(type); + } + + public System.Threading.Tasks.Task GetProductDetailsAsync(long id) + { + return base.Channel.GetProductDetailsAsync(id); + } + + public System.Threading.Tasks.Task SaveProductAsync(Moryx.Products.UI.ProductService.ProductModel instance) + { + return base.Channel.SaveProductAsync(instance); + } + + public System.Threading.Tasks.Task DuplicateProductAsync(long sourceId, string identifier, short revisionNo) + { + return base.Channel.DuplicateProductAsync(sourceId, identifier, revisionNo); + } + + public System.Threading.Tasks.Task DeleteProductAsync(long id) + { + return base.Channel.DeleteProductAsync(id); + } + + public System.Threading.Tasks.Task ImportProductAsync(string importerName, Moryx.Products.UI.ProductService.Entry parametersModel) + { + return base.Channel.ImportProductAsync(importerName, parametersModel); + } + + public System.Threading.Tasks.Task UpdateParametersAsync(string importer, Moryx.Products.UI.ProductService.Entry currentParameters) + { + return base.Channel.UpdateParametersAsync(importer, currentParameters); + } + + public System.Threading.Tasks.Task GetRecipeAsync(long recipeId) + { + return base.Channel.GetRecipeAsync(recipeId); + } + + public System.Threading.Tasks.Task GetRecipesAsync(long productId) + { + return base.Channel.GetRecipesAsync(productId); + } + + public System.Threading.Tasks.Task CreateRecipeAsync(string recipeType) + { + return base.Channel.CreateRecipeAsync(recipeType); + } + + public System.Threading.Tasks.Task SaveRecipeAsync(Moryx.Products.UI.ProductService.RecipeModel recipe) + { + return base.Channel.SaveRecipeAsync(recipe); + } + + public System.Threading.Tasks.Task GetWorkplansAsync() + { + return base.Channel.GetWorkplansAsync(); + } + + public System.Threading.Tasks.Task GetRecipeProviderNameAsync() + { + return base.Channel.GetRecipeProviderNameAsync(); + } + + 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_IProductInteraction)) + { + 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_IProductInteraction)) + { + return new System.ServiceModel.EndpointAddress("http://pxc-n2488/ProductInteraction"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return ProductInteractionClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_IProductInteraction); + } + + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return ProductInteractionClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_IProductInteraction); + } + + public enum EndpointConfiguration + { + + BasicHttpBinding_IProductInteraction, + } + } +} diff --git a/src/Moryx.Products.UI/EntryExtensions.cs b/src/Moryx.Products.UI/EntryExtensions.cs new file mode 100644 index 00000000..c724ce10 --- /dev/null +++ b/src/Moryx.Products.UI/EntryExtensions.cs @@ -0,0 +1,40 @@ +// Copyright (c) 2020, Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Newtonsoft.Json; + +namespace Moryx.Products.UI +{ + /// + /// Extensions for the entry class to convert from to and back + /// + public static class EntryExtensions + { + /// + /// Converts the to + /// + public static Moryx.Serialization.Entry ToSerializationEntry(this Moryx.Products.UI.ProductService.Entry serviceEntry) + { + var json = JsonConvert.SerializeObject(serviceEntry); + return JsonConvert.DeserializeObject(json); + } + + /// + /// Converts the to + /// + public static Moryx.Products.UI.ProductService.Entry ToServiceEntry(this Moryx.Serialization.Entry serializationEntry) + { + var json = JsonConvert.SerializeObject(serializationEntry); + return JsonConvert.DeserializeObject(json); + } + + /// + /// Clones an object by serialize it and reads it again + /// + public static TType SerializationClone(this TType obj) + { + var json = JsonConvert.SerializeObject(obj); + return JsonConvert.DeserializeObject(json); + } + } +} \ No newline at end of file diff --git a/src/Moryx.Products.UI/IProductServiceModel.cs b/src/Moryx.Products.UI/IProductServiceModel.cs index 1a736577..44d4b792 100644 --- a/src/Moryx.Products.UI/IProductServiceModel.cs +++ b/src/Moryx.Products.UI/IProductServiceModel.cs @@ -2,10 +2,9 @@ // Licensed under the Apache License, Version 2.0 using System.Threading.Tasks; -using Moryx.AbstractionLayer.UI; using Moryx.Products.UI.ProductService; -using Moryx.Serialization; using Moryx.Tools.Wcf; +using Entry = Moryx.Products.UI.ProductService.Entry; namespace Moryx.Products.UI { diff --git a/src/Moryx.Products.UI/Moryx.Products.UI.csproj b/src/Moryx.Products.UI/Moryx.Products.UI.csproj index d0e53d40..587101a6 100644 --- a/src/Moryx.Products.UI/Moryx.Products.UI.csproj +++ b/src/Moryx.Products.UI/Moryx.Products.UI.csproj @@ -1,223 +1,33 @@ - - - + + + + - Debug - AnyCPU - {E04D4A2D-70FC-48CF-A412-853CE51D5D40} - Library - Properties - Moryx.Products.UI - Moryx.Products.UI - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Products.UI.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Products.UI.XML + net45 + true + true + Moryx.Products.UI + true + - - ..\..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - True - - - ..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll - - - ..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll - - - ..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll - - - ..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll - - - ..\..\packages\Moryx.Controls.3.0.0-dev.32\lib\net461\Moryx.Controls.dll - - - ..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll - - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll - - + + - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - True - True - Reference.svcmap - - - - - - - - - - - - - - - - - - - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - - Designer - - - - - - - - - - - - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - WCF Proxy Generator - Reference.cs - - - - - + + - - {b9920541-7e0e-4cde-b195-b18589a2bbb1} - Moryx.AbstractionLayer.UI - + + - - MSBuild:Compile - Designer - + - - + \ No newline at end of file diff --git a/src/Moryx.Products.UI/ProductServiceModel.cs b/src/Moryx.Products.UI/ProductServiceModel.cs index 985d7c31..4f15d657 100644 --- a/src/Moryx.Products.UI/ProductServiceModel.cs +++ b/src/Moryx.Products.UI/ProductServiceModel.cs @@ -5,6 +5,7 @@ using Moryx.Products.UI.ProductService; using Moryx.Serialization; using Moryx.Tools.Wcf; +using Entry = Moryx.Products.UI.ProductService.Entry; namespace Moryx.Products.UI { diff --git a/src/Moryx.Products.UI/Properties/AssemblyInfo.cs b/src/Moryx.Products.UI/Properties/AssemblyInfo.cs deleted file mode 100644 index 05eed8c7..00000000 --- a/src/Moryx.Products.UI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +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.Products.UI")] -[assembly: AssemblyDescription("Moryx.Products.UI")] -[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("e04d4a2d-70fc-48cf-a412-853ce51d5d40")] - -// 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.*")] \ No newline at end of file diff --git a/src/Moryx.Products.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource b/src/Moryx.Products.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource deleted file mode 100644 index ef1a4fcf..00000000 --- a/src/Moryx.Products.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Serialization.Entry, Moryx, Version=3.0.0.3101, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse.datasource b/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse.datasource deleted file mode 100644 index c129620c..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Products.UI.ProductService.DuplicateProductResponse, Service References.ProductService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse1.datasource b/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse1.datasource deleted file mode 100644 index 0406fd9e..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.DuplicateProductResponse1.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Products.UI.ProductService.DuplicateProductResponse, Moryx.Products.UI, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ImportParameter.datasource b/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ImportParameter.datasource deleted file mode 100644 index 58791aea..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ImportParameter.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Products.UI.ProductService.ImportParameter, Service References.ProductService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductCustomization.datasource b/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductCustomization.datasource deleted file mode 100644 index b0937b17..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductCustomization.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Products.UI.ProductService.ProductCustomization, Moryx.Products.UI, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductModel.datasource b/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductModel.datasource deleted file mode 100644 index 13ddd7c7..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.ProductModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Products.UI.ProductService.ProductModel, Moryx.Products.UI, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.RecipeModel.datasource b/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.RecipeModel.datasource deleted file mode 100644 index e6099e1d..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.RecipeModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Products.UI.ProductService.RecipeModel, Moryx.Products.UI, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.WorkplanModel.datasource b/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.WorkplanModel.datasource deleted file mode 100644 index ca3f6ee6..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Moryx.Products.UI.ProductService.WorkplanModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Products.UI.ProductService.WorkplanModel - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction.wsdl b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction.wsdl deleted file mode 100644 index 6317080a..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction.wsdl +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction31.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction31.xsd deleted file mode 100644 index 6d1ba4bd..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction31.xsd +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction32.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction32.xsd deleted file mode 100644 index d58e7f39..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction32.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction33.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction33.xsd deleted file mode 100644 index 4baa424b..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction33.xsd +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction34.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction34.xsd deleted file mode 100644 index 78a56417..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction34.xsd +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction35.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction35.xsd deleted file mode 100644 index 04a74a45..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction35.xsd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction36.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction36.xsd deleted file mode 100644 index f446278b..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction36.xsd +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction37.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction37.xsd deleted file mode 100644 index 22961353..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction37.xsd +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction38.xsd b/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction38.xsd deleted file mode 100644 index 8f83a94c..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/ProductInteraction38.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/Reference.cs b/src/Moryx.Products.UI/Service References/ProductService/Reference.cs deleted file mode 100644 index 6e82f127..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/Reference.cs +++ /dev/null @@ -1,1624 +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.Products.UI.ProductService { - 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="ProductCustomization", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] - [System.SerializableAttribute()] - public partial class ProductCustomization : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.ProductImporter[] ImportersField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.ProductDefinitionModel[] ProductTypesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.RecipeDefinitionModel[] RecipeTypesField; - - [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.Products.UI.ProductService.ProductImporter[] Importers { - get { - return this.ImportersField; - } - set { - if ((object.ReferenceEquals(this.ImportersField, value) != true)) { - this.ImportersField = value; - this.RaisePropertyChanged("Importers"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.ProductDefinitionModel[] ProductTypes { - get { - return this.ProductTypesField; - } - set { - if ((object.ReferenceEquals(this.ProductTypesField, value) != true)) { - this.ProductTypesField = value; - this.RaisePropertyChanged("ProductTypes"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.RecipeDefinitionModel[] RecipeTypes { - get { - return this.RecipeTypesField; - } - set { - if ((object.ReferenceEquals(this.RecipeTypesField, value) != true)) { - this.RecipeTypesField = value; - this.RaisePropertyChanged("RecipeTypes"); - } - } - } - - 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="ProductImporter", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] - [System.SerializableAttribute()] - public partial class ProductImporter : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.Entry ParametersField; - - [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 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.Serialization.Entry Parameters { - get { - return this.ParametersField; - } - set { - if ((object.ReferenceEquals(this.ParametersField, value) != true)) { - this.ParametersField = value; - this.RaisePropertyChanged("Parameters"); - } - } - } - - 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="ProductDefinitionModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] - [System.SerializableAttribute()] - public partial class ProductDefinitionModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string BaseDefinitionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DisplayNameField; - - [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 BaseDefinition { - get { - return this.BaseDefinitionField; - } - set { - if ((object.ReferenceEquals(this.BaseDefinitionField, value) != true)) { - this.BaseDefinitionField = value; - this.RaisePropertyChanged("BaseDefinition"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string DisplayName { - get { - return this.DisplayNameField; - } - set { - if ((object.ReferenceEquals(this.DisplayNameField, value) != true)) { - this.DisplayNameField = value; - this.RaisePropertyChanged("DisplayName"); - } - } - } - - [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="RecipeDefinitionModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] - [System.SerializableAttribute()] - public partial class RecipeDefinitionModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DisplayNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool HasWorkplansField; - - [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 DisplayName { - get { - return this.DisplayNameField; - } - set { - if ((object.ReferenceEquals(this.DisplayNameField, value) != true)) { - this.DisplayNameField = value; - this.RaisePropertyChanged("DisplayName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool HasWorkplans { - get { - return this.HasWorkplansField; - } - set { - if ((this.HasWorkplansField.Equals(value) != true)) { - this.HasWorkplansField = value; - this.RaisePropertyChanged("HasWorkplans"); - } - } - } - - [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="ProductQuery", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] - [System.SerializableAttribute()] - public partial class ProductQuery : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool ExcludeDerivedTypesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string IdentifierField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IncludeDeletedField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.RecipeFilter RecipeFilterField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private short RevisionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.RevisionFilter RevisionFilterField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.Selector SelectorField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string 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 bool ExcludeDerivedTypes { - get { - return this.ExcludeDerivedTypesField; - } - set { - if ((this.ExcludeDerivedTypesField.Equals(value) != true)) { - this.ExcludeDerivedTypesField = value; - this.RaisePropertyChanged("ExcludeDerivedTypes"); - } - } - } - - [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 bool IncludeDeleted { - get { - return this.IncludeDeletedField; - } - set { - if ((this.IncludeDeletedField.Equals(value) != true)) { - this.IncludeDeletedField = value; - this.RaisePropertyChanged("IncludeDeleted"); - } - } - } - - [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.Products.UI.ProductService.RecipeFilter RecipeFilter { - get { - return this.RecipeFilterField; - } - set { - if ((this.RecipeFilterField.Equals(value) != true)) { - this.RecipeFilterField = value; - this.RaisePropertyChanged("RecipeFilter"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public short Revision { - get { - return this.RevisionField; - } - set { - if ((this.RevisionField.Equals(value) != true)) { - this.RevisionField = value; - this.RaisePropertyChanged("Revision"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.RevisionFilter RevisionFilter { - get { - return this.RevisionFilterField; - } - set { - if ((this.RevisionFilterField.Equals(value) != true)) { - this.RevisionFilterField = value; - this.RaisePropertyChanged("RevisionFilter"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.Selector Selector { - get { - return this.SelectorField; - } - set { - if ((this.SelectorField.Equals(value) != true)) { - this.SelectorField = value; - this.RaisePropertyChanged("Selector"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Type { - get { - return this.TypeField; - } - set { - if ((object.ReferenceEquals(this.TypeField, 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="RecipeFilter", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] - public enum RecipeFilter : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Unset = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - WithRecipe = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - WithoutRecipes = 2, - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="RevisionFilter", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] - public enum RevisionFilter : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - All = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Latest = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Specific = 2, - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="Selector", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] - public enum Selector : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Direct = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Parent = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Parts = 2, - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="ProductModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] - [System.SerializableAttribute()] - public partial class ProductModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.ProductFile[] FilesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private long IdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string IdentifierField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.PartConnector[] PartsField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.Entry PropertiesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.RecipeModel[] RecipesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private short RevisionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.ProductState StateField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string 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 Moryx.Products.UI.ProductService.ProductFile[] Files { - get { - return this.FilesField; - } - set { - if ((object.ReferenceEquals(this.FilesField, value) != true)) { - this.FilesField = value; - this.RaisePropertyChanged("Files"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public long Id { - get { - return this.IdField; - } - set { - if ((this.IdField.Equals(value) != true)) { - this.IdField = value; - this.RaisePropertyChanged("Id"); - } - } - } - - [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"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.PartConnector[] Parts { - get { - return this.PartsField; - } - set { - if ((object.ReferenceEquals(this.PartsField, value) != true)) { - this.PartsField = value; - this.RaisePropertyChanged("Parts"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Serialization.Entry Properties { - get { - return this.PropertiesField; - } - set { - if ((object.ReferenceEquals(this.PropertiesField, value) != true)) { - this.PropertiesField = value; - this.RaisePropertyChanged("Properties"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.RecipeModel[] Recipes { - get { - return this.RecipesField; - } - set { - if ((object.ReferenceEquals(this.RecipesField, value) != true)) { - this.RecipesField = value; - this.RaisePropertyChanged("Recipes"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public short Revision { - get { - return this.RevisionField; - } - set { - if ((this.RevisionField.Equals(value) != true)) { - this.RevisionField = value; - this.RaisePropertyChanged("Revision"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.ProductState State { - get { - return this.StateField; - } - set { - if ((this.StateField.Equals(value) != true)) { - this.StateField = value; - this.RaisePropertyChanged("State"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Type { - get { - return this.TypeField; - } - set { - if ((object.ReferenceEquals(this.TypeField, 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.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="ProductFile", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] - [System.SerializableAttribute()] - public partial class ProductFile : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string FileHashField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string FilePathField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string MimeTypeField; - - [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 FileHash { - get { - return this.FileHashField; - } - set { - if ((object.ReferenceEquals(this.FileHashField, value) != true)) { - this.FileHashField = value; - this.RaisePropertyChanged("FileHash"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string FilePath { - get { - return this.FilePathField; - } - set { - if ((object.ReferenceEquals(this.FilePathField, value) != true)) { - this.FilePathField = value; - this.RaisePropertyChanged("FilePath"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string MimeType { - get { - return this.MimeTypeField; - } - set { - if ((object.ReferenceEquals(this.MimeTypeField, value) != true)) { - this.MimeTypeField = value; - this.RaisePropertyChanged("MimeType"); - } - } - } - - [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="PartConnector", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] - [System.SerializableAttribute()] - public partial class PartConnector : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DisplayNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IsCollectionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.PartModel[] PartsField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.Entry PropertyTemplatesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string 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 DisplayName { - get { - return this.DisplayNameField; - } - set { - if ((object.ReferenceEquals(this.DisplayNameField, value) != true)) { - this.DisplayNameField = value; - this.RaisePropertyChanged("DisplayName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsCollection { - get { - return this.IsCollectionField; - } - set { - if ((this.IsCollectionField.Equals(value) != true)) { - this.IsCollectionField = value; - this.RaisePropertyChanged("IsCollection"); - } - } - } - - [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.Products.UI.ProductService.PartModel[] Parts { - get { - return this.PartsField; - } - set { - if ((object.ReferenceEquals(this.PartsField, value) != true)) { - this.PartsField = value; - this.RaisePropertyChanged("Parts"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Serialization.Entry PropertyTemplates { - get { - return this.PropertyTemplatesField; - } - set { - if ((object.ReferenceEquals(this.PropertyTemplatesField, value) != true)) { - this.PropertyTemplatesField = value; - this.RaisePropertyChanged("PropertyTemplates"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Type { - get { - return this.TypeField; - } - set { - if ((object.ReferenceEquals(this.TypeField, 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.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="RecipeModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] - [System.SerializableAttribute()] - public partial class RecipeModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.RecipeClassificationModel ClassificationField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private long IdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.Entry PropertiesField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int RevisionField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.RecipeState StateField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string TypeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private long WorkplanIdField; - - [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.Products.UI.ProductService.RecipeClassificationModel Classification { - get { - return this.ClassificationField; - } - set { - if ((this.ClassificationField.Equals(value) != true)) { - this.ClassificationField = value; - this.RaisePropertyChanged("Classification"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public long Id { - get { - return this.IdField; - } - set { - if ((this.IdField.Equals(value) != true)) { - this.IdField = value; - this.RaisePropertyChanged("Id"); - } - } - } - - [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.Serialization.Entry Properties { - get { - return this.PropertiesField; - } - set { - if ((object.ReferenceEquals(this.PropertiesField, value) != true)) { - this.PropertiesField = value; - this.RaisePropertyChanged("Properties"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int Revision { - get { - return this.RevisionField; - } - set { - if ((this.RevisionField.Equals(value) != true)) { - this.RevisionField = value; - this.RaisePropertyChanged("Revision"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.RecipeState State { - get { - return this.StateField; - } - set { - if ((this.StateField.Equals(value) != true)) { - this.StateField = value; - this.RaisePropertyChanged("State"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public string Type { - get { - return this.TypeField; - } - set { - if ((object.ReferenceEquals(this.TypeField, value) != true)) { - this.TypeField = value; - this.RaisePropertyChanged("Type"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public long WorkplanId { - get { - return this.WorkplanIdField; - } - set { - if ((this.WorkplanIdField.Equals(value) != true)) { - this.WorkplanIdField = value; - this.RaisePropertyChanged("WorkplanId"); - } - } - } - - 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="ProductState", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Products")] - public enum ProductState : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Created = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Released = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Deprecated = 2, - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="PartModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] - [System.SerializableAttribute()] - public partial class PartModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private long IdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.ProductModel ProductField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.Entry PropertiesField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public long Id { - get { - return this.IdField; - } - set { - if ((this.IdField.Equals(value) != true)) { - this.IdField = value; - this.RaisePropertyChanged("Id"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Products.UI.ProductService.ProductModel Product { - get { - return this.ProductField; - } - set { - if ((object.ReferenceEquals(this.ProductField, value) != true)) { - this.ProductField = value; - this.RaisePropertyChanged("Product"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Serialization.Entry Properties { - get { - return this.PropertiesField; - } - set { - if ((object.ReferenceEquals(this.PropertiesField, value) != true)) { - this.PropertiesField = value; - this.RaisePropertyChanged("Properties"); - } - } - } - - 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="RecipeClassificationModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] - public enum RecipeClassificationModel : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Unset = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Default = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Alternative = 2, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Intermediate = 3, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Part = 4, - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="RecipeState", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Recipes")] - public enum RecipeState : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - New = 0, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Released = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - Revoked = 2, - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="DuplicateProductResponse", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification")] - [System.SerializableAttribute()] - public partial class DuplicateProductResponse : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Products.UI.ProductService.ProductModel DuplicateField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool IdentityConflictField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private bool InvalidSourceField; - - [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.Products.UI.ProductService.ProductModel Duplicate { - get { - return this.DuplicateField; - } - set { - if ((object.ReferenceEquals(this.DuplicateField, value) != true)) { - this.DuplicateField = value; - this.RaisePropertyChanged("Duplicate"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool IdentityConflict { - get { - return this.IdentityConflictField; - } - set { - if ((this.IdentityConflictField.Equals(value) != true)) { - this.IdentityConflictField = value; - this.RaisePropertyChanged("IdentityConflict"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public bool InvalidSource { - get { - return this.InvalidSourceField; - } - set { - if ((this.InvalidSourceField.Equals(value) != true)) { - this.InvalidSourceField = value; - this.RaisePropertyChanged("InvalidSource"); - } - } - } - - 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="WorkplanModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Products.Management.Modification", IsReference=true)] - [System.SerializableAttribute()] - public partial class WorkplanModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private long IdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string NameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Workflows.WorkplanState StateField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private int 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 long Id { - get { - return this.IdField; - } - set { - if ((this.IdField.Equals(value) != true)) { - this.IdField = value; - this.RaisePropertyChanged("Id"); - } - } - } - - [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.Workflows.WorkplanState State { - get { - return this.StateField; - } - set { - if ((this.StateField.Equals(value) != true)) { - this.StateField = value; - this.RaisePropertyChanged("State"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute()] - public int Version { - get { - return this.VersionField; - } - set { - if ((this.VersionField.Equals(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.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="ProductService.IProductInteraction")] - public interface IProductInteraction { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetCustomization", ReplyAction="http://tempuri.org/IProductInteraction/GetCustomizationResponse")] - Moryx.Products.UI.ProductService.ProductCustomization GetCustomization(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetCustomization", ReplyAction="http://tempuri.org/IProductInteraction/GetCustomizationResponse")] - System.Threading.Tasks.Task GetCustomizationAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetProducts", ReplyAction="http://tempuri.org/IProductInteraction/GetProductsResponse")] - Moryx.Products.UI.ProductService.ProductModel[] GetProducts(Moryx.Products.UI.ProductService.ProductQuery query); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetProducts", ReplyAction="http://tempuri.org/IProductInteraction/GetProductsResponse")] - System.Threading.Tasks.Task GetProductsAsync(Moryx.Products.UI.ProductService.ProductQuery query); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/CreateProduct", ReplyAction="http://tempuri.org/IProductInteraction/CreateProductResponse")] - Moryx.Products.UI.ProductService.ProductModel CreateProduct(string type); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/CreateProduct", ReplyAction="http://tempuri.org/IProductInteraction/CreateProductResponse")] - System.Threading.Tasks.Task CreateProductAsync(string type); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetProductDetails", ReplyAction="http://tempuri.org/IProductInteraction/GetProductDetailsResponse")] - Moryx.Products.UI.ProductService.ProductModel GetProductDetails(long id); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetProductDetails", ReplyAction="http://tempuri.org/IProductInteraction/GetProductDetailsResponse")] - System.Threading.Tasks.Task GetProductDetailsAsync(long id); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/SaveProduct", ReplyAction="http://tempuri.org/IProductInteraction/SaveProductResponse")] - Moryx.Products.UI.ProductService.ProductModel SaveProduct(Moryx.Products.UI.ProductService.ProductModel instance); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/SaveProduct", ReplyAction="http://tempuri.org/IProductInteraction/SaveProductResponse")] - System.Threading.Tasks.Task SaveProductAsync(Moryx.Products.UI.ProductService.ProductModel instance); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/DuplicateProduct", ReplyAction="http://tempuri.org/IProductInteraction/DuplicateProductResponse")] - Moryx.Products.UI.ProductService.DuplicateProductResponse DuplicateProduct(long sourceId, string identifier, short revisionNo); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/DuplicateProduct", ReplyAction="http://tempuri.org/IProductInteraction/DuplicateProductResponse")] - System.Threading.Tasks.Task DuplicateProductAsync(long sourceId, string identifier, short revisionNo); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/DeleteProduct", ReplyAction="http://tempuri.org/IProductInteraction/DeleteProductResponse")] - bool DeleteProduct(long id); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/DeleteProduct", ReplyAction="http://tempuri.org/IProductInteraction/DeleteProductResponse")] - System.Threading.Tasks.Task DeleteProductAsync(long id); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/ImportProduct", ReplyAction="http://tempuri.org/IProductInteraction/ImportProductResponse")] - Moryx.Products.UI.ProductService.ProductModel ImportProduct(string importerName, Moryx.Serialization.Entry parametersModel); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/ImportProduct", ReplyAction="http://tempuri.org/IProductInteraction/ImportProductResponse")] - System.Threading.Tasks.Task ImportProductAsync(string importerName, Moryx.Serialization.Entry parametersModel); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/UpdateParameters", ReplyAction="http://tempuri.org/IProductInteraction/UpdateParametersResponse")] - Moryx.Serialization.Entry UpdateParameters(string importer, Moryx.Serialization.Entry currentParameters); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/UpdateParameters", ReplyAction="http://tempuri.org/IProductInteraction/UpdateParametersResponse")] - System.Threading.Tasks.Task UpdateParametersAsync(string importer, Moryx.Serialization.Entry currentParameters); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipe", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipeResponse")] - Moryx.Products.UI.ProductService.RecipeModel GetRecipe(long recipeId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipe", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipeResponse")] - System.Threading.Tasks.Task GetRecipeAsync(long recipeId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipes", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipesResponse")] - Moryx.Products.UI.ProductService.RecipeModel[] GetRecipes(long productId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipes", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipesResponse")] - System.Threading.Tasks.Task GetRecipesAsync(long productId); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/CreateRecipe", ReplyAction="http://tempuri.org/IProductInteraction/CreateRecipeResponse")] - Moryx.Products.UI.ProductService.RecipeModel CreateRecipe(string recipeType); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/CreateRecipe", ReplyAction="http://tempuri.org/IProductInteraction/CreateRecipeResponse")] - System.Threading.Tasks.Task CreateRecipeAsync(string recipeType); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/SaveRecipe", ReplyAction="http://tempuri.org/IProductInteraction/SaveRecipeResponse")] - Moryx.Products.UI.ProductService.RecipeModel SaveRecipe(Moryx.Products.UI.ProductService.RecipeModel recipe); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/SaveRecipe", ReplyAction="http://tempuri.org/IProductInteraction/SaveRecipeResponse")] - System.Threading.Tasks.Task SaveRecipeAsync(Moryx.Products.UI.ProductService.RecipeModel recipe); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetWorkplans", ReplyAction="http://tempuri.org/IProductInteraction/GetWorkplansResponse")] - Moryx.Products.UI.ProductService.WorkplanModel[] GetWorkplans(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetWorkplans", ReplyAction="http://tempuri.org/IProductInteraction/GetWorkplansResponse")] - System.Threading.Tasks.Task GetWorkplansAsync(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipeProviderName", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipeProviderNameResponse")] - string GetRecipeProviderName(); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IProductInteraction/GetRecipeProviderName", ReplyAction="http://tempuri.org/IProductInteraction/GetRecipeProviderNameResponse")] - System.Threading.Tasks.Task GetRecipeProviderNameAsync(); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IProductInteractionChannel : Moryx.Products.UI.ProductService.IProductInteraction, System.ServiceModel.IClientChannel { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class ProductInteractionClient : System.ServiceModel.ClientBase, Moryx.Products.UI.ProductService.IProductInteraction { - - public ProductInteractionClient() { - } - - public ProductInteractionClient(string endpointConfigurationName) : - base(endpointConfigurationName) { - } - - public ProductInteractionClient(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public ProductInteractionClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) { - } - - public ProductInteractionClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(binding, remoteAddress) { - } - - public Moryx.Products.UI.ProductService.ProductCustomization GetCustomization() { - return base.Channel.GetCustomization(); - } - - public System.Threading.Tasks.Task GetCustomizationAsync() { - return base.Channel.GetCustomizationAsync(); - } - - public Moryx.Products.UI.ProductService.ProductModel[] GetProducts(Moryx.Products.UI.ProductService.ProductQuery query) { - return base.Channel.GetProducts(query); - } - - public System.Threading.Tasks.Task GetProductsAsync(Moryx.Products.UI.ProductService.ProductQuery query) { - return base.Channel.GetProductsAsync(query); - } - - public Moryx.Products.UI.ProductService.ProductModel CreateProduct(string type) { - return base.Channel.CreateProduct(type); - } - - public System.Threading.Tasks.Task CreateProductAsync(string type) { - return base.Channel.CreateProductAsync(type); - } - - public Moryx.Products.UI.ProductService.ProductModel GetProductDetails(long id) { - return base.Channel.GetProductDetails(id); - } - - public System.Threading.Tasks.Task GetProductDetailsAsync(long id) { - return base.Channel.GetProductDetailsAsync(id); - } - - public Moryx.Products.UI.ProductService.ProductModel SaveProduct(Moryx.Products.UI.ProductService.ProductModel instance) { - return base.Channel.SaveProduct(instance); - } - - public System.Threading.Tasks.Task SaveProductAsync(Moryx.Products.UI.ProductService.ProductModel instance) { - return base.Channel.SaveProductAsync(instance); - } - - public Moryx.Products.UI.ProductService.DuplicateProductResponse DuplicateProduct(long sourceId, string identifier, short revisionNo) { - return base.Channel.DuplicateProduct(sourceId, identifier, revisionNo); - } - - public System.Threading.Tasks.Task DuplicateProductAsync(long sourceId, string identifier, short revisionNo) { - return base.Channel.DuplicateProductAsync(sourceId, identifier, revisionNo); - } - - public bool DeleteProduct(long id) { - return base.Channel.DeleteProduct(id); - } - - public System.Threading.Tasks.Task DeleteProductAsync(long id) { - return base.Channel.DeleteProductAsync(id); - } - - public Moryx.Products.UI.ProductService.ProductModel ImportProduct(string importerName, Moryx.Serialization.Entry parametersModel) { - return base.Channel.ImportProduct(importerName, parametersModel); - } - - public System.Threading.Tasks.Task ImportProductAsync(string importerName, Moryx.Serialization.Entry parametersModel) { - return base.Channel.ImportProductAsync(importerName, parametersModel); - } - - public Moryx.Serialization.Entry UpdateParameters(string importer, Moryx.Serialization.Entry currentParameters) { - return base.Channel.UpdateParameters(importer, currentParameters); - } - - public System.Threading.Tasks.Task UpdateParametersAsync(string importer, Moryx.Serialization.Entry currentParameters) { - return base.Channel.UpdateParametersAsync(importer, currentParameters); - } - - public Moryx.Products.UI.ProductService.RecipeModel GetRecipe(long recipeId) { - return base.Channel.GetRecipe(recipeId); - } - - public System.Threading.Tasks.Task GetRecipeAsync(long recipeId) { - return base.Channel.GetRecipeAsync(recipeId); - } - - public Moryx.Products.UI.ProductService.RecipeModel[] GetRecipes(long productId) { - return base.Channel.GetRecipes(productId); - } - - public System.Threading.Tasks.Task GetRecipesAsync(long productId) { - return base.Channel.GetRecipesAsync(productId); - } - - public Moryx.Products.UI.ProductService.RecipeModel CreateRecipe(string recipeType) { - return base.Channel.CreateRecipe(recipeType); - } - - public System.Threading.Tasks.Task CreateRecipeAsync(string recipeType) { - return base.Channel.CreateRecipeAsync(recipeType); - } - - public Moryx.Products.UI.ProductService.RecipeModel SaveRecipe(Moryx.Products.UI.ProductService.RecipeModel recipe) { - return base.Channel.SaveRecipe(recipe); - } - - public System.Threading.Tasks.Task SaveRecipeAsync(Moryx.Products.UI.ProductService.RecipeModel recipe) { - return base.Channel.SaveRecipeAsync(recipe); - } - - public Moryx.Products.UI.ProductService.WorkplanModel[] GetWorkplans() { - return base.Channel.GetWorkplans(); - } - - public System.Threading.Tasks.Task GetWorkplansAsync() { - return base.Channel.GetWorkplansAsync(); - } - - public string GetRecipeProviderName() { - return base.Channel.GetRecipeProviderName(); - } - - public System.Threading.Tasks.Task GetRecipeProviderNameAsync() { - return base.Channel.GetRecipeProviderNameAsync(); - } - } -} diff --git a/src/Moryx.Products.UI/Service References/ProductService/Reference.svcmap b/src/Moryx.Products.UI/Service References/ProductService/Reference.svcmap deleted file mode 100644 index 7b25caef..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/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/Moryx.Products.UI/Service References/ProductService/configuration.svcinfo b/src/Moryx.Products.UI/Service References/ProductService/configuration.svcinfo deleted file mode 100644 index 98981eec..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/Service References/ProductService/configuration91.svcinfo b/src/Moryx.Products.UI/Service References/ProductService/configuration91.svcinfo deleted file mode 100644 index 6421746e..00000000 --- a/src/Moryx.Products.UI/Service References/ProductService/configuration91.svcinfo +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - BasicHttpBinding_IProductInteraction - - - - - - - - - - - - - - - - - - - - - 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/ProductInteraction - - - - - - basicHttpBinding - - - BasicHttpBinding_IProductInteraction - - - ProductService.IProductInteraction - - - 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_IProductInteraction - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Products.UI/ViewModels/PartConnectorViewModel.cs b/src/Moryx.Products.UI/ViewModels/PartConnectorViewModel.cs index 046debc7..60d850d0 100644 --- a/src/Moryx.Products.UI/ViewModels/PartConnectorViewModel.cs +++ b/src/Moryx.Products.UI/ViewModels/PartConnectorViewModel.cs @@ -112,7 +112,7 @@ public PartLinkViewModel CreatePartLink(ProductInfoViewModel product) var partModel = new PartModel { Product = productModel, - Properties = Model.PropertyTemplates.Clone(true) + Properties = Model.PropertyTemplates.SerializationClone() }; return new PartLinkViewModel(partModel, product); diff --git a/src/Moryx.Products.UI/ViewModels/PartLinkViewModel.cs b/src/Moryx.Products.UI/ViewModels/PartLinkViewModel.cs index 614d0242..c27e5bba 100644 --- a/src/Moryx.Products.UI/ViewModels/PartLinkViewModel.cs +++ b/src/Moryx.Products.UI/ViewModels/PartLinkViewModel.cs @@ -1,7 +1,6 @@ // Copyright (c) 2020, Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 -using System.Linq; using Caliburn.Micro; using Moryx.AbstractionLayer.UI; using Moryx.Controls; @@ -75,7 +74,7 @@ public void UpdateModel(PartModel model) /// public void CopyFromModel() { - Properties = new EntryViewModel(Model.Properties.Clone(true)); + Properties = new EntryViewModel(Model.Properties.ToSerializationEntry()); } /// @@ -83,7 +82,7 @@ public void CopyFromModel() /// public void CopyToModel() { - Model.Properties = Properties.Entry; + Model.Properties = Properties.Entry.ToServiceEntry(); } } } diff --git a/src/Moryx.Products.UI/ViewModels/ProductViewModel.cs b/src/Moryx.Products.UI/ViewModels/ProductViewModel.cs index 936127fb..35cab828 100644 --- a/src/Moryx.Products.UI/ViewModels/ProductViewModel.cs +++ b/src/Moryx.Products.UI/ViewModels/ProductViewModel.cs @@ -9,8 +9,8 @@ using Moryx.AbstractionLayer.UI; using Moryx.Controls; using Moryx.Products.UI.ProductService; -using Moryx.Serialization; using Moryx.Tools; +using Entry = Moryx.Serialization.Entry; namespace Moryx.Products.UI { @@ -47,7 +47,7 @@ private void CopyFromModel() Name = Model.Name; State = Model.State; Properties = Model.Properties != null - ? new EntryViewModel(Model.Properties.Clone(true)) + ? new EntryViewModel(Model.Properties.ToSerializationEntry()) : new EntryViewModel(new List()); if (Model.Parts != null) @@ -61,7 +61,7 @@ private void CopyToModel() { Model.Name = Name; Model.State = State; - Model.Properties = Properties.Entry; + Model.Properties = Properties.Entry.ToServiceEntry(); Model.Parts = Parts.Select(p => p.Model).ToArray(); Model.Recipes = Recipes.Select(r => r.Model).ToArray(); } diff --git a/src/Moryx.Products.UI/ViewModels/RecipeViewModel.cs b/src/Moryx.Products.UI/ViewModels/RecipeViewModel.cs index d609c376..71baa120 100644 --- a/src/Moryx.Products.UI/ViewModels/RecipeViewModel.cs +++ b/src/Moryx.Products.UI/ViewModels/RecipeViewModel.cs @@ -139,7 +139,7 @@ protected void CopyFromModel() Type = Model.Type; Classification = Model.Classification; Revision = Model.Revision; - Properties = new EntryViewModel(Model.Properties.Clone(true)); + Properties = new EntryViewModel(Model.Properties.ToSerializationEntry()); } /// @@ -151,7 +151,7 @@ protected void CopyToModel() Model.Type = _type; Model.Classification = _classification; Model.Revision = _revision; - Model.Properties = Properties.Entry; + Model.Properties = Properties.Entry.ToServiceEntry(); Model.WorkplanId = Workplan?.Id ?? 0; } diff --git a/src/Moryx.Products.UI/ViewModels/WorkplanViewModel.cs b/src/Moryx.Products.UI/ViewModels/WorkplanViewModel.cs index 7e7079e6..addb8cc1 100644 --- a/src/Moryx.Products.UI/ViewModels/WorkplanViewModel.cs +++ b/src/Moryx.Products.UI/ViewModels/WorkplanViewModel.cs @@ -4,6 +4,7 @@ using Caliburn.Micro; using Moryx.Products.UI.ProductService; using Moryx.Workflows; +using WorkplanState = Moryx.Products.UI.ProductService.WorkplanState; namespace Moryx.Products.UI { diff --git a/src/Moryx.Products.UI/app.config b/src/Moryx.Products.UI/app.config index 241b82ff..4619a138 100644 --- a/src/Moryx.Products.UI/app.config +++ b/src/Moryx.Products.UI/app.config @@ -10,16 +10,4 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI.Interaction/Details/Aspects/Methods/ResourceMethodsAspectViewModel.cs b/src/Moryx.Resources.UI.Interaction/Details/Aspects/Methods/ResourceMethodsAspectViewModel.cs index aa8b107c..f8b8b19d 100644 --- a/src/Moryx.Resources.UI.Interaction/Details/Aspects/Methods/ResourceMethodsAspectViewModel.cs +++ b/src/Moryx.Resources.UI.Interaction/Details/Aspects/Methods/ResourceMethodsAspectViewModel.cs @@ -74,7 +74,11 @@ private static bool CanInvokeMethod(object parameters) private async Task InvokeMethod(object parameters) { - var resultEntry = await ResourceServiceModel.InvokeMethod(Resource.Id, ((ResourceMethodViewModel) parameters).Model); + var vm = (ResourceMethodViewModel) parameters; + vm.CopyToModel(); + + var result = await ResourceServiceModel.InvokeMethod(Resource.Id, ((ResourceMethodViewModel) parameters).Model); + var resultEntry = result.ToSerializationEntry(); if (resultEntry == null) MethodInvocationResult = new EntryViewModel(new Entry()); diff --git a/src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.csproj b/src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.csproj index ce612f4f..2c70b481 100644 --- a/src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.csproj +++ b/src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.csproj @@ -1,227 +1,46 @@ - - - + + + + - Debug - AnyCPU - {E0BF3F3A-2E2D-442F-BEA8-A585DC96AD99} - Library - Properties - Moryx.Resources.UI.Interaction - Moryx.Resources.UI.Interaction - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Resources.UI.Interaction.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Resources.UI.Interaction.XML + net45 + true + true + Moryx.Resources.UI.Interaction + true + - - ..\..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - True - - - ..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll - - - ..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll - True - - - ..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll - - - ..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll - - - ..\..\packages\Moryx.Controls.3.0.0-dev.32\lib\net461\Moryx.Controls.dll - - - ..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll - - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll - True - - + - - Properties\GlobalAssemblyInfo.cs - - - ResourceMethodsAspectView.xaml - - - - PropertiesAspectView.xaml - - - - ReferencesAspectView.xaml - - - - SelectTargetDialogView.xaml - - - - - EmptyDetailsView.xaml - - - - DefaultDetailsView.xaml - - - - RemoveResourceView.xaml - - - - - - - - - True - True - Strings.resx - - - TypeSelectorView.xaml - - - - - InteractionWorkspaceView.xaml - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - + + + - - - - - Designer - - - + + + - - {b9920541-7e0e-4cde-b195-b18589a2bbb1} - Moryx.AbstractionLayer.UI - - - {afe31117-c539-48f9-8ea5-4044aaa22c69} - Moryx.Resources.UI - + + True + True + Strings.resx + + - - + PublicResXFileCodeGenerator Strings.Designer.cs - - - - - - - + \ No newline at end of file diff --git a/src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.nuspec b/src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.nuspec deleted file mode 100644 index a4f6ad2f..00000000 --- a/src/Moryx.Resources.UI.Interaction/Moryx.Resources.UI.Interaction.nuspec +++ /dev/null @@ -1,18 +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.Resources.UI.Interaction/Properties/AssemblyInfo.cs b/src/Moryx.Resources.UI.Interaction/Properties/AssemblyInfo.cs index 9bf943a8..cb55e3d1 100644 --- a/src/Moryx.Resources.UI.Interaction/Properties/AssemblyInfo.cs +++ b/src/Moryx.Resources.UI.Interaction/Properties/AssemblyInfo.cs @@ -1,31 +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.Resources.UI.Interaction")] -[assembly: AssemblyDescription("Moryx.Resources.UI.Interaction")] -[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("27254459-7d4f-490b-ba7d-1fb67664a8cb")] - -// 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: InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/src/Moryx.Resources.UI.Interaction/Properties/DataSources/Moryx.Serialization.Entry.datasource b/src/Moryx.Resources.UI.Interaction/Properties/DataSources/Moryx.Serialization.Entry.datasource deleted file mode 100644 index aff7e34e..00000000 --- a/src/Moryx.Resources.UI.Interaction/Properties/DataSources/Moryx.Serialization.Entry.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Serialization.Entry, Moryx, Version=0.0.1163.16037, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Resources.UI.Interaction/Properties/DataSources/Moryx.Serialization.Entry1.datasource b/src/Moryx.Resources.UI.Interaction/Properties/DataSources/Moryx.Serialization.Entry1.datasource deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Moryx.Resources.UI.Interaction/packages.config b/src/Moryx.Resources.UI.Interaction/packages.config deleted file mode 100644 index 6e8d7c50..00000000 --- a/src/Moryx.Resources.UI.Interaction/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/ConnectedService.json b/src/Moryx.Resources.UI/Connected Services/ResourceService/ConnectedService.json new file mode 100644 index 00000000..79f3477c --- /dev/null +++ b/src/Moryx.Resources.UI/Connected Services/ResourceService/ConnectedService.json @@ -0,0 +1,18 @@ +{ + "ProviderId": "Microsoft.VisualStudio.ConnectedService.Wcf", + "Version": "15.0.40203.910", + "ExtendedData": { + "inputs": [ + "http://localhost/metadata/resourceinteraction" + ], + "collectionTypes": [ + "System.Array", + "System.Collections.Generic.Dictionary`2" + ], + "namespaceMappings": [ + "*, Moryx.Resources.UI.ResourceService" + ], + "targetFramework": "net45", + "typeReuseMode": "None" + } +} \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceModel.datasource b/src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceModel.datasource deleted file mode 100644 index 32560510..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Resources.UI.ResourceService.ResourceModel, Connected Services.ResourceService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceTypeModel.datasource b/src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceTypeModel.datasource deleted file mode 100644 index ed1b8bc4..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/Moryx.Resources.UI.ResourceService.ResourceTypeModel.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Resources.UI.ResourceService.ResourceTypeModel, Connected Services.ResourceService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/Reference.cs b/src/Moryx.Resources.UI/Connected Services/ResourceService/Reference.cs index de1c79d6..82bd2fff 100644 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/Reference.cs +++ b/src/Moryx.Resources.UI/Connected Services/ResourceService/Reference.cs @@ -1,336 +1,692 @@ //------------------------------------------------------------------------------ // // 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.Resources.UI.ResourceService { +namespace Moryx.Resources.UI.ResourceService +{ using System.Runtime.Serialization; using System; [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ResourceTypeModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Resources.Interaction", IsReference=true)] - [System.SerializableAttribute()] - public partial class ResourceTypeModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { + public partial class ResourceTypeModel : object + { - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceTypeModel BaseTypeField; - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.MethodEntry[] ConstructorsField; + private Moryx.Resources.UI.ResourceService.MethodEntry[] ConstructorsField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private bool CreatableField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceTypeModel[] DerivedTypesField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string DescriptionField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string DisplayNameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string NameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ReferenceTypeModel[] ReferencesField; - [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.Resources.UI.ResourceService.ResourceTypeModel BaseType { - get { + public Moryx.Resources.UI.ResourceService.ResourceTypeModel BaseType + { + get + { return this.BaseTypeField; } - set { - if ((object.ReferenceEquals(this.BaseTypeField, value) != true)) { - this.BaseTypeField = value; - this.RaisePropertyChanged("BaseType"); - } + set + { + this.BaseTypeField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Serialization.MethodEntry[] Constructors { - get { + public Moryx.Resources.UI.ResourceService.MethodEntry[] Constructors + { + get + { return this.ConstructorsField; } - set { - if ((object.ReferenceEquals(this.ConstructorsField, value) != true)) { - this.ConstructorsField = value; - this.RaisePropertyChanged("Constructors"); - } + set + { + this.ConstructorsField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public bool Creatable { - get { + public bool Creatable + { + get + { return this.CreatableField; } - set { - if ((this.CreatableField.Equals(value) != true)) { - this.CreatableField = value; - this.RaisePropertyChanged("Creatable"); - } + set + { + this.CreatableField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ResourceTypeModel[] DerivedTypes { - get { + public Moryx.Resources.UI.ResourceService.ResourceTypeModel[] DerivedTypes + { + get + { return this.DerivedTypesField; } - set { - if ((object.ReferenceEquals(this.DerivedTypesField, value) != true)) { - this.DerivedTypesField = value; - this.RaisePropertyChanged("DerivedTypes"); - } + set + { + this.DerivedTypesField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string Description { - get { + public string Description + { + get + { return this.DescriptionField; } - set { - if ((object.ReferenceEquals(this.DescriptionField, value) != true)) { - this.DescriptionField = value; - this.RaisePropertyChanged("Description"); - } + set + { + this.DescriptionField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string DisplayName { - get { + public string DisplayName + { + get + { return this.DisplayNameField; } - set { - if ((object.ReferenceEquals(this.DisplayNameField, value) != true)) { - this.DisplayNameField = value; - this.RaisePropertyChanged("DisplayName"); - } + set + { + this.DisplayNameField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { + public string Name + { + get + { return this.NameField; } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } + set + { + this.NameField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ReferenceTypeModel[] References { - get { + public Moryx.Resources.UI.ResourceService.ReferenceTypeModel[] References + { + get + { return this.ReferencesField; } - set { - if ((object.ReferenceEquals(this.ReferencesField, value) != true)) { - this.ReferencesField = value; - this.RaisePropertyChanged("References"); - } + set + { + this.ReferencesField = value; } } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="MethodEntry", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public partial class MethodEntry : object + { - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; + private string DescriptionField; - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); + private string DisplayNameField; + + private string NameField; + + private Moryx.Resources.UI.ResourceService.Entry ParametersField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Description + { + get + { + return this.DescriptionField; + } + set + { + this.DescriptionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string DisplayName + { + get + { + return this.DisplayNameField; + } + set + { + this.DisplayNameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Name + { + get + { + return this.NameField; + } + set + { + this.NameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Resources.UI.ResourceService.Entry Parameters + { + get + { + return this.ParametersField; + } + set + { + this.ParametersField = value; } } } [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ReferenceTypeModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Resources.Interaction")] - [System.SerializableAttribute()] - public partial class ReferenceTypeModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; + public partial class ReferenceTypeModel : object + { - [System.Runtime.Serialization.OptionalFieldAttribute()] private string DescriptionField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string DisplayNameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private bool IsCollectionField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private bool IsRequiredField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string NameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceRelationType RelationTypeField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceReferenceRole RoleField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string[] SupportedTypesField; - [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 { + public string Description + { + get + { return this.DescriptionField; } - set { - if ((object.ReferenceEquals(this.DescriptionField, value) != true)) { - this.DescriptionField = value; - this.RaisePropertyChanged("Description"); - } + set + { + this.DescriptionField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string DisplayName { - get { + public string DisplayName + { + get + { return this.DisplayNameField; } - set { - if ((object.ReferenceEquals(this.DisplayNameField, value) != true)) { - this.DisplayNameField = value; - this.RaisePropertyChanged("DisplayName"); - } + set + { + this.DisplayNameField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsCollection { - get { + public bool IsCollection + { + get + { return this.IsCollectionField; } - set { - if ((this.IsCollectionField.Equals(value) != true)) { - this.IsCollectionField = value; - this.RaisePropertyChanged("IsCollection"); - } + set + { + this.IsCollectionField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public bool IsRequired { - get { + public bool IsRequired + { + get + { return this.IsRequiredField; } - set { - if ((this.IsRequiredField.Equals(value) != true)) { - this.IsRequiredField = value; - this.RaisePropertyChanged("IsRequired"); - } + set + { + this.IsRequiredField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { + public string Name + { + get + { return this.NameField; } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } + set + { + this.NameField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ResourceRelationType RelationType { - get { + public Moryx.Resources.UI.ResourceService.ResourceRelationType RelationType + { + get + { return this.RelationTypeField; } - set { - if ((this.RelationTypeField.Equals(value) != true)) { - this.RelationTypeField = value; - this.RaisePropertyChanged("RelationType"); - } + set + { + this.RelationTypeField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ResourceReferenceRole Role { - get { + public Moryx.Resources.UI.ResourceService.ResourceReferenceRole Role + { + get + { return this.RoleField; } - set { - if ((this.RoleField.Equals(value) != true)) { - this.RoleField = value; - this.RaisePropertyChanged("Role"); - } + set + { + this.RoleField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string[] SupportedTypes { - get { + public string[] SupportedTypes + { + get + { return this.SupportedTypesField; } - set { - if ((object.ReferenceEquals(this.SupportedTypesField, value) != true)) { - this.SupportedTypesField = value; - this.RaisePropertyChanged("SupportedTypes"); - } + set + { + this.SupportedTypesField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="Entry", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public partial class Entry : object + { + + private string DescriptionField; + + private string DisplayNameField; + + private string IdentifierField; + + private Moryx.Resources.UI.ResourceService.Entry[] PrototypesField; + + private Moryx.Resources.UI.ResourceService.Entry[] SubEntriesField; + + private Moryx.Resources.UI.ResourceService.EntryValidation ValidationField; + + private Moryx.Resources.UI.ResourceService.EntryValue ValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Description + { + get + { + return this.DescriptionField; + } + set + { + this.DescriptionField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string DisplayName + { + get + { + return this.DisplayNameField; + } + set + { + this.DisplayNameField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Identifier + { + get + { + return this.IdentifierField; + } + set + { + this.IdentifierField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Resources.UI.ResourceService.Entry[] Prototypes + { + get + { + return this.PrototypesField; + } + set + { + this.PrototypesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Resources.UI.ResourceService.Entry[] SubEntries + { + get + { + return this.SubEntriesField; + } + set + { + this.SubEntriesField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Resources.UI.ResourceService.EntryValidation Validation + { + get + { + return this.ValidationField; + } + set + { + this.ValidationField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Resources.UI.ResourceService.EntryValue Value + { + get + { + return this.ValueField; + } + set + { + this.ValueField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="EntryValidation", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public partial class EntryValidation : object + { + + private bool IsRequiredField; + + private double MaximumField; + + private double MinimumField; + + private string RegexField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool IsRequired + { + get + { + return this.IsRequiredField; + } + set + { + this.IsRequiredField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public double Maximum + { + get + { + return this.MaximumField; + } + set + { + this.MaximumField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public double Minimum + { + get + { + return this.MinimumField; + } + set + { + this.MinimumField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Regex + { + get + { + return this.RegexField; + } + set + { + this.RegexField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="EntryValue", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public partial class EntryValue : object + { + + private string CurrentField; + + private string DefaultField; + + private bool IsReadOnlyField; + + private string[] PossibleField; + + private Moryx.Resources.UI.ResourceService.EntryValueType TypeField; + + private Moryx.Resources.UI.ResourceService.EntryUnitType UnitTypeField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Current + { + get + { + return this.CurrentField; + } + set + { + this.CurrentField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Default + { + get + { + return this.DefaultField; + } + set + { + this.DefaultField = value; } } - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; + [System.Runtime.Serialization.DataMemberAttribute()] + public bool IsReadOnly + { + get + { + return this.IsReadOnlyField; + } + set + { + this.IsReadOnlyField = value; + } + } - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); + [System.Runtime.Serialization.DataMemberAttribute()] + public string[] Possible + { + get + { + return this.PossibleField; + } + set + { + this.PossibleField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Resources.UI.ResourceService.EntryValueType Type + { + get + { + return this.TypeField; + } + set + { + this.TypeField = value; } } + + [System.Runtime.Serialization.DataMemberAttribute()] + public Moryx.Resources.UI.ResourceService.EntryUnitType UnitType + { + get + { + return this.UnitTypeField; + } + set + { + this.UnitTypeField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [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.Runtime.Serialization.EnumMemberAttribute()] + Exception = 14, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Stream = 15, + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.Runtime.Serialization.DataContractAttribute(Name="EntryUnitType", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Serialization")] + public enum EntryUnitType : int + { + + [System.Runtime.Serialization.EnumMemberAttribute()] + None = 0, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Password = 1, + + [System.Runtime.Serialization.EnumMemberAttribute()] + File = 2, + + [System.Runtime.Serialization.EnumMemberAttribute()] + Directory = 3, } - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.FlagsAttribute()] [System.Runtime.Serialization.DataContractAttribute(Name="ResourceRelationType", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Resources")] - public enum ResourceRelationType : int { + public enum ResourceRelationType : int + { [System.Runtime.Serialization.EnumMemberAttribute()] Unset = 0, @@ -372,9 +728,10 @@ public enum ResourceRelationType : int { Custom = 2147483644, } - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ResourceReferenceRole", Namespace="http://schemas.datacontract.org/2004/07/Moryx.AbstractionLayer.Resources")] - public enum ResourceReferenceRole : int { + public enum ResourceReferenceRole : int + { [System.Runtime.Serialization.EnumMemberAttribute()] Target = 0, @@ -384,194 +741,143 @@ public enum ResourceReferenceRole : int { } [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ResourceQuery", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Resources.Interaction")] - [System.SerializableAttribute()] - public partial class ResourceQuery : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; + public partial class ResourceQuery : object + { - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ReferenceFilter[] IncludedReferencesField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ReferenceFilter ReferenceConditionField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private bool ReferenceRecursionField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string[] TypesField; - [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.Resources.UI.ResourceService.ReferenceFilter[] IncludedReferences { - get { + public Moryx.Resources.UI.ResourceService.ReferenceFilter[] IncludedReferences + { + get + { return this.IncludedReferencesField; } - set { - if ((object.ReferenceEquals(this.IncludedReferencesField, value) != true)) { - this.IncludedReferencesField = value; - this.RaisePropertyChanged("IncludedReferences"); - } + set + { + this.IncludedReferencesField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ReferenceFilter ReferenceCondition { - get { + public Moryx.Resources.UI.ResourceService.ReferenceFilter ReferenceCondition + { + get + { return this.ReferenceConditionField; } - set { - if ((object.ReferenceEquals(this.ReferenceConditionField, value) != true)) { - this.ReferenceConditionField = value; - this.RaisePropertyChanged("ReferenceCondition"); - } + set + { + this.ReferenceConditionField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public bool ReferenceRecursion { - get { + public bool ReferenceRecursion + { + get + { return this.ReferenceRecursionField; } - set { - if ((this.ReferenceRecursionField.Equals(value) != true)) { - this.ReferenceRecursionField = value; - this.RaisePropertyChanged("ReferenceRecursion"); - } + set + { + this.ReferenceRecursionField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string[] Types { - get { + public string[] Types + { + get + { return this.TypesField; } - set { - if ((object.ReferenceEquals(this.TypesField, value) != true)) { - this.TypesField = value; - this.RaisePropertyChanged("Types"); - } - } - } - - 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)); + set + { + this.TypesField = value; } } } [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ReferenceFilter", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Resources.Interaction")] - [System.SerializableAttribute()] - public partial class ReferenceFilter : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; + public partial class ReferenceFilter : object + { - [System.Runtime.Serialization.OptionalFieldAttribute()] private string NameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceRelationType RelationTypeField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceReferenceRole RoleField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ReferenceValue ValueConstraintField; - [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 Name { - get { + public string Name + { + get + { return this.NameField; } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } + set + { + this.NameField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ResourceRelationType RelationType { - get { + public Moryx.Resources.UI.ResourceService.ResourceRelationType RelationType + { + get + { return this.RelationTypeField; } - set { - if ((this.RelationTypeField.Equals(value) != true)) { - this.RelationTypeField = value; - this.RaisePropertyChanged("RelationType"); - } + set + { + this.RelationTypeField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ResourceReferenceRole Role { - get { + public Moryx.Resources.UI.ResourceService.ResourceReferenceRole Role + { + get + { return this.RoleField; } - set { - if ((this.RoleField.Equals(value) != true)) { - this.RoleField = value; - this.RaisePropertyChanged("Role"); - } + set + { + this.RoleField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ReferenceValue ValueConstraint { - get { + public Moryx.Resources.UI.ResourceService.ReferenceValue ValueConstraint + { + get + { return this.ValueConstraintField; } - set { - if ((this.ValueConstraintField.Equals(value) != true)) { - this.ValueConstraintField = value; - this.RaisePropertyChanged("ValueConstraint"); - } - } - } - - 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)); + set + { + this.ValueConstraintField = value; } } } - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ReferenceValue", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Resources.Interaction")] - public enum ReferenceValue : int { + public enum ReferenceValue : int + { [System.Runtime.Serialization.EnumMemberAttribute()] Irrelevant = 0, @@ -584,351 +890,328 @@ public enum ReferenceValue : int { } [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ResourceModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Resources.Interaction", IsReference=true)] - [System.SerializableAttribute()] - public partial class ResourceModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { + public partial class ResourceModel : object + { - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] private string DescriptionField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private long IdField; - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.MethodEntry[] MethodsField; + private Moryx.Resources.UI.ResourceService.MethodEntry[] MethodsField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string NameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private bool PartiallyLoadedField; - [System.Runtime.Serialization.OptionalFieldAttribute()] - private Moryx.Serialization.Entry PropertiesField; + private Moryx.Resources.UI.ResourceService.Entry PropertiesField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceReferenceModel[] ReferencesField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private string 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 Description { - get { + public string Description + { + get + { return this.DescriptionField; } - set { - if ((object.ReferenceEquals(this.DescriptionField, value) != true)) { - this.DescriptionField = value; - this.RaisePropertyChanged("Description"); - } + set + { + this.DescriptionField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public long Id { - get { + public long Id + { + get + { return this.IdField; } - set { - if ((this.IdField.Equals(value) != true)) { - this.IdField = value; - this.RaisePropertyChanged("Id"); - } + set + { + this.IdField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Serialization.MethodEntry[] Methods { - get { + public Moryx.Resources.UI.ResourceService.MethodEntry[] Methods + { + get + { return this.MethodsField; } - set { - if ((object.ReferenceEquals(this.MethodsField, value) != true)) { - this.MethodsField = value; - this.RaisePropertyChanged("Methods"); - } + set + { + this.MethodsField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { + public string Name + { + get + { return this.NameField; } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } + set + { + this.NameField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public bool PartiallyLoaded { - get { + public bool PartiallyLoaded + { + get + { return this.PartiallyLoadedField; } - set { - if ((this.PartiallyLoadedField.Equals(value) != true)) { - this.PartiallyLoadedField = value; - this.RaisePropertyChanged("PartiallyLoaded"); - } + set + { + this.PartiallyLoadedField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Serialization.Entry Properties { - get { + public Moryx.Resources.UI.ResourceService.Entry Properties + { + get + { return this.PropertiesField; } - set { - if ((object.ReferenceEquals(this.PropertiesField, value) != true)) { - this.PropertiesField = value; - this.RaisePropertyChanged("Properties"); - } + set + { + this.PropertiesField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ResourceReferenceModel[] References { - get { + public Moryx.Resources.UI.ResourceService.ResourceReferenceModel[] References + { + get + { return this.ReferencesField; } - set { - if ((object.ReferenceEquals(this.ReferencesField, value) != true)) { - this.ReferencesField = value; - this.RaisePropertyChanged("References"); - } + set + { + this.ReferencesField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public string Type { - get { + public string Type + { + get + { return this.TypeField; } - set { - if ((object.ReferenceEquals(this.TypeField, 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)); + set + { + this.TypeField = value; } } } [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] [System.Runtime.Serialization.DataContractAttribute(Name="ResourceReferenceModel", Namespace="http://schemas.datacontract.org/2004/07/Moryx.Resources.Interaction", IsReference=true)] - [System.SerializableAttribute()] - public partial class ResourceReferenceModel : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; + public partial class ResourceReferenceModel : object + { - [System.Runtime.Serialization.OptionalFieldAttribute()] private string NameField; - [System.Runtime.Serialization.OptionalFieldAttribute()] private Moryx.Resources.UI.ResourceService.ResourceModel[] TargetsField; - [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 Name { - get { + public string Name + { + get + { return this.NameField; } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { - this.NameField = value; - this.RaisePropertyChanged("Name"); - } + set + { + this.NameField = value; } } [System.Runtime.Serialization.DataMemberAttribute()] - public Moryx.Resources.UI.ResourceService.ResourceModel[] Targets { - get { + public Moryx.Resources.UI.ResourceService.ResourceModel[] Targets + { + get + { return this.TargetsField; } - set { - if ((object.ReferenceEquals(this.TargetsField, value) != true)) { - this.TargetsField = value; - this.RaisePropertyChanged("Targets"); - } - } - } - - 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)); + set + { + this.TargetsField = value; } } } - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="ResourceService.IResourceInteraction")] - public interface IResourceInteraction { - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/GetTypeTree", ReplyAction="http://tempuri.org/IResourceInteraction/GetTypeTreeResponse")] - Moryx.Resources.UI.ResourceService.ResourceTypeModel GetTypeTree(); + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="Moryx.Resources.UI.ResourceService.IResourceInteraction")] + public interface IResourceInteraction + { [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/GetTypeTree", ReplyAction="http://tempuri.org/IResourceInteraction/GetTypeTreeResponse")] System.Threading.Tasks.Task GetTypeTreeAsync(); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/GetResources", ReplyAction="http://tempuri.org/IResourceInteraction/GetResourcesResponse")] - Moryx.Resources.UI.ResourceService.ResourceModel[] GetResources(Moryx.Resources.UI.ResourceService.ResourceQuery query); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/GetResources", ReplyAction="http://tempuri.org/IResourceInteraction/GetResourcesResponse")] System.Threading.Tasks.Task GetResourcesAsync(Moryx.Resources.UI.ResourceService.ResourceQuery query); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/GetDetails", ReplyAction="http://tempuri.org/IResourceInteraction/GetDetailsResponse")] - Moryx.Resources.UI.ResourceService.ResourceModel[] GetDetails(long[] ids); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/GetDetails", ReplyAction="http://tempuri.org/IResourceInteraction/GetDetailsResponse")] System.Threading.Tasks.Task GetDetailsAsync(long[] ids); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/InvokeMethod", ReplyAction="http://tempuri.org/IResourceInteraction/InvokeMethodResponse")] - Moryx.Serialization.Entry InvokeMethod(long id, Moryx.Serialization.MethodEntry method); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/InvokeMethod", ReplyAction="http://tempuri.org/IResourceInteraction/InvokeMethodResponse")] - System.Threading.Tasks.Task InvokeMethodAsync(long id, Moryx.Serialization.MethodEntry method); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/Create", ReplyAction="http://tempuri.org/IResourceInteraction/CreateResponse")] - Moryx.Resources.UI.ResourceService.ResourceModel Create(string resourceType, Moryx.Serialization.MethodEntry constructor); + System.Threading.Tasks.Task InvokeMethodAsync(long id, Moryx.Resources.UI.ResourceService.MethodEntry method); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/Create", ReplyAction="http://tempuri.org/IResourceInteraction/CreateResponse")] - System.Threading.Tasks.Task CreateAsync(string resourceType, Moryx.Serialization.MethodEntry constructor); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/Save", ReplyAction="http://tempuri.org/IResourceInteraction/SaveResponse")] - Moryx.Resources.UI.ResourceService.ResourceModel Save(Moryx.Resources.UI.ResourceService.ResourceModel resource); + System.Threading.Tasks.Task CreateAsync(string resourceType, Moryx.Resources.UI.ResourceService.MethodEntry constructor); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/Save", ReplyAction="http://tempuri.org/IResourceInteraction/SaveResponse")] System.Threading.Tasks.Task SaveAsync(Moryx.Resources.UI.ResourceService.ResourceModel resource); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/Remove", ReplyAction="http://tempuri.org/IResourceInteraction/RemoveResponse")] - bool Remove(long id); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceInteraction/Remove", ReplyAction="http://tempuri.org/IResourceInteraction/RemoveResponse")] System.Threading.Tasks.Task RemoveAsync(long id); } - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IResourceInteractionChannel : Moryx.Resources.UI.ResourceService.IResourceInteraction, System.ServiceModel.IClientChannel { + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public interface IResourceInteractionChannel : Moryx.Resources.UI.ResourceService.IResourceInteraction, System.ServiceModel.IClientChannel + { } [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class ResourceInteractionClient : System.ServiceModel.ClientBase, Moryx.Resources.UI.ResourceService.IResourceInteraction { + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.0.2")] + public partial class ResourceInteractionClient : System.ServiceModel.ClientBase, Moryx.Resources.UI.ResourceService.IResourceInteraction + { + + /// + /// 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 ResourceInteractionClient() { + public ResourceInteractionClient() : + base(ResourceInteractionClient.GetDefaultBinding(), ResourceInteractionClient.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_IResourceInteraction.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); } - public ResourceInteractionClient(string endpointConfigurationName) : - base(endpointConfigurationName) { + public ResourceInteractionClient(EndpointConfiguration endpointConfiguration) : + base(ResourceInteractionClient.GetBindingForEndpoint(endpointConfiguration), ResourceInteractionClient.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); } - public ResourceInteractionClient(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) { + public ResourceInteractionClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(ResourceInteractionClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); } - public ResourceInteractionClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) { + public ResourceInteractionClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(ResourceInteractionClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); } public ResourceInteractionClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(binding, remoteAddress) { + base(binding, remoteAddress) + { } - public Moryx.Resources.UI.ResourceService.ResourceTypeModel GetTypeTree() { - return base.Channel.GetTypeTree(); + public System.Threading.Tasks.Task GetTypeTreeAsync() + { + return base.Channel.GetTypeTreeAsync(); } - public System.Threading.Tasks.Task GetTypeTreeAsync() { - return base.Channel.GetTypeTreeAsync(); + public System.Threading.Tasks.Task GetResourcesAsync(Moryx.Resources.UI.ResourceService.ResourceQuery query) + { + return base.Channel.GetResourcesAsync(query); } - public Moryx.Resources.UI.ResourceService.ResourceModel[] GetResources(Moryx.Resources.UI.ResourceService.ResourceQuery query) { - return base.Channel.GetResources(query); + public System.Threading.Tasks.Task GetDetailsAsync(long[] ids) + { + return base.Channel.GetDetailsAsync(ids); } - public System.Threading.Tasks.Task GetResourcesAsync(Moryx.Resources.UI.ResourceService.ResourceQuery query) { - return base.Channel.GetResourcesAsync(query); + public System.Threading.Tasks.Task InvokeMethodAsync(long id, Moryx.Resources.UI.ResourceService.MethodEntry method) + { + return base.Channel.InvokeMethodAsync(id, method); } - public Moryx.Resources.UI.ResourceService.ResourceModel[] GetDetails(long[] ids) { - return base.Channel.GetDetails(ids); + public System.Threading.Tasks.Task CreateAsync(string resourceType, Moryx.Resources.UI.ResourceService.MethodEntry constructor) + { + return base.Channel.CreateAsync(resourceType, constructor); } - public System.Threading.Tasks.Task GetDetailsAsync(long[] ids) { - return base.Channel.GetDetailsAsync(ids); + public System.Threading.Tasks.Task SaveAsync(Moryx.Resources.UI.ResourceService.ResourceModel resource) + { + return base.Channel.SaveAsync(resource); } - public Moryx.Serialization.Entry InvokeMethod(long id, Moryx.Serialization.MethodEntry method) { - return base.Channel.InvokeMethod(id, method); + public System.Threading.Tasks.Task RemoveAsync(long id) + { + return base.Channel.RemoveAsync(id); } - public System.Threading.Tasks.Task InvokeMethodAsync(long id, Moryx.Serialization.MethodEntry method) { - return base.Channel.InvokeMethodAsync(id, method); + 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 Moryx.Resources.UI.ResourceService.ResourceModel Create(string resourceType, Moryx.Serialization.MethodEntry constructor) { - return base.Channel.Create(resourceType, constructor); + 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)); } - public System.Threading.Tasks.Task CreateAsync(string resourceType, Moryx.Serialization.MethodEntry constructor) { - return base.Channel.CreateAsync(resourceType, constructor); + private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_IResourceInteraction)) + { + 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)); } - public Moryx.Resources.UI.ResourceService.ResourceModel Save(Moryx.Resources.UI.ResourceService.ResourceModel resource) { - return base.Channel.Save(resource); + private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_IResourceInteraction)) + { + return new System.ServiceModel.EndpointAddress("http://pxc-n2488/ResourceInteraction"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); } - public System.Threading.Tasks.Task SaveAsync(Moryx.Resources.UI.ResourceService.ResourceModel resource) { - return base.Channel.SaveAsync(resource); + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return ResourceInteractionClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_IResourceInteraction); } - public bool Remove(long id) { - return base.Channel.Remove(id); + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return ResourceInteractionClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_IResourceInteraction); } - public System.Threading.Tasks.Task RemoveAsync(long id) { - return base.Channel.RemoveAsync(id); + public enum EndpointConfiguration + { + + BasicHttpBinding_IResourceInteraction, } } } diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/Reference.svcmap b/src/Moryx.Resources.UI/Connected Services/ResourceService/Reference.svcmap deleted file mode 100644 index 97f4381a..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/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/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.wsdl b/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.wsdl deleted file mode 100644 index 75c5de5e..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.wsdl +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.xsd b/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.xsd deleted file mode 100644 index d58e7f39..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction1.xsd b/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction1.xsd deleted file mode 100644 index 517f099a..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction1.xsd +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction2.xsd b/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction2.xsd deleted file mode 100644 index 6b5fb4d0..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction2.xsd +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction3.xsd b/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction3.xsd deleted file mode 100644 index b18c232c..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction3.xsd +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction4.xsd b/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction4.xsd deleted file mode 100644 index fae3f9f9..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction4.xsd +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - 0 - - - - - - - 1 - - - - - - - 2 - - - - - - - 4 - - - - - - - 10 - - - - - - - 25 - - - - - - - 65 - - - - - - - 76 - - - - - - - 132 - - - - - - - 140 - - - - - - - 258 - - - - - - - 265 - - - - - - - 2147483644 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction5.xsd b/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction5.xsd deleted file mode 100644 index 5ad1cb55..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/ResourceInteraction5.xsd +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/configuration.svcinfo b/src/Moryx.Resources.UI/Connected Services/ResourceService/configuration.svcinfo deleted file mode 100644 index 5158afb7..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Connected Services/ResourceService/configuration91.svcinfo b/src/Moryx.Resources.UI/Connected Services/ResourceService/configuration91.svcinfo deleted file mode 100644 index 5bcde54f..00000000 --- a/src/Moryx.Resources.UI/Connected Services/ResourceService/configuration91.svcinfo +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - BasicHttpBinding_IResourceInteraction - - - - - - - - - - - - - - - - - - - - - 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/ResourceInteraction - - - - - - basicHttpBinding - - - BasicHttpBinding_IResourceInteraction - - - ResourceService.IResourceInteraction - - - 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_IResourceInteraction - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/ConstructorViewModel.cs b/src/Moryx.Resources.UI/ConstructorViewModel.cs index 50de8dc4..cf303e21 100644 --- a/src/Moryx.Resources.UI/ConstructorViewModel.cs +++ b/src/Moryx.Resources.UI/ConstructorViewModel.cs @@ -3,7 +3,7 @@ using Caliburn.Micro; using Moryx.Controls; -using Moryx.Serialization; +using Moryx.Resources.UI.ResourceService; namespace Moryx.Resources.UI { @@ -47,19 +47,19 @@ public bool IsSelected /// public ConstructorViewModel(MethodEntry model) { - UpdateModel(model); + CopyFromModel(model); } /// /// Updates the internal model /// /// - public void UpdateModel(MethodEntry model) + public void CopyFromModel(MethodEntry model) { Model = model; NotifyOfPropertyChange(nameof(DisplayName)); - Parameters = new EntryViewModel(model.Parameters); + Parameters = new EntryViewModel(model.Parameters.ToSerializationEntry()); NotifyOfPropertyChange(nameof(Parameters)); } } diff --git a/src/Moryx.Resources.UI/EntryExtensions.cs b/src/Moryx.Resources.UI/EntryExtensions.cs new file mode 100644 index 00000000..1d287975 --- /dev/null +++ b/src/Moryx.Resources.UI/EntryExtensions.cs @@ -0,0 +1,58 @@ +// Copyright (c) 2020, Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Newtonsoft.Json; + +namespace Moryx.Resources.UI +{ + /// + /// Extensions for the entry class to convert from to and back + /// + public static class EntryExtensions + { + /// + /// Converts the to + /// + public static Moryx.Serialization.Entry ToSerializationEntry(this Moryx.Resources.UI.ResourceService.Entry serviceEntry) + { + var json = JsonConvert.SerializeObject(serviceEntry); + return JsonConvert.DeserializeObject(json); + } + + /// + /// Converts the to + /// + public static Moryx.Resources.UI.ResourceService.Entry ToServiceEntry(this Moryx.Serialization.Entry serializationEntry) + { + var json = JsonConvert.SerializeObject(serializationEntry); + return JsonConvert.DeserializeObject(json); + } + + /// + /// Converts the to + /// + public static Moryx.Serialization.MethodEntry ToSerializationEntry(this Moryx.Resources.UI.ResourceService.MethodEntry serviceEntry) + { + var json = JsonConvert.SerializeObject(serviceEntry); + return JsonConvert.DeserializeObject(json); + } + + /// + /// Converts the to + /// + public static Moryx.Resources.UI.ResourceService.MethodEntry ToServiceEntry(this Moryx.Serialization.MethodEntry serializationEntry) + { + var json = JsonConvert.SerializeObject(serializationEntry); + return JsonConvert.DeserializeObject(json); + } + + /// + /// Clones an object by serialize it and reads it again + /// + public static TType SerializationClone(this TType obj) + { + var json = JsonConvert.SerializeObject(obj); + return JsonConvert.DeserializeObject(json); + } + } +} \ No newline at end of file diff --git a/src/Moryx.Resources.UI/IResourceServiceModel.cs b/src/Moryx.Resources.UI/IResourceServiceModel.cs index 31684384..5042be04 100644 --- a/src/Moryx.Resources.UI/IResourceServiceModel.cs +++ b/src/Moryx.Resources.UI/IResourceServiceModel.cs @@ -5,6 +5,8 @@ using Moryx.Resources.UI.ResourceService; using Moryx.Serialization; using Moryx.Tools.Wcf; +using Entry = Moryx.Resources.UI.ResourceService.Entry; +using MethodEntry = Moryx.Resources.UI.ResourceService.MethodEntry; namespace Moryx.Resources.UI { diff --git a/src/Moryx.Resources.UI/Moryx.Resources.UI.csproj b/src/Moryx.Resources.UI/Moryx.Resources.UI.csproj index b16047f5..5528a17a 100644 --- a/src/Moryx.Resources.UI/Moryx.Resources.UI.csproj +++ b/src/Moryx.Resources.UI/Moryx.Resources.UI.csproj @@ -1,184 +1,33 @@ - - - + + + + - Debug - AnyCPU - {AFE31117-C539-48F9-8EA5-4044AAA22C69} - Library - Properties - Moryx.Resources.UI - Moryx.Resources.UI - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Moryx.Resources.UI.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Moryx.Resources.UI.XML + net45 + true + true + Moryx.Resources.UI + true + - - ..\..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll - True - - - ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - True - - - ..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll - - - ..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll - True - - - ..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll - - - ..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll - - - ..\..\packages\Moryx.Controls.3.0.0-dev.32\lib\net461\Moryx.Controls.dll - - - ..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll - - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - + + - - - ..\..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll - True - - - - - - Properties\GlobalAssemblyInfo.cs - - - True - True - Reference.svcmap - - - - - - - - - - - - - - - - - - - - - - - Reference.svcmap - - - Reference.svcmap - - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - - - - - - - {b9920541-7e0e-4cde-b195-b18589a2bbb1} - Moryx.AbstractionLayer.UI - - - - - - - + + + - + + - + + - - WCF Proxy Generator - Reference.cs - + - - + \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Moryx.Resources.UI.nuspec b/src/Moryx.Resources.UI/Moryx.Resources.UI.nuspec deleted file mode 100644 index d6e8a53b..00000000 --- a/src/Moryx.Resources.UI/Moryx.Resources.UI.nuspec +++ /dev/null @@ -1,14 +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.Resources.UI/Properties/AssemblyInfo.cs b/src/Moryx.Resources.UI/Properties/AssemblyInfo.cs deleted file mode 100644 index 10d8a333..00000000 --- a/src/Moryx.Resources.UI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +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.Resources.UI")] -[assembly: AssemblyDescription("Moryx.Resources.UI")] -[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("c3624761-3411-4a21-9125-6216184ae732")] - -// 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.*")] \ No newline at end of file diff --git a/src/Moryx.Resources.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource b/src/Moryx.Resources.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource deleted file mode 100644 index 4cfa3109..00000000 --- a/src/Moryx.Resources.UI/Properties/DataSources/Moryx.Serialization.Entry.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - Moryx.Serialization.Entry, Moryx, Version=3.0.0.5699, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/ResourceMethodViewModel.cs b/src/Moryx.Resources.UI/ResourceMethodViewModel.cs index 446dda62..90a0172f 100644 --- a/src/Moryx.Resources.UI/ResourceMethodViewModel.cs +++ b/src/Moryx.Resources.UI/ResourceMethodViewModel.cs @@ -3,7 +3,7 @@ using Caliburn.Micro; using Moryx.Controls; -using Moryx.Serialization; +using Moryx.Resources.UI.ResourceService; namespace Moryx.Resources.UI { @@ -22,19 +22,24 @@ public class ResourceMethodViewModel : PropertyChangedBase /// public ResourceMethodViewModel(MethodEntry model) { - UpdateModel(model); + CopyFromModel(model); } - public void UpdateModel(MethodEntry model) + private void CopyFromModel(MethodEntry model) { Model = model; NotifyOfPropertyChange(nameof(DisplayName)); NotifyOfPropertyChange(nameof(Description)); - Parameters = new EntryViewModel(Model.Parameters); + Parameters = new EntryViewModel(Model.Parameters.ToSerializationEntry()); NotifyOfPropertyChange(nameof(Parameters)); } + public void CopyToModel() + { + Model.Parameters = Parameters.Entry.ToServiceEntry(); + } + /// /// Name of the method /// diff --git a/src/Moryx.Resources.UI/ResourceServiceModel.cs b/src/Moryx.Resources.UI/ResourceServiceModel.cs index 0dc7a742..d609ea7b 100644 --- a/src/Moryx.Resources.UI/ResourceServiceModel.cs +++ b/src/Moryx.Resources.UI/ResourceServiceModel.cs @@ -3,8 +3,10 @@ using System.Threading.Tasks; using Moryx.Resources.UI.ResourceService; -using Moryx.Serialization; using Moryx.Tools.Wcf; +using MethodEntry = Moryx.Resources.UI.ResourceService.MethodEntry; +using Entry = Moryx.Resources.UI.ResourceService.Entry; + namespace Moryx.Resources.UI { diff --git a/src/Moryx.Resources.UI/ResourceTypeViewModel.cs b/src/Moryx.Resources.UI/ResourceTypeViewModel.cs index 290753b9..5fd385d9 100644 --- a/src/Moryx.Resources.UI/ResourceTypeViewModel.cs +++ b/src/Moryx.Resources.UI/ResourceTypeViewModel.cs @@ -1,7 +1,6 @@ // Copyright (c) 2020, Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 -using System.Collections.Generic; using System.Linq; using Caliburn.Micro; using Moryx.Resources.UI.ResourceService; diff --git a/src/Moryx.Resources.UI/ResourceViewModel.cs b/src/Moryx.Resources.UI/ResourceViewModel.cs index b4d18efe..cd34f559 100644 --- a/src/Moryx.Resources.UI/ResourceViewModel.cs +++ b/src/Moryx.Resources.UI/ResourceViewModel.cs @@ -6,11 +6,11 @@ using System.ComponentModel; using System.Linq; using Caliburn.Micro; -using Moryx.AbstractionLayer.UI; using Moryx.Controls; using Moryx.Resources.UI.ResourceService; using Moryx.Serialization; using Moryx.Tools; +using Entry = Moryx.Serialization.Entry; namespace Moryx.Resources.UI { @@ -150,7 +150,7 @@ private void CopyToModel() { Model.Name = Name; Model.Description = Description; - Model.Properties = Properties.Entry; + Model.Properties = Properties.Entry.ToServiceEntry(); Model.References = References.Select(r => r.Model).ToArray(); } @@ -163,7 +163,7 @@ private void CopyFromModel() Description = Model.Description; Properties = Model.Properties != null - ? new EntryViewModel(Model.Properties.Clone(true)) + ? new EntryViewModel(Model.Properties.ToSerializationEntry()) : new EntryViewModel(new List()); Methods = Model.Methods != null diff --git a/src/Moryx.Resources.UI/app.config b/src/Moryx.Resources.UI/app.config deleted file mode 100644 index 8de68912..00000000 --- a/src/Moryx.Resources.UI/app.config +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Moryx.Resources.UI/packages.config b/src/Moryx.Resources.UI/packages.config deleted file mode 100644 index 6e8d7c50..00000000 --- a/src/Moryx.Resources.UI/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/StartProject.UI/StartProject.UI.csproj b/src/StartProject.UI/StartProject.UI.csproj index 30740448..7d943dd3 100644 --- a/src/StartProject.UI/StartProject.UI.csproj +++ b/src/StartProject.UI/StartProject.UI.csproj @@ -59,29 +59,29 @@ ..\..\packages\CommandLineParser.2.8.0\lib\net461\CommandLine.dll - - ..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll + + ..\..\packages\Controls4Industry.3.0.0-dev.41\lib\net45\Controls4Industry.dll - - ..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll + + ..\..\packages\Moryx.3.0.0-dev.138\lib\net461\Moryx.dll - - ..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll + + ..\..\packages\Moryx.ClientFramework.3.0.0-dev.41\lib\net45\Moryx.ClientFramework.dll - - ..\..\packages\Moryx.ClientFramework.Configurator.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.Configurator.dll + + ..\..\packages\Moryx.ClientFramework.Configurator.3.0.0-dev.41\lib\net45\Moryx.ClientFramework.Configurator.dll - - ..\..\packages\Moryx.ClientFramework.Kernel.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.Kernel.dll + + ..\..\packages\Moryx.ClientFramework.Kernel.3.0.0-dev.41\lib\net45\Moryx.ClientFramework.Kernel.dll - - ..\..\packages\Moryx.ClientFramework.SimpleShell.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.SimpleShell.dll + + ..\..\packages\Moryx.ClientFramework.SimpleShell.3.0.0-dev.41\lib\net45\Moryx.ClientFramework.SimpleShell.dll - - ..\..\packages\Moryx.Container.3.0.0-dev.105\lib\netstandard2.0\Moryx.Container.dll + + ..\..\packages\Moryx.Container.3.0.0-dev.138\lib\net45\Moryx.Container.dll - - ..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll + + ..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.138\lib\net45\Moryx.Tools.Wcf.dll ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -92,9 +92,13 @@ + ..\..\packages\System.Reflection.TypeExtensions.4.7.0\lib\net461\System.Reflection.TypeExtensions.dll + + + ..\..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll True diff --git a/src/StartProject.UI/packages.config b/src/StartProject.UI/packages.config index 78ec5491..aca1cf59 100644 --- a/src/StartProject.UI/packages.config +++ b/src/StartProject.UI/packages.config @@ -5,15 +5,15 @@ - + - - - - - - - + + + + + + + diff --git a/src/Tests/Moryx.AbstractionLayer.UI.Tests/Mocks/DialogManagerMock.cs b/src/Tests/Moryx.AbstractionLayer.UI.Tests/Mocks/DialogManagerMock.cs index a700c87d..ec362831 100644 --- a/src/Tests/Moryx.AbstractionLayer.UI.Tests/Mocks/DialogManagerMock.cs +++ b/src/Tests/Moryx.AbstractionLayer.UI.Tests/Mocks/DialogManagerMock.cs @@ -12,17 +12,17 @@ public class DialogManagerMock : IDialogManager { public void ShowDialog(T dialogViewModel) where T : IScreen { - + } public Task ShowDialogAsync(T dialogViewModel) where T : IScreen { - return Task.CompletedTask; + return Task.FromResult(true); } public void ShowDialog(T dialogViewModel, Action callback) where T : IScreen { - + } public Task ShowMessageBoxAsync(string message, string title, MessageBoxOptions options, MessageBoxImage image) @@ -32,27 +32,27 @@ public Task ShowMessageBoxAsync(string message, string title, public void ShowMessageBox(string message, string title, MessageBoxOptions options, MessageBoxImage image, Action callback) { - + } public void ShowMessageBox(string message, string title, MessageBoxOptions options, MessageBoxImage image) { - + } public Task ShowMessageBoxAsync(string message, string title) { - return Task.CompletedTask; + return Task.FromResult(true); } public void ShowMessageBox(string message, string title, Action callback) { - + } public void ShowMessageBox(string message, string title) { - + } } } diff --git a/src/Tests/Moryx.AbstractionLayer.UI.Tests/Moryx.AbstractionLayer.UI.Tests.csproj b/src/Tests/Moryx.AbstractionLayer.UI.Tests/Moryx.AbstractionLayer.UI.Tests.csproj index 9a3e408f..fca63d4c 100644 --- a/src/Tests/Moryx.AbstractionLayer.UI.Tests/Moryx.AbstractionLayer.UI.Tests.csproj +++ b/src/Tests/Moryx.AbstractionLayer.UI.Tests/Moryx.AbstractionLayer.UI.Tests.csproj @@ -1,140 +1,27 @@ - - - - + + - Debug - AnyCPU - {47B9DE3F-18D2-4C36-AD35-7EF06A799ED0} - Library - Properties - Moryx.AbstractionLayer.UI.Tests - Moryx.AbstractionLayer.UI.Tests - v4.6.1 - 512 - - - - - - true + net45 + false full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + - - ..\..\..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll - True - - - ..\..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll - True - - - ..\..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - True - - - ..\..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - - ..\..\..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll - - - ..\..\..\packages\CommandLineParser.2.8.0\lib\net461\CommandLine.dll - - - ..\..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll - - - ..\..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll - - - ..\..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll - - - ..\..\..\packages\Moryx.ClientFramework.Kernel.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.Kernel.dll - - - ..\..\..\packages\Moryx.Container.3.0.0-dev.105\lib\netstandard2.0\Moryx.Container.dll - - - ..\..\..\packages\Moryx.TestTools.UnitTest.3.0.0-dev.105\lib\netstandard2.0\Moryx.TestTools.UnitTest.dll - - - ..\..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll - - - ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\..\..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll - - - - ..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - ..\..\..\packages\System.Reflection.TypeExtensions.4.7.0\lib\net461\System.Reflection.TypeExtensions.dll - - - ..\..\..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll - True - - - - - - - - - - - - - - - - - - + + + + + - - {b9920541-7e0e-4cde-b195-b18589a2bbb1} - Moryx.AbstractionLayer.UI - + + + + + - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + + diff --git a/src/Tests/Moryx.AbstractionLayer.UI.Tests/Properties/AssemblyInfo.cs b/src/Tests/Moryx.AbstractionLayer.UI.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index cbb23eab..00000000 --- a/src/Tests/Moryx.AbstractionLayer.UI.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.AbstractionLayer.UI.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("PHOENIX CONTACT GmbH & Co. KG")] -[assembly: AssemblyProduct("Moryx.AbstractionLayer.UI.Tests")] -[assembly: AssemblyCopyright("Copyright © PHOENIX CONTACT GmbH & Co. KG 2016")] -[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("47b9de3f-18d2-4c36-ad35-7ef06a799ed0")] - -// 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")]