diff --git a/.groovy b/.groovy new file mode 100644 index 0000000..dd33f0d --- /dev/null +++ b/.groovy @@ -0,0 +1,172 @@ +#!/usr/bin/env groovy +/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */ +import groovy.transform.Field + +@Field String _DDrive = 'D:/' +@Field String _AssemblyName = '...' +@Field String _TargetLocation = '...' +@Field String _GitCommitSeven = '...' +@Field String _GitName = 'DEP08SIASM' +@Field String _TestProjectDirectory = 'Adaptation' +@Field String _AgentStaging = 'mestsa07ec-ecmeseaf' +@Field String _DDriveNet = "${_DDrive}Framework4.8" +@Field String _AgentProduction = 'messa08ec-ecmeseaf' +@Field String _AgentDevelopment = 'mestsa003-mesedasvc' +@Field String _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe' +@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe' + +pipeline { + agent { + label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else' + } + parameters { + string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server') + string(name: 'DEFAULT_FILE_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'messv02ecc1_ec_local' : 'messv02ecc1.ec.local', description: 'Default file server...') + } + stages { + stage('Git') { + steps { + bat(returnStatus: true, script: 'git init') + bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git') + bat(returnStatus: true, script: 'git pull origin master') + } + } + stage('Setup') { + steps { + script { + _AssemblyName = "${env.JOB_NAME}" + _GitCommitSeven = '1234567' + // _GitCommitSeven = env.GIT_COMMIT.substring(0, 7) + def files = findFiles(glob: '*.csproj') + if (files.length != 1) { + error("Build failed because couldn't find a *.csproj file") + } + echo """ + ${files[0].name} + ${files[0].path} + ${files[0].directory} + ${files[0].length} + ${files[0].lastModified} + """ + _AssemblyName = files[0].name.split('[.]csproj')[0] + _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${env.JENKINS_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}" + } + } + } + stage('Info') { + steps { + echo "_AssemblyName ${_AssemblyName}" // ... + echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11 + echo "DEFAULT_FILE_SERVER ${params.DEFAULT_FILE_SERVER}" // 11 + echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master + echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41 + echo "GIT_SERVER ${params.GIT_SERVER}" // ... + echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git + echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11 + echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/ + echo "JOB_NAME ${env.JOB_NAME}" // ... + echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\... + } + } + // stage('Restore') { + // steps { + // bat(returnStatus: true, script: 'dotnet --info') + // } + // } + stage('Safe storage of app secrets') { + steps { + dir(_TestProjectDirectory) { + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets init') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "BuildNumber" "' + env.BUILD_NUMBER + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "GitCommitSeven" "' + _GitCommitSeven + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "Server" "' + params.DEFAULT_FILE_SERVER + '"') + } + } + } + stage('Core Build') { + steps { + echo "Build number is ${currentBuild.number}" + dir(_TestProjectDirectory) { + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'build --runtime win-x64 --self-contained --verbosity quiet') + } + } + } + // stage('Test') { + // options { + // timeout(time: 10, unit: 'MINUTES') + // } + // steps { + // dir(_TestProjectDirectory) { + // bat('dotnet --info') + // } + // } + // } + stage('Framework Build') { + steps { + echo "Build number is ${currentBuild.number}" + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + + '/target:Restore ' + + '/detailedsummary ' + + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + + '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' + + _AssemblyName + '.csproj') + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + + '/target:Build ' + + '/detailedsummary ' + + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + + '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' + + _AssemblyName + '.csproj') + } + } + stage('Commit Id') { + steps { + dir('bin/Debug') { + writeFile file: "${_AssemblyName}.txt", text: "${env.GIT_COMMIT}-${env.BUILD_NUMBER}-${env.GIT_URL}" + } + } + } + stage('Package') { + steps { + fileOperations([fileZipOperation(folderPath: 'bin/Debug', outputFolderPath: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug")]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*", renameFiles: false, sourceCaptureExpression: '', targetLocation: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug", targetNameExpression: '')]) + } + } + // stage('Force Fail') { + // steps { + // error("Build failed because of this and that..") + // } + // } + stage('Copy Files to: file-share') { + steps { + dir('bin/Debug') { + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.txt", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.dll", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.exe", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.pdb", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + } + } + } + } + post { + always { + dir('bin') { + deleteDir() + } + dir('obj') { + deleteDir() + } + dir(_TestProjectDirectory + '/bin') { + deleteDir() + } + dir(_TestProjectDirectory + '/obj') { + deleteDir() + } + // cleanWs() + } + } +} diff --git a/Adaptation/.editorconfig b/Adaptation/.editorconfig index a3ebdb2..2220133 100644 --- a/Adaptation/.editorconfig +++ b/Adaptation/.editorconfig @@ -1,137 +1,10 @@ -# Remove the line below if you want to inherit .editorconfig settings from higher directories -root = true - -# C# files [*.cs] - -#### Core EditorConfig Options #### - -# Indentation and spacing -indent_size = 4 -indent_style = space -tab_width = 4 - -# New line preferences -end_of_line = crlf -insert_final_newline = false - -#### .NET Coding Conventions #### - -# Organize usings -dotnet_separate_import_directive_groups = false -dotnet_sort_system_directives_first = false -file_header_template = unset - -# this. and Me. preferences -dotnet_style_qualification_for_event = false:error -dotnet_style_qualification_for_field = false -dotnet_style_qualification_for_method = false:error -dotnet_style_qualification_for_property = false:error - -# Language keywords vs BCL types preferences -dotnet_style_predefined_type_for_locals_parameters_members = true -dotnet_style_predefined_type_for_member_access = true - -# Parentheses preferences -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity -dotnet_style_parentheses_in_other_operators = never_if_unnecessary -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity - -# Modifier preferences -dotnet_style_require_accessibility_modifiers = for_non_interface_members - -# Expression-level preferences -dotnet_style_coalesce_expression = true -dotnet_style_collection_initializer = true:warning -dotnet_style_explicit_tuple_names = true:warning -dotnet_style_namespace_match_folder = true -dotnet_style_null_propagation = true:warning -dotnet_style_object_initializer = true:warning -dotnet_style_operator_placement_when_wrapping = beginning_of_line -dotnet_style_prefer_auto_properties = true:warning -dotnet_style_prefer_compound_assignment = true:warning -dotnet_style_prefer_conditional_expression_over_assignment = false -dotnet_style_prefer_conditional_expression_over_return = false -dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning -dotnet_style_prefer_inferred_tuple_names = true:warning -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning -dotnet_style_prefer_simplified_boolean_expressions = true:warning -dotnet_style_prefer_simplified_interpolation = true - -# Field preferences -dotnet_style_readonly_field = true:warning - -# Parameter preferences -dotnet_code_quality_unused_parameters = all - -# Suppression preferences -dotnet_remove_unnecessary_suppression_exclusions = 0 - -# New line preferences -dotnet_style_allow_multiple_blank_lines_experimental = false:warning -dotnet_style_allow_statement_immediately_after_block_experimental = true - -#### C# Coding Conventions #### - -# var preferences -csharp_style_var_elsewhere = false:warning -csharp_style_var_for_built_in_types = false:warning -csharp_style_var_when_type_is_apparent = false:warning - -# Expression-bodied members -csharp_style_expression_bodied_accessors = when_on_single_line:warning -csharp_style_expression_bodied_constructors = when_on_single_line:warning -csharp_style_expression_bodied_indexers = when_on_single_line:warning -csharp_style_expression_bodied_lambdas = when_on_single_line:warning -csharp_style_expression_bodied_local_functions = when_on_single_line:warning -csharp_style_expression_bodied_methods = when_on_single_line:warning -csharp_style_expression_bodied_operators = when_on_single_line:warning -csharp_style_expression_bodied_properties = when_on_single_line:warning - -# Pattern matching preferences -csharp_style_pattern_matching_over_as_with_null_check = true:warning -csharp_style_pattern_matching_over_is_with_cast_check = true:warning -csharp_style_prefer_not_pattern = true:warning -csharp_style_prefer_pattern_matching = true:warning -csharp_style_prefer_switch_expression = true:warning - -# Null-checking preferences -csharp_style_conditional_delegate_call = true - -# Modifier preferences -csharp_prefer_static_local_function = true:warning -csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async - -# Code-block preferences -csharp_prefer_braces = false -csharp_prefer_simple_using_statement = true:warning -csharp_style_namespace_declarations = file_scoped:warning - -# Expression-level preferences -csharp_prefer_simple_default_expression = true:warning -csharp_style_deconstructed_variable_declaration = false -csharp_style_implicit_object_creation_when_type_is_apparent = true:warning -csharp_style_inlined_variable_declaration = false -csharp_style_pattern_local_over_anonymous_function = true:warning -csharp_style_prefer_index_operator = false:warning -csharp_style_prefer_null_check_over_type_check = true -csharp_style_prefer_range_operator = false:warning -csharp_style_throw_expression = true -csharp_style_unused_value_assignment_preference = discard_variable:warning -csharp_style_unused_value_expression_statement_preference = discard_variable:warning - -# 'using' directive preferences -csharp_using_directive_placement = outside_namespace - -# New line preferences -csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true -csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true -csharp_style_allow_embedded_statements_on_same_line_experimental = true - -#### C# Formatting Rules #### - -# New line preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true csharp_new_line_before_catch = true csharp_new_line_before_else = true csharp_new_line_before_finally = true @@ -139,16 +12,13 @@ csharp_new_line_before_members_in_anonymous_types = true csharp_new_line_before_members_in_object_initializers = true csharp_new_line_before_open_brace = all csharp_new_line_between_query_expression_clauses = true - -# Indentation preferences -csharp_indent_block_contents = true -csharp_indent_braces = false -csharp_indent_case_contents = true -csharp_indent_case_contents_when_block = true -csharp_indent_labels = one_less_than_current -csharp_indent_switch_labels = true - -# Space preferences +csharp_prefer_braces = false +csharp_prefer_simple_default_expression = true:warning +csharp_prefer_simple_using_statement = true:warning +csharp_prefer_static_local_function = true:warning +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = false csharp_space_after_cast = false csharp_space_after_colon_in_inheritance_clause = true csharp_space_after_comma = true @@ -171,166 +41,203 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = false csharp_space_between_method_declaration_parameter_list_parentheses = false csharp_space_between_parentheses = false csharp_space_between_square_brackets = false - -# Wrapping preferences -csharp_preserve_single_line_blocks = true -csharp_preserve_single_line_statements = false - -#### Naming styles #### - -# Naming rules - -dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning -dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface -dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i - -dotnet_naming_rule.types_should_be_pascal_case.severity = warning -dotnet_naming_rule.types_should_be_pascal_case.symbols = types -dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.severity = warning -dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.symbols = private_or_internal_field -dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.style = private_of_internal_field - -dotnet_naming_rule.enum_should_be_pascal_case.severity = warning -dotnet_naming_rule.enum_should_be_pascal_case.symbols = enum -dotnet_naming_rule.enum_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.severity = warning -dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.symbols = public_or_protected_field -dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.style = private_of_internal_field - -dotnet_naming_rule.class_should_be_pascal_case.severity = warning -dotnet_naming_rule.class_should_be_pascal_case.symbols = class -dotnet_naming_rule.class_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.method_should_be_pascal_case.severity = warning -dotnet_naming_rule.method_should_be_pascal_case.symbols = method -dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.severity = warning -dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.symbols = private_or_internal_static_field -dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.style = private_of_internal_field - -dotnet_naming_rule.static_field_should_be_pascal_case.severity = warning -dotnet_naming_rule.static_field_should_be_pascal_case.symbols = static_field -dotnet_naming_rule.static_field_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.property_should_be_pascal_case.severity = warning -dotnet_naming_rule.property_should_be_pascal_case.symbols = property -dotnet_naming_rule.property_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.static_method_should_be_pascal_case.severity = warning -dotnet_naming_rule.static_method_should_be_pascal_case.symbols = static_method -dotnet_naming_rule.static_method_should_be_pascal_case.style = pascal_case - +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true +csharp_style_conditional_delegate_call = true +csharp_style_deconstructed_variable_declaration = false +csharp_style_expression_bodied_accessors = when_on_single_line:warning +csharp_style_expression_bodied_constructors = when_on_single_line:warning +csharp_style_expression_bodied_indexers = when_on_single_line:warning +csharp_style_expression_bodied_lambdas = when_on_single_line:warning +csharp_style_expression_bodied_local_functions = when_on_single_line:warning +csharp_style_expression_bodied_methods = when_on_single_line:warning +csharp_style_expression_bodied_operators = when_on_single_line:warning +csharp_style_expression_bodied_properties = when_on_single_line:warning +csharp_style_implicit_object_creation_when_type_is_apparent = true:warning +csharp_style_inlined_variable_declaration = false +csharp_style_namespace_declarations = file_scoped:warning +csharp_style_pattern_local_over_anonymous_function = true:warning +csharp_style_pattern_matching_over_as_with_null_check = true:warning +csharp_style_pattern_matching_over_is_with_cast_check = true:warning +csharp_style_prefer_index_operator = false:warning +csharp_style_prefer_not_pattern = true:warning +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_pattern_matching = true:warning +csharp_style_prefer_range_operator = false:warning +csharp_style_prefer_switch_expression = true:warning +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable:warning +csharp_style_unused_value_expression_statement_preference = discard_variable:warning +csharp_style_var_elsewhere = false:warning +csharp_style_var_for_built_in_types = false:warning +csharp_style_var_when_type_is_apparent = false:warning +csharp_using_directive_placement = outside_namespace +dotnet_code_quality_unused_parameters = all +dotnet_code_quality_unused_parameters = non_public # IDE0060: Remove unused parameter +dotnet_code_quality.CAXXXX.api_surface = private, internal +dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array allocations +dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available +dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable +dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name +dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2"); +dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary +dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed +dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning -dotnet_naming_rule.abstract_method_should_be_pascal_case.symbols = abstract_method dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.private_method_should_be_pascal_case.severity = warning -dotnet_naming_rule.private_method_should_be_pascal_case.symbols = private_method -dotnet_naming_rule.private_method_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.event_should_be_pascal_case.severity = warning -dotnet_naming_rule.event_should_be_pascal_case.symbols = event -dotnet_naming_rule.event_should_be_pascal_case.style = pascal_case - +dotnet_naming_rule.abstract_method_should_be_pascal_case.symbols = abstract_method +dotnet_naming_rule.class_should_be_pascal_case.severity = warning +dotnet_naming_rule.class_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.class_should_be_pascal_case.symbols = class dotnet_naming_rule.delegate_should_be_pascal_case.severity = warning -dotnet_naming_rule.delegate_should_be_pascal_case.symbols = delegate dotnet_naming_rule.delegate_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.struct_should_be_pascal_case.severity = warning -dotnet_naming_rule.struct_should_be_pascal_case.symbols = struct -dotnet_naming_rule.struct_should_be_pascal_case.style = pascal_case - +dotnet_naming_rule.delegate_should_be_pascal_case.symbols = delegate +dotnet_naming_rule.enum_should_be_pascal_case.severity = warning +dotnet_naming_rule.enum_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.enum_should_be_pascal_case.symbols = enum +dotnet_naming_rule.event_should_be_pascal_case.severity = warning +dotnet_naming_rule.event_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.event_should_be_pascal_case.symbols = event +dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.method_should_be_pascal_case.severity = warning +dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.method_should_be_pascal_case.symbols = method dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning -dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case - -# Symbol specifications - -dotnet_naming_symbols.class.applicable_kinds = class -dotnet_naming_symbols.class.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.class.required_modifiers = - -dotnet_naming_symbols.interface.applicable_kinds = interface -dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = - -dotnet_naming_symbols.struct.applicable_kinds = struct -dotnet_naming_symbols.struct.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.struct.required_modifiers = - -dotnet_naming_symbols.enum.applicable_kinds = enum -dotnet_naming_symbols.enum.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.enum.required_modifiers = - -dotnet_naming_symbols.delegate.applicable_kinds = delegate -dotnet_naming_symbols.delegate.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.delegate.required_modifiers = - -dotnet_naming_symbols.event.applicable_kinds = event -dotnet_naming_symbols.event.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.event.required_modifiers = - -dotnet_naming_symbols.method.applicable_kinds = method -dotnet_naming_symbols.method.applicable_accessibilities = public -dotnet_naming_symbols.method.required_modifiers = - -dotnet_naming_symbols.private_method.applicable_kinds = method -dotnet_naming_symbols.private_method.applicable_accessibilities = private -dotnet_naming_symbols.private_method.required_modifiers = - -dotnet_naming_symbols.abstract_method.applicable_kinds = method -dotnet_naming_symbols.abstract_method.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.abstract_method.required_modifiers = abstract - -dotnet_naming_symbols.static_method.applicable_kinds = method -dotnet_naming_symbols.static_method.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.static_method.required_modifiers = static - -dotnet_naming_symbols.property.applicable_kinds = property -dotnet_naming_symbols.property.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.property.required_modifiers = - -dotnet_naming_symbols.public_or_protected_field.applicable_kinds = field -dotnet_naming_symbols.public_or_protected_field.applicable_accessibilities = public, protected -dotnet_naming_symbols.public_or_protected_field.required_modifiers = - -dotnet_naming_symbols.static_field.applicable_kinds = field -dotnet_naming_symbols.static_field.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.static_field.required_modifiers = static - -dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field -dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected -dotnet_naming_symbols.private_or_internal_field.required_modifiers = - -dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds = field -dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities = internal, private, private_protected -dotnet_naming_symbols.private_or_internal_static_field.required_modifiers = static - -dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum -dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = - -dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method -dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = - -# Naming styles - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.private_method_should_be_pascal_case.severity = warning +dotnet_naming_rule.private_method_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.private_method_should_be_pascal_case.symbols = private_method +dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.severity = warning +dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.style = private_of_internal_field +dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.symbols = private_or_internal_field +dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.severity = warning +dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.style = private_of_internal_field +dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.symbols = private_or_internal_static_field +dotnet_naming_rule.property_should_be_pascal_case.severity = warning +dotnet_naming_rule.property_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.property_should_be_pascal_case.symbols = property +dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.severity = warning +dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.style = private_of_internal_field +dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.symbols = public_or_protected_field +dotnet_naming_rule.static_field_should_be_pascal_case.severity = warning +dotnet_naming_rule.static_field_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.static_field_should_be_pascal_case.symbols = static_field +dotnet_naming_rule.static_method_should_be_pascal_case.severity = warning +dotnet_naming_rule.static_method_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.static_method_should_be_pascal_case.symbols = static_method +dotnet_naming_rule.struct_should_be_pascal_case.severity = warning +dotnet_naming_rule.struct_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.struct_should_be_pascal_case.symbols = struct +dotnet_naming_rule.types_should_be_pascal_case.severity = warning +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_style.begins_with_i.capitalization = pascal_case dotnet_naming_style.begins_with_i.required_prefix = I dotnet_naming_style.begins_with_i.required_suffix = dotnet_naming_style.begins_with_i.word_separator = -dotnet_naming_style.begins_with_i.capitalization = pascal_case - +dotnet_naming_style.pascal_case.capitalization = pascal_case +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.private_of_internal_field.capitalization = pascal_case dotnet_naming_style.private_of_internal_field.required_prefix = _ dotnet_naming_style.private_of_internal_field.required_suffix = dotnet_naming_style.private_of_internal_field.word_separator = -dotnet_naming_style.private_of_internal_field.capitalization = pascal_case +dotnet_naming_symbols.abstract_method.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.abstract_method.applicable_kinds = method +dotnet_naming_symbols.abstract_method.required_modifiers = abstract +dotnet_naming_symbols.class.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.class.applicable_kinds = class +dotnet_naming_symbols.class.required_modifiers = +dotnet_naming_symbols.delegate.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.delegate.applicable_kinds = delegate +dotnet_naming_symbols.delegate.required_modifiers = +dotnet_naming_symbols.enum.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.enum.applicable_kinds = enum +dotnet_naming_symbols.enum.required_modifiers = +dotnet_naming_symbols.event.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.event.applicable_kinds = event +dotnet_naming_symbols.event.required_modifiers = +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.required_modifiers = +dotnet_naming_symbols.method.applicable_accessibilities = public +dotnet_naming_symbols.method.applicable_kinds = method +dotnet_naming_symbols.method.required_modifiers = +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.required_modifiers = +dotnet_naming_symbols.private_method.applicable_accessibilities = private +dotnet_naming_symbols.private_method.applicable_kinds = method +dotnet_naming_symbols.private_method.required_modifiers = +dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected +dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field +dotnet_naming_symbols.private_or_internal_field.required_modifiers = +dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities = internal, private, private_protected +dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds = field +dotnet_naming_symbols.private_or_internal_static_field.required_modifiers = static +dotnet_naming_symbols.property.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.property.applicable_kinds = property +dotnet_naming_symbols.property.required_modifiers = +dotnet_naming_symbols.public_or_protected_field.applicable_accessibilities = public, protected +dotnet_naming_symbols.public_or_protected_field.applicable_kinds = field +dotnet_naming_symbols.public_or_protected_field.required_modifiers = +dotnet_naming_symbols.static_field.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.static_field.applicable_kinds = field +dotnet_naming_symbols.static_field.required_modifiers = static +dotnet_naming_symbols.static_method.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.static_method.applicable_kinds = method +dotnet_naming_symbols.static_method.required_modifiers = static +dotnet_naming_symbols.struct.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.struct.applicable_kinds = struct +dotnet_naming_symbols.struct.required_modifiers = +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.required_modifiers = +dotnet_remove_unnecessary_suppression_exclusions = 0 +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +dotnet_style_allow_multiple_blank_lines_experimental = false:warning +dotnet_style_allow_statement_immediately_after_block_experimental = true +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true:warning +dotnet_style_explicit_tuple_names = true:warning +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true:warning +dotnet_style_object_initializer = true:warning +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true +dotnet_style_prefer_auto_properties = true:warning +dotnet_style_prefer_compound_assignment = true:warning +dotnet_style_prefer_conditional_expression_over_assignment = false +dotnet_style_prefer_conditional_expression_over_return = false +dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning +dotnet_style_prefer_inferred_tuple_names = true:warning +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning +dotnet_style_prefer_simplified_boolean_expressions = true:warning +dotnet_style_prefer_simplified_interpolation = true +dotnet_style_qualification_for_event = false:error +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false:error +dotnet_style_qualification_for_property = false:error +dotnet_style_readonly_field = true:warning +dotnet_style_require_accessibility_modifiers = for_non_interface_members +end_of_line = crlf +file_header_template = unset +indent_size = 4 +indent_style = space +insert_final_newline = false +root = true +tab_width = 4 +# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1822 +# https://github.com/dotnet/aspnetcore/blob/main/.editorconfig +# https://github.com/dotnet/project-system/blob/main/.editorconfig \ No newline at end of file diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json index bbb2c04..94fe746 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -71,5 +71,6 @@ "titleBar.inactiveBackground": "#5684ce99", "titleBar.inactiveForeground": "#e7e7e799" }, - "peacock.color": "#5684ce" + "peacock.color": "#5684ce", + "cSpell.enabled": false } \ No newline at end of file diff --git a/Adaptation/DEP08SIASM.Tests.csproj b/Adaptation/DEP08SIASM.Tests.csproj index c6e6656..83f39da 100644 --- a/Adaptation/DEP08SIASM.Tests.csproj +++ b/Adaptation/DEP08SIASM.Tests.csproj @@ -6,22 +6,13 @@ SAK - enable + disable + false 10.0 disable - Exe win-x64 net6.0 - - Infineon.Mesa.EAF.DEP08SIASM - false - 6.0.0.0 - Mike Phares - Phares - true - snupkg - trx ../../../../DEP08SIASM/05_TestResults/TestResults @@ -43,35 +34,38 @@ - + - + - - + + - - + + - + - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - + + diff --git a/Adaptation/Eaf/Management/ConfigurationData/CellAutomation/ModelObjectParameterDefinition.cs b/Adaptation/Eaf/Management/ConfigurationData/CellAutomation/ModelObjectParameterDefinition.cs index 5c0bd65..5742acc 100644 --- a/Adaptation/Eaf/Management/ConfigurationData/CellAutomation/ModelObjectParameterDefinition.cs +++ b/Adaptation/Eaf/Management/ConfigurationData/CellAutomation/ModelObjectParameterDefinition.cs @@ -2,7 +2,7 @@ namespace Adaptation.Eaf.Management.ConfigurationData.CellAutomation; -[System.Runtime.Serialization.DataContractAttribute(IsReference = true)] +[System.Runtime.Serialization.DataContract(IsReference = true)] public class ModelObjectParameterDefinition : IConfigurationObject { @@ -12,15 +12,15 @@ public class ModelObjectParameterDefinition : IConfigurationObject public ModelObjectParameterDefinition(string name, ModelObjectParameterType valueType, object defaultValue) { } public ModelObjectParameterDefinition(string name, Type enumType, object defaultValue) { } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long Id { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual string Name { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual string Value { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual ModelObjectParameterType ValueType { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual string EnumType { get; set; } public virtual ModelObjectParameterDefinition Clone() => null; diff --git a/Adaptation/Eaf/Management/ConfigurationData/Semiconductor/CellInstances/SecsConnectionConfiguration.cs b/Adaptation/Eaf/Management/ConfigurationData/Semiconductor/CellInstances/SecsConnectionConfiguration.cs index bea5a40..b8c1bd3 100644 --- a/Adaptation/Eaf/Management/ConfigurationData/Semiconductor/CellInstances/SecsConnectionConfiguration.cs +++ b/Adaptation/Eaf/Management/ConfigurationData/Semiconductor/CellInstances/SecsConnectionConfiguration.cs @@ -3,41 +3,41 @@ using System; namespace Adaptation.Eaf.Management.ConfigurationData.Semiconductor.CellInstances; -[System.Runtime.Serialization.DataContractAttribute] +[System.Runtime.Serialization.DataContract] public class SecsConnectionConfiguration { public SecsConnectionConfiguration() { } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T6HsmsControlMessage { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T5ConnectionSeperation { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T4InterBlock { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T3MessageReply { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T2Protocol { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T1InterCharacter { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual SerialBaudRate? BaudRate { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual SecsTransportType? PortType { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long? Port { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan LinkTestTimer { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual string Host { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long? DeviceId { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual HsmsSessionMode? SessionMode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual HsmsConnectionMode? ConnectionMode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T7ConnectionIdle { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual TimeSpan T8NetworkIntercharacter { get; set; } } \ No newline at end of file diff --git a/Adaptation/FileHandlers/Archive/FileRead.cs b/Adaptation/FileHandlers/Archive/FileRead.cs deleted file mode 100644 index a502d10..0000000 --- a/Adaptation/FileHandlers/Archive/FileRead.cs +++ /dev/null @@ -1,139 +0,0 @@ -using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; -using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; -using Adaptation.Shared; -using Adaptation.Shared.Duplicator; -using Adaptation.Shared.Methods; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Text.Json; - -namespace Adaptation.FileHandlers.Archive; - -public class FileRead : Shared.FileRead, IFileRead -{ - - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) - { - _MinFileLength = 10; - _NullData = string.Empty; - _Logistics = new Logistics(this); - if (_FileParameter is null) - throw new Exception(cellInstanceConnectionName); - if (_ModelObjectParameterDefinitions is null) - throw new Exception(cellInstanceConnectionName); - if (!_IsDuplicator) - throw new Exception(cellInstanceConnectionName); - } - - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); - - void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); - - string IFileRead.GetEventDescription() - { - string result = _Description.GetEventDescription(); - return result; - } - - List IFileRead.GetHeaderNames() - { - List results = _Description.GetHeaderNames(); - return results; - } - - string[] IFileRead.Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) - { - string[] results = Move(extractResults, to, from, resolvedFileLocation, exception); - return results; - } - - JsonProperty[] IFileRead.GetDefault() - { - JsonProperty[] results = _Description.GetDefault(this, _Logistics); - return results; - } - - Dictionary IFileRead.GetDisplayNamesJsonElement() - { - Dictionary results = _Description.GetDisplayNamesJsonElement(this); - return results; - } - - List IFileRead.GetDescriptions(IFileRead fileRead, List tests, IProcessData processData) - { - List results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData); - return results; - } - - Tuple> IFileRead.GetExtractResult(string reportFullPath, string eventName) - { - Tuple> results; - if (string.IsNullOrEmpty(eventName)) - throw new Exception(); - _ReportFullPath = reportFullPath; - DateTime dateTime = DateTime.Now; - results = GetExtractResult(reportFullPath, dateTime); - if (results.Item3 is null) - results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); - if (results.Item3.Length > 0 && _IsEAFHosted) - WritePDSF(this, results.Item3); - UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); - return results; - } - - Tuple> IFileRead.ReExtract() - { - Tuple> results; - List headerNames = _Description.GetHeaderNames(); - Dictionary keyValuePairs = _Description.GetDisplayNamesJsonElement(this); - results = ReExtract(this, headerNames, keyValuePairs); - return results; - } - - void IFileRead.CheckTests(Test[] tests, bool extra) - { - if (_Description is not Description) - throw new Exception(); - } - - private void MoveArchive(DateTime dateTime) - { - if (dateTime == DateTime.MinValue) - { } - string logisticsSequence = _Logistics.Sequence.ToString(); - string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - string weekDirectory = string.Concat(_Logistics.DateTimeFromSequence.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd")); - string jobIdDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\", _Logistics.JobID); - if (!Directory.Exists(jobIdDirectory)) - _ = Directory.CreateDirectory(jobIdDirectory); - //string destinationArchiveDirectory = string.Concat(jobIdDirectory, @"\!Archive\", weekDirectory); - string destinationArchiveDirectory = string.Concat(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation), @"\Archive\", _Logistics.JobID, @"\", weekDirectory); - if (!Directory.Exists(destinationArchiveDirectory)) - _ = Directory.CreateDirectory(destinationArchiveDirectory); - string[] matchDirectories = new string[] { GetDirectoriesRecursively(jobIdDirectory, logisticsSequence).FirstOrDefault() }; - if ((matchDirectories is null) || matchDirectories.Length != 1) - throw new Exception("Didn't find directory by logistics sequence"); - string sourceDirectory = Path.GetDirectoryName(matchDirectories[0]); - destinationArchiveDirectory = string.Concat(destinationArchiveDirectory, @"\", Path.GetFileName(sourceDirectory)); - Directory.Move(sourceDirectory, destinationArchiveDirectory); - } - - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) - { - Tuple> results; - Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); - _Logistics = new Logistics(reportFullPath, pdsf.Item1); - SetFileParameterLotIDToLogisticsMID(); - JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); - List descriptions = GetDuplicatorDescriptions(jsonElements); - Tuple>> tuple = GetTuple(this, descriptions, extra: false); - MoveArchive(dateTime); - results = new Tuple>(pdsf.Item1, tuple.Item1, jsonElements, new List()); - return results; - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/CellInstanceConnectionName.cs b/Adaptation/FileHandlers/CellInstanceConnectionName.cs index 9f22f4b..8b09867 100644 --- a/Adaptation/FileHandlers/CellInstanceConnectionName.cs +++ b/Adaptation/FileHandlers/CellInstanceConnectionName.cs @@ -9,31 +9,15 @@ namespace Adaptation.FileHandlers; public class CellInstanceConnectionName { - internal static IFileRead Get(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) + internal static IFileRead Get(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) { - IFileRead result; - bool isDuplicator = cellInstanceConnectionName.StartsWith(cellInstanceName); - if (isDuplicator) + IFileRead result = cellInstanceConnectionName switch { - string cellInstanceConnectionNameBase = cellInstanceConnectionName.Replace("-", string.Empty); - int hyphens = cellInstanceConnectionName.Length - cellInstanceConnectionNameBase.Length; - result = hyphens switch - { - (int)DEP08SIASM.Hyphen.IsArchive => new Archive.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - (int)DEP08SIASM.Hyphen.IsDummy => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - (int)DEP08SIASM.Hyphen.IsXToArchive => new ToArchive.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - _ => new DEP08SIASM.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) - }; - } - else - { - result = cellInstanceConnectionName switch - { - nameof(DownloadJpegFile) => new DownloadJpegFile.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - nameof(jpeg) => new jpeg.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - _ => throw new Exception(), - }; - } + nameof(DownloadJpegFile) => new DownloadJpegFile.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(jpeg) => new jpeg.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(OpenInsight) => new OpenInsight.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + _ => throw new Exception($"\"{cellInstanceConnectionName}\" not mapped") + }; return result; } diff --git a/Adaptation/FileHandlers/DEP08SIASM/FileRead.cs b/Adaptation/FileHandlers/DEP08SIASM/FileRead.cs deleted file mode 100644 index f0f43bc..0000000 --- a/Adaptation/FileHandlers/DEP08SIASM/FileRead.cs +++ /dev/null @@ -1,278 +0,0 @@ -using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; -using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; -using Adaptation.Shared; -using Adaptation.Shared.Deposition; -using Adaptation.Shared.Duplicator; -using Adaptation.Shared.Methods; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Reflection; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.Threading; - -namespace Adaptation.FileHandlers.DEP08SIASM; - -public class FileRead : Shared.FileRead, IFileRead -{ - - private readonly bool _IsXToAPC; - private readonly bool _IsXToIQSSi; - private readonly string _MemoryPath; - private readonly HttpClient _HttpClient; - private readonly bool _IsXToOpenInsight; - private readonly bool _IsXToOpenInsightMetrologyViewer; - private readonly Dictionary _CellNames; - private readonly bool _IsXToOpenInsightMetrologyViewerAttachments; - - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) - { - _MinFileLength = 10; - _NullData = string.Empty; - _Logistics = new Logistics(this); - if (_FileParameter is null) - throw new Exception(cellInstanceConnectionName); - if (_ModelObjectParameterDefinitions is null) - throw new Exception(cellInstanceConnectionName); - if (!_IsDuplicator) - throw new Exception(cellInstanceConnectionName); - _IsXToAPC = _Hyphens == (int)Hyphen.IsXToAPC; - _CellNames = new Dictionary(); - _IsXToIQSSi = _Hyphens == (int)Hyphen.IsXToIQSSi; - _IsXToOpenInsight = _Hyphens == (int)Hyphen.IsXToOpenInsight; - _IsXToOpenInsightMetrologyViewer = _Hyphens == (int)Hyphen.IsXToOpenInsightMetrologyViewer; - _MemoryPath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Memory"); - _IsXToOpenInsightMetrologyViewerAttachments = _Hyphens == (int)Hyphen.IsXToOpenInsightMetrologyViewerAttachments; - ModelObjectParameterDefinition[] cellInstanceCollection = GetProperties(cellInstanceConnectionName, modelObjectParameters, "CellInstance.", ".Path"); - foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in cellInstanceCollection) - _CellNames.Add(modelObjectParameterDefinition.Name.Split('.')[1], modelObjectParameterDefinition.Value); - if (_IsXToOpenInsight) - { - _HttpClient = new(); - string openInsightCommonGatewayInterfaceReactorStatesStatus = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.CommonGatewayInterface.ReactorStates.Status"); - _HttpClient.BaseAddress = new(openInsightCommonGatewayInterfaceReactorStatesStatus); - } - } - - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); - - void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); - - string IFileRead.GetEventDescription() - { - string result = _Description.GetEventDescription(); - return result; - } - - List IFileRead.GetHeaderNames() - { - List results = _Description.GetHeaderNames(); - return results; - } - - string[] IFileRead.Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) - { - string[] results = Move(extractResults, to, from, resolvedFileLocation, exception); - return results; - } - - JsonProperty[] IFileRead.GetDefault() - { - JsonProperty[] results = _Description.GetDefault(this, _Logistics); - return results; - } - - Dictionary IFileRead.GetDisplayNamesJsonElement() - { - Dictionary results = _Description.GetDisplayNamesJsonElement(this); - return results; - } - - List IFileRead.GetDescriptions(IFileRead fileRead, List tests, IProcessData processData) - { - List results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData); - return results; - } - - Tuple> IFileRead.GetExtractResult(string reportFullPath, string eventName) - { - Tuple> results; - if (string.IsNullOrEmpty(eventName)) - throw new Exception(); - _ReportFullPath = reportFullPath; - DateTime dateTime = DateTime.Now; - results = GetExtractResult(reportFullPath, dateTime); - if (results.Item3 is null) - results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); - if (results.Item3.Length > 0 && _IsEAFHosted) - WritePDSF(this, results.Item3); - UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); - return results; - } - - Tuple> IFileRead.ReExtract() - { - Tuple> results; - List headerNames = _Description.GetHeaderNames(); - Dictionary keyValuePairs = _Description.GetDisplayNamesJsonElement(this); - results = ReExtract(this, headerNames, keyValuePairs); - return results; - } - - void IFileRead.CheckTests(Test[] tests, bool extra) - { - if (_Description is not Description) - throw new Exception(); - } - - protected static List GetDescriptions(JsonElement[] jsonElements) - { - List results = new(); - jpeg.Description description; - JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString }; - foreach (JsonElement jsonElement in jsonElements) - { - if (jsonElement.ValueKind != JsonValueKind.Object) - throw new Exception(); - description = JsonSerializer.Deserialize(jsonElement.ToString(), jsonSerializerOptions); - results.Add(description); - } - return results; - } - - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) - { - Tuple> results; - string duplicateDirectory; - Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); - _Logistics = new Logistics(reportFullPath, pdsf.Item1); - SetFileParameterLotIDToLogisticsMID(); - JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); - List descriptions = GetDescriptions(jsonElements); - Tuple>> tuple = GetTuple(this, from l in descriptions select (Shared.Properties.IDescription)l, extra: false); - results = new Tuple>(pdsf.Item1, tuple.Item1, jsonElements, new List()); - bool isDummyRun = _DummyRuns.Any() && _DummyRuns.ContainsKey(_Logistics.JobID) && _DummyRuns[_Logistics.JobID].Any() && (from l in _DummyRuns[_Logistics.JobID] where l == _Logistics.Sequence select 1).Any(); - if (isDummyRun) - { - try - { File.SetLastWriteTime(reportFullPath, dateTime); } - catch (Exception) { } - } - string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_'); - if (_IsXToIQSSi) - duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\All"); - else if (!_IsXToOpenInsight) - duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\", segments[0]); - else - duplicateDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\Data"); - if (segments.Length > 2) - duplicateDirectory = string.Concat(duplicateDirectory, @"-", segments[2]); - if (!Directory.Exists(duplicateDirectory)) - _ = Directory.CreateDirectory(duplicateDirectory); - if (isDummyRun || _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) - { - if (!Directory.Exists(duplicateDirectory)) - _ = Directory.CreateDirectory(duplicateDirectory); - string successDirectory; - if (!_IsXToAPC) - successDirectory = string.Empty; - else - { - successDirectory = string.Concat(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation), @"\ViewerPath"); - if (!Directory.Exists(successDirectory)) - _ = Directory.CreateDirectory(successDirectory); - } - List> tuples = new(); - string duplicateFile = string.Concat(duplicateDirectory, @"\", Path.GetFileName(reportFullPath)); - string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - string weekDirectory = string.Concat(_Logistics.DateTimeFromSequence.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd")); - string logisticsSequenceMemoryDirectory = string.Concat(_MemoryPath, @"\", _EquipmentType, @"\Source\", weekDirectory, @"\", _Logistics.Sequence); - if (!Directory.Exists(logisticsSequenceMemoryDirectory)) - _ = Directory.CreateDirectory(logisticsSequenceMemoryDirectory); - if (_IsXToAPC) - { - if (!isDummyRun && _IsEAFHosted) - File.Copy(reportFullPath, duplicateFile, overwrite: true); - } - else - { - if (_IsXToOpenInsightMetrologyViewer) - _Log.Debug("Not sure if this data should post to OI Metrology Viewer?"); - else if (!_IsXToOpenInsight) - throw new Exception($"Only {nameof(_IsXToOpenInsight)} is codded!"); - else if (_IsXToOpenInsight) - { - if (_HttpClient is null) - throw new Exception($"{nameof(_HttpClient)} is null!"); - if (!isDummyRun && _IsEAFHosted) - ProcessData.PutOpenInsightCommonGatewayInterfaceReactorStatesStatus(this, _Logistics, _HttpClient, descriptions, logisticsSequenceMemoryDirectory); - } - else - throw new Exception(); - } - } - if (_IsXToOpenInsightMetrologyViewerAttachments) - { - string destinationDirectory; - //string destinationDirectory = WriteScopeInfo(_ProgressPath, _Logistics, dateTime, duplicateDirectory, tuples); - FileInfo fileInfo = new(reportFullPath); - string logisticsSequence = _Logistics.Sequence.ToString(); - if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) - File.SetLastWriteTime(reportFullPath, fileInfo.CreationTime); - string jobIdDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\", _Logistics.JobID); - if (!Directory.Exists(jobIdDirectory)) - _ = Directory.CreateDirectory(jobIdDirectory); - string[] matchDirectories; - if (!_IsEAFHosted) - matchDirectories = new string[] { Path.GetDirectoryName(Path.GetDirectoryName(reportFullPath)) }; - else - matchDirectories = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly); - if ((matchDirectories is null) || matchDirectories.Length != 1) - throw new Exception("Didn't find directory by logistics sequence"); - destinationDirectory = matchDirectories[0]; - if (isDummyRun) - Shared0607(reportFullPath, duplicateDirectory, logisticsSequence, destinationDirectory); - else - { - var wsRequest = new { _Logistics, descriptions }; - JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; - string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions); - if (_IsEAFHosted) - Shared1277(reportFullPath, destinationDirectory, logisticsSequence, jobIdDirectory, json); - else - { - string jsonFileName = Path.ChangeExtension(reportFullPath, ".json"); - string historicalText = File.ReadAllText(jsonFileName); - if (json != historicalText) - throw new Exception("File doesn't match historical!"); - } - string[] inProcessDirectorySegments; - string[] inProcessDirectories = Directory.GetDirectories(jobIdDirectory, "*_*_*", SearchOption.TopDirectoryOnly); - foreach (string inProcessDirectory in inProcessDirectories) - { - inProcessDirectorySegments = Path.GetFileName(inProcessDirectory).Split('_'); - if (inProcessDirectorySegments.Length != 3) - continue; - if (!long.TryParse(inProcessDirectorySegments[1], out long ticks)) - continue; - if (ticks > _Logistics.Sequence) - continue; - if (Directory.GetDirectories(inProcessDirectory).Any()) - continue; - if (Directory.GetFiles(inProcessDirectory).Any()) - continue; - Directory.Delete(inProcessDirectory); - } - } - } - return results; - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/DEP08SIASM/Hyphen.cs b/Adaptation/FileHandlers/DEP08SIASM/Hyphen.cs deleted file mode 100644 index 1063c83..0000000 --- a/Adaptation/FileHandlers/DEP08SIASM/Hyphen.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Adaptation.FileHandlers.DEP08SIASM; - -public enum Hyphen -{ - IsXToOpenInsightMetrologyViewer, - IsXToIQSSi, - IsXToOpenInsight, - IsXToOpenInsightMetrologyViewerAttachments, - IsXToAPC, - IsXToSPaCe, - IsXToArchive, - IsArchive, - IsDummy, - IsNaEDA -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/DEP08SIASM/ProcessData.cs b/Adaptation/FileHandlers/DEP08SIASM/ProcessData.cs deleted file mode 100644 index 5966374..0000000 --- a/Adaptation/FileHandlers/DEP08SIASM/ProcessData.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Adaptation.Shared; -using Adaptation.Shared.Properties; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net.Http; -using System.Text; - -namespace Adaptation.FileHandlers.DEP08SIASM; - -public class ProcessData -{ - - internal static List> HyphenTuples => new() - { - new Tuple(0, Hyphen.IsNaEDA, @"\EC_EDA\Staging\Traces\~\Source"), - new Tuple(15, Hyphen.IsXToOpenInsightMetrologyViewer, @"\EC_EAFLog\TracesMES\~\Source"), - new Tuple(-361, Hyphen.IsXToIQSSi, @"\EC_SPC_Si\Traces\~\PollPath"), - new Tuple(362, Hyphen.IsXToOpenInsight, @"\\messa01ec.ec.local\APPS\Metrology\~\Source"), - new Tuple(-363, Hyphen.IsXToOpenInsightMetrologyViewerAttachments, @"\EC_Characterization_Si\In Process\~\Source"), - new Tuple(-3604, Hyphen.IsXToAPC, @"\EC_APC\Staging\Traces\~\PollPath"), - new Tuple(-365, Hyphen.IsXToSPaCe, @"\EC_SPC_Si\Traces\~\Source"), - new Tuple(1806, Hyphen.IsXToArchive, @"\EC_EAFLog\TracesArchive\~\Source"), - new Tuple(367, Hyphen.IsArchive, @"\EC_Characterization_Si\Processed") - // new Tuple(1808, Hyphen.IsDummy - }; - - internal static string GetLines(IFileRead fileRead, Logistics logistics, List descriptions) - { - StringBuilder result = new(); - if (fileRead is null) - { } - if (logistics is null) - { } - if (descriptions is null) - { } - return result.ToString(); - } - - internal static async void PutOpenInsightCommonGatewayInterfaceReactorStatesStatus(IFileRead fileRead, Logistics logistics, HttpClient httpClient, List descriptions, string logisticsSequenceMemoryDirectory) - { - HttpContent httpContent = null; - string status = descriptions[0].MID; - string reactorNumber = logistics.MesEntity.Substring(1); - string statusDateTime = logistics.DateTimeFromSequence.ToString("MM-dd-yyyy HH:mm:ss"); - string contentFile = Path.Combine(logisticsSequenceMemoryDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt"); - Uri uri = new($"{httpClient.BaseAddress.OriginalString}reactno={reactorNumber}&status={status}&statusdtm={statusDateTime}"); - try - { - HttpResponseMessage httpResponseMessage = await httpClient.PutAsync(uri, httpContent); - if (httpResponseMessage.StatusCode is not System.Net.HttpStatusCode.OK) - File.WriteAllText(contentFile, "Failed!"); - else - { - string content = await httpResponseMessage.Content.ReadAsStringAsync(); - File.WriteAllText(contentFile, content); - } - } - catch (Exception ex) - { - File.WriteAllText(contentFile, $"{ex.Message}{Environment.NewLine}{ex.StackTrace}{Environment.NewLine}{fileRead.CellInstanceConnectionName}"); - } - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/DownloadJpegFile/FileRead.cs b/Adaptation/FileHandlers/DownloadJpegFile/FileRead.cs index ec08683..d60dca1 100644 --- a/Adaptation/FileHandlers/DownloadJpegFile/FileRead.cs +++ b/Adaptation/FileHandlers/DownloadJpegFile/FileRead.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Reflection; using System.Text.Json; using System.Threading; @@ -21,12 +20,12 @@ public class FileRead : Shared.FileRead, IFileRead private readonly string _FFmpegFileName; private readonly string _StaticFileServer; - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 10; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -34,9 +33,8 @@ public class FileRead : Shared.FileRead, IFileRead if (_IsDuplicator) throw new Exception(cellInstanceConnectionName); _StaticFileServer = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".StaticFileServer")); - string entryAssemblyLocationDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - string ffmpegFileName = Path.Combine(entryAssemblyLocationDirectory, "ffmpeg.dll"); - _FFmpegFileName = Path.Combine(entryAssemblyLocationDirectory, "ffmpeg.exe"); + string ffmpegFileName = Path.Combine(AppContext.BaseDirectory, "ffmpeg.dll"); + _FFmpegFileName = Path.Combine(AppContext.BaseDirectory, "ffmpeg.exe"); if (File.Exists(ffmpegFileName) && !File.Exists(_FFmpegFileName)) File.Copy(ffmpegFileName, _FFmpegFileName); if (!Debugger.IsAttached && fileConnectorConfiguration.PreProcessingMode != FileConnectorConfiguration.PreProcessingModeEnum.Process) @@ -48,7 +46,7 @@ public class FileRead : Shared.FileRead, IFileRead } } - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); + void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -113,8 +111,6 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) => throw new Exception(string.Concat("Not ", nameof(_IsDuplicator))); - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { if (reportFullPath is null) diff --git a/Adaptation/FileHandlers/Dummy/FileRead.cs b/Adaptation/FileHandlers/Dummy/FileRead.cs deleted file mode 100644 index 6ef5f81..0000000 --- a/Adaptation/FileHandlers/Dummy/FileRead.cs +++ /dev/null @@ -1,292 +0,0 @@ -using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; -using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; -using Adaptation.Shared; -using Adaptation.Shared.Duplicator; -using Adaptation.Shared.Methods; -using Infineon.Monitoring.MonA; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Text.Json; -using System.Threading; - -namespace Adaptation.FileHandlers.Dummy; - -public class FileRead : Shared.FileRead, IFileRead -{ - - private readonly Timer _Timer; - private int _LastDummyRunIndex; - private readonly string[] _CellNames; - - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) - { - _MinFileLength = 10; - _NullData = string.Empty; - _Logistics = new Logistics(this); - if (_FileParameter is null) - throw new Exception(cellInstanceConnectionName); - if (_ModelObjectParameterDefinitions is null) - throw new Exception(cellInstanceConnectionName); - if (!_IsDuplicator) - throw new Exception(cellInstanceConnectionName); - _LastDummyRunIndex = -1; - List cellNames = new(); - _Timer = new Timer(Callback, null, Timeout.Infinite, Timeout.Infinite); - ModelObjectParameterDefinition[] cellInstanceCollection = GetProperties(cellInstanceConnectionName, modelObjectParameters, "CellInstance.", ".Alias"); - foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in cellInstanceCollection) - cellNames.Add(modelObjectParameterDefinition.Name.Split('.')[1]); - _CellNames = cellNames.ToArray(); - if (Debugger.IsAttached || fileConnectorConfiguration.PreProcessingMode == FileConnectorConfiguration.PreProcessingModeEnum.Process) - Callback(null); - else - { - TimeSpan timeSpan = new(DateTime.Now.AddSeconds(_FileConnectorConfiguration.FileScanningIntervalInSeconds.Value).Ticks - DateTime.Now.Ticks); - _ = _Timer.Change((long)timeSpan.TotalMilliseconds, Timeout.Infinite); - } - } - - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); - - void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); - - string IFileRead.GetEventDescription() - { - string result = _Description.GetEventDescription(); - return result; - } - - List IFileRead.GetHeaderNames() - { - List results = _Description.GetHeaderNames(); - return results; - } - - string[] IFileRead.Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) - { - string[] results = Move(extractResults, to, from, resolvedFileLocation, exception); - return results; - } - - JsonProperty[] IFileRead.GetDefault() - { - JsonProperty[] results = _Description.GetDefault(this, _Logistics); - return results; - } - - Dictionary IFileRead.GetDisplayNamesJsonElement() - { - Dictionary results = _Description.GetDisplayNamesJsonElement(this); - return results; - } - - List IFileRead.GetDescriptions(IFileRead fileRead, List tests, IProcessData processData) - { - List results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData); - return results; - } - - Tuple> IFileRead.GetExtractResult(string reportFullPath, string eventName) => throw new Exception(string.Concat("See ", nameof(CallbackFileExists))); - - Tuple> IFileRead.ReExtract() => throw new Exception(string.Concat("See ", nameof(CallbackFileExists))); - - void IFileRead.CheckTests(Test[] tests, bool extra) - { - if (_Description is not Description) - throw new Exception(); - } - - private void CallbackInProcessCleared(string sourceArchiveFile, string traceDummyFile, string targetFileLocation, string monARessource, string inProcessDirectory, long sequence, bool warning) - { - const string site = "sjc"; - string stateName = string.Concat("Dummy_", _EventName); - const string monInURL = "http://moninhttp.sjc.infineon.com/input/text"; - MonIn monIn = MonIn.GetInstance(monInURL); - try - { - if (warning) - { - File.AppendAllLines(traceDummyFile, new string[] { site, monARessource, stateName, State.Warning.ToString() }); - _ = monIn.SendStatus(site, monARessource, stateName, State.Warning); - for (int i = 1; i < 12; i++) - Thread.Sleep(500); - } - ZipFile.ExtractToDirectory(sourceArchiveFile, inProcessDirectory); - string[] files = Directory.GetFiles(inProcessDirectory, "*", SearchOption.TopDirectoryOnly); - if (files.Length > 250) - throw new Exception("Safety net!"); - foreach (string file in files) - File.SetLastWriteTime(file, new DateTime(sequence)); - if (!_FileConnectorConfiguration.IncludeSubDirectories.Value) - { - foreach (string file in files) - File.Move(file, Path.Combine(targetFileLocation, Path.GetFileName(file))); - } - else - { - string[] directories = Directory.GetDirectories(inProcessDirectory, "*", SearchOption.AllDirectories); - foreach (string directory in directories) - _ = Directory.CreateDirectory(string.Concat(targetFileLocation, directory.Substring(inProcessDirectory.Length))); - foreach (string file in files) - File.Move(file, string.Concat(targetFileLocation, file.Substring(inProcessDirectory.Length))); - } - File.AppendAllLines(traceDummyFile, new string[] { site, monARessource, stateName, State.Ok.ToString() }); - _ = monIn.SendStatus(site, monARessource, stateName, State.Ok); - } - catch (Exception exception) - { - string subject = string.Concat("Exception:", _CellInstanceConnectionName); - string body = string.Concat(exception.Message, Environment.NewLine, Environment.NewLine, exception.StackTrace); - try - { _SMTP.SendHighPriorityEmailMessage(subject, body); } - catch (Exception) { } - File.AppendAllLines(traceDummyFile, new string[] { site, monARessource, stateName, State.Critical.ToString(), exception.Message, exception.StackTrace }); - _ = monIn.SendStatus(site, monARessource, stateName, State.Critical); - } - } - - private void CallbackFileExists(string sourceArchiveFile, string traceDummyFile, string targetFileLocation, string monARessource, long sequence) - { - string[] files; - bool warning = false; - if (!_DummyRuns.ContainsKey(monARessource)) - _DummyRuns.Add(monARessource, new List()); - if (!_DummyRuns[monARessource].Contains(sequence)) - _DummyRuns[monARessource].Add(sequence); - File.AppendAllLines(traceDummyFile, new string[] { sourceArchiveFile }); - string inProcessDirectory = Path.Combine(_ProgressPath, "Dummy In-Process", sequence.ToString()); - if (!Directory.Exists(inProcessDirectory)) - _ = Directory.CreateDirectory(inProcessDirectory); - files = Directory.GetFiles(inProcessDirectory, "*", SearchOption.AllDirectories); - if (files.Any()) - { - if (files.Length > 250) - throw new Exception("Safety net!"); - try - { - foreach (string file in files) - File.Delete(file); - } - catch (Exception) { } - } - if (_FileConnectorConfiguration.IncludeSubDirectories.Value) - files = Directory.GetFiles(targetFileLocation, "*", SearchOption.AllDirectories); - else - files = Directory.GetFiles(targetFileLocation, "*", SearchOption.TopDirectoryOnly); - foreach (string file in files) - { - if (new FileInfo(file).LastWriteTime.Ticks == sequence) - { - warning = true; - break; - } - } - CallbackInProcessCleared(sourceArchiveFile, traceDummyFile, targetFileLocation, monARessource, inProcessDirectory, sequence, warning); - } - - private string GetCellName(string pathSegment) - { - string result = string.Empty; - foreach (string cellName in _CellNames) - { - if (pathSegment.ToLower().Contains(cellName.ToLower())) - { - result = cellName; - break; - } - } - if (string.IsNullOrEmpty(result)) - { - int count; - List<(string CellName, int Count)> cellNames = new(); - foreach (string cellName in _CellNames) - { - count = 0; - foreach (char @char in cellName.ToLower()) - count += pathSegment.Length - pathSegment.ToLower().Replace(@char.ToString(), string.Empty).Length; - cellNames.Add(new(cellName, count)); - } - result = (from l in cellNames orderby l.CellName.Length, l.Count descending select l.CellName).First(); - } - return result; - } - - private void Callback(object state) - { - try - { - string sourceParentDirectory; - string targetParentDirectory; - DateTime dateTime = DateTime.Now; - if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.SourceFileLocation))) - sourceParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation); - else - sourceParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation)); - if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.TargetFileLocation))) - targetParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation); - else - targetParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)); - if (sourceParentDirectory != targetParentDirectory) - throw new Exception("Target and source must have the same parent for Si Dummy FileConnectorConfiguration!"); - bool check = dateTime.Hour > 7 && dateTime.Hour < 18 && dateTime.DayOfWeek != DayOfWeek.Sunday && dateTime.DayOfWeek != DayOfWeek.Saturday; - if (!_IsEAFHosted || check) - { - string monARessource; - string sourceFileFilter; - string sourceArchiveFile; - string weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - string traceDummyDirectory = Path.Combine(Path.GetPathRoot(_TracePath), "TracesDummy", _CellInstanceName, "Source", $"{dateTime:yyyy}___Week_{weekOfYear}"); - if (!Directory.Exists(traceDummyDirectory)) - _ = Directory.CreateDirectory(traceDummyDirectory); - string traceDummyFile = Path.Combine(traceDummyDirectory, $"{dateTime.Ticks} - {_CellInstanceName}.txt"); - File.AppendAllText(traceDummyFile, string.Empty); - for (int i = 0; i < _FileConnectorConfiguration.SourceFileFilters.Count; i++) - { - _LastDummyRunIndex += 1; - if (_LastDummyRunIndex >= _FileConnectorConfiguration.SourceFileFilters.Count) - _LastDummyRunIndex = 0; - sourceFileFilter = _FileConnectorConfiguration.SourceFileFilters[_LastDummyRunIndex]; - sourceArchiveFile = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, sourceFileFilter); - if (File.Exists(sourceArchiveFile)) - { - if (!long.TryParse(Path.GetFileNameWithoutExtension(sourceArchiveFile).Replace("x", string.Empty), out long sequence)) - throw new Exception("Invalid file name for source archive file!"); - monARessource = GetCellName(sourceArchiveFile); - if (string.IsNullOrEmpty(monARessource)) - throw new Exception("Could not determine which cell archive file is associated with!"); - if (_IsEAFHosted) - CallbackFileExists(sourceArchiveFile, traceDummyFile, _FileConnectorConfiguration.TargetFileLocation, monARessource, sequence); - break; - } - } - } - } - catch (Exception exception) - { - string subject = string.Concat("Exception:", _CellInstanceConnectionName); - string body = string.Concat(exception.Message, Environment.NewLine, Environment.NewLine, exception.StackTrace); - try - { _SMTP.SendHighPriorityEmailMessage(subject, body); } - catch (Exception) { } - } - try - { - TimeSpan timeSpan = new(DateTime.Now.AddSeconds(_FileConnectorConfiguration.FileScanningIntervalInSeconds.Value).Ticks - DateTime.Now.Ticks); - _ = _Timer.Change((long)timeSpan.TotalMilliseconds, Timeout.Infinite); - } - catch (Exception exception) - { - string subject = string.Concat("Exception:", _CellInstanceConnectionName); - string body = string.Concat(exception.Message, Environment.NewLine, Environment.NewLine, exception.StackTrace); - try - { _SMTP.SendHighPriorityEmailMessage(subject, body); } - catch (Exception) { } - } - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsight/CommonGatewayInterface.cs b/Adaptation/FileHandlers/OpenInsight/CommonGatewayInterface.cs new file mode 100644 index 0000000..b7f3449 --- /dev/null +++ b/Adaptation/FileHandlers/OpenInsight/CommonGatewayInterface.cs @@ -0,0 +1,38 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Http; + +namespace Adaptation.FileHandlers.OpenInsight; + +public class CommonGatewayInterface +{ + + internal static async void PutReactorStatesStatus(IFileRead fileRead, Logistics logistics, HttpClient httpClient, List descriptions, string logisticsSequenceMemoryDirectory) + { + HttpContent httpContent = null; + string status = descriptions[0].MID; + string reactorNumber = logistics.MesEntity.Substring(1); + string statusDateTime = logistics.DateTimeFromSequence.ToString("MM-dd-yyyy HH:mm:ss"); + string contentFile = Path.Combine(logisticsSequenceMemoryDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt"); + Uri uri = new($"{httpClient.BaseAddress.OriginalString}reactno={reactorNumber}&status={status}&statusdtm={statusDateTime}"); + try + { + HttpResponseMessage httpResponseMessage = await httpClient.PutAsync(uri, httpContent); + if (httpResponseMessage.StatusCode is not System.Net.HttpStatusCode.OK) + File.WriteAllText(contentFile, "Failed!"); + else + { + string content = await httpResponseMessage.Content.ReadAsStringAsync(); + File.WriteAllText(contentFile, content); + } + } + catch (Exception ex) + { + File.WriteAllText(contentFile, $"{ex.Message}{Environment.NewLine}{ex.StackTrace}{Environment.NewLine}{fileRead.CellInstanceConnectionName}"); + } + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/ToArchive/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs similarity index 67% rename from Adaptation/FileHandlers/ToArchive/FileRead.cs rename to Adaptation/FileHandlers/OpenInsight/FileRead.cs index 18646a2..6ffe427 100644 --- a/Adaptation/FileHandlers/ToArchive/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -5,26 +5,36 @@ using Adaptation.Shared.Duplicator; using Adaptation.Shared.Methods; using System; using System.Collections.Generic; +using System.Globalization; using System.IO; +using System.Linq; +using System.Net.Http; using System.Text.Json; -namespace Adaptation.FileHandlers.ToArchive; +namespace Adaptation.FileHandlers.OpenInsight; public class FileRead : Shared.FileRead, IFileRead { - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + private readonly string _MemoryPath; + private readonly HttpClient _HttpClient; + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 10; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) throw new Exception(cellInstanceConnectionName); if (!_IsDuplicator) throw new Exception(cellInstanceConnectionName); + _MemoryPath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Memory"); + _HttpClient = new(); + string openInsightCommonGatewayInterfaceReactorStatesStatus = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.CommonGatewayInterface.ReactorStates.Status"); + _HttpClient.BaseAddress = new(openInsightCommonGatewayInterfaceReactorStatesStatus); } void IFileRead.Move(Tuple> extractResults, Exception exception) @@ -36,7 +46,7 @@ public class FileRead : Shared.FileRead, IFileRead if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) File.SetLastWriteTime(_Logistics.ReportFullPath, fileInfo.CreationTime); } - Move(extractResults, exception); + Move(extractResults); } void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -102,20 +112,32 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) + private void SendData(DateTime dateTime, List descriptions) { - if (_Description is not Description) - throw new Exception(); + if (dateTime == DateTime.MinValue) + { } + string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); + string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}"; + string logisticsSequenceMemoryDirectory = Path.Combine(_MemoryPath, _EquipmentType, "Source", weekDirectory, _Logistics.Sequence.ToString()); + if (!Directory.Exists(logisticsSequenceMemoryDirectory)) + _ = Directory.CreateDirectory(logisticsSequenceMemoryDirectory); + if (_HttpClient is null) + throw new Exception($"{nameof(_HttpClient)} is null!"); + CommonGatewayInterface.PutReactorStatesStatus(this, _Logistics, _HttpClient, descriptions, logisticsSequenceMemoryDirectory); } private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { - if (dateTime == DateTime.MinValue) - { } - Tuple> results = new(string.Empty, null, null, new List()); + Tuple> results; Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); _Logistics = new Logistics(reportFullPath, pdsf.Item1); SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = jpeg.ProcessData.GetDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) + SendData(dateTime, descriptions); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); return results; } diff --git a/Adaptation/FileHandlers/jpeg/FileRead.cs b/Adaptation/FileHandlers/jpeg/FileRead.cs index 57b5bac..2fc6745 100644 --- a/Adaptation/FileHandlers/jpeg/FileRead.cs +++ b/Adaptation/FileHandlers/jpeg/FileRead.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; -using System.Reflection; using System.Text.Json; using System.Text.RegularExpressions; @@ -20,20 +19,21 @@ public class FileRead : Shared.FileRead, IFileRead protected string _LastText; protected readonly int _EndX; protected readonly int _EndY; + protected readonly Size _Size; protected readonly int _StartX; protected readonly int _StartY; protected string _TessDataDirectory; protected List _PreviousTotalDeltaCollection; protected readonly Dictionary _Reactors; - protected readonly List<(string, Color[])> _ColorCollections; + protected readonly List> _ColorCollections; - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 36790; _NullData = string.Empty; _LastText = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -42,33 +42,27 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); _LastChange = DateTime.Now.AddDays(-1).Ticks; _Reactors = new Dictionary(); - string reactor = string.Concat("Reactor.", cellInstanceName); - ModelObjectParameterDefinition[] reactors = GetProperties(cellInstanceConnectionName, modelObjectParameters, "Reactor."); - reactors = (from l in reactors where l.Name.EndsWith(".FilePrefix") select l).ToArray(); - if (!reactors.Any()) - throw new Exception(cellInstanceConnectionName); - foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in reactors) - _Reactors.Add(modelObjectParameterDefinition.Name.Split('.')[1], modelObjectParameterDefinition.Value); - string entryAssemblyLocationDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - string x86 = Path.Combine(entryAssemblyLocationDirectory, "x86"); + string alias = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".Alias")); + _Reactors.Add(alias, alias); + string x86 = Path.Combine(AppContext.BaseDirectory, "x86"); if (!Directory.Exists(x86)) _ = Directory.CreateDirectory(x86); - _TessDataDirectory = Path.Combine(entryAssemblyLocationDirectory, "tessdata"); + _TessDataDirectory = Path.Combine(AppContext.BaseDirectory, "tessdata"); if (!Directory.Exists(_TessDataDirectory)) _ = Directory.CreateDirectory(_TessDataDirectory); - string pdfttfSource = Path.Combine(entryAssemblyLocationDirectory, "pdf.ttf"); + string pdfttfSource = Path.Combine(AppContext.BaseDirectory, "pdf.ttf"); string pdfttfDestination = Path.Combine(_TessDataDirectory, Path.GetFileName(pdfttfSource)); if (File.Exists(pdfttfSource) && !File.Exists(pdfttfDestination)) File.Copy(pdfttfSource, pdfttfDestination); - string tesseract41dllSource = Path.Combine(entryAssemblyLocationDirectory, "tesseract41.dll"); + string tesseract41dllSource = Path.Combine(AppContext.BaseDirectory, "tesseract41.dll"); string tesseract41dllDestination = Path.Combine(x86, Path.GetFileName(tesseract41dllSource)); if (File.Exists(tesseract41dllSource) && !File.Exists(tesseract41dllDestination)) File.Copy(tesseract41dllSource, tesseract41dllDestination); - string engtraineddataSource = Path.Combine(entryAssemblyLocationDirectory, "eng.traineddata"); + string engtraineddataSource = Path.Combine(AppContext.BaseDirectory, "eng.traineddata"); string engtraineddataDestination = Path.Combine(_TessDataDirectory, Path.GetFileName(engtraineddataSource)); if (File.Exists(engtraineddataSource) && !File.Exists(engtraineddataDestination)) File.Copy(engtraineddataSource, engtraineddataDestination); - string leptonica1800dllSource = Path.Combine(entryAssemblyLocationDirectory, "leptonica-1.80.0.dll"); + string leptonica1800dllSource = Path.Combine(AppContext.BaseDirectory, "leptonica-1.80.0.dll"); string leptonica1800dllDestination = Path.Combine(x86, Path.GetFileName(leptonica1800dllSource)); if (File.Exists(leptonica1800dllSource) && !File.Exists(leptonica1800dllDestination)) File.Copy(leptonica1800dllSource, leptonica1800dllDestination); @@ -81,12 +75,18 @@ public class FileRead : Shared.FileRead, IFileRead _StartY = int.Parse(startY); _EndX = int.Parse(endX); _EndY = int.Parse(endY); + _ColorCollections = new(); _PreviousTotalDeltaCollection = new(); string masterImageDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Memory.Master.Images"); - _ColorCollections = ProcessData.GetColorCollections(_StartX, _StartY, _EndX, _EndY, masterImageDirectory); + List<(string File, Size Size, Color[] Colors)> colorCollections = ProcessData.GetColorCollections(_StartX, _StartY, _EndX, _EndY, masterImageDirectory); + int[] distinctSizes = (from l in colorCollections select l.Size.Width * l.Size.Height).Distinct().ToArray(); + if (distinctSizes.Length != 1) + throw new Exception($"All Master Images must be the same size{Environment.NewLine}{string.Join(Environment.NewLine, distinctSizes)}"); + _Size = colorCollections[0].Size; + _ColorCollections.AddRange(from l in colorCollections select new Tuple(l.File, l.Colors)); } - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); + void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -151,25 +151,22 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) => throw new Exception(string.Concat("Not ", nameof(_IsDuplicator))); - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { Tuple> results = new(string.Empty, null, null, new List()); _Logistics = new Logistics(this, reportFullPath, useSplitForMID: true); SetFileParameterLotIDToLogisticsMID(); - if (reportFullPath.Length < _MinFileLength) - results.Item4.Add(new FileInfo(reportFullPath)); + if (_Logistics.FileInfo.Length < _MinFileLength) + results.Item4.Add(_Logistics.FileInfo); else { - IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4, _StartX, _StartY, _EndX, _EndY, _ColorCollections); + IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4, _StartX, _StartY, _EndX, _EndY, _Size, _ColorCollections); if (iProcessData is not ProcessData processData) throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); - string mid = processData.Text; - mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; - _Logistics.MID = mid; + string mid = Regex.Replace(processData.Text, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; SetFileParameterLotID(mid); - _Logistics.ProcessJobID = iProcessData.GetCurrentReactor(this, _Logistics, _Reactors); + string processJobID = iProcessData.GetCurrentReactor(this, _Logistics, _Reactors); + _Logistics.Update(mid, processJobID); if (!iProcessData.Details.Any()) throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks)); if (processData.Text == _LastText && _LastChange > DateTime.Now.AddMinutes(-30).Ticks) diff --git a/Adaptation/FileHandlers/jpeg/ProcessData.cs b/Adaptation/FileHandlers/jpeg/ProcessData.cs index 6033395..4ab5ba0 100644 --- a/Adaptation/FileHandlers/jpeg/ProcessData.cs +++ b/Adaptation/FileHandlers/jpeg/ProcessData.cs @@ -8,6 +8,7 @@ using System.Drawing; using System.IO; using System.Linq; using System.Text.Json; +using System.Text.Json.Serialization; namespace Adaptation.FileHandlers.jpeg; @@ -29,7 +30,7 @@ public class ProcessData : IProcessData List Shared.Properties.IProcessData.Details => _Details; - public ProcessData(IFileRead fileRead, Logistics logistics, List fileInfoCollection, int startX, int startY, int endX, int endY, List<(string, Color[])> colorCollections) + public ProcessData(IFileRead fileRead, Logistics logistics, List fileInfoCollection, int startX, int startY, int endX, int endY, Size size, List> colorCollections) { if (logistics is null) { } @@ -38,7 +39,7 @@ public class ProcessData : IProcessData _Details = new List(); MesEntity = logistics.MesEntity; _Log = LogManager.GetLogger(typeof(ProcessData)); - Parse(fileRead, fileInfoCollection, startX, startY, endX, endY, colorCollections); + Parse(fileRead, fileInfoCollection, startX, startY, endX, endY, size, colorCollections); } private static string Get(string value, bool useSplitForMID) @@ -104,7 +105,7 @@ public class ProcessData : IProcessData #nullable enable #pragma warning disable CA1416 - private static Color[] Get(string reportFullPath, int startX, int startY, int endX, int endY) + private static (Size, Color[]) Get(string reportFullPath, int startX, int startY, int endX, int endY) { Color color; List colors = new(); @@ -119,7 +120,7 @@ public class ProcessData : IProcessData colors.Add(color); } } - return colors.ToArray(); + return new(bitmap.Size, colors.ToArray()); } private static System.Drawing.Imaging.ImageFormat Get(string extension) @@ -137,7 +138,7 @@ public class ProcessData : IProcessData return imageFormat; } - private static (Color[], int, int) Get(IFileRead fileRead, List fileInfoCollection, string extension, int startX, int startY, int endX, int endY) + private static (Color[], int, int) Get(IFileRead fileRead, List fileInfoCollection, int startX, int startY, int endX, int endY, string extension, Size size) { Color color; List colors = new(); @@ -148,6 +149,8 @@ public class ProcessData : IProcessData string saveFileName = Path.ChangeExtension(fileRead.ReportFullPath, extension); if (bitmap is null) throw new Exception($"Couldn't load image from <{fileRead.ReportFullPath}>"); + if (!size.Equals(bitmap.Size)) + throw new Exception("Source size doesn't match master image size "); for (int x = startX; x < endX; x++) { for (int y = startY; y < endY; y++) @@ -209,16 +212,20 @@ public class ProcessData : IProcessData File.WriteAllLines(textFileName, lines); } - internal static List<(string, Color[])> GetColorCollections(int startX, int startY, int endX, int endY, string masterImageDirectory) + internal static List<(string, Size, Color[])> GetColorCollections(int startX, int startY, int endX, int endY, string masterImageDirectory) { - List<(string, Color[])> results = new(); + List<(string, Size, Color[])> results = new(); + (Size Size, Color[] Colors) result; string[] files = Directory.GetFiles(masterImageDirectory, "*.jpeg", SearchOption.TopDirectoryOnly); foreach (string file in files) - results.Add(new(file, Get(file, startX, startY, endX, endY))); + { + result = Get(file, startX, startY, endX, endY); + results.Add(new(file, result.Size, result.Colors)); + } return results; } - private void Parse(IFileRead fileRead, List fileInfoCollection, int startX, int startY, int endX, int endY, List<(string, Color[])> colorCollections) + private void Parse(IFileRead fileRead, List fileInfoCollection, int startX, int startY, int endX, int endY, Size size, List> colorCollections) { Red = 0; Green = 0; @@ -228,7 +235,7 @@ public class ProcessData : IProcessData const int thresHold = 70; const string extension = ".tiff"; List<(string File, int TotalDelta)> totalDeltaCollection = new(); - (Color[] sourceColors, int width, int height) = Get(fileRead, fileInfoCollection, extension, startX, startY, endX, endY); + (Color[] sourceColors, int width, int height) = Get(fileRead, fileInfoCollection, startX, startY, endX, endY, extension, size); foreach ((string file, Color[] colors) in colorCollections) { totalDelta = 0; @@ -274,4 +281,23 @@ public class ProcessData : IProcessData _Details.Add(Text); } +#nullable enable + + internal static List GetDescriptions(JsonElement[] jsonElements) + { + List results = new(); + Description? description; + JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString }; + foreach (JsonElement jsonElement in jsonElements) + { + if (jsonElement.ValueKind != JsonValueKind.Object) + throw new Exception(); + description = JsonSerializer.Deserialize(jsonElement.ToString(), jsonSerializerOptions); + if (description is null) + continue; + results.Add(description); + } + return results; + } + } \ No newline at end of file diff --git a/Adaptation/Ifx/Eaf/Common/Configuration/ConnectionSetting.cs b/Adaptation/Ifx/Eaf/Common/Configuration/ConnectionSetting.cs index 7c31ecf..7cd0603 100644 --- a/Adaptation/Ifx/Eaf/Common/Configuration/ConnectionSetting.cs +++ b/Adaptation/Ifx/Eaf/Common/Configuration/ConnectionSetting.cs @@ -1,6 +1,6 @@ namespace Adaptation.Ifx.Eaf.Common.Configuration; -[System.Runtime.Serialization.DataContractAttribute] +[System.Runtime.Serialization.DataContract] public class ConnectionSetting { @@ -8,9 +8,9 @@ public class ConnectionSetting public ConnectionSetting(string name, string value) { } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string Name { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string Value { get; set; } } \ No newline at end of file diff --git a/Adaptation/Ifx/Eaf/EquipmentConnector/File/Configuration/FileConnectorConfiguration.cs b/Adaptation/Ifx/Eaf/EquipmentConnector/File/Configuration/FileConnectorConfiguration.cs index 4e4aa83..05fe1cc 100644 --- a/Adaptation/Ifx/Eaf/EquipmentConnector/File/Configuration/FileConnectorConfiguration.cs +++ b/Adaptation/Ifx/Eaf/EquipmentConnector/File/Configuration/FileConnectorConfiguration.cs @@ -4,85 +4,85 @@ using System.Collections.Generic; namespace Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; -[System.Runtime.Serialization.DataContractAttribute] +[System.Runtime.Serialization.DataContract] public class FileConnectorConfiguration { public const ulong IDLE_EVENT_WAIT_TIME_DEFAULT = 360; public const ulong FILE_HANDLE_TIMEOUT_DEFAULT = 15; - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual bool? TriggerOnChanged { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long? PostProcessingRetries { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual bool? CopySourceFolderStructure { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public IfPostProcessingFailsEnum? IfPostProcessingFailsAction { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string AlternateTargetFolder { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public long? FileHandleTimeout { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public bool? DeleteEmptySourceSubFolders { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public long? IdleEventWaitTimeInSeconds { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string FileAgeThreshold { get; set; } public bool? FolderAgeCheckIndividualSubFolders { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual ZipModeEnum? ZipMode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public FileAgeFilterEnum? FileAgeFilterMode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string ZipTargetFileName { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string ZipErrorTargetFileName { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public long? ZipFileSubFolderLevel { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string DefaultPlaceHolderValue { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public bool? UseZip64Mode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public List ConnectionSettings { get; set; } public string SourceDirectoryCloaking { get; set; } public string FolderAgeThreshold { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long? FileScanningIntervalInSeconds { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual bool? TriggerOnCreated { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long? ZipFileTime { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string SourceFileLocation { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string SourceFileFilter { get; set; } public List SourceFileFilters { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual bool? IncludeSubDirectories { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual FileScanningOptionEnum? FileScanningOption { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string TargetFileLocation { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string ErrorTargetFileLocation { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string TargetFileName { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long? FileHandleWaitTime { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public IfFileExistEnum? IfFileExistAction { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public long? ConnectionRetryInterval { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public PreProcessingModeEnum? PreProcessingMode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public PostProcessingModeEnum? PostProcessingMode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public PostProcessingModeEnum? ErrorPostProcessingMode { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public virtual long? ZipFileAmount { get; set; } - [System.Runtime.Serialization.DataMemberAttribute] + [System.Runtime.Serialization.DataMember] public string ErrorTargetFileName { get; set; } public void Initialize() => throw new NotImplementedException(); diff --git a/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs b/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs index 9d9aa53..57475d5 100644 --- a/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs +++ b/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs @@ -1,5 +1,4 @@ using Adaptation.Eaf.EquipmentCore.SelfDescription.ParameterTypes; -using System; using System.Collections.Generic; namespace Adaptation.Ifx.Eaf.EquipmentConnector.File.SelfDescription; diff --git a/Adaptation/Shared/Deposition/ScopeInfo.cs b/Adaptation/Shared/Deposition/ScopeInfo.cs deleted file mode 100644 index a07a785..0000000 --- a/Adaptation/Shared/Deposition/ScopeInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Adaptation.Shared.Properties; -using System; -using System.IO; - -namespace Adaptation.Shared.Deposition; - -public class ScopeInfo : IScopeInfo -{ - - public Enum Enum { get; private set; } - public Test Test { get; private set; } - public string HTML { get; private set; } - public string Title { get; private set; } - public int TestValue { get; private set; } - public string Header { get; private set; } - public string FileName { get; private set; } - public string QueryFilter { get; private set; } - public string FileNameWithoutExtension { get; private set; } - - public ScopeInfo(IFileRead fileRead, Test test, string extra) - { - Enum = test; - Test = test; - HTML = string.Empty; - Title = string.Empty; - TestValue = (int)test; - Header = string.Empty; - QueryFilter = string.Empty; - FileName = Path.GetFileName(fileRead.ReportFullPath); - FileNameWithoutExtension = extra; - } - -} \ No newline at end of file diff --git a/Adaptation/Shared/Duplicator/Description.cs b/Adaptation/Shared/Duplicator/Description.cs index 04295ef..abbb7a4 100644 --- a/Adaptation/Shared/Duplicator/Description.cs +++ b/Adaptation/Shared/Duplicator/Description.cs @@ -6,7 +6,7 @@ using System.Text.Json; namespace Adaptation.Shared.Duplicator; -public class Description : IDescription, Shared.Properties.IDescription +public class Description : IDescription, Properties.IDescription { public int Test { get; set; } diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs index 54813e2..d01861a 100644 --- a/Adaptation/Shared/FileRead.cs +++ b/Adaptation/Shared/FileRead.cs @@ -33,8 +33,6 @@ public class FileRead : Properties.IFileRead protected readonly bool _IsDuplicator; protected readonly Calendar _Calendar; protected readonly bool _IsSourceTimer; - protected readonly string _VillachPath; - protected readonly string _ProgressPath; protected readonly string _EquipmentType; protected readonly long _BreakAfterSeconds; protected readonly string _ExceptionSubject; @@ -46,6 +44,7 @@ public class FileRead : Properties.IFileRead protected readonly string _CellInstanceConnectionNameBase; protected readonly Dictionary> _DummyRuns; protected readonly Dictionary _FileParameter; + protected readonly Dictionary> _StaticRuns; protected readonly string _ParameterizedModelObjectDefinitionType; protected readonly FileConnectorConfiguration _FileConnectorConfiguration; protected readonly IList _ModelObjectParameterDefinitions; @@ -63,12 +62,13 @@ public class FileRead : Properties.IFileRead string Properties.IFileRead.CellInstanceConnectionName => _CellInstanceConnectionName; string Properties.IFileRead.ParameterizedModelObjectDefinitionType => _ParameterizedModelObjectDefinitionType; - public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) + public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) { _SMTP = smtp; _IsEvent = isEvent; _DummyRuns = dummyRuns; _LastTicksDuration = 0; + _StaticRuns = staticRuns; _IsEAFHosted = isEAFHosted; _Description = description; _FileParameter = fileParameter; @@ -84,6 +84,7 @@ public class FileRead : Properties.IFileRead _IsSourceTimer = fileConnectorConfiguration.SourceFileFilter.StartsWith("*Timer.txt"); string cellInstanceConnectionNameBase = cellInstanceConnectionName.Replace("-", string.Empty); _Hyphens = cellInstanceConnectionName.Length - cellInstanceConnectionNameBase.Length; + _TracePath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Trace"); _ExceptionSubject = string.Concat("Exception:", _CellInstanceConnectionName, _FileConnectorConfiguration?.SourceDirectoryCloaking); string suffix; string[] segments = _ParameterizedModelObjectDefinitionType.Split('.'); @@ -111,16 +112,10 @@ public class FileRead : Properties.IFileRead // if (!string.IsNullOrEmpty(equipmentDictionaryName) && isEvent) // throw new Exception(cellInstanceConnectionName); } - ModelObjectParameterDefinition[] paths = GetProperties(cellInstanceConnectionName, modelObjectParameters, "Path."); - if (paths.Length < 3) - throw new Exception(cellInstanceConnectionName); if (isDuplicator) _MesEntity = string.Empty; else _MesEntity = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".Alias")); - _TracePath = (from l in paths where l.Name.EndsWith("Trace") select l.Value).FirstOrDefault(); - _VillachPath = (from l in paths where l.Name.EndsWith("Villach") select l.Value).FirstOrDefault(); - _ProgressPath = (from l in paths where l.Name.EndsWith("Progress") select l.Value).FirstOrDefault(); _EventName = eventName; _EventNameFileRead = eventNameFileRead; _EquipmentType = parameterizedModelObjectDefinitionTypeAppended; @@ -130,9 +125,11 @@ public class FileRead : Properties.IFileRead else { if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.TimeBased) - breakAfterSeconds = 360; - else + breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileHandleTimeout.Value); + else if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.FileWatcher) breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileScanningIntervalInSeconds.Value); + else + throw new Exception(); } _BreakAfterSeconds = breakAfterSeconds; UpdateLastTicksDuration(breakAfterSeconds * 10000000); @@ -142,13 +139,13 @@ public class FileRead : Properties.IFileRead throw new Exception("_Configuration is empty?"); if (_FileConnectorConfiguration.TargetFileLocation.Contains('%') || _FileConnectorConfiguration.ErrorTargetFileLocation.Contains('%')) throw new Exception("_Configuration is incorrect for a duplicator!"); - if (_FileConnectorConfiguration is not null) - { - if (string.IsNullOrEmpty(_FileConnectorConfiguration.SourceDirectoryCloaking)) - throw new Exception("SourceDirectoryCloaking is empty?"); - if (!_FileConnectorConfiguration.SourceDirectoryCloaking.StartsWith("~")) - throw new Exception("SourceDirectoryCloaking is incorrect for a duplicator!"); - } + // if (_FileConnectorConfiguration is not null) + // { + // if (string.IsNullOrEmpty(_FileConnectorConfiguration.SourceDirectoryCloaking)) + // throw new Exception("SourceDirectoryCloaking is empty?"); + // if (!_FileConnectorConfiguration.SourceDirectoryCloaking.StartsWith("~")) + // throw new Exception("SourceDirectoryCloaking is incorrect for a duplicator!"); + // } } } @@ -183,6 +180,7 @@ public class FileRead : Properties.IFileRead if (ticksDuration < 50000000) ticksDuration = 50000000; _LastTicksDuration = (long)Math.Ceiling(ticksDuration * .667); + _Log.Info($"{new TimeSpan(ticksDuration).TotalMilliseconds} TotalMillisecond(s) to process {Environment.NewLine}{_CellInstanceConnectionName}{Environment.NewLine}<{_ReportFullPath}>"); } protected void WaitForThread(Thread thread, List threadExceptions) @@ -216,35 +214,16 @@ public class FileRead : Properties.IFileRead } } - protected void CreateProgressDirectory(string[] exceptionLines) + private void WriteAllLines(string to, string[] exceptionLines) { - string progressDirectory; - StringBuilder stringBuilder = new(); - if (_Hyphens == 0) - progressDirectory = Path.Combine(_ProgressPath, _CellInstanceConnectionName); - else + string fileName = string.Concat(to, @"\readme.txt"); + try { - _ = stringBuilder.Clear(); - for (int i = 0; i < _Hyphens; i++) - { - if (i > 0 && (i % 2) == 0) - _ = stringBuilder.Append(' '); - _ = stringBuilder.Append('-'); - } - progressDirectory = string.Concat(_ProgressPath, @"\", (_Hyphens + 1).ToString().PadLeft(2, '0'), " ", stringBuilder).Trim(); - } - DateTime dateTime = DateTime.Now; - string weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - progressDirectory = string.Concat(progressDirectory, @"\", dateTime.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.MID, "_", _Logistics.Sequence, "_", DateTime.Now.Ticks - _Logistics.Sequence); - if (!Directory.Exists(progressDirectory)) - _ = Directory.CreateDirectory(progressDirectory); - if (exceptionLines is not null) - { - string fileName = string.Concat(progressDirectory, @"\readme.txt"); - try - { File.WriteAllLines(fileName, exceptionLines); } - catch (Exception) { } + if (!Directory.Exists(to)) + _ = Directory.CreateDirectory(to); + File.WriteAllLines(fileName, exceptionLines); } + catch (Exception ex) { _Log.Error(ex.Message); } } protected string[] Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) @@ -258,7 +237,8 @@ public class FileRead : Properties.IFileRead else { results = new string[] { _Logistics.Sequence.ToString(), _Logistics.ReportFullPath, from, resolvedFileLocation, to, string.Empty, string.Empty, exception.Message, string.Empty, string.Empty, exception.StackTrace }; - Shared0449(to, results); + if (!_IsDuplicator) + WriteAllLines(to, results); } if (extractResults is not null && extractResults.Item4 is not null && extractResults.Item4.Any()) { @@ -279,64 +259,6 @@ public class FileRead : Properties.IFileRead return results; } - protected static IEnumerable GetDirectoriesRecursively(string path, string directoryNameSegment = null) - { - Queue queue = new(); - queue.Enqueue(path); - while (queue.Count > 0) - { - path = queue.Dequeue(); - foreach (string subDirectory in Directory.GetDirectories(path)) - { - queue.Enqueue(subDirectory); - if (string.IsNullOrEmpty(directoryNameSegment) || Path.GetFileName(subDirectory).Contains(directoryNameSegment)) - yield return subDirectory; - } - } - } - - protected string GetProcessedDirectory(string progressPath, Logistics logistics, DateTime dateTime, string duplicateDirectory) - { - string result = duplicateDirectory; - string logisticsSequence = logistics.Sequence.ToString(); - string[] matchDirectories; - if (!_IsEAFHosted) - matchDirectories = new string[] { Path.GetDirectoryName(Path.GetDirectoryName(logistics.ReportFullPath)) }; - else - matchDirectories = new string[] { GetDirectoriesRecursively(Path.GetDirectoryName(progressPath), logisticsSequence).FirstOrDefault() }; - if (matchDirectories.Length == 0 || string.IsNullOrEmpty(matchDirectories[0])) - matchDirectories = Directory.GetDirectories(duplicateDirectory, string.Concat('*', logisticsSequence, '*'), SearchOption.AllDirectories); - if ((matchDirectories is null) || matchDirectories.Length != 1) - throw new Exception("Didn't find directory by logistics sequence"); - if (!matchDirectories[0].Contains("_processed")) - { - result = string.Concat(matchDirectories[0].Split(new string[] { logisticsSequence }, StringSplitOptions.None)[0], logistics.DateTimeFromSequence.ToString("yyyy-MM-dd_hh;mm_tt_"), dateTime.Ticks - logistics.Sequence, "_processed"); - Directory.Move(matchDirectories[0], result); - result = string.Concat(result, @"\", logistics.Sequence); - if (!Directory.Exists(result)) - _ = Directory.CreateDirectory(result); - } - return result; - } - - protected string WriteScopeInfo(string progressPath, Logistics logistics, DateTime dateTime, string duplicateDirectory, List> tuples) - { - string result = GetProcessedDirectory(progressPath, logistics, dateTime, duplicateDirectory); - string tupleFile; - string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath); - string duplicateFile = string.Concat(result, @"\", fileName, ".pdsf"); - foreach (Tuple tuple in tuples) - { - if (tuple.Item1.FileName.StartsWith(@"\")) - tupleFile = tuple.Item1.FileName; - else - tupleFile = string.Concat(result, @"\", fileName, "_", tuple.Item1.FileNameWithoutExtension, ".pdsfc"); - File.WriteAllText(tupleFile, tuple.Item2); - } - File.Copy(logistics.ReportFullPath, duplicateFile, overwrite: true); - return result; - } - protected static string GetTupleFile(Logistics logistics, Properties.IScopeInfo scopeInfo, string duplicateDirectory) { string result; @@ -369,34 +291,34 @@ public class FileRead : Properties.IFileRead return result; } - protected void WaitForFileConsumption(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, string successDirectory, string duplicateDirectory, string duplicateFile, List> tuples) + protected void WaitForFileConsumption(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, string successDirectory, string duplicateDirectory, string duplicateFile, List<(Properties.IScopeInfo, string)> tuples) { bool check; long preWait; string tupleFile; - List consumedFileIndices = new(); List duplicateFiles = new(); - bool moreThanAnHour = (_BreakAfterSeconds > 3600); StringBuilder stringBuilder = new(); + List consumedFileIndices = new(); + bool moreThanAnHour = _BreakAfterSeconds > 3600; long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks; - if (moreThanAnHour) - preWait = dateTime.AddSeconds(30).Ticks; + if (_FileConnectorConfiguration?.FileHandleWaitTime is null) + preWait = dateTime.AddMilliseconds(1234).Ticks; else - preWait = dateTime.AddTicks(_LastTicksDuration).Ticks; + preWait = dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks; if (!tuples.Any()) duplicateFiles.Add(duplicateFile); string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath); string successFile = string.Concat(successDirectory, @"\", Path.GetFileName(logistics.ReportFullPath)); - foreach (Tuple tuple in tuples) + foreach ((Properties.IScopeInfo scopeInfo, string text) in tuples) { - if (tuple.Item1.FileName.StartsWith(@"\")) - tupleFile = tuple.Item1.FileName; - else if (!tuple.Item1.FileName.Contains('%')) - tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", tuple.Item1.FileNameWithoutExtension, ".pdsfc"); + if (scopeInfo.FileName.StartsWith(@"\")) + tupleFile = scopeInfo.FileName; + else if (!scopeInfo.FileName.Contains('%')) + tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc"); else - tupleFile = GetTupleFile(logistics, tuple.Item1, duplicateDirectory); + tupleFile = GetTupleFile(logistics, scopeInfo, duplicateDirectory); duplicateFiles.Add(tupleFile); - File.WriteAllText(tupleFile, tuple.Item2); + File.WriteAllText(tupleFile, text); } for (short i = 0; i < short.MaxValue; i++) { @@ -410,7 +332,7 @@ public class FileRead : Properties.IFileRead { try { - check = (string.IsNullOrEmpty(successDirectory) || File.Exists(successFile)); + check = string.IsNullOrEmpty(successDirectory) || File.Exists(successFile); if (check) { consumedFileIndices.Clear(); @@ -482,7 +404,7 @@ public class FileRead : Properties.IFileRead { string directory; if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType) - directory = Path.Combine(_VillachPath, _EquipmentType, "Target"); + directory = Path.Combine(_TracePath, _EquipmentType, "Target", _CellInstanceName, _CellInstanceConnectionName); else directory = Path.Combine(_TracePath, _EquipmentType, "Source", _CellInstanceName, _CellInstanceConnectionName); if (!Directory.Exists(directory)) @@ -498,14 +420,8 @@ public class FileRead : Properties.IFileRead } } - protected void Move(Tuple> extractResults, Exception exception) + protected void Move(Tuple> extractResults) { - bool isErrorFile = exception is not null; - if (!isErrorFile && _IsDuplicator) - { - if (_IsEAFHosted && !string.IsNullOrEmpty(_ProgressPath)) - CreateProgressDirectory(exceptionLines: null); - } if (!_IsEAFHosted) { string to; @@ -583,20 +499,6 @@ public class FileRead : Properties.IFileRead return results; } - protected static Dictionary> GetKeyValuePairs(List descriptions) - { - Dictionary> results = new(); - Test testKey; - for (int i = 0; i < descriptions.Count; i++) - { - testKey = (Test)descriptions[i].Test; - if (!results.ContainsKey(testKey)) - results.Add(testKey, new List()); - results[testKey].Add(descriptions[i]); - } - return results; - } - protected static List GetDuplicatorDescriptions(JsonElement[] jsonElements) { List results = new(); @@ -612,34 +514,7 @@ public class FileRead : Properties.IFileRead return results; } - protected static Tuple>> GetTuple(IFileRead fileRead, IEnumerable descriptions, bool extra = false) - { - Tuple>> result; - Dictionary> keyValuePairs = GetKeyValuePairs(descriptions.ToList()); - Test[] tests = (from l in keyValuePairs select l.Key).ToArray(); - fileRead.CheckTests(tests, extra); - result = new Tuple>>(tests, keyValuePairs); - return result; - } - - protected void Shared0449(string to, string[] exceptionLines) - { - if (_IsDuplicator) - CreateProgressDirectory(exceptionLines: null); - else - { - string fileName = string.Concat(to, @"\readme.txt"); - try - { - if (!Directory.Exists(to)) - _ = Directory.CreateDirectory(to); - File.WriteAllLines(fileName, exceptionLines); - } - catch (Exception ex) { _Log.Error(ex.Message); } - } - } - - protected void Shared1880(string itemFile, List directories, FileInfo sourceFile, bool isErrorFile) + private void Shared1880(string itemFile, List directories, FileInfo sourceFile, bool isErrorFile) { string itemDirectory; directories.Add(Path.GetDirectoryName(sourceFile.FullName)); @@ -674,7 +549,7 @@ public class FileRead : Properties.IFileRead } } - protected void Shared1811(string to, FileInfo sourceFile) + private void Shared1811(string to, FileInfo sourceFile) { if (!_IsDuplicator && _FileConnectorConfiguration.SourceFileFilter != "*" && sourceFile.Exists && sourceFile.Length < _MinFileLength) { @@ -682,7 +557,7 @@ public class FileRead : Properties.IFileRead string jobIdDirectory = Path.GetDirectoryName(to); DateTime dateTime = DateTime.Now.AddMinutes(-15); string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - string weekDirectory = string.Concat(_Logistics.DateTimeFromSequence.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd")); + string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}"; string destinationDirectory = string.Concat(jobIdDirectory, @"\_ Ignore 100 bytes\", weekDirectory, @"\", directoryName); if (!Directory.Exists(destinationDirectory)) _ = Directory.CreateDirectory(destinationDirectory); @@ -711,7 +586,7 @@ public class FileRead : Properties.IFileRead } } - protected void Shared0231(List directories) + private void Shared0231(List directories) { if (_FileConnectorConfiguration.PostProcessingMode != FileConnectorConfiguration.PostProcessingModeEnum.Copy) { @@ -723,7 +598,7 @@ public class FileRead : Properties.IFileRead } } - protected void Shared0413(DateTime dateTime, bool isDummyRun, string successDirectory, string duplicateDirectory, List> tuples, string duplicateFile) + protected void WaitForFileConsumption(DateTime dateTime, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> tuples, string duplicateFile) { if (!isDummyRun && _IsEAFHosted) WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, successDirectory, duplicateDirectory, duplicateFile, tuples); @@ -739,75 +614,50 @@ public class FileRead : Properties.IFileRead } } - protected static void Shared0607(string reportFullPath, string duplicateDirectory, string logisticsSequence, string destinationDirectory) + internal static string GetJobIdParentDirectory(string directory) { - if (destinationDirectory == duplicateDirectory) - throw new Exception("Check Target File Folder for %LotIDWithLogisticsSequence%_in process on CI (not Duplicator)"); - if (destinationDirectory.EndsWith(logisticsSequence)) - destinationDirectory = Path.GetDirectoryName(destinationDirectory); - string[] deleteFiles = Directory.GetFiles(destinationDirectory, "*", SearchOption.AllDirectories); - if (deleteFiles.Length > 250) - throw new Exception("Safety net!"); - foreach (string file in deleteFiles) - File.Delete(file); - Directory.Delete(destinationDirectory, recursive: true); - File.Delete(reportFullPath); + string result; + if (!string.IsNullOrEmpty(Path.GetFileName(directory))) + result = Path.GetFullPath(GetParentParent(directory)); + else + result = Path.GetFullPath(GetParentParent(Path.GetDirectoryName(directory))); + if (!Directory.Exists(result)) + _ = Directory.CreateDirectory(result); + return result; } - protected string[] Shared1567(string reportFullPath, List> tuples) + internal string[] GetInProcessDirectory(string jobIdDirectory) { string[] results; - string historicalText; - string logisticsSequence = _Logistics.Sequence.ToString(); - string jobIdDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\", _Logistics.JobID); - if (!Directory.Exists(jobIdDirectory)) - _ = Directory.CreateDirectory(jobIdDirectory); - string[] matchDirectories; if (!_IsEAFHosted) - matchDirectories = new string[] { Path.GetDirectoryName(Path.GetDirectoryName(reportFullPath)) }; + results = new string[] { jobIdDirectory }; else - matchDirectories = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly); - if ((matchDirectories is null) || matchDirectories.Length != 1) - throw new Exception("Didn't find directory by logistics sequence"); - string fileName = Path.GetFileNameWithoutExtension(reportFullPath); - string sequenceDirectory = string.Concat(matchDirectories[0], @"\", logisticsSequence); - if (!Directory.Exists(sequenceDirectory)) - _ = Directory.CreateDirectory(sequenceDirectory); - foreach (Tuple tuple in tuples) { - fileName = string.Concat(sequenceDirectory, @"\", fileName, "_", tuple.Item1.FileNameWithoutExtension, ".pdsfc"); - if (_IsEAFHosted) - File.WriteAllText(fileName, tuple.Item2); - else - { - if (File.Exists(fileName)) - { - historicalText = File.ReadAllText(fileName); - if (tuple.Item2 != historicalText) - throw new Exception("File doesn't match historical!"); - } - } + string logisticsSequence = _Logistics.Sequence.ToString(); + results = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly); } - results = matchDirectories; + if ((results is null) || results.Length != 1) + throw new Exception("Didn't find directory by logistics sequence"); return results; } - protected void Shared1277(string reportFullPath, string destinationDirectory, string logisticsSequence, string jobIdDirectory, string json) + internal static string GetFileNameAfterUnderscoreSplit(string reportFullPath) { - string ecCharacterizationSi = Path.GetDirectoryName(Path.GetDirectoryName(jobIdDirectory)); - string destinationJobIdDirectory = string.Concat(ecCharacterizationSi, @"\Processed\", _Logistics.JobID); - if (!Directory.Exists(destinationJobIdDirectory)) - _ = Directory.CreateDirectory(destinationJobIdDirectory); - destinationJobIdDirectory = string.Concat(destinationJobIdDirectory, @"\", Path.GetFileName(destinationDirectory).Split(new string[] { logisticsSequence }, StringSplitOptions.None)[0], _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd_hh;mm_tt_"), DateTime.Now.Ticks - _Logistics.Sequence); - string sequenceDirectory = string.Concat(destinationJobIdDirectory, @"\", logisticsSequence); - string jsonFileName = string.Concat(sequenceDirectory, @"\", Path.GetFileNameWithoutExtension(reportFullPath), ".json"); - Directory.Move(destinationDirectory, destinationJobIdDirectory); - if (!Directory.Exists(sequenceDirectory)) - _ = Directory.CreateDirectory(sequenceDirectory); - File.Copy(reportFullPath, string.Concat(sequenceDirectory, @"\", Path.GetFileName(reportFullPath)), overwrite: true); - File.WriteAllText(jsonFileName, json); + string result; + string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_'); + if (segments.Length <= 2) + result = segments[0]; + else + result = string.Concat(segments[0], segments[2]); + return result; + } + + internal static string GetParentParent(string value) + { + string result = Path.GetDirectoryName(Path.GetDirectoryName(value)); + return result; } } -// 2022-02-14 -> Shared - FileRead \ No newline at end of file +// 2022-06-08 -> Shared - FileRead \ No newline at end of file diff --git a/Adaptation/Shared/Logistics.cs b/Adaptation/Shared/Logistics.cs index c441b3f..38ed83c 100644 --- a/Adaptation/Shared/Logistics.cs +++ b/Adaptation/Shared/Logistics.cs @@ -9,34 +9,46 @@ namespace Adaptation.Shared; public class Logistics : ILogistics { - public object NullData { get; private set; } - public string JobID { get; private set; } //CellName - public long Sequence { get; private set; } //Ticks - public DateTime DateTimeFromSequence { get; private set; } - public double TotalSecondsSinceLastWriteTimeFromSequence { get; private set; } - public string MesEntity { get; private set; } //SPC - public string ReportFullPath { get; private set; } //Extract file - public string ProcessJobID { get; set; } //Reactor (duplicate but I want it in the logistics) - public string MID { get; set; } //Lot & Pocket || Lot - public List Tags { get; set; } - public List Logistics1 { get; set; } - public List Logistics2 { get; set; } + protected readonly DateTime _DateTimeFromSequence; + protected readonly FileInfo _FileInfo; + protected readonly string _JobID; + protected readonly List _Logistics1; + protected readonly List _Logistics2; + protected string _MID; + protected readonly string _MesEntity; + protected readonly object _NullData; + protected string _ProcessJobID; + protected readonly string _ReportFullPath; + protected readonly long _Sequence; + protected readonly double _TotalSecondsSinceLastWriteTimeFromSequence; + + public DateTime DateTimeFromSequence => _DateTimeFromSequence; + public FileInfo FileInfo => _FileInfo; + public string JobID => _JobID; + public List Logistics1 => _Logistics1; + public List Logistics2 => _Logistics2; + public string MID => _MID; + public string MesEntity => _MesEntity; + public object NullData => _NullData; + public string ProcessJobID => _ProcessJobID; + public string ReportFullPath => _ReportFullPath; + public long Sequence => _Sequence; + public double TotalSecondsSinceLastWriteTimeFromSequence => _TotalSecondsSinceLastWriteTimeFromSequence; public Logistics(IFileRead fileRead) { DateTime dateTime = DateTime.Now; - NullData = null; - Sequence = dateTime.Ticks; - DateTimeFromSequence = dateTime; - JobID = fileRead.CellInstanceName; - TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; - MesEntity = DefaultMesEntity(dateTime); - ReportFullPath = string.Empty; - ProcessJobID = nameof(ProcessJobID); - MID = nameof(MID); - Tags = new List(); - Logistics1 = new string[] { string.Concat("LOGISTICS_1", '\t', "A_JOBID=", JobID, ";A_MES_ENTITY=", MesEntity, ";") }.ToList(); - Logistics2 = new List(); + _NullData = null; + _Sequence = dateTime.Ticks; + _DateTimeFromSequence = dateTime; + _JobID = fileRead.CellInstanceName; + _TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; + _MesEntity = DefaultMesEntity(dateTime); + _ReportFullPath = string.Empty; + _ProcessJobID = nameof(ProcessJobID); + _MID = nameof(MID); + _Logistics1 = new string[] { string.Concat("LOGISTICS_1", '\t', "A_JOBID=", JobID, ";A_MES_ENTITY=", MesEntity, ";") }.ToList(); + _Logistics2 = new List(); } public Logistics(IFileRead fileRead, string reportFullPath, bool useSplitForMID, int? fileInfoLength = null) @@ -45,19 +57,19 @@ public class Logistics : ILogistics throw new Exception(); if (string.IsNullOrEmpty(fileRead.MesEntity)) throw new Exception(); - NullData = fileRead.NullData; - FileInfo fileInfo = new(reportFullPath); - DateTime dateTime = fileInfo.LastWriteTime; - if (fileInfoLength.HasValue && fileInfo.Length < fileInfoLength.Value) + _NullData = fileRead.NullData; + _FileInfo = new(reportFullPath); + DateTime dateTime = _FileInfo.LastWriteTime; + if (fileInfoLength.HasValue && _FileInfo.Length < fileInfoLength.Value) dateTime = dateTime.AddTicks(-1); - JobID = fileRead.CellInstanceName; - Sequence = dateTime.Ticks; - DateTimeFromSequence = dateTime; - TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; - MesEntity = fileRead.MesEntity; - ReportFullPath = fileInfo.FullName; - ProcessJobID = nameof(ProcessJobID); - string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileInfo.FullName); + _JobID = fileRead.CellInstanceName; + _Sequence = dateTime.Ticks; + _DateTimeFromSequence = dateTime; + _TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; + _MesEntity = fileRead.MesEntity; + _ReportFullPath = _FileInfo.FullName; + _ProcessJobID = nameof(ProcessJobID); + string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(_FileInfo.FullName); if (useSplitForMID) { if (fileNameWithoutExtension.IndexOf(".") > -1) @@ -67,10 +79,9 @@ public class Logistics : ILogistics if (fileNameWithoutExtension.IndexOf("-") > -1) fileNameWithoutExtension = fileNameWithoutExtension.Split('-')[0].Trim(); } - MID = string.Concat(fileNameWithoutExtension.Substring(0, 1).ToUpper(), fileNameWithoutExtension.Substring(1).ToLower()); - Tags = new List(); - Logistics1 = new string[] { string.Concat("LOGISTICS_1", '\t', "A_JOBID=", JobID, ";A_MES_ENTITY=", MesEntity, ";") }.ToList(); - Logistics2 = new List(); + _MID = string.Concat(fileNameWithoutExtension.Substring(0, 1).ToUpper(), fileNameWithoutExtension.Substring(1).ToLower()); + _Logistics1 = new string[] { string.Concat("LOGISTICS_1", '\t', "A_JOBID=", JobID, ";A_MES_ENTITY=", MesEntity, ";") }.ToList(); + _Logistics2 = new List(); } public Logistics(string reportFullPath, string logistics) @@ -78,57 +89,57 @@ public class Logistics : ILogistics string key; DateTime dateTime; string[] segments; - Logistics1 = logistics.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).ToList(); + _FileInfo = new(reportFullPath); + _Logistics1 = logistics.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).ToList(); if (!Logistics1.Any() || !Logistics1[0].StartsWith("LOGISTICS_1")) { - NullData = null; - JobID = "null"; - dateTime = new FileInfo(reportFullPath).LastWriteTime; - Sequence = dateTime.Ticks; - DateTimeFromSequence = dateTime; - TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; - MesEntity = DefaultMesEntity(dateTime); - ReportFullPath = reportFullPath; - ProcessJobID = "R##"; - MID = "null"; - Tags = new List(); - Logistics1 = new string[] { string.Concat("LOGISTICS_1", '\t', "A_JOBID=", JobID, ";A_MES_ENTITY=", MesEntity, ";") }.ToList(); - Logistics2 = new List(); + _NullData = null; + _JobID = "null"; + dateTime = _FileInfo.LastWriteTime; + _Sequence = dateTime.Ticks; + _DateTimeFromSequence = dateTime; + _TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; + _MesEntity = DefaultMesEntity(dateTime); + _ReportFullPath = reportFullPath; + _ProcessJobID = "R##"; + _MID = "null"; + _Logistics1 = new string[] { string.Concat("LOGISTICS_1", '\t', "A_JOBID=", JobID, ";A_MES_ENTITY=", MesEntity, ";") }.ToList(); + _Logistics2 = new List(); } else { string logistics1Line1 = Logistics1[0]; key = "NULL_DATA="; if (!logistics1Line1.Contains(key)) - NullData = null; + _NullData = null; else { segments = logistics1Line1.Split(new string[] { key }, StringSplitOptions.RemoveEmptyEntries); - NullData = segments[1].Split(';')[0]; + _NullData = segments[1].Split(';')[0]; } key = "JOBID="; if (!logistics1Line1.Contains(key)) - JobID = "null"; + _JobID = "null"; else { segments = logistics1Line1.Split(new string[] { key }, StringSplitOptions.RemoveEmptyEntries); - JobID = segments[1].Split(';')[0]; + _JobID = segments[1].Split(';')[0]; } key = "SEQUENCE="; if (!logistics1Line1.Contains(key)) - dateTime = new FileInfo(reportFullPath).LastWriteTime; + dateTime = _FileInfo.LastWriteTime; else { segments = logistics1Line1.Split(new string[] { key }, StringSplitOptions.RemoveEmptyEntries); if (!long.TryParse(segments[1].Split(';')[0].Split('.')[0], out long sequence) || sequence < new DateTime(1999, 1, 1).Ticks) - dateTime = new FileInfo(reportFullPath).LastWriteTime; + dateTime = _FileInfo.LastWriteTime; else dateTime = new DateTime(sequence); } - Sequence = dateTime.Ticks; - DateTimeFromSequence = dateTime; - TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; - DateTime lastWriteTime = new FileInfo(reportFullPath).LastWriteTime; + _Sequence = dateTime.Ticks; + _DateTimeFromSequence = dateTime; + _TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTime).TotalSeconds; + DateTime lastWriteTime = _FileInfo.LastWriteTime; if (TotalSecondsSinceLastWriteTimeFromSequence > 600) { if (lastWriteTime != dateTime) @@ -138,33 +149,32 @@ public class Logistics : ILogistics } key = "MES_ENTITY="; if (!logistics1Line1.Contains(key)) - MesEntity = DefaultMesEntity(dateTime); + _MesEntity = DefaultMesEntity(dateTime); else { segments = logistics1Line1.Split(new string[] { key }, StringSplitOptions.RemoveEmptyEntries); - MesEntity = segments[1].Split(';')[0]; + _MesEntity = segments[1].Split(';')[0]; } - ReportFullPath = reportFullPath; + _ReportFullPath = reportFullPath; key = "PROCESS_JOBID="; if (!logistics1Line1.Contains(key)) - ProcessJobID = "R##"; + _ProcessJobID = "R##"; else { segments = logistics1Line1.Split(new string[] { key }, StringSplitOptions.RemoveEmptyEntries); - ProcessJobID = segments[1].Split(';')[0]; + _ProcessJobID = segments[1].Split(';')[0]; } key = "MID="; if (!logistics1Line1.Contains(key)) - MID = "null"; + _MID = "null"; else { segments = logistics1Line1.Split(new string[] { key }, StringSplitOptions.RemoveEmptyEntries); - MID = segments[1].Split(';')[0]; + _MID = segments[1].Split(';')[0]; } } Logistics2 logistics2; - Tags = new List(); - Logistics2 = new List(); + _Logistics2 = new List(); for (int i = 1; i < Logistics1.Count; i++) { if (Logistics1[i].StartsWith("LOGISTICS_2")) @@ -180,29 +190,12 @@ public class Logistics : ILogistics } } - public Logistics ShallowCopy() => (Logistics)MemberwiseClone(); - private static string DefaultMesEntity(DateTime dateTime) => string.Concat(dateTime.Ticks, "_MES_ENTITY"); - internal string GetLotViaMostCommonMethod() => MID.Substring(0, MID.Length - 2); - - internal string GetPocketNumberViaMostCommonMethod() => MID.Substring(MID.Length - 2); - - internal void Update(string dateTime, string processJobID, string mid) + internal void Update(string mid, string processJobID) { - if (!DateTime.TryParse(dateTime, out DateTime dateTimeCasted)) - dateTimeCasted = DateTime.Now; - NullData = null; - //JobID = Description.GetCellName(); - Sequence = dateTimeCasted.Ticks; - DateTimeFromSequence = dateTimeCasted; - TotalSecondsSinceLastWriteTimeFromSequence = (DateTime.Now - dateTimeCasted).TotalSeconds; - //MesEntity = DefaultMesEntity(dateTime); - //ReportFullPath = string.Empty; - ProcessJobID = processJobID; - MID = mid; - Tags = new List(); - Logistics1 = new string[] { string.Concat("LOGISTICS_1", '\t', "A_JOBID=", JobID, ";A_MES_ENTITY=", MesEntity, ";") }.ToList(); - Logistics2 = new List(); + _MID = mid; + _ProcessJobID = processJobID; } + } \ No newline at end of file diff --git a/Adaptation/Shared/Methods/IFileRead.cs b/Adaptation/Shared/Methods/IFileRead.cs index 4d383c3..3d690c1 100644 --- a/Adaptation/Shared/Methods/IFileRead.cs +++ b/Adaptation/Shared/Methods/IFileRead.cs @@ -12,7 +12,6 @@ public interface IFileRead : Properties.IFileRead JsonProperty[] GetDefault(); string GetEventDescription(); List GetHeaderNames(); - void CheckTests(Test[] tests, bool extra); Dictionary GetDisplayNamesJsonElement(); Tuple> ReExtract(); List GetDescriptions(IFileRead fileRead, List tests, IProcessData processData); diff --git a/Adaptation/Shared/Metrology/ScopeInfo.cs b/Adaptation/Shared/Metrology/ScopeInfo.cs new file mode 100644 index 0000000..2de909e --- /dev/null +++ b/Adaptation/Shared/Metrology/ScopeInfo.cs @@ -0,0 +1,300 @@ +using System; +using System.IO; + +namespace Adaptation.Shared.Metrology; + +public class ScopeInfo : Properties.IScopeInfo +{ + + public Test Test { get; private set; } + public Enum Enum { get; private set; } + public string HTML { get; private set; } + public string Title { get; private set; } + public string FileName { get; private set; } + public int TestValue { get; private set; } + public string Header { get; private set; } + public string QueryFilter { get; private set; } + public string FileNameWithoutExtension { get; private set; } + + public ScopeInfo(Test test, string fileName, string queryFilter = "", string title = "", string html = "") + { + Enum = test; + Test = test; + HTML = html; + Title = title; + FileName = fileName; + TestValue = (int)test; + Header = string.Empty; + QueryFilter = queryFilter; + FileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName); + } + + public ScopeInfo(Test test) + { + Enum = test; + Test = test; + TestValue = (int)test; + switch (Test) + { + case Test.AFMRoughness: + FileNameWithoutExtension = "afm_iqs_01"; + Header = string.Empty; + QueryFilter = "AFM Roughness"; + Title = "AFM"; + HTML = @"GaN Epi Data\10 - afm.html"; + break; + case Test.BreakdownVoltageCenter: + FileNameWithoutExtension = "bv_iqs_01"; + Header = "Reactor;fDate;fRecipeName;Lot;fPocketNumber;g4Scribe;BV Position;BV Value;Tool"; + QueryFilter = "Breakdown Voltage"; + Title = "Breakdown Voltage-Center"; + HTML = @"GaN Epi Data\03 - bv-production.html"; + break; + case Test.BreakdownVoltageEdge: + FileNameWithoutExtension = "bv_iqs_01_Edge"; + Header = "Reactor;fDate;fRecipeName;Lot;fPocketNumber;g4Scribe;BV Position;BV Value;Tool"; + QueryFilter = "Breakdown Voltage - Edge"; + Title = "Breakdown Voltage-Edge"; + HTML = @"GaN Epi Data\03 - bv-production.html"; + break; + case Test.BreakdownVoltageMiddle8in: + FileNameWithoutExtension = "bv_iqs_01_Middle"; + Header = "Reactor;fDate;fRecipeName;Lot;fPocketNumber;g4Scribe;BV Position;BV Value;Tool"; + QueryFilter = "Breakdown Voltage - Middle"; + Title = "Breakdown Voltage-Middle (8 in)"; + HTML = @"GaN Epi Data\03 - bv-production.html"; + break; + case Test.CV: + FileNameWithoutExtension = "cv_iqs_01"; + Header = "Reactor;fDate;fPart;Lot;pocketNumber;g4Scribe;Position;Vp;NdMin;Tool ID;CV Ns;CV Cap"; + QueryFilter = "CV_Ns"; + Title = "CV"; + HTML = @"GaN Epi Data\05 - cv.html"; + break; + case Test.MonthlyCV: + FileNameWithoutExtension = "cv_iqs_01"; + Header = "Reactor;fDate;fPart;Lot;pocketNumber;g4Scribe;Position;Vp;NdMin;Tool ID;CV Ns;CV Cap"; + QueryFilter = "CV_Ns"; + Title = "CV Monthly Verification"; + HTML = @"Metrology\07 - cv_verif_monthly.html"; + break; + case Test.WeeklyCV: + FileNameWithoutExtension = "cv_iqs_01"; + Header = "Reactor;fDate;fPart;Lot;pocketNumber;g4Scribe;Position;Vp;NdMin;Tool ID;CV Ns;CV Cap"; + QueryFilter = "CV_Ns"; + Title = "CV Weekly Verification"; + HTML = @"Metrology\16 - cv_verif_weekly.html"; + break; + case Test.CandelaKlarfDC: + FileNameWithoutExtension = "candela_iqs_01"; + Header = "LotID;OperatorID;RecipeName;CandelaRecipe;WaferID;PocketNumber;RunDate;Epi;SlipLines;Cracks;EpiDef;HazeSpot;SmallLpd;MediumLpd;LargeLpd;Cracks_A;Spirals;Craters;8620 Small;Pits;Tool ID;Defect Count"; + QueryFilter = "Candela Cracking"; + Title = "Candela"; + HTML = @"GaN Epi Data\12 - candela.html"; + break; + case Test.CandelaLaser: + FileNameWithoutExtension = "candela_iqs_01"; + Header = "LotID;OperatorID;RecipeName;CandelaRecipe;WaferID;PocketNumber;RunDate;Epi;SlipLines;Cracks;EpiDef;HazeSpot;SmallLpd;MediumLpd;LargeLpd;Cracks_A;Spirals;Craters;Pits;Tool ID;Defect Count"; + QueryFilter = "Candela Cracking"; + Title = "Candela"; + HTML = @"GaN Epi Data\12 - candela.html"; + break; + case Test.CandelaVerify: + FileNameWithoutExtension = "candela_iqs_01"; + Header = string.Concat("LotID;OperatorID;RecipeName;CandelaRecipe;WaferID;PocketNumber;RunDate;RunID;Reactor;", "Slip Lines;Cracks;Epi Def;Haze Spot;Small LPD;Medium LPD;Large LPD;Cracks_A;Spirals;Craters;8620 Small;Pits;Tool ID;Defect Count"); + QueryFilter = "Candela Cracking"; + Title = "Candela"; + HTML = @"GaN Epi Data\12 - candela.html"; + break; + case Test.CandelaPSL: + FileNameWithoutExtension = "candela_iqs_01"; + Header = string.Empty; + QueryFilter = "102-83nm"; + Title = "Candela"; + HTML = @"GaN Epi Data\12 - candela.html"; + break; + case Test.CandelaProdU: + FileNameWithoutExtension = "candela_iqs_01"; + Header = string.Empty; + QueryFilter = "SPE verification"; + Title = "Candela"; + HTML = @"GaN Epi Data\12 - candela.html"; + break; + case Test.Denton: + FileNameWithoutExtension = "denton_iqs_01"; + Header = "Tool;fDate;Run;Recipe;Operator;Name;Value"; + QueryFilter = "Denton_Voltage_AVG"; + Title = "Denton Data"; + HTML = @"Support Process\03 - ebeam02_denton_v1.html"; + break; + case Test.Hall: + FileNameWithoutExtension = "hall_iqs_01"; + Header = "Lot;Tool;TimeDate;RunDate;RunID;Part;Reactor;Scribe;PocketNumber;Tool ID;Name;Value"; + QueryFilter = "Hall Rs"; + Title = "Hall Data"; + HTML = @"GaN Epi Data\04 - hall.html"; + break; + case Test.MonthlyHall: + FileNameWithoutExtension = "hall_iqs_01"; + Header = "Lot;Tool;TimeDate;RunDate;RunID;Part;Reactor;Scribe;PocketNumber;Tool ID;Name;Value"; + QueryFilter = "Hall Rs"; + Title = "Hall Monthly Verification"; + HTML = @"Metrology\06 - hall_verif_monthly.html"; + break; + case Test.WeeklyHall: + FileNameWithoutExtension = "hall_iqs_01"; + Header = "Lot;Tool;TimeDate;RunDate;RunID;Part;Reactor;Scribe;PocketNumber;Tool ID;Name;Value"; + QueryFilter = "Hall Rs"; + Title = "Hall Weekly Verification"; + HTML = @"Metrology\15 - hall_verif_weekly.html"; + break; + case Test.Lehighton: + FileNameWithoutExtension = "lei_iqs_01"; + Header = "Reactor;Date;Recipe;Lot;Pocket;Scribe;Tool;Name;Value"; + QueryFilter = "LEI RS Average value"; + Title = "Lehighton"; + HTML = @"GaN Epi Data\13 - lehighton.html"; + break; + case Test.VerificationLehighton: + FileNameWithoutExtension = "___"; + Header = "Reactor;Date;Recipe;Lot;Pocket;Scribe;Tool;Name;Value"; + QueryFilter = "___"; + Title = "LEI Weekly Verification 2 Ohm cm"; + HTML = @"Metrology\14 - lei_verif_weekly.html.html"; + break; + case Test.Microscope: + FileNameWithoutExtension = string.Empty; + Header = string.Empty; + QueryFilter = "Microscope Center 5x"; + Title = "Total Microscope Defects"; + HTML = string.Empty; + break; + case Test.RPMXY: + FileNameWithoutExtension = "RPM_Data"; + Header = "Lot;Date;Recipe;Reactor;Scribe;Pocket;Tool;Name;Value"; + QueryFilter = "Barrier_Composition_RPM_XY"; + Title = "RPM XY Data ***&*** View Data"; + HTML = @"GaN Epi Data\09 - rpm --- 08 - photoluminescence.html"; + break; + case Test.RPMAverage: + FileNameWithoutExtension = "RPMdata-short"; + Header = "fProductId;fDate;average;stdDev;fRecipeName;Reactor;g4Scribe;Pocket Number;Tool ID;Recipe From Rpm File"; + QueryFilter = "Epi Thickness Mean"; + Title = "RPM Average Data"; + HTML = @"GaN Epi Data\09 - rpm.html"; + break; + case Test.RPMPLRatio: + FileNameWithoutExtension = "PHOTOLUMINESCENCE_data-short"; + Header = "fProductId;fDate;g4Scribe;fRecipeName;bandEdge_nm;bandEdge_V;yellowBand_Pmw;yellowBand_nm;yellowBand_V;Reactor;Pocket Number;Tool ID"; + QueryFilter = "PL Ratio"; + Title = "Photoluminescence: PL Ratio"; + HTML = @"GaN Epi Data\08 - photoluminescence.html"; + break; + case Test.DailyRPMXY: + FileNameWithoutExtension = "RPM_Data"; + Header = "Lot;Date;Recipe;Reactor;Scribe;Pocket;Tool;Name;Value"; + QueryFilter = "Barrier_Composition_RPM_XY"; + Title = ""; + HTML = @"Metrology\?"; + break; + case Test.DailyRPMAverage: + FileNameWithoutExtension = "RPMdata-short"; + Header = "fProductId;fDate;average;stdDev;fRecipeName;Reactor;g4Scribe;Pocket Number;Tool ID;Recipe From Rpm File"; + QueryFilter = "Epi Thickness Mean"; + Title = ""; + HTML = @"Metrology\?"; + break; + case Test.DailyRPMPLRatio: + FileNameWithoutExtension = "PHOTOLUMINESCENCE_data-short"; + Header = "fProductId;fDate;g4Scribe;fRecipeName;bandEdge_nm;bandEdge_V;yellowBand_Pmw;yellowBand_nm;yellowBand_V;Reactor;Pocket Number;Tool ID"; + QueryFilter = "PL Ratio"; + Title = "RPM Daily Verification"; + HTML = @"Metrology\17 - rpm_verif_daily.html"; + break; + case Test.VerificationRPM: + FileNameWithoutExtension = "PhotoLuminescence_Ver"; + Header = "Part;Process;Date;Test;Value"; + QueryFilter = "PL Edge Wavelength"; + Title = "PL Daily Verification - [PL Edge Wavelength]"; + HTML = @"Metrology\18 - photoluminescence_verif_daily.html"; + break; + case Test.Photoreflectance: + FileNameWithoutExtension = "photoreflect_iqs_01"; + Header = "Lot;Date;Part;Reactor;Scribe;Pocket;Tool;Point;WaferPosition_PR;PR_Peak"; + QueryFilter = "PR Barrier Composition"; + Title = "Photoreflectance 6 in, Photoreflectance 8 in"; + HTML = @"GaN Epi Data\07 - photoreflectance.html"; + break; + case Test.UV: + FileNameWithoutExtension = "uv_iqs_01"; + Header = string.Empty; + QueryFilter = "UV Broken"; + Title = "UV"; + HTML = @"GaN Epi Data\15 - uv 2.1.html"; + break; + case Test.VpdIcpmsAnalyte: + FileNameWithoutExtension = "VPD_iqs_01"; + Header = "Reactor;RunID;RunDate;PartNumber;PocketNumber;WaferScribe;Analyte;Value"; + QueryFilter = "Mg"; + Title = "VpdIcpmsAnalyteData"; + HTML = @""; + break; + case Test.WarpAndBow: + FileNameWithoutExtension = "warp_iqs_01"; + Header = "fDate;fRecipeName;fProductId;g4Scribe;warp;bow;tool;Reactor;Pocket ID;bow_range;BowX;BowY;CenterBow"; + QueryFilter = "BowCenter"; + Title = "Warp and Bow"; + HTML = @"GaN Epi Data\14 - warp.html"; + break; + case Test.VerificationWarpAndBow: + FileNameWithoutExtension = "warp_ver_iqs_01"; + Header = "Part;Process;Date;WaferScribe;totWarp;bow"; + QueryFilter = "Bow Calibration"; + Title = "6 Inch Warp/Bow Daily Verification, 8 Inch Warp/Bow Daily Verification"; + HTML = @"Metrology\19 - warp_cal_daily.html"; + break; + case Test.XRDXY: + FileNameWithoutExtension = "xrd_iqs_NEW_01"; + Header = "Reactor;fDate;fRecipeName;Lot;pocketNumber;g4Scribe;ToolID;Name;Value;Group"; + QueryFilter = "SL Period"; + Title = "XRD XY Raw Data Viewer"; + HTML = @"GaN Epi Data\11 - xrd.html"; + break; + case Test.XRDWeightedAverage: + FileNameWithoutExtension = "xrd_iqs_NEW_01_WtAVG"; + Header = "Reactor;fDate;fRecipeName;Lot;pocketNumber;g4Scribe;Name;Value;Group"; + //QueryFilter = "Al% Barrier WTAVG"; + QueryFilter = "SL Period WTAVG"; + Title = "XRD Weighted Average Data"; + HTML = @"GaN Epi Data\11 - xrd.html"; + break; + case Test.MonthlyXRD: + FileNameWithoutExtension = "xrd_monthly_ver_iqs_01"; + Header = "Part;Process;Date;TestName;Value"; + QueryFilter = "XRD 2-Theta Position"; + Title = "XRD Monthly Verification"; + HTML = @"Metrology\03 - xrd_verif_monthly.html"; + break; + case Test.WeeklyXRD: + FileNameWithoutExtension = "xrd_weekly_ver_iqs_01"; + Header = "Part;Process;Lot;Date;TestName;Value"; + QueryFilter = "XRD Weekly AL% Center"; + Title = "XRD Weekly Verification"; + HTML = @"Metrology\12 - xrd_verif_weekly.html"; + break; + case Test.JVXRD: + FileNameWithoutExtension = "xrd_iqs_NEW_01"; + Header = "Reactor;fDate;fRecipeName;Lot;pocketNumber;g4Scribe;ToolID;Name;Value;Group"; + QueryFilter = "SL Period"; + Title = "XRD XY Raw Data Viewer"; + HTML = @"GaN Epi Data\11 - xrd.html"; + break; + default: + throw new Exception(); + } + FileName = string.Concat(FileNameWithoutExtension, ".txt"); + } + + public ScopeInfo ShallowCopy() => (ScopeInfo)MemberwiseClone(); + +} \ No newline at end of file diff --git a/Adaptation/Shared/Metrology/WS.Attachment.cs b/Adaptation/Shared/Metrology/WS.Attachment.cs new file mode 100644 index 0000000..ea105ed --- /dev/null +++ b/Adaptation/Shared/Metrology/WS.Attachment.cs @@ -0,0 +1,21 @@ +namespace Adaptation.Shared.Metrology; + +public partial class WS +{ + public class Attachment + { + + public string UniqueId { get; set; } + public string DestinationFileName { get; set; } + public string SourceFileName { get; set; } + + public Attachment(string uniqueId, string destinationFileName, string sourceFileName) + { + UniqueId = uniqueId; + DestinationFileName = destinationFileName; + SourceFileName = sourceFileName; + } + + } + +} \ No newline at end of file diff --git a/Adaptation/Shared/Metrology/WS.Results.cs b/Adaptation/Shared/Metrology/WS.Results.cs new file mode 100644 index 0000000..2d1c603 --- /dev/null +++ b/Adaptation/Shared/Metrology/WS.Results.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using System.Text.Json; + +namespace Adaptation.Shared.Metrology; + +public partial class WS +{ + // this class represents the response from the Inbound API endpoint + public class Results + { + // true or false if data was written to the database + public bool Success { get; set; } + + // if true, contains ID of the Header record in the database + public long HeaderID { get; set; } + + // if false, this collection will contain a list of errors + public List Errors { get; set; } + + // this collection will contain a list of warnings, they will not prevent data from being saved + public List Warnings { get; set; } + + // this is just a helper function to make displaying the results easier + public override string ToString() => JsonSerializer.Serialize(this, GetType()); + } + +} \ No newline at end of file diff --git a/Adaptation/Shared/Metrology/WS.cs b/Adaptation/Shared/Metrology/WS.cs new file mode 100644 index 0000000..b892219 --- /dev/null +++ b/Adaptation/Shared/Metrology/WS.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Http; +using System.Text; +using System.Text.Json; + +namespace Adaptation.Shared.Metrology; + +public partial class WS +{ + + public static (string, Results) SendData(string url, object payload, int timeoutSeconds = 120) + { + Results results = new(); + string resultsJson = string.Empty; + try + { + string json = JsonSerializer.Serialize(payload, payload.GetType()); + if (string.IsNullOrEmpty(url) || !url.Contains(":") || !url.Contains(".")) + throw new Exception("Invalid URL"); + using (HttpClient httpClient = new()) + { + httpClient.Timeout = new TimeSpan(0, 0, 0, timeoutSeconds, 0); + HttpRequestMessage httpRequestMessage = new() + { + RequestUri = new Uri(url), + Method = HttpMethod.Post, + Content = new StringContent(json, Encoding.UTF8, "application/json") + }; + HttpResponseMessage httpResponseMessage = httpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).Result; + resultsJson = httpResponseMessage.Content.ReadAsStringAsync().Result; + results = JsonSerializer.Deserialize(resultsJson); + } + if (!results.Success) + results.Errors.Add(results.ToString()); + } + catch (Exception e) + { + Exception exception = e; + StringBuilder stringBuilder = new(); + while (exception is not null) + { + _ = stringBuilder.AppendLine(exception.Message); + exception = exception.InnerException; + } + if (results.Errors is null) + results.Errors = new List(); + results.Errors.Add(stringBuilder.ToString()); + } + return new(resultsJson, results); + } + + // this method is a wrapper for attaching a file to either a header or data record + // URL is the same URL used for SendData, ex: http://localhost/api/inbound/CDE + // attachToHeaderId is the ID returned by SendData + // attachToDataUniqueId is the string unique ID for the data record, aka the Title of the Sharepoint list entry + // fileContents is a byte array with the contents of the file + // fileName is which attachment this is, image.pdf, data.pdf, data.txt, header.pdf, etc + // timeoutSeconds is configured as the request timeout + // this method will either succeed or throw an exception + // also, this has been made synchronous + public static void AttachFile(string url, long attachToHeaderId, string attachToDataUniqueId, byte[] fileContents, string fileName, int timeoutSeconds = 60) + { + using HttpClient httpClient = new(); + string requestUrl = url + "/attachment?headerid=" + attachToHeaderId.ToString(); + if (!string.IsNullOrWhiteSpace(attachToDataUniqueId)) + { + requestUrl += "&datauniqueid="; + requestUrl += System.Net.WebUtility.UrlEncode(attachToDataUniqueId); + } + requestUrl += "&filename="; // this is just so the web server log shows the filename + requestUrl += System.Net.WebUtility.UrlEncode(fileName); + + httpClient.Timeout = new TimeSpan(0, 0, 0, timeoutSeconds, 0); + + MultipartFormDataContent multipartFormDataContent = new(); + ByteArrayContent byteArrayContent = new(fileContents); + byteArrayContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream"); + + multipartFormDataContent.Add(byteArrayContent, "attachment", fileName); + + HttpResponseMessage httpResponseMessage = httpClient.PostAsync(requestUrl, multipartFormDataContent).Result; + + if (httpResponseMessage.IsSuccessStatusCode) + return; + + string resultBody = httpResponseMessage.Content.ReadAsStringAsync().Result; + + throw new Exception("Attachment failed: " + resultBody); + } + + public static void AttachFiles(string url, long headerID, List headerAttachments = null, List dataAttachments = null) + { + try + { + if (headerAttachments is not null) + { + foreach (Attachment attachment in headerAttachments) + AttachFile(url, headerID, "", File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName); + } + if (dataAttachments is not null) + { + foreach (Attachment attachment in dataAttachments) + AttachFile(url, headerID, attachment.UniqueId, File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName); + } + //MessageBox.Show(r.ToString()); + } + catch (Exception e) + { + Exception exception = e; + StringBuilder stringBuilder = new(); + while (exception is not null) + { + _ = stringBuilder.AppendLine(exception.Message); + exception = exception.InnerException; + } + //MessageBox.Show(msgs.ToString(), "Exception", //MessageBoxButtons.OK, //MessageBoxIcon.Error); + throw new Exception(stringBuilder.ToString()); + } + } + +} \ No newline at end of file diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs index 251d1b4..9dcdb0a 100644 --- a/Adaptation/Shared/ProcessDataStandardFormat.cs +++ b/Adaptation/Shared/ProcessDataStandardFormat.cs @@ -12,8 +12,6 @@ namespace Adaptation.Shared; public class ProcessDataStandardFormat { - public const string RecordStart = "RECORD_START"; - public enum SearchFor { EquipmentIntegration = 1, @@ -348,8 +346,8 @@ public class ProcessDataStandardFormat int startsAt = 0; string[] segments; int? currentGroup = null; - char inputSeperator = '\t'; - char outputSeperator = '\t'; + char inputSeparator = '\t'; + char outputSeparator = '\t'; List vs = new(); List groups = new(); string[] lines = File.ReadAllLines(reportFullPath); @@ -358,7 +356,7 @@ public class ProcessDataStandardFormat { if (string.IsNullOrEmpty(lines[i])) continue; - segments = lines[i].Split(inputSeperator); + segments = lines[i].Split(inputSeparator); if (currentGroup is null) currentGroup = segments.Length; if (segments.Length != currentGroup) @@ -368,20 +366,20 @@ public class ProcessDataStandardFormat startsAt = i; } } - if (startsAt == lines.Length - 1 && lines[0].Split(inputSeperator).Length != currentGroup) + if (startsAt == lines.Length - 1 && lines[0].Split(inputSeparator).Length != currentGroup) groups.Add(new int[] { lines.Length - 1, lines.Length - 1 }); for (int g = 0; g < groups.Count; g++) { vs.Clear(); group = groups[g]; line = lines[group[0]]; - segments = line.Split(inputSeperator); + segments = line.Split(inputSeparator); for (int s = 0; s < segments.Length; s++) vs.Add(segments[s].Length); for (int i = group[0]; i <= group[1]; i++) { line = lines[i]; - segments = line.Split(inputSeperator); + segments = line.Split(inputSeparator); for (int s = 0; s < segments.Length; s++) { if (vs[s] < segments[s].Length) @@ -390,16 +388,16 @@ public class ProcessDataStandardFormat } _ = stringBuilder.Clear(); for (int s = 0; s < segments.Length; s++) - _ = stringBuilder.Append((s + 1).ToString().PadLeft(vs[s], ' ')).Append(outputSeperator); + _ = stringBuilder.Append((s + 1).ToString().PadLeft(vs[s], ' ')).Append(outputSeparator); _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); results.Add(stringBuilder.ToString()); for (int i = group[0]; i <= group[1]; i++) { line = lines[i]; _ = stringBuilder.Clear(); - segments = line.Split(inputSeperator); + segments = line.Split(inputSeparator); for (int s = 0; s < segments.Length; s++) - _ = stringBuilder.Append(segments[s].PadLeft(vs[s], ' ')).Append(outputSeperator); + _ = stringBuilder.Append(segments[s].PadLeft(vs[s], ' ')).Append(outputSeparator); _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); results.Add(stringBuilder.ToString()); } diff --git a/Adaptation/Shared/Properties/ILogistics.cs b/Adaptation/Shared/Properties/ILogistics.cs index dc1a106..398bed9 100644 --- a/Adaptation/Shared/Properties/ILogistics.cs +++ b/Adaptation/Shared/Properties/ILogistics.cs @@ -1,22 +1,23 @@ using System; using System.Collections.Generic; +using System.IO; namespace Adaptation.Shared.Properties; public interface ILogistics { - public object NullData { get; } - public string JobID { get; } //CellName - public long Sequence { get; } //Ticks public DateTime DateTimeFromSequence { get; } + public FileInfo FileInfo { get; } + public string JobID { get; } + public List Logistics1 { get; } + public List Logistics2 { get; } + public string MID { get; } + public string MesEntity { get; } + public object NullData { get; } + public string ProcessJobID { get; } + public string ReportFullPath { get; } + public long Sequence { get; } public double TotalSecondsSinceLastWriteTimeFromSequence { get; } - public string MesEntity { get; } //SPC - public string ReportFullPath { get; } //Extract file - public string ProcessJobID { get; set; } //Reactor (duplicate but I want it in the logistics) - public string MID { get; set; } //Lot & Pocket || Lot - public List Tags { get; set; } - public List Logistics1 { get; set; } - public List Logistics2 { get; set; } } \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/DEP08SIASM.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/DEP08SIASM.cs index 3772dec..b3453de 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/DEP08SIASM.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/DEP08SIASM.cs @@ -1,16 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Reflection; -using System.Text.Json; -using System.Threading; -namespace _Tests.CreateSelfDescription.Staging.v2_39_2; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_2; [TestClass] public class DEP08SIASM : EAFLoggingUnitTesting @@ -57,7 +53,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsXToOpenInsightMetrologyViewer"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -67,7 +63,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsXToIQSSi"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -77,7 +73,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsXToOpenInsight"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -87,7 +83,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsXToOpenInsightMetrologyViewerAttachments"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -97,7 +93,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsXToAPC"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -107,7 +103,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsXToSPaCe"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -117,7 +113,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsXToArchive"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -127,7 +123,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsArchive"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -137,7 +133,7 @@ public class DEP08SIASM : EAFLoggingUnitTesting string check = "~IsDummy"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34-EQPT.cs index a743106..29caaab 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34-EQPT.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_39_2; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_2; [TestClass] public class R34_EQPT : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class R34_EQPT : EAFLoggingUnitTesting string check = ".jpeg"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34.cs index 8ee8826..f2e79ff 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R34.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_39_2; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_2; [TestClass] public class R34 : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class R34 : EAFLoggingUnitTesting string check = "*.jpeg"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36-EQPT.cs index cf6d97b..b58d526 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36-EQPT.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_39_2; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_2; [TestClass] public class R36_EQPT : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class R36_EQPT : EAFLoggingUnitTesting string check = ".jpeg"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36.cs index c066157..a93a11c 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.2/R36.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_39_2; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_2; [TestClass] public class R36 : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class R36 : EAFLoggingUnitTesting string check = "*.jpeg"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Deposition.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/DEP08SIASM.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/DEP08SIASM.cs new file mode 100644 index 0000000..4e666e8 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/DEP08SIASM.cs @@ -0,0 +1,150 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0; + +[TestClass] +public class DEP08SIASM : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static DEP08SIASM EAFLoggingUnitTesting { get; private set; } + + public DEP08SIASM() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public DEP08SIASM(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + if (EAFLoggingUnitTesting is null) + EAFLoggingUnitTesting = new DEP08SIASM(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + if (EAFLoggingUnitTesting.Logger is not null) + EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); + if (EAFLoggingUnitTesting is not null) + EAFLoggingUnitTesting.Dispose(); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__MoveMatchingFiles() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__OpenInsightMetrologyViewer() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__IQSSi() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__OpenInsight() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__OpenInsightMetrologyViewerAttachments() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__APC() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__SPaCe() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__Processed() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__Archive() + { + string check = "*.pdsf"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__Dummy() + { + string check = "637400762024374000.zip"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R34-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R34-EQPT.cs new file mode 100644 index 0000000..58815a5 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R34-EQPT.cs @@ -0,0 +1,60 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0; + +[TestClass] +public class R34_EQPT : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static R34_EQPT EAFLoggingUnitTesting { get; private set; } + + public R34_EQPT() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public R34_EQPT(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + if (EAFLoggingUnitTesting is null) + EAFLoggingUnitTesting = new R34_EQPT(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + if (EAFLoggingUnitTesting.Logger is not null) + EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); + if (EAFLoggingUnitTesting is not null) + EAFLoggingUnitTesting.Dispose(); + } + + [TestMethod] + public void Staging__v2_43_0__R34_EQPT__DownloadJpegFile() + { + string check = ".jpeg"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R34.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R34.cs new file mode 100644 index 0000000..cd80e19 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R34.cs @@ -0,0 +1,60 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0; + +[TestClass] +public class R34 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static R34 EAFLoggingUnitTesting { get; private set; } + + public R34() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public R34(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + if (EAFLoggingUnitTesting is null) + EAFLoggingUnitTesting = new R34(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + if (EAFLoggingUnitTesting.Logger is not null) + EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); + if (EAFLoggingUnitTesting is not null) + EAFLoggingUnitTesting.Dispose(); + } + + [TestMethod] + public void Staging__v2_43_0__R34__jpeg() + { + string check = "*.jpeg"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R36-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R36-EQPT.cs new file mode 100644 index 0000000..6614eac --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R36-EQPT.cs @@ -0,0 +1,60 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0; + +[TestClass] +public class R36_EQPT : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static R36_EQPT EAFLoggingUnitTesting { get; private set; } + + public R36_EQPT() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public R36_EQPT(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + if (EAFLoggingUnitTesting is null) + EAFLoggingUnitTesting = new R36_EQPT(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + if (EAFLoggingUnitTesting.Logger is not null) + EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); + if (EAFLoggingUnitTesting is not null) + EAFLoggingUnitTesting.Dispose(); + } + + [TestMethod] + public void Staging__v2_43_0__R36_EQPT__DownloadJpegFile() + { + string check = ".jpeg"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R36.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R36.cs new file mode 100644 index 0000000..1d5c152 --- /dev/null +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/R36.cs @@ -0,0 +1,60 @@ +using Adaptation._Tests.Shared; +using Microsoft.Extensions.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; + +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0; + +[TestClass] +public class R36 : EAFLoggingUnitTesting +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + internal static R36 EAFLoggingUnitTesting { get; private set; } + + public R36() : base(testContext: null, declaringType: null, skipEquipmentDictionary: false) + { + if (EAFLoggingUnitTesting is null) + throw new Exception(); + } + + public R36(TestContext testContext) : base(testContext, new StackFrame().GetMethod().DeclaringType, skipEquipmentDictionary: false) + { + } + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + if (EAFLoggingUnitTesting is null) + EAFLoggingUnitTesting = new R36(testContext); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(testContext.TestName, " - ClassInitialize")); + string[] fileNameAndText = EAFLoggingUnitTesting.AdaptationTesting.GetCSharpText(testContext.TestName); + File.WriteAllText(fileNameAndText[0], fileNameAndText[1]); + File.WriteAllText(fileNameAndText[2], fileNameAndText[3]); + } + + [ClassCleanup()] + public static void ClassCleanup() + { + if (EAFLoggingUnitTesting.Logger is not null) + EAFLoggingUnitTesting.Logger.LogInformation("Cleanup"); + if (EAFLoggingUnitTesting is not null) + EAFLoggingUnitTesting.Dispose(); + } + + [TestMethod] + public void Staging__v2_43_0__R36__jpeg() + { + string check = "*.jpeg"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.2/DEP08SIASM.cs b/Adaptation/_Tests/Extract/Staging/v2.39.2/DEP08SIASM.cs index d81c4a3..e1e6071 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.2/DEP08SIASM.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.2/DEP08SIASM.cs @@ -1,17 +1,10 @@ using Adaptation.Shared; using Adaptation.Shared.Methods; -using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Reflection; -using System.Text.Json; -using System.Threading; -namespace _Tests.Extract.Staging.v2_39_2; +namespace Adaptation._Tests.Extract.Staging.v2_39_2; [TestClass] public class DEP08SIASM @@ -47,7 +40,7 @@ public class DEP08SIASM string[] variables = _DEP08SIASM.AdaptationTesting.GetVariables(methodBase, check); IFileRead fileRead = _DEP08SIASM.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); Logistics logistics = new(fileRead); - _ = Helpers.Deposition.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } [TestMethod] diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.2/R34-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.39.2/R34-EQPT.cs index 3f28995..071618d 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.2/R34-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.2/R34-EQPT.cs @@ -1,14 +1,6 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_39_2; +namespace Adaptation._Tests.Extract.Staging.v2_39_2; [TestClass] public class R34_EQPT diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.2/R34.cs b/Adaptation/_Tests/Extract/Staging/v2.39.2/R34.cs index 464543a..72534e5 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.2/R34.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.2/R34.cs @@ -1,14 +1,10 @@ using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_39_2; +namespace Adaptation._Tests.Extract.Staging.v2_39_2; [TestClass] public class R34 @@ -38,7 +34,7 @@ public class R34 string[] variables = _R34.AdaptationTesting.GetVariables(methodBase, check); IFileRead fileRead = _R34.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); Logistics logistics = new(fileRead); - _ = Helpers.Deposition.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } } \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.2/R36-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.39.2/R36-EQPT.cs index 44eed90..400439d 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.2/R36-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.2/R36-EQPT.cs @@ -1,14 +1,6 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_39_2; +namespace Adaptation._Tests.Extract.Staging.v2_39_2; [TestClass] public class R36_EQPT diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.2/R36.cs b/Adaptation/_Tests/Extract/Staging/v2.39.2/R36.cs index 6085392..bc208fc 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.2/R36.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.2/R36.cs @@ -1,14 +1,6 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_39_2; +namespace Adaptation._Tests.Extract.Staging.v2_39_2; [TestClass] public class R36 diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/DEP08SIASM.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/DEP08SIASM.cs new file mode 100644 index 0000000..85408c1 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/DEP08SIASM.cs @@ -0,0 +1,51 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_43_0; + +[TestClass] +public class DEP08SIASM +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_43_0.DEP08SIASM _DEP08SIASM; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_43_0.DEP08SIASM.ClassInitialize(testContext); + _DEP08SIASM = CreateSelfDescription.Staging.v2_43_0.DEP08SIASM.EAFLoggingUnitTesting; + } + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__MoveMatchingFiles() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__MoveMatchingFiles(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__OpenInsightMetrologyViewer() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__OpenInsightMetrologyViewer(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__IQSSi() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__IQSSi(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__OpenInsight() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__OpenInsight(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__OpenInsightMetrologyViewerAttachments() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__OpenInsightMetrologyViewerAttachments(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__APC() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__APC(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__SPaCe() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__SPaCe(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__Processed() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__Processed(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__Archive() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__Archive(); + + [TestMethod] + public void Staging__v2_43_0__DEP08SIASM__Dummy() => _DEP08SIASM.Staging__v2_43_0__DEP08SIASM__Dummy(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/R34-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/R34-EQPT.cs new file mode 100644 index 0000000..9f0ddd4 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/R34-EQPT.cs @@ -0,0 +1,27 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_43_0; + +[TestClass] +public class R34_EQPT +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_43_0.R34_EQPT _R34_EQPT; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_43_0.R34_EQPT.ClassInitialize(testContext); + _R34_EQPT = CreateSelfDescription.Staging.v2_43_0.R34_EQPT.EAFLoggingUnitTesting; + } + + [TestMethod] + public void Staging__v2_43_0__R34_EQPT__DownloadJpegFile() => _R34_EQPT.Staging__v2_43_0__R34_EQPT__DownloadJpegFile(); + + [TestMethod] + public void Staging__v2_43_0__R34_EQPT__DownloadJpegFile637812143477007703__Normal() => _R34_EQPT.Staging__v2_43_0__R34_EQPT__DownloadJpegFile(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/R34.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/R34.cs new file mode 100644 index 0000000..5f4800d --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/R34.cs @@ -0,0 +1,63 @@ +using Adaptation.Shared; +using Adaptation.Shared.Methods; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Diagnostics; +using System.Reflection; + +namespace Adaptation._Tests.Extract.Staging.v2_43_0; + +[TestClass] +public class R34 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_43_0.R34 _R34; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_43_0.R34.ClassInitialize(testContext); + _R34 = CreateSelfDescription.Staging.v2_43_0.R34.EAFLoggingUnitTesting; + } + + [TestMethod] + public void Staging__v2_43_0__R34__jpeg() => _R34.Staging__v2_43_0__R34__jpeg(); + + [TestMethod] + public void Staging__v2_43_0__R34__jpeg637812143477007703__Normal() + { + string check = "*.jpeg"; + _R34.Staging__v2_43_0__R34__jpeg(); + MethodBase methodBase = new StackFrame().GetMethod(); + string[] variables = _R34.AdaptationTesting.GetVariables(methodBase, check); + IFileRead fileRead = _R34.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); + Logistics logistics = new(fileRead); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF: false); + // var uri = $"http://{hostip}/set_output?input=0&output=0&venc_framerate={venc_framerate}&venc_gop={venc_gop}&venc_width={venc_width}&venc_height={venc_height}&venc_bitrate={venc_bitrate}&http_ts_uri={http_ts_uri}&http_flv_uri={http_flv_uri}&rtsp_uri={rtsp_uri}&rtmp_enable={rtmp_enable}&rtmp_uri={rtmp_uri}&rtmp_publish_uri={rtmp_publish_uri}&rtmp_publish_enable={rtmp_publish_enable}&http_ts_enable={http_ts_enable}&http_flv_enable={http_flv_enable}&rtsp_enable={rtsp_enable}&venc_profile={venc_profile}&http_hls_uri={http_hls_uri}&http_hls_enable={http_hls_enable}&venc_width_height_same_as_input={venc_width_height_same_as_input}&multicast_ip={multicast_ip}&multicast_port={multicast_port}&multicast_enable={multicast_enable}&venc_codec={venc_codec}&srt_enable={srt_enable}&srt_port={srt_port}&srt_publish_enable={srt_publish_enable}&srt_publish_uri={srt_publish_uri}&srt_key={srt_key}&srt_key_enable={srt_key_enable}&max_qp={venc_max_qp}"; + // if (venc_rc_mode == "5") + // { + // uri += $"&ts_muxrate={venc_bitrate}; + // } + // else + // { + // uri += $"&venc_rc_mode={venc_rc_mode}&ts_muxrate=0"; + // } + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=30&venc_gop=30&venc_width=1920&venc_height=1080&venc_bitrate=2800&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=1&http_flv_enable=1&rtsp_enable=1&venc_profile=0&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655307410424 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=60&venc_gop=300&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=1&http_flv_enable=1&rtsp_enable=1&venc_profile=0&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=265&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655307485097 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=60&venc_gop=300&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=0&http_flv_enable=0&rtsp_enable=1&venc_profile=0&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655326370050 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=60&venc_gop=300&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=0&http_flv_enable=0&rtsp_enable=1&venc_profile=1&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655326507855 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=5&venc_gop=300&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=0&http_flv_enable=0&rtsp_enable=1&venc_profile=1&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655326566457 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=5&venc_gop=5&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=0&http_flv_enable=0&rtsp_enable=1&venc_profile=2&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655326739485 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=5&venc_gop=5&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=0&http_flv_enable=1&rtsp_enable=1&venc_profile=2&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655326928562 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=5&venc_gop=5&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=1&http_flv_enable=1&rtsp_enable=1&venc_profile=2&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655327093005 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=5&venc_gop=5&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=1&http_flv_enable=1&rtsp_enable=1&venc_profile=2&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655327167711 + // http://10.95.154.28/set_output?input=0&output=0&venc_framerate=5&venc_gop=5&venc_width=640&venc_height=480&venc_bitrate=32000&http_ts_uri=/0.ts&http_flv_uri=/0.flv&rtsp_uri=/0&rtmp_enable=0&rtmp_uri=/0&rtmp_publish_uri=rtmp%3A%2F%2F192.168.1.169%2Flive%2F0&rtmp_publish_enable=0&http_ts_enable=0&http_flv_enable=1&rtsp_enable=1&venc_profile=2&http_hls_uri=/0.m3u8&http_hls_enable=0&venc_width_height_same_as_input=0&multicast_ip=238.0.0.1&multicast_port=1234&multicast_enable=0&venc_codec=96&srt_enable=0&srt_port=9000&srt_publish_enable=0&srt_publish_uri=srt%3A%2F%2F192.168.1.169%3A9000&srt_key=0123456789&srt_key_enable=0&max_qp=42&venc_rc_mode=0&ts_muxrate=0&_=1655327315199 + // http://10.95.154.28/set_adv?vga_auto_adjust=1 + // http://10.95.154.28/set_time?sync_time= + // http://10.95.154.28/set_time?sync_time=1655307949&_=1655307949299 + // http://10.95.154.28/get_status?_=1655307702476 + } + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/R36-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/R36-EQPT.cs new file mode 100644 index 0000000..5417cf2 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/R36-EQPT.cs @@ -0,0 +1,24 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_43_0; + +[TestClass] +public class R36_EQPT +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_43_0.R36_EQPT _R36_EQPT; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_43_0.R36_EQPT.ClassInitialize(testContext); + _R36_EQPT = CreateSelfDescription.Staging.v2_43_0.R36_EQPT.EAFLoggingUnitTesting; + } + + [TestMethod] + public void Staging__v2_43_0__R36_EQPT__DownloadJpegFile() => _R36_EQPT.Staging__v2_43_0__R36_EQPT__DownloadJpegFile(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/R36.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/R36.cs new file mode 100644 index 0000000..f1da372 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.43.0/R36.cs @@ -0,0 +1,24 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_43_0; + +[TestClass] +public class R36 +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_43_0.R36 _R36; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_43_0.R36.ClassInitialize(testContext); + _R36 = CreateSelfDescription.Staging.v2_43_0.R36.EAFLoggingUnitTesting; + } + + [TestMethod] + public void Staging__v2_43_0__R36__jpeg() => _R36.Staging__v2_43_0__R36__jpeg(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Helpers/Deposition.cs b/Adaptation/_Tests/Helpers/Deposition.cs deleted file mode 100644 index fcaada6..0000000 --- a/Adaptation/_Tests/Helpers/Deposition.cs +++ /dev/null @@ -1,189 +0,0 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text.Json; - -namespace _Tests.Helpers; - -public class Deposition -{ - - internal static Tuple GetLogisticsColumnsAndBody(string fileFullName) - { - Tuple results; - results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(fileFullName); - Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); - Assert.IsTrue(results.Item2.Length > 0, "Column check"); - Assert.IsTrue(results.Item3.Length > 0, "Body check"); - return results; - } - - internal static Tuple GetLogisticsColumnsAndBody(string searchDirectory, string searchPattern) - { - Tuple results; - if (searchPattern.Length > 3 && !searchPattern.Contains('*') && File.Exists(searchPattern)) - results = GetLogisticsColumnsAndBody(searchPattern); - else - { - string[] pdsfFiles; - pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly); - if (!pdsfFiles.Any()) - _ = Process.Start("explorer.exe", searchDirectory); - Assert.IsTrue(pdsfFiles.Any(), "GetFiles check"); - results = GetLogisticsColumnsAndBody(pdsfFiles[0]); - } - Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); - Assert.IsTrue(results.Item2.Length > 0, "Column check"); - Assert.IsTrue(results.Item3.Length > 0, "Body check"); - return results; - } - - internal static Tuple GetLogisticsColumnsAndBody(IFileRead fileRead, Logistics logistics, Tuple> extractResult, Tuple pdsf) - { - Tuple results; - string text = ProcessDataStandardFormat.GetPDSFText(fileRead, logistics, extractResult.Item3, logisticsText: pdsf.Item1); - string[] lines = text.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); - results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(logistics.ReportFullPath, lines); - Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); - Assert.IsTrue(results.Item2.Length > 0, "Column check"); - Assert.IsTrue(results.Item3.Length > 0, "Body check"); - return results; - } - - internal static string[] GetItem2(Tuple pdsf, Tuple pdsfNew) - { - JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; - string jsonOld = JsonSerializer.Serialize(pdsf.Item2, pdsf.Item2.GetType(), jsonSerializerOptions); - string jsonNew = JsonSerializer.Serialize(pdsfNew.Item2, pdsfNew.Item2.GetType(), jsonSerializerOptions); - return new string[] { jsonOld, jsonNew }; - } - - internal static string[] GetItem3(Tuple pdsf, Tuple pdsfNew) - { - string joinOld = string.Join(Environment.NewLine, from l in pdsf.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); - string joinNew = string.Join(Environment.NewLine, from l in pdsfNew.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); - return new string[] { joinOld, joinNew }; - } - - internal static void UpdatePassDirectory(string searchDirectory) - { - DateTime dateTime = DateTime.Now; - try - { Directory.SetLastWriteTime(searchDirectory, dateTime); } - catch (System.Exception) { } - string ticksDirectory = Path.GetDirectoryName(searchDirectory); - try - { Directory.SetLastWriteTime(ticksDirectory, dateTime); } - catch (System.Exception) { } - string[] directories = Directory.GetDirectories(searchDirectory, "*", SearchOption.TopDirectoryOnly); - foreach (string directory in directories) - { - try - { Directory.SetLastWriteTime(directory, dateTime); } - catch (System.Exception) { } - } - } - - internal static string GetFileName(MethodBase methodBase) - { - string result; - string connectionName; - string seperator = "__"; - string connectionNameAndTicks; - string[] segments = methodBase.Name.Split(new string[] { seperator }, StringSplitOptions.None); - string environment = segments[0]; - string rawVersionName = segments[1]; - string equipmentTypeDirectory = segments[2]; - string ticks = DateTime.Now.Ticks.ToString(); - string comment = segments[segments.Length - 1]; - string versionName = segments[1].Replace('_', '.'); - string before = string.Concat(environment, seperator, rawVersionName, seperator, equipmentTypeDirectory, seperator); - string after = methodBase.Name.Substring(before.Length); - if (after.Length < ticks.Length) - { - connectionName = after; - } - else - { - connectionNameAndTicks = after.Substring(0, after.Length - 2 - comment.Length); - connectionName = connectionNameAndTicks.Substring(0, connectionNameAndTicks.Length - ticks.Length); - ticks = connectionNameAndTicks.Substring(connectionName.Length); - } - result = Path.Combine(environment, equipmentTypeDirectory, versionName, $"{environment}__{rawVersionName}__{equipmentTypeDirectory}__{connectionName}", ticks, $"{connectionName.Replace('_', '-')}.json"); - if (result.Contains('/')) - result = string.Concat('/', result); - else - result = string.Concat('\\', result); - return result; - } - - internal static void CompareSaveTSV(string textFileDirectory, string[] join) - { - if (join[0] != join[1]) - { - _ = Process.Start("explorer.exe", textFileDirectory); - File.WriteAllText(Path.Combine(textFileDirectory, "0.tsv"), join[0]); - File.WriteAllText(Path.Combine(textFileDirectory, "1.tsv"), join[1]); - } - } - - internal static void CompareSaveJSON(string textFileDirectory, string[] json) - { - if (json[0] != json[1]) - { - _ = Process.Start("explorer.exe", textFileDirectory); - File.WriteAllText(Path.Combine(textFileDirectory, "0.json"), json[0]); - File.WriteAllText(Path.Combine(textFileDirectory, "1.json"), json[1]); - } - } - - internal static void CompareSave(string textFileDirectory, Tuple pdsf, Tuple pdsfNew) - { - if (pdsf.Item1 != pdsfNew.Item1) - { - _ = Process.Start("explorer.exe", textFileDirectory); - File.WriteAllText(Path.Combine(textFileDirectory, "0.dat"), pdsf.Item1); - File.WriteAllText(Path.Combine(textFileDirectory, "1.dat"), pdsfNew.Item1); - } - } - - internal static IFileRead GetWriteConfigurationGetFileRead(MethodBase methodBase, string check, Shared.AdaptationTesting adaptationTesting) - { - IFileRead result; - string[] fileNameAndJson = adaptationTesting.GetConfiguration(methodBase); - Assert.IsTrue(fileNameAndJson[1].Contains(check)); - File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]); - result = adaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false); - Assert.IsFalse(string.IsNullOrEmpty(result.CellInstanceConnectionName)); - return result; - } - - internal static string ReExtractComapareUpdatePassDirectory(string[] variables, IFileRead fileRead, Logistics logistics) - { - string result; - Tuple> extractResult = fileRead.ReExtract(); - Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1)); - Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!"); - Assert.IsNotNull(extractResult.Item4); - Tuple pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]); - Tuple pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf); - CompareSave(variables[5], pdsf, pdsfNew); - Assert.IsTrue(pdsf.Item1 == pdsfNew.Item1, "Item1 check!"); - string[] json = GetItem2(pdsf, pdsfNew); - CompareSaveJSON(variables[5], json); - Assert.IsTrue(json[0] == json[1], "Item2 check!"); - string[] join = GetItem3(pdsf, pdsfNew); - CompareSaveTSV(variables[5], join); - Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!"); - UpdatePassDirectory(variables[2]); - result = extractResult.Item1; - return result; - } - -} \ No newline at end of file diff --git a/Adaptation/_Tests/Helpers/Helper.cs b/Adaptation/_Tests/Helpers/Helper.cs deleted file mode 100644 index e26104a..0000000 --- a/Adaptation/_Tests/Helpers/Helper.cs +++ /dev/null @@ -1,164 +0,0 @@ -// using Adaptation.Shared.Deposition; -// using Microsoft.VisualStudio.TestTools.UnitTesting; -// using System; -// using System.Collections.Generic; -// using System.Diagnostics; -// using System.IO; -// using System.Linq; -// using System.Reflection; -// using System.Runtime.InteropServices; -// using System.Text; -// using System.Text.Json; - -// namespace _Tests.Helpers -// { - -// public class Helper -// { - -// public static string GetLaunchText() -// { -// StringBuilder result = new(); -// _ = result. -// AppendLine("{"). -// AppendLine(" \"configurations\": ["). -// AppendLine(" {"). -// AppendLine(" \"name\": \".NET Core Attach\","). -// AppendLine(" \"type\": \"coreclr\","). -// AppendLine(" \"request\": \"attach\","). -// AppendLine($" \"processId\": {System.Diagnostics.Process.GetCurrentProcess().Id}"). -// AppendLine(" }"). -// AppendLine(" ]"). -// AppendLine("}"); -// return result.ToString(); -// } - -// public static string GetProjectDirectory() -// { -// string result; -// string[] checkFiles = null; -// Assembly assembly = Assembly.GetExecutingAssembly(); -// result = Path.GetDirectoryName(assembly.Location); -// for (int i = 0; i < int.MaxValue; i++) -// { -// if (string.IsNullOrEmpty(result)) -// break; -// checkFiles = Directory.GetFiles(result, "*.Tests.csproj", SearchOption.TopDirectoryOnly); -// if (checkFiles.Any()) -// break; -// result = Path.GetDirectoryName(result); -// } -// if (string.IsNullOrEmpty(result) || checkFiles is null || !checkFiles.Any()) -// throw new Exception(result); -// return result; -// } - -// public static string[] GetVariables(string jsonFile, string sourceDirectoryCloaking) -// { -// string[] results; -// string sourceFileFilter = string.Empty; -// string sourceFileLocation = string.Empty; -// string projectDirectory = GetProjectDirectory(); -// string equipmentTypeDirectory = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(projectDirectory))); -// string testResultsDirectory = Path.Combine(equipmentTypeDirectory, "05_TestResults"); -// FileInfo fileInfo = new(string.Concat(testResultsDirectory, jsonFile)); -// if (!Directory.Exists(fileInfo.Directory.FullName)) -// _ = Directory.CreateDirectory(fileInfo.Directory.FullName); -// if (!fileInfo.Exists) -// _ = Process.Start("explorer.exe", fileInfo.Directory.FullName); -// string json = File.ReadAllText(fileInfo.FullName); -// Assert.IsTrue(json.Contains(sourceDirectoryCloaking)); -// JsonElement jsonElement = JsonSerializer.Deserialize(json); -// foreach (JsonProperty jsonProperty in jsonElement.EnumerateObject()) -// { -// if (jsonProperty.Name == "SourceFileLocation") -// sourceFileLocation = jsonProperty.Value.ToString(); -// else if (jsonProperty.Name == "SourceFileFilter") -// sourceFileFilter = jsonProperty.Value.ToString(); -// } -// results = new string[] { jsonFile, json, sourceFileLocation, sourceFileFilter }; - -// Assert.IsFalse(string.IsNullOrEmpty(results[0])); -// Assert.IsFalse(string.IsNullOrEmpty(results[1])); -// Assert.IsFalse(string.IsNullOrEmpty(results[2])); -// Assert.IsFalse(string.IsNullOrEmpty(results[3])); -// return results; -// } - -// public static Tuple GetLogisticsColumnsAndBody(string searchDirectory, string searchPattern) -// { -// Tuple results; -// string[] pdsfFiles; -// pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly); -// if (!pdsfFiles.Any()) -// _ = Process.Start("explorer.exe", searchDirectory); -// Assert.IsTrue(pdsfFiles.Any(), "GetFiles check"); -// results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(pdsfFiles[0]); -// Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); -// Assert.IsTrue(results.Item2.Length > 0, "Column check"); -// Assert.IsTrue(results.Item3.Length > 0, "Body check"); -// return results; -// } - -// public static Tuple GetLogisticsColumnsAndBody(ConfigDataBase configDataBase, ILogic logic, Tuple> extractResult, Tuple pdsf) -// { -// Tuple results; -// string text = ProcessDataStandardFormat.GetPDSFText(logic, configDataBase.GetEventName(), configDataBase.GetEquipmentType(), extractResult.Item2.Value, logisticsText: pdsf.Item1); -// string[] lines = text.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); -// results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(logic.Logistics.ReportFullPath, lines); -// Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); -// Assert.IsTrue(results.Item2.Length > 0, "Column check"); -// Assert.IsTrue(results.Item3.Length > 0, "Body check"); -// return results; -// } - -// public static string[] GetItem2(Tuple pdsf, Tuple pdsfNew) -// { -// JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; -// string jsonOld = JsonSerializer.Serialize(pdsf.Item2, pdsf.Item2.GetType(), jsonSerializerOptions); -// string jsonNew = JsonSerializer.Serialize(pdsfNew.Item2, pdsfNew.Item2.GetType(), jsonSerializerOptions); -// return new string[] { jsonOld, jsonNew }; -// } - -// public static string[] GetItem3(Tuple pdsf, Tuple pdsfNew) -// { -// string joinOld = string.Join(Environment.NewLine, from l in pdsf.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); -// string joinNew = string.Join(Environment.NewLine, from l in pdsfNew.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); -// return new string[] { joinOld, joinNew }; -// } - -// public static void UpdatePassDirectory(string[] variables, MethodBase methodBase) -// { -// string passDirectory = Path.Combine(variables[2], methodBase.Name); -// if (!Directory.Exists(passDirectory)) -// _ = Directory.CreateDirectory(passDirectory); -// else -// Directory.SetLastWriteTime(variables[2], DateTime.Now); -// } - -// public static string GetFileName(MethodBase methodBase) -// { -// string result; -// string[] segments = methodBase.Name.Split(new string[] { "__" }, StringSplitOptions.None); -// string environment = segments[0]; -// string rawVersionName = segments[1]; -// string equipmentTypeDirectory = segments[2]; -// string ticks = DateTime.Now.Ticks.ToString(); -// string comment = segments[segments.Length - 1]; -// string versionName = segments[1].Replace('_', '.'); -// string before = string.Concat(environment, "__", rawVersionName, "__", equipmentTypeDirectory, "__"); -// string after = methodBase.Name.Substring(before.Length); -// string connectionNameAndTicks = after.Substring(0, after.Length - 2 - comment.Length); -// string connectionName = connectionNameAndTicks.Substring(0, connectionNameAndTicks.Length - ticks.Length); -// ticks = connectionNameAndTicks.Substring(connectionName.Length); -// result = Path.Combine(environment, equipmentTypeDirectory, versionName, $"{environment}__{rawVersionName}__{equipmentTypeDirectory}__{connectionName}", ticks, $"{connectionName.Replace('_', '-')}.json"); -// if (result.Contains('/')) -// result = string.Concat('/', result); -// else -// result = string.Concat('\\', result); -// return result; -// } - -// } - -// } \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs index ae60df3..997a93e 100644 --- a/Adaptation/_Tests/Shared/AdaptationTesting.cs +++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs @@ -1,12 +1,13 @@ +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.CellInstance; +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; using Adaptation.Ifx.Eaf.Common.Configuration; using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; +using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared.PasteSpecialXml.EAF.XML.API.CellInstance; -using Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; -using Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; -using Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; using System; using System.Collections.Generic; using System.Diagnostics; @@ -20,7 +21,7 @@ using System.Xml; using System.Xml.Linq; using System.Xml.Serialization; -namespace Shared; +namespace Adaptation._Tests.Shared; public class AdaptationTesting : ISMTP { @@ -175,20 +176,20 @@ public class AdaptationTesting : ISMTP string fileFullName; string comment; string[] textFiles; - string seperator = "__"; + string separator = "__"; string connectionNameAndTicks; string cellInstanceConnectionName; string ticks = DateTime.Now.Ticks.ToString(); string cellInstanceConnectionNameFromMethodBaseName; string testResultsDirectory = GetTestResultsDirectory(); - string[] segments = methodBaseName.Split(new string[] { seperator }, StringSplitOptions.None); + string[] segments = methodBaseName.Split(new string[] { separator }, StringSplitOptions.None); if (segments[0] != _Environment) throw new Exception(); string rawVersionName = segments[1]; string rawCellInstanceName = segments[2]; string cellInstanceVersionName = segments[1].Replace('_', '.'); string cellInstanceName = segments[2].Replace('_', '-').Replace("_EQPT", "-EQPT"); - string before = string.Concat(_Environment, seperator, rawVersionName, seperator, cellInstanceName, seperator); + string before = string.Concat(_Environment, separator, rawVersionName, separator, cellInstanceName, separator); string after = methodBaseName.Substring(before.Length); string versionDirectory = Path.Combine(testResultsDirectory, _Environment, cellInstanceName, cellInstanceVersionName); if (!Directory.Exists(versionDirectory)) @@ -341,7 +342,7 @@ public class AdaptationTesting : ISMTP { xml = XDocument.Load(url).ToString(); } - catch (System.Exception exception) + catch (Exception exception) { throw new Exception(string.Concat(url, System.Environment.NewLine, exception.Message)); } @@ -436,7 +437,7 @@ public class AdaptationTesting : ISMTP AppendLine("using Adaptation.Shared.Methods;"). AppendLine("using Microsoft.Extensions.Logging;"). AppendLine("using Microsoft.VisualStudio.TestTools.UnitTesting;"). - AppendLine("using Shared;"). + AppendLine("using Adaptation._Tests.Shared;"). AppendLine("using System;"). AppendLine("using System.Collections.Generic;"). AppendLine("using System.Diagnostics;"). @@ -445,7 +446,7 @@ public class AdaptationTesting : ISMTP AppendLine("using System.Text.Json;"). AppendLine("using System.Threading;"); _ = stringBuilder.AppendLine(). - Append("namespace _Tests.").Append(loopName).Append('.').Append(_Environment).Append('.').Append(cellInstanceVersionNameAsCode).AppendLine(";"). + Append("namespace Adaptation._Tests.").Append(loopName).Append('.').Append(_Environment).Append('.').Append(cellInstanceVersionNameAsCode).AppendLine(";"). AppendLine(). AppendLine("[TestClass]"); if (i == 2) @@ -555,7 +556,7 @@ public class AdaptationTesting : ISMTP Append("string check = \"").Append(check.Split('\\').Last()).AppendLine("\";"). AppendLine("MethodBase methodBase = new StackFrame().GetMethod();"). AppendLine("EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, \" - Getting configuration\"));"). - AppendLine("_ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);"). + AppendLine("_ = Shared.AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);"). AppendLine("EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, \" - Exit\"));"). AppendLine("}"). AppendLine(); @@ -614,7 +615,7 @@ public class AdaptationTesting : ISMTP foreach (Setting setting in componentsCellComponentCellComponent.Equipment.ConnectionSettings.Setting) result.ConnectionSettings.Add(new ConnectionSetting(null, null) { Name = setting.Name, Value = setting.Value }); } - IEnumerable sourceDirectoryCloakingCollection = (from l in result.ConnectionSettings where l.Name == sourceDirectoryCloaking select l); + IEnumerable sourceDirectoryCloakingCollection = from l in result.ConnectionSettings where l.Name == sourceDirectoryCloaking select l; if (sourceDirectoryCloakingCollection.Any()) result.SourceDirectoryCloaking = sourceDirectoryCloakingCollection.First().Value; else @@ -656,7 +657,7 @@ public class AdaptationTesting : ISMTP { xml = XDocument.Load(url).ToString(); } - catch (System.Exception exception) + catch (Exception exception) { throw new Exception(string.Concat(url, System.Environment.NewLine, exception.Message)); } @@ -777,7 +778,7 @@ public class AdaptationTesting : ISMTP { xml = XDocument.Load(url).ToString(); } - catch (System.Exception exception) + catch (Exception exception) { throw new Exception(string.Concat(url, System.Environment.NewLine, exception.Message)); } @@ -860,7 +861,7 @@ public class AdaptationTesting : ISMTP { Dictionary results = new() { - { nameof(Environment), _Environment }, + { nameof(System.Environment), _Environment }, { nameof(HostNameAndPort), _HostNameAndPort }, { nameof(cellInstanceName), cellInstanceName }, { nameof(equipmentTypeName), equipmentTypeName }, @@ -894,6 +895,7 @@ public class AdaptationTesting : ISMTP { string[] results; string[] segments = GetSegments(methodBase.Name); + string ticks = GetTicks(segments); FileInfo fileInfo = GetFileName(segments); string cellInstanceName = GetCellInstanceName(segments); string cellInstanceVersionName = GetCellInstanceVersionName(segments); @@ -902,6 +904,16 @@ public class AdaptationTesting : ISMTP _ = Directory.CreateDirectory(fileInfo.Directory.FullName); Tuple cellInstanceVersionTuple = GetCellInstanceVersionTuple(cellInstanceName, cellInstanceVersionName); Tuple fileConnectorConfigurationTuple = GetFileConnectorConfigurationTuple(cellInstanceVersionTuple, cellInstanceConnectionName); + if (string.IsNullOrEmpty(ticks) && fileConnectorConfigurationTuple.Item2?.FileScanningIntervalInSeconds is not null) + { + string fileScanningIntervalInSecondsLine; + string versionDirectory = Path.GetDirectoryName(fileInfo.DirectoryName); + if (fileConnectorConfigurationTuple.Item2.FileScanningIntervalInSeconds.Value < 0) + fileScanningIntervalInSecondsLine = $"-\t{fileConnectorConfigurationTuple.Item2.FileScanningIntervalInSeconds.Value:0000}\t{Path.GetFileName(fileInfo.DirectoryName)}"; + else + fileScanningIntervalInSecondsLine = $"+\t{fileConnectorConfigurationTuple.Item2.FileScanningIntervalInSeconds.Value:+0000}\t{Path.GetFileName(fileInfo.DirectoryName)}"; + File.AppendAllLines(Path.Combine(versionDirectory, "FileScanningIntervalInSeconds.txt"), new string[] { fileScanningIntervalInSecondsLine }); + } Tuple equipmentTypeVersionTuple = GetEquipmentTypeVersionTuple(cellInstanceVersionTuple.Item2, cellInstanceConnectionName); Tuple parameterizedModelObjectDefinitionTypeTuple = GetParameterizedModelObjectDefinitionTypeTuple(equipmentTypeVersionTuple); Tuple> modelObjectParametersTuple = GetModelObjectParameters(equipmentTypeVersionTuple); @@ -925,13 +937,13 @@ public class AdaptationTesting : ISMTP if (!string.IsNullOrEmpty(cellInstanceConnectionName) && !Directory.Exists(fileInfo.DirectoryName)) _ = Directory.CreateDirectory(fileInfo.Directory.FullName); Dictionary> dummyRuns = new(); + Dictionary> staticRuns = new(); Tuple cellInstanceVersionTuple = GetCellInstanceVersionTuple(cellInstanceName, cellInstanceVersionName); Tuple fileConnectorConfigurationTuple = GetFileConnectorConfigurationTuple(cellInstanceVersionTuple, cellInstanceConnectionName); Tuple equipmentTypeVersionTuple = GetEquipmentTypeVersionTuple(cellInstanceVersionTuple.Item2, cellInstanceConnectionName); Tuple parameterizedModelObjectDefinitionTypeTuple = GetParameterizedModelObjectDefinitionTypeTuple(equipmentTypeVersionTuple); Tuple> modelObjectParametersTuple = GetModelObjectParameters(equipmentTypeVersionTuple); Tuple equipmentDictionaryVersionTuple = GetEquipmentDictionaryVersionTuple(cellInstanceVersionTuple.Item2, cellInstanceConnectionName, equipmentTypeVersionTuple.Item4); - _ = GetEquipmentDictionaryIsAlwaysEnabledEventsTuple(equipmentDictionaryVersionTuple); if (!string.IsNullOrEmpty(sourceFileLocation) && sourceFileLocation != fileConnectorConfigurationTuple.Item2.SourceFileLocation) fileConnectorConfigurationTuple.Item2.SourceFileLocation = sourceFileLocation; @@ -940,7 +952,30 @@ public class AdaptationTesting : ISMTP fileConnectorConfigurationTuple.Item2.SourceFileFilter = sourceFileFilter; fileConnectorConfigurationTuple.Item2.SourceFileFilters = sourceFileFilter.Split('|').ToList(); } - result = Adaptation.FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, useCyclicalForDescription, isEAFHosted: false); + if (_TestContext.FullyQualifiedTestClassName.Contains(nameof(Extract))) + { + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation); + } + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.SourceFileLocation)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.SourceFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.SourceFileLocation); + } + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.TargetFileLocation)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.TargetFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.TargetFileLocation); + } + if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder)) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder); + } + } + result = FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: false); return result; } @@ -1043,6 +1078,183 @@ public class AdaptationTesting : ISMTP return results; } + internal static Tuple GetLogisticsColumnsAndBody(string fileFullName) + { + Tuple results; + results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(fileFullName); + Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); + Assert.IsTrue(results.Item2.Length > 0, "Column check"); + Assert.IsTrue(results.Item3.Length > 0, "Body check"); + return results; + } + + internal static Tuple GetLogisticsColumnsAndBody(string searchDirectory, string searchPattern) + { + Tuple results; + if (searchPattern.Length > 3 && !searchPattern.Contains('*') && File.Exists(searchPattern)) + results = GetLogisticsColumnsAndBody(searchPattern); + else + { + string[] pdsfFiles; + pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly); + if (!pdsfFiles.Any()) + _ = Process.Start("explorer.exe", searchDirectory); + Assert.IsTrue(pdsfFiles.Any(), "GetFiles check"); + results = GetLogisticsColumnsAndBody(pdsfFiles[0]); + } + Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); + Assert.IsTrue(results.Item2.Length > 0, "Column check"); + Assert.IsTrue(results.Item3.Length > 0, "Body check"); + return results; + } + + internal static Tuple GetLogisticsColumnsAndBody(IFileRead fileRead, Logistics logistics, Tuple> extractResult, Tuple pdsf) + { + Tuple results; + string text = ProcessDataStandardFormat.GetPDSFText(fileRead, logistics, extractResult.Item3, logisticsText: pdsf.Item1); + string[] lines = text.Split(new string[] { System.Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); + results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(logistics.ReportFullPath, lines); + Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); + Assert.IsTrue(results.Item2.Length > 0, "Column check"); + Assert.IsTrue(results.Item3.Length > 0, "Body check"); + return results; + } + + internal static string[] GetItem2(Tuple pdsf, Tuple pdsfNew) + { + JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; + string jsonOld = JsonSerializer.Serialize(pdsf.Item2, pdsf.Item2.GetType(), jsonSerializerOptions); + string jsonNew = JsonSerializer.Serialize(pdsfNew.Item2, pdsfNew.Item2.GetType(), jsonSerializerOptions); + return new string[] { jsonOld, jsonNew }; + } + + internal static string[] GetItem3(Tuple pdsf, Tuple pdsfNew) + { + string joinOld = string.Join(System.Environment.NewLine, from l in pdsf.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); + string joinNew = string.Join(System.Environment.NewLine, from l in pdsfNew.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); + return new string[] { joinOld, joinNew }; + } + + internal static void UpdatePassDirectory(string searchDirectory) + { + DateTime dateTime = DateTime.Now; + try + { Directory.SetLastWriteTime(searchDirectory, dateTime); } + catch (Exception) { } + string ticksDirectory = Path.GetDirectoryName(searchDirectory); + try + { Directory.SetLastWriteTime(ticksDirectory, dateTime); } + catch (Exception) { } + string[] directories = Directory.GetDirectories(searchDirectory, "*", SearchOption.TopDirectoryOnly); + foreach (string directory in directories) + { + try + { Directory.SetLastWriteTime(directory, dateTime); } + catch (Exception) { } + } + } + + internal static string GetFileName(MethodBase methodBase) + { + string result; + string connectionName; + string separator = "__"; + string connectionNameAndTicks; + string[] segments = methodBase.Name.Split(new string[] { separator }, StringSplitOptions.None); + string environment = segments[0]; + string rawVersionName = segments[1]; + string equipmentTypeDirectory = segments[2]; + string ticks = DateTime.Now.Ticks.ToString(); + string comment = segments[segments.Length - 1]; + string versionName = segments[1].Replace('_', '.'); + string before = string.Concat(environment, separator, rawVersionName, separator, equipmentTypeDirectory, separator); + string after = methodBase.Name.Substring(before.Length); + if (after.Length < ticks.Length) + { + connectionName = after; + } + else + { + connectionNameAndTicks = after.Substring(0, after.Length - 2 - comment.Length); + connectionName = connectionNameAndTicks.Substring(0, connectionNameAndTicks.Length - ticks.Length); + ticks = connectionNameAndTicks.Substring(connectionName.Length); + } + result = Path.Combine(environment, equipmentTypeDirectory, versionName, $"{environment}__{rawVersionName}__{equipmentTypeDirectory}__{connectionName}", ticks, $"{connectionName.Replace('_', '-')}.json"); + if (result.Contains('/')) + result = string.Concat('/', result); + else + result = string.Concat('\\', result); + return result; + } + + internal static void CompareSaveTSV(string textFileDirectory, string[] join) + { + if (join[0] != join[1]) + { + _ = Process.Start("explorer.exe", textFileDirectory); + File.WriteAllText(Path.Combine(textFileDirectory, "0.tsv"), join[0]); + File.WriteAllText(Path.Combine(textFileDirectory, "1.tsv"), join[1]); + } + } + + internal static void CompareSaveJSON(string textFileDirectory, string[] json) + { + if (json[0] != json[1]) + { + _ = Process.Start("explorer.exe", textFileDirectory); + File.WriteAllText(Path.Combine(textFileDirectory, "0.json"), json[0]); + File.WriteAllText(Path.Combine(textFileDirectory, "1.json"), json[1]); + } + } + + internal static void CompareSave(string textFileDirectory, Tuple pdsf, Tuple pdsfNew) + { + if (pdsf.Item1 != pdsfNew.Item1) + { + _ = Process.Start("explorer.exe", textFileDirectory); + File.WriteAllText(Path.Combine(textFileDirectory, "0.dat"), pdsf.Item1); + File.WriteAllText(Path.Combine(textFileDirectory, "1.dat"), pdsfNew.Item1); + } + } + + internal static IFileRead GetWriteConfigurationGetFileRead(MethodBase methodBase, string check, AdaptationTesting adaptationTesting) + { + IFileRead result; + string[] fileNameAndJson = adaptationTesting.GetConfiguration(methodBase); + Assert.IsTrue(fileNameAndJson[1].Contains(check)); + File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]); + result = adaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false); + Assert.IsFalse(string.IsNullOrEmpty(result.CellInstanceConnectionName)); + return result; + } + + internal static string ReExtractCompareUpdatePassDirectory(string[] variables, IFileRead fileRead, Logistics logistics, bool validatePDSF = true) + { + string result; + Tuple> extractResult = fileRead.ReExtract(); + Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1)); + Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!"); + Assert.IsNotNull(extractResult.Item4); + if (!validatePDSF) + _ = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, new(string.Empty, Array.Empty(), Array.Empty())); + else + { + Tuple pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]); + Tuple pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf); + CompareSave(variables[5], pdsf, pdsfNew); + Assert.IsTrue(pdsf.Item1 == pdsfNew.Item1, "Item1 check!"); + string[] json = GetItem2(pdsf, pdsfNew); + CompareSaveJSON(variables[5], json); + Assert.IsTrue(json[0] == json[1], "Item2 check!"); + string[] join = GetItem3(pdsf, pdsfNew); + CompareSaveTSV(variables[5], join); + Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!"); + } + UpdatePassDirectory(variables[2]); + result = extractResult.Item1; + return result; + } + } -// namespace _Tests.Helpers { public class AdaptationTesting { } } -// 2022-02-02 -> AdaptationTesting \ No newline at end of file +// namespace Adaptation._Tests.Helpers { public class AdaptationTesting { } } +// 2022-05-12 -> AdaptationTesting \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs b/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs index 4504bae..62a6cf7 100644 --- a/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs +++ b/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs @@ -1,7 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -namespace Shared; +namespace Adaptation._Tests.Shared; public class EAFLoggingUnitTesting : LoggingUnitTesting, IDisposable { diff --git a/Adaptation/_Tests/Shared/IsEnvironment.cs b/Adaptation/_Tests/Shared/IsEnvironment.cs index d47716e..fee5113 100644 --- a/Adaptation/_Tests/Shared/IsEnvironment.cs +++ b/Adaptation/_Tests/Shared/IsEnvironment.cs @@ -2,7 +2,7 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Shared; +namespace Adaptation._Tests.Shared; public class IsEnvironment { @@ -155,11 +155,11 @@ public class IsEnvironment { string result; if (isEnvironment.Windows) - result = nameof(IsEnvironment.Windows); + result = nameof(Windows); else if (isEnvironment.Linux) - result = nameof(IsEnvironment.Linux); + result = nameof(Linux); else if (isEnvironment.OSX) - result = nameof(IsEnvironment.OSX); + result = nameof(OSX); else throw new Exception(); return result; diff --git a/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs b/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs index c188615..8ea4d19 100644 --- a/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs +++ b/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; using System; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class ConsoleLogger : ILogger { diff --git a/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs b/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs index 2fc60a3..94cad4d 100644 --- a/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs +++ b/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Concurrent; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class ConsoleProvider : ILoggerProvider { diff --git a/Adaptation/_Tests/Shared/Log/DebugLogger.cs b/Adaptation/_Tests/Shared/Log/DebugLogger.cs index d70eca6..87e312d 100644 --- a/Adaptation/_Tests/Shared/Log/DebugLogger.cs +++ b/Adaptation/_Tests/Shared/Log/DebugLogger.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; using System; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class DebugLogger : ILogger { diff --git a/Adaptation/_Tests/Shared/Log/DebugProvider.cs b/Adaptation/_Tests/Shared/Log/DebugProvider.cs index a0fb7d6..0511f67 100644 --- a/Adaptation/_Tests/Shared/Log/DebugProvider.cs +++ b/Adaptation/_Tests/Shared/Log/DebugProvider.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Concurrent; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class DebugProvider : ILoggerProvider { diff --git a/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs b/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs index b9e6e0f..5a6cabf 100644 --- a/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs +++ b/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; using System; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class FeedbackLogger : ILogger { diff --git a/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs b/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs index 7f09d85..f207b9b 100644 --- a/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs +++ b/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Concurrent; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class FeedbackProvider : ILoggerProvider { diff --git a/Adaptation/_Tests/Shared/Log/IFeedback.cs b/Adaptation/_Tests/Shared/Log/IFeedback.cs index 66d6d96..9cd7e79 100644 --- a/Adaptation/_Tests/Shared/Log/IFeedback.cs +++ b/Adaptation/_Tests/Shared/Log/IFeedback.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public interface IFeedback { diff --git a/Adaptation/_Tests/Shared/Log/Log.cs b/Adaptation/_Tests/Shared/Log/Log.cs index 0de9242..8a57ac6 100644 --- a/Adaptation/_Tests/Shared/Log/Log.cs +++ b/Adaptation/_Tests/Shared/Log/Log.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class Log { @@ -116,7 +116,7 @@ public class Log if (i == 1) result = directory; else - result = string.Concat("D", directory.Substring(1)); + result = string.Concat("D", directory[1..]); try { if (!Directory.Exists(result)) diff --git a/Adaptation/_Tests/Shared/LoggingUnitTesting.cs b/Adaptation/_Tests/Shared/LoggingUnitTesting.cs index 1f44068..f5c6a40 100644 --- a/Adaptation/_Tests/Shared/LoggingUnitTesting.cs +++ b/Adaptation/_Tests/Shared/LoggingUnitTesting.cs @@ -1,3 +1,4 @@ +using Adaptation._Tests.Shared.Log; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -5,7 +6,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace Shared; +namespace Adaptation._Tests.Shared; public class LoggingUnitTesting : UnitTesting, IDisposable { @@ -48,7 +49,7 @@ public class LoggingUnitTesting : UnitTesting, IDisposable configurationSection = _ConfigurationRoot.GetSection(section); if (configurationSection is null) logLevel = LogLevel.Debug; - else if (!Enum.TryParse(configurationSection.Value, out logLevel)) + else if (!Enum.TryParse(configurationSection.Value, out logLevel)) logLevel = LogLevel.Debug; logLevels.Add(logLevel); } diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs index 304f0b2..77ac5ab 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs @@ -1,11 +1,13 @@ -namespace Shared.PasteSpecialXml.EAF.XML.API.CellInstance; +using System; + +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.CellInstance; // NOTE: Generated code may require at least .NET Framework 4.5 or .NET Core/Standard 2.0. /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities", IsNullable = false)] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities", IsNullable = false)] public partial class CellInstanceVersion { @@ -13,13 +15,13 @@ public partial class CellInstanceVersion private string createdByField; - private System.DateTime creationDateField; + private DateTime creationDateField; private object descriptionField; private ExtensionsVersionExtension[] extensionsField; - private System.DateTime freezeDateField; + private DateTime freezeDateField; private string frozenByField; @@ -29,7 +31,7 @@ public partial class CellInstanceVersion private bool isRetiredField; - private System.DateTime retireDateField; + private DateTime retireDateField; private object retiredByField; @@ -56,7 +58,7 @@ public partial class CellInstanceVersion private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public string CreatedBy { @@ -65,16 +67,16 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - public System.DateTime CreationDate + public DateTime CreationDate { get => this.creationDateField; set => this.creationDateField = value; } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities", IsNullable = true)] public object Description { @@ -83,9 +85,9 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlArrayAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlArray(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - [System.Xml.Serialization.XmlArrayItemAttribute("VersionExtension", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("VersionExtension", IsNullable = false)] public ExtensionsVersionExtension[] Extensions { get => this.extensionsField; @@ -93,16 +95,16 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - public System.DateTime FreezeDate + public DateTime FreezeDate { get => this.freezeDateField; set => this.freezeDateField = value; } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public string FrozenBy { @@ -111,7 +113,7 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public long Id { @@ -120,7 +122,7 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public bool IsFrozen { @@ -129,7 +131,7 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public bool IsRetired { @@ -138,16 +140,16 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - public System.DateTime RetireDate + public DateTime RetireDate { get => this.retireDateField; set => this.retireDateField = value; } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities", IsNullable = true)] public object RetiredBy { @@ -184,7 +186,7 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlArrayItemAttribute("SelectedDeploymentPackage", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + + [System.Xml.Serialization.XmlArrayItem("SelectedDeploymentPackage", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + "nt", IsNullable = false)] public SelectedDeploymentPackage[] DeploymentPackages { @@ -200,7 +202,7 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlArrayItemAttribute("EquipmentConnectionSettings", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlArrayItem("EquipmentConnectionSettings", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances", IsNullable = false)] public EquipmentConnectionSettings[] EquipmentConnections { @@ -230,7 +232,7 @@ public partial class CellInstanceVersion } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -239,11 +241,11 @@ public partial class CellInstanceVersion } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + "nt")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + "nt", IsNullable = false)] public partial class SelectedDeploymentPackage { @@ -277,11 +279,11 @@ public partial class SelectedDeploymentPackage } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances", IsNullable = false)] public partial class EquipmentConnectionSettings { @@ -289,7 +291,7 @@ public partial class EquipmentConnectionSettings private string refField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Ref { get => this.refField; @@ -298,9 +300,9 @@ public partial class EquipmentConnectionSettings } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public partial class ExtensionsVersionExtension { @@ -327,7 +329,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + "s")] public string ClassName { @@ -336,7 +338,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + "s", IsNullable = true)] public object Configuration { @@ -345,7 +347,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + "s")] public string Name { @@ -354,7 +356,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tAutomationClient")] public object Editors { @@ -363,7 +365,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -371,7 +373,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlAttributeAttribute()] + [System.Xml.Serialization.XmlAttribute()] public string i___type { get => this.i___typeField; @@ -380,9 +382,9 @@ public partial class ExtensionsVersionExtension } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class CellInstanceVersionCellSetting { @@ -395,7 +397,7 @@ public partial class CellInstanceVersionCellSetting private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public long Id { @@ -404,7 +406,7 @@ public partial class CellInstanceVersionCellSetting } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public CellType CellType { @@ -413,7 +415,7 @@ public partial class CellInstanceVersionCellSetting } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public string Name { @@ -422,7 +424,7 @@ public partial class CellInstanceVersionCellSetting } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -431,11 +433,11 @@ public partial class CellInstanceVersionCellSetting } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances", IsNullable = false)] public partial class CellType { @@ -449,7 +451,7 @@ public partial class CellType private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public long Id { get => this.idField; @@ -457,7 +459,7 @@ public partial class CellType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Name { get => this.nameField; @@ -465,7 +467,7 @@ public partial class CellType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Version { get => this.versionField; @@ -473,7 +475,7 @@ public partial class CellType } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -482,9 +484,9 @@ public partial class CellType } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class CellInstanceVersionComponentModel { @@ -495,7 +497,7 @@ public partial class CellInstanceVersionComponentModel private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public long Id { @@ -504,9 +506,9 @@ public partial class CellInstanceVersionComponentModel } /// - [System.Xml.Serialization.XmlArrayAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlArray(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] - [System.Xml.Serialization.XmlArrayItemAttribute("CellComponent", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("CellComponent", IsNullable = false)] public ComponentsCellComponent[] Components { get => this.componentsField; @@ -514,7 +516,7 @@ public partial class CellInstanceVersionComponentModel } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -523,9 +525,9 @@ public partial class CellInstanceVersionComponentModel } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponent { @@ -545,7 +547,7 @@ public partial class ComponentsCellComponent private string idField; /// - [System.Xml.Serialization.XmlArrayItemAttribute("CellComponent", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("CellComponent", IsNullable = false)] public ComponentsCellComponentCellComponent[] Children { get => this.childrenField; @@ -574,7 +576,7 @@ public partial class ComponentsCellComponent } /// - [System.Xml.Serialization.XmlArrayItemAttribute("ComponentParameter", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("ComponentParameter", IsNullable = false)] public ComponentsCellComponentComponentParameter[] Parameters { get => this.parametersField; @@ -589,7 +591,7 @@ public partial class ComponentsCellComponent } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -598,9 +600,9 @@ public partial class ComponentsCellComponent } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentCellComponent { @@ -648,7 +650,7 @@ public partial class ComponentsCellComponentCellComponent } /// - [System.Xml.Serialization.XmlArrayItemAttribute("ComponentParameter", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("ComponentParameter", IsNullable = false)] public ComponentsCellComponentCellComponentComponentParameter[] Parameters { get => this.parametersField; @@ -663,7 +665,7 @@ public partial class ComponentsCellComponentCellComponent } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -672,9 +674,9 @@ public partial class ComponentsCellComponentCellComponent } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentCellComponentEquipment { @@ -800,7 +802,7 @@ public partial class ComponentsCellComponentCellComponentEquipment private string i___typeField; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public long Id { @@ -832,7 +834,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string AlternateTargetFolder { @@ -841,7 +843,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ConnectionRetryInterval { @@ -850,7 +852,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public ConnectionSettings ConnectionSettings { @@ -859,7 +861,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool CopySourceFolderStructure { @@ -868,7 +870,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string DefaultPlaceHolderValue { @@ -877,7 +879,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool DeleteEmptySourceSubFolders { @@ -886,7 +888,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorPostProcessingMode { @@ -895,7 +897,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorTargetFileLocation { @@ -904,7 +906,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorTargetFileName { @@ -913,7 +915,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileAgeFilterMode { @@ -922,7 +924,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileAgeThreshold { @@ -931,7 +933,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long FileHandleTimeout { @@ -940,7 +942,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long FileHandleWaitTime { @@ -949,7 +951,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public int FileScanningIntervalInSeconds { @@ -958,7 +960,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileScanningOption { @@ -967,7 +969,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public int IdleEventWaitTimeInSeconds { @@ -976,7 +978,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string IfFileExistAction { @@ -985,7 +987,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string IfPostProcessingFailsAction { @@ -994,7 +996,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool IncludeSubDirectories { @@ -1003,7 +1005,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string PostProcessingMode { @@ -1012,7 +1014,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long PostProcessingRetries { @@ -1021,7 +1023,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string PreProcessingMode { @@ -1030,7 +1032,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SkipSearchDirectoryNames { @@ -1039,7 +1041,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SourceFileFilter { @@ -1048,7 +1050,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SourceFileLocation { @@ -1057,7 +1059,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string TargetFileLocation { @@ -1066,7 +1068,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string TargetFileName { @@ -1075,7 +1077,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool TriggerOnChanged { @@ -1084,7 +1086,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool TriggerOnCreated { @@ -1093,7 +1095,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool UseZip64Mode { @@ -1102,7 +1104,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipErrorTargetFileName { @@ -1111,7 +1113,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileAmount { @@ -1120,7 +1122,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileSubFolderLevel { @@ -1129,7 +1131,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileTime { @@ -1138,7 +1140,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipMode { @@ -1147,7 +1149,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipTargetFileName { @@ -1156,7 +1158,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances")] public string BaudRate { @@ -1165,7 +1167,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances")] public string ConnectionMode { @@ -1174,7 +1176,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances")] public byte DeviceId { @@ -1183,7 +1185,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlIgnoreAttribute()] + [System.Xml.Serialization.XmlIgnore()] public bool DeviceIdSpecified { get => this.deviceIdFieldSpecified; @@ -1191,7 +1193,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances")] public string Host { @@ -1200,7 +1202,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string LinkTestTimer { @@ -1209,7 +1211,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances")] public ushort Port { @@ -1218,7 +1220,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlIgnoreAttribute()] + [System.Xml.Serialization.XmlIgnore()] public bool PortSpecified { get => this.portFieldSpecified; @@ -1226,7 +1228,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances")] public string PortType { @@ -1235,7 +1237,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances")] public string SessionMode { @@ -1244,7 +1246,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T1InterCharacter { @@ -1253,7 +1255,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T2Protocol { @@ -1262,7 +1264,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T3MessageReply { @@ -1271,7 +1273,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T4InterBlock { @@ -1280,7 +1282,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T5ConnectionSeperation { @@ -1289,7 +1291,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T6HsmsControlMessage { @@ -1298,7 +1300,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T7ConnectionIdle { @@ -1307,7 +1309,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Semicond" + "uctor.CellInstances", DataType = "duration")] public string T8NetworkIntercharacter { @@ -1316,7 +1318,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -1324,7 +1326,7 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// - [System.Xml.Serialization.XmlAttributeAttribute()] + [System.Xml.Serialization.XmlAttribute()] public string i___type { get => this.i___typeField; @@ -1333,9 +1335,9 @@ public partial class ComponentsCellComponentCellComponentEquipment } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentChildrenCellComponentEquipmentEquipmentDictionaries { @@ -1343,7 +1345,7 @@ public partial class ComponentsCellComponentChildrenCellComponentEquipmentEquipm private CellEquipmentDictionaryReference cellEquipmentDictionaryReferenceField; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public CellEquipmentDictionaryReference CellEquipmentDictionaryReference { get => this.cellEquipmentDictionaryReferenceField; @@ -1352,10 +1354,10 @@ public partial class ComponentsCellComponentChildrenCellComponentEquipmentEquipm } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities", IsNullable = false)] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities", IsNullable = false)] public partial class CellEquipmentDictionaryReference { @@ -1389,7 +1391,7 @@ public partial class CellEquipmentDictionaryReference } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -1398,9 +1400,9 @@ public partial class CellEquipmentDictionaryReference } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentCellComponentEquipmentEquipmentType { @@ -1414,7 +1416,7 @@ public partial class ComponentsCellComponentCellComponentEquipmentEquipmentType private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public long Id { get => this.idField; @@ -1422,7 +1424,7 @@ public partial class ComponentsCellComponentCellComponentEquipmentEquipmentType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Name { get => this.nameField; @@ -1430,7 +1432,7 @@ public partial class ComponentsCellComponentCellComponentEquipmentEquipmentType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Version { get => this.versionField; @@ -1438,7 +1440,7 @@ public partial class ComponentsCellComponentCellComponentEquipmentEquipmentType } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -1447,9 +1449,9 @@ public partial class ComponentsCellComponentCellComponentEquipmentEquipmentType } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentCellComponentComponentParameter { @@ -1469,7 +1471,7 @@ public partial class ComponentsCellComponentCellComponentComponentParameter private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation", IsNullable = true)] public object EnumType { @@ -1478,7 +1480,7 @@ public partial class ComponentsCellComponentCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public long Id { @@ -1487,7 +1489,7 @@ public partial class ComponentsCellComponentCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public string Name { @@ -1496,7 +1498,7 @@ public partial class ComponentsCellComponentCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public string Value { @@ -1505,7 +1507,7 @@ public partial class ComponentsCellComponentCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public string ValueType { @@ -1521,7 +1523,7 @@ public partial class ComponentsCellComponentCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -1530,9 +1532,9 @@ public partial class ComponentsCellComponentCellComponentComponentParameter } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentEquipment { @@ -1624,7 +1626,7 @@ public partial class ComponentsCellComponentEquipment private string i___typeField; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public long Id { @@ -1654,7 +1656,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string AlternateTargetFolder { @@ -1663,7 +1665,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ConnectionRetryInterval { @@ -1672,7 +1674,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public ConnectionSettings ConnectionSettings { @@ -1681,7 +1683,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool CopySourceFolderStructure { @@ -1690,7 +1692,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string DefaultPlaceHolderValue { @@ -1699,7 +1701,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool DeleteEmptySourceSubFolders { @@ -1708,7 +1710,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorPostProcessingMode { @@ -1717,7 +1719,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorTargetFileLocation { @@ -1726,7 +1728,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorTargetFileName { @@ -1735,7 +1737,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileAgeFilterMode { @@ -1744,7 +1746,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileAgeThreshold { @@ -1753,7 +1755,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long FileHandleTimeout { @@ -1762,7 +1764,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long FileHandleWaitTime { @@ -1771,7 +1773,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public int FileScanningIntervalInSeconds { @@ -1780,7 +1782,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileScanningOption { @@ -1789,7 +1791,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public int IdleEventWaitTimeInSeconds { @@ -1798,7 +1800,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string IfFileExistAction { @@ -1807,7 +1809,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string IfPostProcessingFailsAction { @@ -1816,7 +1818,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool IncludeSubDirectories { @@ -1825,7 +1827,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string PostProcessingMode { @@ -1834,7 +1836,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long PostProcessingRetries { @@ -1843,7 +1845,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string PreProcessingMode { @@ -1852,7 +1854,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SkipSearchDirectoryNames { @@ -1861,7 +1863,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SourceFileFilter { @@ -1870,7 +1872,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SourceFileLocation { @@ -1879,7 +1881,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string TargetFileLocation { @@ -1888,7 +1890,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string TargetFileName { @@ -1897,7 +1899,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool TriggerOnChanged { @@ -1906,7 +1908,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool TriggerOnCreated { @@ -1915,7 +1917,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool UseZip64Mode { @@ -1924,7 +1926,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipErrorTargetFileName { @@ -1933,7 +1935,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileAmount { @@ -1942,7 +1944,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileSubFolderLevel { @@ -1951,7 +1953,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileTime { @@ -1960,7 +1962,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipMode { @@ -1969,7 +1971,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipTargetFileName { @@ -1978,7 +1980,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Ref { get => this.refField; @@ -1986,7 +1988,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -1994,7 +1996,7 @@ public partial class ComponentsCellComponentEquipment } /// - [System.Xml.Serialization.XmlAttributeAttribute()] + [System.Xml.Serialization.XmlAttribute()] public string i___type { get => this.i___typeField; @@ -2003,9 +2005,9 @@ public partial class ComponentsCellComponentEquipment } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentEquipmentEquipmentType { @@ -2019,7 +2021,7 @@ public partial class ComponentsCellComponentEquipmentEquipmentType private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public long Id { get => this.idField; @@ -2027,7 +2029,7 @@ public partial class ComponentsCellComponentEquipmentEquipmentType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Name { get => this.nameField; @@ -2035,7 +2037,7 @@ public partial class ComponentsCellComponentEquipmentEquipmentType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Version { get => this.versionField; @@ -2043,7 +2045,7 @@ public partial class ComponentsCellComponentEquipmentEquipmentType } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -2052,9 +2054,9 @@ public partial class ComponentsCellComponentEquipmentEquipmentType } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public partial class ComponentsCellComponentComponentParameter { @@ -2074,7 +2076,7 @@ public partial class ComponentsCellComponentComponentParameter private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation", IsNullable = true)] public object EnumType { @@ -2083,7 +2085,7 @@ public partial class ComponentsCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public long Id { @@ -2092,7 +2094,7 @@ public partial class ComponentsCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public string Name { @@ -2101,7 +2103,7 @@ public partial class ComponentsCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public string Value { @@ -2110,7 +2112,7 @@ public partial class ComponentsCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public string ValueType { @@ -2126,7 +2128,7 @@ public partial class ComponentsCellComponentComponentParameter } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -2135,9 +2137,9 @@ public partial class ComponentsCellComponentComponentParameter } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class CellInstanceVersionEdaConnection { @@ -2160,7 +2162,7 @@ public partial class CellInstanceVersionEdaConnection private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public long Id { @@ -2169,7 +2171,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public int CheckInterval { get => this.checkIntervalField; @@ -2177,7 +2179,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public int ConnectionTimeout { get => this.connectionTimeoutField; @@ -2185,7 +2187,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA", IsNullable = true)] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA", IsNullable = true)] public object EdaClientProxyFactoryProviderName { get => this.edaClientProxyFactoryProviderNameField; @@ -2193,7 +2195,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public long MaxLostPings { get => this.maxLostPingsField; @@ -2201,7 +2203,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public string PortName { get => this.portNameField; @@ -2209,7 +2211,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public int PortNumber { get => this.portNumberField; @@ -2217,7 +2219,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public string SSLEnabled { get => this.sSLEnabledField; @@ -2225,7 +2227,7 @@ public partial class CellInstanceVersionEdaConnection } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -2234,9 +2236,9 @@ public partial class CellInstanceVersionEdaConnection } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class CellInstanceVersionParentInstance { @@ -2272,7 +2274,7 @@ public partial class CellInstanceVersionParentInstance } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object CurrentHost { get => this.currentHostField; @@ -2287,7 +2289,7 @@ public partial class CellInstanceVersionParentInstance } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object Info { get => this.infoField; @@ -2309,7 +2311,7 @@ public partial class CellInstanceVersionParentInstance } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object StartTime { get => this.startTimeField; @@ -2324,7 +2326,7 @@ public partial class CellInstanceVersionParentInstance } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object StopTime { get => this.stopTimeField; @@ -2339,7 +2341,7 @@ public partial class CellInstanceVersionParentInstance } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object TargetHost { get => this.targetHostField; @@ -2347,7 +2349,7 @@ public partial class CellInstanceVersionParentInstance } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -2356,9 +2358,9 @@ public partial class CellInstanceVersionParentInstance } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class CellInstanceVersionEdaTraceHandling { @@ -2373,7 +2375,7 @@ public partial class CellInstanceVersionEdaTraceHandling private TraceSourcePrimaryPrioritiesConnection[] traceSourcePrimaryPrioritiesField; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public long MaxParameterCollectionTimeDelta { get => this.maxParameterCollectionTimeDeltaField; @@ -2381,7 +2383,7 @@ public partial class CellInstanceVersionEdaTraceHandling } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA", IsNullable = true)] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA", IsNullable = true)] public object MergeStrategyClass { get => this.mergeStrategyClassField; @@ -2389,7 +2391,7 @@ public partial class CellInstanceVersionEdaTraceHandling } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public object MergeStrategyParameters { get => this.mergeStrategyParametersField; @@ -2397,7 +2399,7 @@ public partial class CellInstanceVersionEdaTraceHandling } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public long TraceCleanupDaemonInterval { get => this.traceCleanupDaemonIntervalField; @@ -2405,8 +2407,8 @@ public partial class CellInstanceVersionEdaTraceHandling } /// - [System.Xml.Serialization.XmlArrayAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] - [System.Xml.Serialization.XmlArrayItemAttribute("Connection", IsNullable = false)] + [System.Xml.Serialization.XmlArray(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] + [System.Xml.Serialization.XmlArrayItem("Connection", IsNullable = false)] public TraceSourcePrimaryPrioritiesConnection[] TraceSourcePrimaryPriorities { get => this.traceSourcePrimaryPrioritiesField; @@ -2415,9 +2417,9 @@ public partial class CellInstanceVersionEdaTraceHandling } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] public partial class TraceSourcePrimaryPrioritiesConnection { @@ -2506,7 +2508,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection private string i___typeField; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public long Id { @@ -2515,7 +2517,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public object EquipmentDictionaries { @@ -2524,7 +2526,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public EquipmentType EquipmentType { @@ -2533,7 +2535,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] public string Name { @@ -2542,7 +2544,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string AlternateTargetFolder { @@ -2551,7 +2553,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ConnectionRetryInterval { @@ -2560,7 +2562,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public ConnectionSettings ConnectionSettings { @@ -2569,7 +2571,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool CopySourceFolderStructure { @@ -2578,7 +2580,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string DefaultPlaceHolderValue { @@ -2587,7 +2589,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool DeleteEmptySourceSubFolders { @@ -2596,7 +2598,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorPostProcessingMode { @@ -2605,7 +2607,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorTargetFileLocation { @@ -2614,7 +2616,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ErrorTargetFileName { @@ -2623,7 +2625,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileAgeFilterMode { @@ -2632,7 +2634,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileAgeThreshold { @@ -2641,7 +2643,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long FileHandleTimeout { @@ -2650,7 +2652,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long FileHandleWaitTime { @@ -2659,7 +2661,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public int FileScanningIntervalInSeconds { @@ -2668,7 +2670,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string FileScanningOption { @@ -2677,7 +2679,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public int IdleEventWaitTimeInSeconds { @@ -2686,7 +2688,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string IfFileExistAction { @@ -2695,7 +2697,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string IfPostProcessingFailsAction { @@ -2704,7 +2706,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool IncludeSubDirectories { @@ -2713,7 +2715,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string PostProcessingMode { @@ -2722,7 +2724,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long PostProcessingRetries { @@ -2731,7 +2733,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string PreProcessingMode { @@ -2740,7 +2742,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SkipSearchDirectoryNames { @@ -2749,7 +2751,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SourceFileFilter { @@ -2758,7 +2760,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string SourceFileLocation { @@ -2767,7 +2769,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string TargetFileLocation { @@ -2776,7 +2778,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string TargetFileName { @@ -2785,7 +2787,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool TriggerOnChanged { @@ -2794,7 +2796,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool TriggerOnCreated { @@ -2803,7 +2805,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public bool UseZip64Mode { @@ -2812,7 +2814,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipErrorTargetFileName { @@ -2821,7 +2823,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileAmount { @@ -2830,7 +2832,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileSubFolderLevel { @@ -2839,7 +2841,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public long ZipFileTime { @@ -2848,7 +2850,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipMode { @@ -2857,7 +2859,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] public string ZipTargetFileName { @@ -2866,7 +2868,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -2874,7 +2876,7 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// - [System.Xml.Serialization.XmlAttributeAttribute()] + [System.Xml.Serialization.XmlAttribute()] public string i___type { get => this.i___typeField; @@ -2883,11 +2885,11 @@ public partial class TraceSourcePrimaryPrioritiesConnection } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances", IsNullable = false)] public partial class EquipmentType { @@ -2901,7 +2903,7 @@ public partial class EquipmentType private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public long Id { get => this.idField; @@ -2909,7 +2911,7 @@ public partial class EquipmentType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Name { get => this.nameField; @@ -2917,7 +2919,7 @@ public partial class EquipmentType } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public string Version { get => this.versionField; @@ -2925,7 +2927,7 @@ public partial class EquipmentType } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -2934,11 +2936,11 @@ public partial class EquipmentType } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities", IsNullable = false)] public partial class Extensions { @@ -2946,7 +2948,7 @@ public partial class Extensions private ExtensionsVersionExtension[] versionExtensionField; /// - [System.Xml.Serialization.XmlElementAttribute("VersionExtension")] + [System.Xml.Serialization.XmlElement("VersionExtension")] public ExtensionsVersionExtension[] VersionExtension { get => this.versionExtensionField; @@ -2955,11 +2957,11 @@ public partial class Extensions } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities.CellInstances", IsNullable = false)] public partial class Components { @@ -2967,7 +2969,7 @@ public partial class Components private ComponentsCellComponent[] cellComponentField; /// - [System.Xml.Serialization.XmlElementAttribute("CellComponent")] + [System.Xml.Serialization.XmlElement("CellComponent")] public ComponentsCellComponent[] CellComponent { get => this.cellComponentField; @@ -2976,17 +2978,17 @@ public partial class Components } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA", IsNullable = false)] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA")] +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.EDA", IsNullable = false)] public partial class TraceSourcePrimaryPriorities { private TraceSourcePrimaryPrioritiesConnection[] connectionField; /// - [System.Xml.Serialization.XmlElementAttribute("Connection")] + [System.Xml.Serialization.XmlElement("Connection")] public TraceSourcePrimaryPrioritiesConnection[] Connection { get => this.connectionField; @@ -2995,11 +2997,11 @@ public partial class TraceSourcePrimaryPriorities } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.CellInstances", IsNullable = false)] public partial class ConnectionSettings { @@ -3009,7 +3011,7 @@ public partial class ConnectionSettings private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Setting", Namespace = "http://schemas.datacontract.org/2004/07/Ifx.ManagementInterfaceIfx.Common.Connect" + + [System.Xml.Serialization.XmlElement("Setting", Namespace = "http://schemas.datacontract.org/2004/07/Ifx.ManagementInterfaceIfx.Common.Connect" + "ionSettings")] public Setting[] Setting { @@ -3018,7 +3020,7 @@ public partial class ConnectionSettings } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -3027,11 +3029,11 @@ public partial class ConnectionSettings } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Ifx.ManagementInterfaceIfx.Common.Connect" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Ifx.ManagementInterfaceIfx.Common.Connect" + "ionSettings")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Ifx.ManagementInterfaceIfx.Common.Connect" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Ifx.ManagementInterfaceIfx.Common.Connect" + "ionSettings", IsNullable = false)] public partial class Setting { diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs index 40e7492..6fe43f6 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; [XmlRoot(ElementName = "ChildBackboneMembers", Namespace = "http://schemas.datacontract.org/2004/07/EafManagement.Configuration.Services")] public class ChildBackboneMembers diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs index e54c13c..040401c 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs @@ -1,12 +1,14 @@ -namespace Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; +using System; + +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; // NOTE: Generated code may require at least .NET Framework 4.5 or .NET Core/Standard 2.0. /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization", IsNullable = false)] public partial class EquipmentDictionaryVersion { @@ -17,7 +19,7 @@ public partial class EquipmentDictionaryVersion private string createdByField; - private System.DateTime creationDateField; + private DateTime creationDateField; private EquipmentDictionaryVersionDataItems dataItemsField; @@ -29,7 +31,7 @@ public partial class EquipmentDictionaryVersion private EquipmentDictionaryVersionEvents eventsField; - private System.DateTime freezeDateField; + private DateTime freezeDateField; private object frozenByField; @@ -43,7 +45,7 @@ public partial class EquipmentDictionaryVersion private EquipmentDictionaryVersionReports reportsField; - private System.DateTime retireDateField; + private DateTime retireDateField; private object retiredByField; @@ -68,7 +70,7 @@ public partial class EquipmentDictionaryVersion } /// - public System.DateTime CreationDate + public DateTime CreationDate { get => this.creationDateField; set => this.creationDateField = value; @@ -110,7 +112,7 @@ public partial class EquipmentDictionaryVersion } /// - public System.DateTime FreezeDate + public DateTime FreezeDate { get => this.freezeDateField; set => this.freezeDateField = value; @@ -159,7 +161,7 @@ public partial class EquipmentDictionaryVersion } /// - public System.DateTime RetireDate + public DateTime RetireDate { get => this.retireDateField; set => this.retireDateField = value; @@ -187,7 +189,7 @@ public partial class EquipmentDictionaryVersion } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -196,9 +198,9 @@ public partial class EquipmentDictionaryVersion } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionAlarms { @@ -208,7 +210,7 @@ public partial class EquipmentDictionaryVersionAlarms private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Alarm")] + [System.Xml.Serialization.XmlElement("Alarm")] public EquipmentDictionaryVersionAlarmsAlarm[] Alarm { get => this.alarmField; @@ -216,7 +218,7 @@ public partial class EquipmentDictionaryVersionAlarms } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -225,9 +227,9 @@ public partial class EquipmentDictionaryVersionAlarms } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionAlarmsAlarm { @@ -281,7 +283,7 @@ public partial class EquipmentDictionaryVersionAlarmsAlarm } /// - [System.Xml.Serialization.XmlIgnoreAttribute()] + [System.Xml.Serialization.XmlIgnore()] public bool IsVirtualSpecified { get => this.isVirtualFieldSpecified; @@ -317,7 +319,7 @@ public partial class EquipmentDictionaryVersionAlarmsAlarm } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -326,9 +328,9 @@ public partial class EquipmentDictionaryVersionAlarmsAlarm } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionDataItems { @@ -338,7 +340,7 @@ public partial class EquipmentDictionaryVersionDataItems private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Item")] + [System.Xml.Serialization.XmlElement("Item")] public EquipmentDictionaryVersionDataItemsItem[] Item { get => this.itemField; @@ -346,7 +348,7 @@ public partial class EquipmentDictionaryVersionDataItems } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -355,9 +357,9 @@ public partial class EquipmentDictionaryVersionDataItems } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionDataItemsItem { @@ -428,7 +430,7 @@ public partial class EquipmentDictionaryVersionDataItemsItem } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -437,9 +439,9 @@ public partial class EquipmentDictionaryVersionDataItemsItem } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionEquipmentSettings { @@ -449,7 +451,7 @@ public partial class EquipmentDictionaryVersionEquipmentSettings private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Setting")] + [System.Xml.Serialization.XmlElement("Setting")] public EquipmentDictionaryVersionEquipmentSettingsSetting[] Setting { get => this.settingField; @@ -457,7 +459,7 @@ public partial class EquipmentDictionaryVersionEquipmentSettings } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -466,9 +468,9 @@ public partial class EquipmentDictionaryVersionEquipmentSettings } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionEquipmentSettingsSetting { @@ -490,7 +492,7 @@ public partial class EquipmentDictionaryVersionEquipmentSettingsSetting private string idField; /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object Context { get => this.contextField; @@ -540,7 +542,7 @@ public partial class EquipmentDictionaryVersionEquipmentSettingsSetting } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -549,9 +551,9 @@ public partial class EquipmentDictionaryVersionEquipmentSettingsSetting } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionEvents { @@ -561,7 +563,7 @@ public partial class EquipmentDictionaryVersionEvents private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Event")] + [System.Xml.Serialization.XmlElement("Event")] public EquipmentDictionaryVersionEventsEvent[] Event { get => this.eventField; @@ -569,7 +571,7 @@ public partial class EquipmentDictionaryVersionEvents } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -578,9 +580,9 @@ public partial class EquipmentDictionaryVersionEvents } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionEventsEvent { @@ -651,7 +653,7 @@ public partial class EquipmentDictionaryVersionEventsEvent } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -660,9 +662,9 @@ public partial class EquipmentDictionaryVersionEventsEvent } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionEventsEventValidDataItems { @@ -670,7 +672,7 @@ public partial class EquipmentDictionaryVersionEventsEventValidDataItems private string idField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -679,9 +681,9 @@ public partial class EquipmentDictionaryVersionEventsEventValidDataItems } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypes { @@ -691,7 +693,7 @@ public partial class EquipmentDictionaryVersionObjectTypes private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Type")] + [System.Xml.Serialization.XmlElement("Type")] public EquipmentDictionaryVersionObjectTypesType[] Type { get => this.typeField; @@ -699,7 +701,7 @@ public partial class EquipmentDictionaryVersionObjectTypes } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -708,9 +710,9 @@ public partial class EquipmentDictionaryVersionObjectTypes } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesType { @@ -737,7 +739,7 @@ public partial class EquipmentDictionaryVersionObjectTypesType } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object BaseType { get => this.baseTypeField; @@ -773,7 +775,7 @@ public partial class EquipmentDictionaryVersionObjectTypesType } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -782,9 +784,9 @@ public partial class EquipmentDictionaryVersionObjectTypesType } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeAlarms { @@ -792,7 +794,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeAlarms private string idField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -801,9 +803,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeAlarms } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeDataItems { @@ -813,7 +815,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItems private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Item")] + [System.Xml.Serialization.XmlElement("Item")] public EquipmentDictionaryVersionObjectTypesTypeDataItemsItem[] Item { get => this.itemField; @@ -821,7 +823,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItems } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -830,9 +832,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItems } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItem { @@ -867,7 +869,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItem } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -876,9 +878,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItem } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquipmentDataItems { @@ -888,7 +890,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquip private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Item")] + [System.Xml.Serialization.XmlElement("Item")] public EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquipmentDataItemsItem[] Item { get => this.itemField; @@ -896,7 +898,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquip } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -905,9 +907,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquip } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquipmentDataItemsItem { @@ -915,7 +917,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquip private string refField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Ref { get => this.refField; @@ -924,9 +926,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeDataItemsItemEquip } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeEvents { @@ -936,7 +938,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEvents private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Event")] + [System.Xml.Serialization.XmlElement("Event")] public EquipmentDictionaryVersionObjectTypesTypeEventsEvent[] Event { get => this.eventField; @@ -944,7 +946,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEvents } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -953,9 +955,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEvents } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEvent { @@ -990,7 +992,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEvent } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -999,9 +1001,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEvent } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEventEquipmentEvents { @@ -1018,7 +1020,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEventEquipme } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -1027,9 +1029,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEventEquipme } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEventEquipmentEventsEvent { @@ -1037,7 +1039,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEventEquipme private string refField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Ref { get => this.refField; @@ -1046,9 +1048,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeEventsEventEquipme } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionObjectTypesTypeSettings { @@ -1056,7 +1058,7 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeSettings private string idField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -1065,9 +1067,9 @@ public partial class EquipmentDictionaryVersionObjectTypesTypeSettings } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionReports { @@ -1077,7 +1079,7 @@ public partial class EquipmentDictionaryVersionReports private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Report")] + [System.Xml.Serialization.XmlElement("Report")] public EquipmentDictionaryVersionReportsReport[] Report { get => this.reportField; @@ -1085,7 +1087,7 @@ public partial class EquipmentDictionaryVersionReports } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -1094,9 +1096,9 @@ public partial class EquipmentDictionaryVersionReports } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionReportsReport { @@ -1158,7 +1160,7 @@ public partial class EquipmentDictionaryVersionReportsReport } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -1167,9 +1169,9 @@ public partial class EquipmentDictionaryVersionReportsReport } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionReportsReportDataItems { @@ -1179,7 +1181,7 @@ public partial class EquipmentDictionaryVersionReportsReportDataItems private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Item")] + [System.Xml.Serialization.XmlElement("Item")] public EquipmentDictionaryVersionReportsReportDataItemsItem[] Item { get => this.itemField; @@ -1187,7 +1189,7 @@ public partial class EquipmentDictionaryVersionReportsReportDataItems } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -1196,9 +1198,9 @@ public partial class EquipmentDictionaryVersionReportsReportDataItems } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionReportsReportDataItemsItem { @@ -1206,7 +1208,7 @@ public partial class EquipmentDictionaryVersionReportsReportDataItemsItem private string refField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Ref { get => this.refField; @@ -1215,9 +1217,9 @@ public partial class EquipmentDictionaryVersionReportsReportDataItemsItem } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionReportsReportLinkEvents { @@ -1227,7 +1229,7 @@ public partial class EquipmentDictionaryVersionReportsReportLinkEvents private string idField; /// - [System.Xml.Serialization.XmlElementAttribute("Event")] + [System.Xml.Serialization.XmlElement("Event")] public EquipmentDictionaryVersionReportsReportLinkEventsEvent[] Event { get => this.eventField; @@ -1235,7 +1237,7 @@ public partial class EquipmentDictionaryVersionReportsReportLinkEvents } /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -1244,9 +1246,9 @@ public partial class EquipmentDictionaryVersionReportsReportLinkEvents } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionReportsReportLinkEventsEvent { @@ -1254,7 +1256,7 @@ public partial class EquipmentDictionaryVersionReportsReportLinkEventsEvent private string refField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Ref { get => this.refField; @@ -1263,9 +1265,9 @@ public partial class EquipmentDictionaryVersionReportsReportLinkEventsEvent } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionReportsReportPreLinkedEvents { @@ -1273,7 +1275,7 @@ public partial class EquipmentDictionaryVersionReportsReportPreLinkedEvents private string idField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -1282,9 +1284,9 @@ public partial class EquipmentDictionaryVersionReportsReportPreLinkedEvents } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Equipmen" + "tCharacterization")] public partial class EquipmentDictionaryVersionValidityMapDataItemToEvent { diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs index c5efa45..ae223c9 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs @@ -1,11 +1,13 @@ -namespace Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; +using System; + +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; // NOTE: Generated code may require at least .NET Framework 4.5 or .NET Core/Standard 2.0. /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities", IsNullable = false)] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities", IsNullable = false)] public partial class EquipmentTypeVersion { @@ -13,13 +15,13 @@ public partial class EquipmentTypeVersion private string createdByField; - private System.DateTime creationDateField; + private DateTime creationDateField; private object descriptionField; private ExtensionsVersionExtension[] extensionsField; - private System.DateTime freezeDateField; + private DateTime freezeDateField; private string frozenByField; @@ -29,7 +31,7 @@ public partial class EquipmentTypeVersion private bool isRetiredField; - private System.DateTime retireDateField; + private DateTime retireDateField; private object retiredByField; @@ -58,7 +60,7 @@ public partial class EquipmentTypeVersion private string i___typeField; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public string CreatedBy { @@ -67,16 +69,16 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - public System.DateTime CreationDate + public DateTime CreationDate { get => this.creationDateField; set => this.creationDateField = value; } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities", IsNullable = true)] public object Description { @@ -85,9 +87,9 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlArrayAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlArray(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - [System.Xml.Serialization.XmlArrayItemAttribute("VersionExtension", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("VersionExtension", IsNullable = false)] public ExtensionsVersionExtension[] Extensions { get => this.extensionsField; @@ -95,16 +97,16 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - public System.DateTime FreezeDate + public DateTime FreezeDate { get => this.freezeDateField; set => this.freezeDateField = value; } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public string FrozenBy { @@ -113,7 +115,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public byte Id { @@ -122,7 +124,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public bool IsFrozen { @@ -131,7 +133,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public bool IsRetired { @@ -140,16 +142,16 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] - public System.DateTime RetireDate + public DateTime RetireDate { get => this.retireDateField; set => this.retireDateField = value; } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities", IsNullable = true)] public object RetiredBy { @@ -158,7 +160,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlArrayItemAttribute("SelectedDeploymentPackage", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + + [System.Xml.Serialization.XmlArrayItem("SelectedDeploymentPackage", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + "nt", IsNullable = false)] public SelectedDeploymentPackage[] DeploymentPackages { @@ -188,9 +190,9 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlArrayAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlArray(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] - [System.Xml.Serialization.XmlArrayItemAttribute("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlArrayItem("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation", IsNullable = false)] public ParameterizedModelObjectDefinition[] EquipmentComponents { @@ -199,9 +201,9 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlArrayAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlArray(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] - [System.Xml.Serialization.XmlArrayItemAttribute("EventActionSequenceDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlArrayItem("EventActionSequenceDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation", IsNullable = false)] public EventActionSequenceDefinition[] EventActionSequences { @@ -210,7 +212,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] public object FileCommunicatorObjectTypes { @@ -219,7 +221,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] public FileConfiguration FileConfiguration { @@ -228,7 +230,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] public FileHandlerObjectTypes FileHandlerObjectTypes { @@ -237,9 +239,9 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlArrayAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + + [System.Xml.Serialization.XmlArray(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] - [System.Xml.Serialization.XmlArrayItemAttribute("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlArrayItem("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation", IsNullable = false)] public ParameterizedModelObjectDefinition[] TransientEquipmentObjectTypes { @@ -248,7 +250,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -256,7 +258,7 @@ public partial class EquipmentTypeVersion } /// - [System.Xml.Serialization.XmlAttributeAttribute()] + [System.Xml.Serialization.XmlAttribute()] public string i___type { get => this.i___typeField; @@ -265,11 +267,11 @@ public partial class EquipmentTypeVersion } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + "nt")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Deployme" + "nt", IsNullable = false)] public partial class SelectedDeploymentPackage { @@ -303,9 +305,9 @@ public partial class SelectedDeploymentPackage } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] public partial class ExtensionsVersionExtension { @@ -330,7 +332,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + "s")] public string ClassName { @@ -339,7 +341,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + "s", IsNullable = true)] public object Configuration { @@ -348,7 +350,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.Backbone" + "s")] public string Name { @@ -357,7 +359,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -365,7 +367,7 @@ public partial class ExtensionsVersionExtension } /// - [System.Xml.Serialization.XmlAttributeAttribute()] + [System.Xml.Serialization.XmlAttribute()] public string i___type { get => this.i___typeField; @@ -374,9 +376,9 @@ public partial class ExtensionsVersionExtension } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class EquipmentTypeVersionDictionaries { @@ -391,9 +393,9 @@ public partial class EquipmentTypeVersionDictionaries } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class EquipmentTypeVersionDictionariesEquipmentTypeDictionaryReference { @@ -427,7 +429,7 @@ public partial class EquipmentTypeVersionDictionariesEquipmentTypeDictionaryRefe } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -436,9 +438,9 @@ public partial class EquipmentTypeVersionDictionariesEquipmentTypeDictionaryRefe } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.FactoryEntities")] public partial class EquipmentTypeVersionParentType { @@ -463,7 +465,7 @@ public partial class EquipmentTypeVersionParentType } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -472,11 +474,11 @@ public partial class EquipmentTypeVersionParentType } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation", IsNullable = false)] public partial class ParameterizedModelObjectDefinition { @@ -506,7 +508,7 @@ public partial class ParameterizedModelObjectDefinition } /// - [System.Xml.Serialization.XmlArrayItemAttribute("ModelObjectParameterDefinition", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("ModelObjectParameterDefinition", IsNullable = false)] public ParameterizedModelObjectDefinitionModelObjectParameterDefinition[] Parameters { get => this.parametersField; @@ -521,7 +523,7 @@ public partial class ParameterizedModelObjectDefinition } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -530,9 +532,9 @@ public partial class ParameterizedModelObjectDefinition } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public partial class ParameterizedModelObjectDefinitionModelObjectParameterDefinition { @@ -550,7 +552,7 @@ public partial class ParameterizedModelObjectDefinitionModelObjectParameterDefin private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public string EnumType { get => this.enumTypeField; @@ -586,7 +588,7 @@ public partial class ParameterizedModelObjectDefinitionModelObjectParameterDefin } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -595,11 +597,11 @@ public partial class ParameterizedModelObjectDefinitionModelObjectParameterDefin } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation", IsNullable = false)] public partial class EventActionSequenceDefinition { @@ -615,7 +617,7 @@ public partial class EventActionSequenceDefinition private string id1Field; /// - [System.Xml.Serialization.XmlArrayItemAttribute("EventActionParameterDefinition", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("EventActionParameterDefinition", IsNullable = false)] public EventActionSequenceDefinitionEventActionParameterDefinition[] Actions { get => this.actionsField; @@ -644,7 +646,7 @@ public partial class EventActionSequenceDefinition } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -653,11 +655,11 @@ public partial class EventActionSequenceDefinition } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes", IsNullable = false)] public class FileConfiguration { @@ -665,7 +667,7 @@ public class FileConfiguration private string idField; /// - [System.Xml.Serialization.XmlAttributeAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute(Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id { get => this.idField; @@ -674,11 +676,11 @@ public class FileConfiguration } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes", IsNullable = false)] public class FileHandlerObjectTypes { @@ -686,7 +688,7 @@ public class FileHandlerObjectTypes private ParameterizedModelObjectDefinition parameterizedModelObjectDefinitionField; /// - [System.Xml.Serialization.XmlElementAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public ParameterizedModelObjectDefinition ParameterizedModelObjectDefinition { @@ -696,11 +698,11 @@ public class FileHandlerObjectTypes } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.FactoryE" + "ntities", IsNullable = false)] public partial class Extensions { @@ -708,7 +710,7 @@ public partial class Extensions private ExtensionsVersionExtension[] versionExtensionField; /// - [System.Xml.Serialization.XmlElementAttribute("VersionExtension")] + [System.Xml.Serialization.XmlElement("VersionExtension")] public ExtensionsVersionExtension[] VersionExtension { get => this.versionExtensionField; @@ -717,11 +719,11 @@ public partial class Extensions } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes", IsNullable = false)] public partial class EquipmentComponents { @@ -729,7 +731,7 @@ public partial class EquipmentComponents private ParameterizedModelObjectDefinition[] parameterizedModelObjectDefinitionField; /// - [System.Xml.Serialization.XmlElementAttribute("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public ParameterizedModelObjectDefinition[] ParameterizedModelObjectDefinition { @@ -739,11 +741,11 @@ public partial class EquipmentComponents } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes", IsNullable = false)] public partial class EventActionSequences { @@ -751,7 +753,7 @@ public partial class EventActionSequences private EventActionSequenceDefinition[] eventActionSequenceDefinitionField; /// - [System.Xml.Serialization.XmlElementAttribute("EventActionSequenceDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement("EventActionSequenceDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public EventActionSequenceDefinition[] EventActionSequenceDefinition { @@ -761,11 +763,11 @@ public partial class EventActionSequences } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes")] -[System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + +[System.Xml.Serialization.XmlRoot(Namespace = "http://schemas.datacontract.org/2004/07/EafRuntimeIfx.ManagementInterfaceIfx.File" + "Connector.EquipmentTypes", IsNullable = false)] public partial class TransientEquipmentObjectTypes { @@ -773,7 +775,7 @@ public partial class TransientEquipmentObjectTypes private ParameterizedModelObjectDefinition[] parameterizedModelObjectDefinitionField; /// - [System.Xml.Serialization.XmlElementAttribute("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + + [System.Xml.Serialization.XmlElement("ParameterizedModelObjectDefinition", Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public ParameterizedModelObjectDefinition[] ParameterizedModelObjectDefinition { @@ -783,9 +785,9 @@ public partial class TransientEquipmentObjectTypes } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public partial class EventActionSequenceDefinitionEventActionParameterDefinition { @@ -810,7 +812,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object Name { get => this.nameField; @@ -818,7 +820,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// - [System.Xml.Serialization.XmlArrayItemAttribute("ModelObjectParameterDefinition", IsNullable = false)] + [System.Xml.Serialization.XmlArrayItem("ModelObjectParameterDefinition", IsNullable = false)] public EventActionSequenceDefinitionEventActionParameterDefinitionModelObjectParameterDefinition[] Parameters { get => this.parametersField; @@ -840,7 +842,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; @@ -849,9 +851,9 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// -[System.SerializableAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + +[Serializable()] +[System.ComponentModel.DesignerCategory("code")] +[System.Xml.Serialization.XmlType(AnonymousType = true, Namespace = "http://schemas.datacontract.org/2004/07/Eaf.Management.ConfigurationData.CellAuto" + "mation")] public partial class EventActionSequenceDefinitionEventActionParameterDefinitionModelObjectParameterDefinition { @@ -879,7 +881,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition private string id1Field; /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object Category { get => this.categoryField; @@ -887,7 +889,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object Description { get => this.descriptionField; @@ -895,7 +897,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object DisplayName { get => this.displayNameField; @@ -903,7 +905,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// - [System.Xml.Serialization.XmlElementAttribute(IsNullable = true)] + [System.Xml.Serialization.XmlElement(IsNullable = true)] public object EnumType { get => this.enumTypeField; @@ -953,7 +955,7 @@ public partial class EventActionSequenceDefinitionEventActionParameterDefinition } /// - [System.Xml.Serialization.XmlAttributeAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] + [System.Xml.Serialization.XmlAttribute("Id", Form = System.Xml.Schema.XmlSchemaForm.Qualified, Namespace = "http://schemas.microsoft.com/2003/10/Serialization/")] public string Id1 { get => this.id1Field; diff --git a/Adaptation/_Tests/Shared/UnitTesting.cs b/Adaptation/_Tests/Shared/UnitTesting.cs index 161de0c..3477030 100644 --- a/Adaptation/_Tests/Shared/UnitTesting.cs +++ b/Adaptation/_Tests/Shared/UnitTesting.cs @@ -8,7 +8,7 @@ using System.Text; using System.Text.Json; using System.Threading; -namespace Shared; +namespace Adaptation._Tests.Shared; public class UnitTesting { diff --git a/Adaptation/package.json b/Adaptation/package.json index 21ed381..3111665 100644 --- a/Adaptation/package.json +++ b/Adaptation/package.json @@ -1,26 +1,29 @@ { "scripts": { "Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", + "nuget-clear": "dotnet nuget locals all --clear", "build": "dotnet build --runtime win-x64 --self-contained", + "build-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://packagemanagement.eu.infineon.com:4430/api/v2/", + "build-nuget-And-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/", "build-All-Sources": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/ --source https://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json --source http://192.168.0.73:5002/v3/index.json", "dotnet-format": "dotnet format --report .vscode --verbosity detailed --severity warn", - "MSBuild": "\"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\Msbuild\\Current\\Bin\\MSBuild.exe\" /target:Build /restore:True /p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=Debug;TargetFrameworkVersion=v4.8 \"..\\DEP08SIASM.csproj\"", + "MSBuild": "\"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe\" /target:Build /restore:True /p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=Debug;TargetFrameworkVersion=v4.8 ../DEP08SIASM.csproj", "pull": "git pull", "garbage-collect": "git gc", - "AT-CreateSelfDescription.Staging.v2_39_2-DEP08SIASM": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_39_2 & ClassName~DEP08SIASM\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AV-CreateSelfDescription.Staging.v2_39_2-R34_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_39_2 & ClassName~R34_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AW-CreateSelfDescription.Staging.v2_39_2-R34": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_39_2 & ClassName~R34\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AX-CreateSelfDescription.Staging.v2_39_2-R36_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_39_2 & ClassName~R36_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AY-CreateSelfDescription.Staging.v2_39_2-R36": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_39_2 & ClassName~R36\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AZ-CreateSelfDescription.Staging.v2_39_2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_39_2\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BA-Extract.Staging.v2_39_2-R34_EQPT-Staging__v2_39_2__R34_EQPT__DownloadJpegFile637812143477007703__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~R34_EQPT & Staging__v2_39_2__R34_EQPT__DownloadJpegFile637812143477007703__Normal\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BB-Extract.Staging.v2_39_2-R34-Staging__v2_39_2__R34__jpeg637812143477007703__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~R34 & Staging__v2_39_2__R34__jpeg637812143477007703__Normal\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BC-Extract.Staging.v2_39_2-R34-Staging__v2_39_2__DEP08SIASM__DEP08SIASM__637825304581476827__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~DEP08SIASM & Staging__v2_39_2__DEP08SIASM__DEP08SIASM__637825304581476827__Normal\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BT-Extract.Staging.v2_39_2-DEP08SIASM": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~DEP08SIASM\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BV-Extract.Staging.v2_39_2-R34_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~R34_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BW-Extract.Staging.v2_39_2-R34": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~R34\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BX-Extract.Staging.v2_39_2-R36_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~R36_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BY-Extract.Staging.v2_39_2-R36": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2 & ClassName~R36\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BZ-Extract.Staging.v2_39_2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_39_2\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")" + "AT-CreateSelfDescription.Staging.v2_43_0-DEP08SIASM": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~DEP08SIASM\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AV-CreateSelfDescription.Staging.v2_43_0-R34_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~R34_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AW-CreateSelfDescription.Staging.v2_43_0-R34": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~R34\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AX-CreateSelfDescription.Staging.v2_43_0-R36_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~R36_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AY-CreateSelfDescription.Staging.v2_43_0-R36": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~R36\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AZ-CreateSelfDescription.Staging.v2_43_0": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_0\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BA-Extract.Staging.v2_43_0-R34_EQPT-Staging__v2_43_0__R34_EQPT__DownloadJpegFile637812143477007703__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~R34_EQPT & Name~Staging__v2_43_0__R34_EQPT__DownloadJpegFile637812143477007703__Normal\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BB-Extract.Staging.v2_43_0-R34-Staging__v2_43_0__R34__jpeg637812143477007703__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~R34 & Name~Staging__v2_43_0__R34__jpeg637812143477007703__Normal\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BC-Extract.Staging.v2_43_0-R34-Staging__v2_43_0__DEP08SIASM__DEP08SIASM__637825304581476827__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~DEP08SIASM & Name~Staging__v2_43_0__DEP08SIASM__DEP08SIASM__637825304581476827__Normal\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BT-Extract.Staging.v2_43_0-DEP08SIASM": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~DEP08SIASM\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BV-Extract.Staging.v2_43_0-R34_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~R34_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BW-Extract.Staging.v2_43_0-R34": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~R34\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BX-Extract.Staging.v2_43_0-R36_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~R36_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BY-Extract.Staging.v2_43_0-R36": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0 & ClassName~R36\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BZ-Extract.Staging.v2_43_0": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_0\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")" } } \ No newline at end of file diff --git a/DEP08SIASM.csproj b/DEP08SIASM.csproj index b63e23c..474870d 100644 --- a/DEP08SIASM.csproj +++ b/DEP08SIASM.csproj @@ -1,158 +1,158 @@  - - - Debug - AnyCPU - {435F7498-2A8A-4D9C-A932-8437C87F7220} - 10.0 - Library - Properties - DEP08SIASM - DEP08SIASM - v4.8 - win-x86 - win-x86 - 512 - - - SAK - SAK - SAK - SAK - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x86 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4.7.0 - - - 2.39.2 - - - 1.6.1 - - - 5.0.1 - - - 4.1.1 - - - + + + Debug + AnyCPU + {435F7498-2A8A-4D9C-A932-8437C87F7220} + 10.0 + Library + Properties + DEP08SIASM + DEP08SIASM + v4.8 + win-x86 + 512 + + + SAK + SAK + SAK + SAK + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + x86 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4.7.0 + + + 2.43.0 + + + 1.6.1 + + + 6.0.3 + + + 4.1.1 + + + \ No newline at end of file diff --git a/FileHandlers/FileRead.cs b/FileHandlers/FileRead.cs index 709d98a..24a7abe 100644 --- a/FileHandlers/FileRead.cs +++ b/FileHandlers/FileRead.cs @@ -37,8 +37,13 @@ public partial class FileRead : FileReaderHandler, ISMTP private FilePathGenerator _FilePathGeneratorForTarget; private readonly List _EquipmentParameters; private static readonly Dictionary> _DummyRuns; + private static readonly Dictionary> _StaticRuns; - static FileRead() => _DummyRuns = new Dictionary>(); + static FileRead() + { + _DummyRuns = new(); + _StaticRuns = new(); + } public FileRead() { @@ -192,7 +197,7 @@ public partial class FileRead : FileReaderHandler, ISMTP FileConnectorConfiguration fileConnectorConfiguration = Mapper.Map(Configuration); string parameterizedModelObjectDefinitionType = methodBase.DeclaringType.FullName; IList modelObjectParameters = Mapper.Map(ConfiguredParameters); - _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _UseCyclicalForDescription, isEAFHosted: true); + _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, isEAFHosted: true); if (_FileRead.IsEvent) AddParameterRangeAndEvent(); } @@ -333,7 +338,7 @@ public partial class FileRead : FileReaderHandler, ISMTP if (modelObjectParameterDefinitionJsonElement.ValueKind != JsonValueKind.Array) throw new Exception(); IList modelObjectParameters = JsonSerializer.Deserialize>(modelObjectParameterDefinitionJsonElement.ToString(), jsonSerializerOptions); - _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _UseCyclicalForDescription, isEAFHosted: false); + _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, isEAFHosted: false); results = _FileRead.ReExtract(); if (results?.Item2 is null) throw new Exception(); diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..2cf0884 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,172 @@ +#!/usr/bin/env groovy +/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */ +import groovy.transform.Field + +@Field String _DDrive = 'D:/' +@Field String _AssemblyName = '...' +@Field String _TargetLocation = '...' +@Field String _GitCommitSeven = '...' +@Field String _GitName = 'DEP08SIASM' +@Field String _TestProjectDirectory = 'Adaptation' +@Field String _AgentStaging = 'mestsa07ec-ecmeseaf' +@Field String _DDriveNet = "${_DDrive}Framework4.8" +@Field String _AgentProduction = 'messa08ec-ecmeseaf' +@Field String _AgentDevelopment = 'mestsa003-mesedasvc' +@Field String _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe' +@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe' + +pipeline { + agent { + label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else' + } + parameters { + string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server') + string(name: 'DEFAULT_FILE_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'messv02ecc1_ec_local' : 'messv02ecc1.ec.local', description: 'Default file server...') + } + stages { + // stage('Git') { + // steps { + // bat(returnStatus: true, script: 'git init') + // bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git') + // bat(returnStatus: true, script: 'git pull origin master') + // } + // } + stage('Setup') { + steps { + script { + _AssemblyName = "${env.JOB_NAME}" + // _GitCommitSeven = '1234567' + _GitCommitSeven = env.GIT_COMMIT.substring(0, 7) + def files = findFiles(glob: '*.csproj') + if (files.length != 1) { + error("Build failed because couldn't find a *.csproj file") + } + echo """ + ${files[0].name} + ${files[0].path} + ${files[0].directory} + ${files[0].length} + ${files[0].lastModified} + """ + _AssemblyName = files[0].name.split('[.]csproj')[0] + _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${env.JENKINS_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}" + } + } + } + stage('Info') { + steps { + echo "_AssemblyName ${_AssemblyName}" // ... + echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11 + echo "DEFAULT_FILE_SERVER ${params.DEFAULT_FILE_SERVER}" // 11 + echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master + echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41 + echo "GIT_SERVER ${params.GIT_SERVER}" // ... + echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git + echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11 + echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/ + echo "JOB_NAME ${env.JOB_NAME}" // ... + echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\... + } + } + // stage('Restore') { + // steps { + // bat(returnStatus: true, script: 'dotnet --info') + // } + // } + stage('Safe storage of app secrets') { + steps { + dir(_TestProjectDirectory) { + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets init') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "BuildNumber" "' + env.BUILD_NUMBER + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "GitCommitSeven" "' + _GitCommitSeven + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "Server" "' + params.DEFAULT_FILE_SERVER + '"') + } + } + } + stage('Core Build') { + steps { + echo "Build number is ${currentBuild.number}" + dir(_TestProjectDirectory) { + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'build --runtime win-x64 --self-contained --verbosity quiet') + } + } + } + // stage('Test') { + // options { + // timeout(time: 10, unit: 'MINUTES') + // } + // steps { + // dir(_TestProjectDirectory) { + // bat('dotnet --info') + // } + // } + // } + stage('Framework Build') { + steps { + echo "Build number is ${currentBuild.number}" + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + + '/target:Restore ' + + '/detailedsummary ' + + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + + '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' + + _AssemblyName + '.csproj') + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + + '/target:Build ' + + '/detailedsummary ' + + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + + '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' + + _AssemblyName + '.csproj') + } + } + stage('Commit Id') { + steps { + dir('bin/Debug') { + writeFile file: "${_AssemblyName}.txt", text: "${env.GIT_COMMIT}-${env.BUILD_NUMBER}-${env.GIT_URL}" + } + } + } + stage('Package') { + steps { + fileOperations([fileZipOperation(folderPath: 'bin/Debug', outputFolderPath: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug")]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*", renameFiles: false, sourceCaptureExpression: '', targetLocation: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug", targetNameExpression: '')]) + } + } + // stage('Force Fail') { + // steps { + // error("Build failed because of this and that..") + // } + // } + stage('Copy Files to: file-share') { + steps { + dir('bin/Debug') { + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.txt", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.dll", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.exe", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*.pdb", renameFiles: false, sourceCaptureExpression: '', targetLocation: _TargetLocation, targetNameExpression: '')]) + } + } + } + } + post { + always { + dir('bin') { + deleteDir() + } + dir('obj') { + deleteDir() + } + dir(_TestProjectDirectory + '/bin') { + deleteDir() + } + dir(_TestProjectDirectory + '/obj') { + deleteDir() + } + cleanWs() + } + } +} diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 2d398ef..f06ac1b 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("2.39.2.0")] -[assembly: AssemblyFileVersion("2.39.2.0")] +[assembly: AssemblyVersion("2.43.0.0")] +[assembly: AssemblyFileVersion("2.43.0.0")]