diff --git a/ButcherFactory.Tools/MainWindow.xaml.cs b/ButcherFactory.Tools/MainWindow.xaml.cs index 2b84eed..6326adc 100644 --- a/ButcherFactory.Tools/MainWindow.xaml.cs +++ b/ButcherFactory.Tools/MainWindow.xaml.cs @@ -27,7 +27,7 @@ namespace ButcherFactory.Tools modeComboBox.Items.Add("MES"); modeComboBox.Items.Add("B3"); modeComboBox.SelectedIndex = AppContext.ConnectInfo.ServerMode; - var list = XmlUtil.DeserializeFromFile>("DbSelectList.xml"); + var list = XmlUtil.DeserializeFromFile>("Config\\DbSelectList.xml"); dbComboBox.SelectedValuePath = "Value"; dbComboBox.DisplayMemberPath = "Name"; dbComboBox.ItemsSource = list; diff --git a/ButcherFactorySolution/ButcherFactorySolution.vdproj b/ButcherFactorySolution/ButcherFactorySolution.vdproj index 6ad39b1..32e1109 100644 --- a/ButcherFactorySolution/ButcherFactorySolution.vdproj +++ b/ButcherFactorySolution/ButcherFactorySolution.vdproj @@ -33,12 +33,6 @@ } "Entry" { - "MsmKey" = "8:_1946798B92364B4EB1315D5EA08BCF2A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_205FCEA99488480A87AEB53DD601C834" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -147,6 +141,12 @@ } "Entry" { + "MsmKey" = "8:_7A952C003008483BBF4EE01C4B8710BD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -207,6 +207,12 @@ } "Entry" { + "MsmKey" = "8:_A47D1F2EDEB9445DAE5C62DE51CC8FAD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B24BD1F54711439BA132ABC05EC82AF6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -273,12 +279,6 @@ } "Entry" { - "MsmKey" = "8:_E161C94B0D1C4AD5A17A65917F64ACEE" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F6C3568789ED47638FCE9494DA24CF51" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -528,26 +528,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1946798B92364B4EB1315D5EA08BCF2A" - { - "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\DbSelectList.xml" - "TargetName" = "8:DbSelectList.xml" - "Tag" = "8:" - "Folder" = "8:_DDF0E5520C37445FBCDCE0D5082C076B" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_205FCEA99488480A87AEB53DD601C834" { "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\SegmentProductionPrint.html" @@ -834,6 +814,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7A952C003008483BBF4EE01C4B8710BD" + { + "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Config\\DbSelectList.xml" + "TargetName" = "8:DbSelectList.xml" + "Tag" = "8:" + "Folder" = "8:_DDF0E5520C37445FBCDCE0D5082C076B" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7C73DC68AEB6485CB5209D5939E2DC1A" { "SourcePath" = "8:..\\ButcherFactory.Login\\images\\login.png" @@ -987,6 +987,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A47D1F2EDEB9445DAE5C62DE51CC8FAD" + { + "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Config\\MESUrl.cfg" + "TargetName" = "8:MESUrl.cfg" + "Tag" = "8:" + "Folder" = "8:_DDF0E5520C37445FBCDCE0D5082C076B" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B24BD1F54711439BA132ABC05EC82AF6" { "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Sounds\\l55.wav" @@ -1171,26 +1191,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E161C94B0D1C4AD5A17A65917F64ACEE" - { - "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\MESUrl.cfg" - "TargetName" = "8:MESUrl.cfg" - "Tag" = "8:" - "Folder" = "8:_DDF0E5520C37445FBCDCE0D5082C076B" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F6C3568789ED47638FCE9494DA24CF51" { "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\SegmentProductionPrintEnd.html" @@ -1917,7 +1917,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7BC73039AAAE423AB1ADC71EDB603430" { - "SourcePath" = "8:..\\ButcherFactory.Login\\obj\\Debug\\ButcherFactory.Login.exe" + "SourcePath" = "8:..\\ButcherFactory.Login\\obj\\Release\\ButcherFactory.Login.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A4535DAA71C54DC088A3FA09FCED8C88"