diff --git a/ButcherManage.Install/ButcherManage.Install.vdproj b/ButcherManage.Install/ButcherManage.Install.vdproj index c40a088..7831f09 100644 --- a/ButcherManage.Install/ButcherManage.Install.vdproj +++ b/ButcherManage.Install/ButcherManage.Install.vdproj @@ -21,38 +21,38 @@ } "Entry" { - "MsmKey" = "8:_2A3E85F8471A4F88807B2908CC15C3C1" + "MsmKey" = "8:_20CC678D7E864A76B5A18F0E3DFD4F35" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2BF5AE3EC26D4C389A9F4B4CC9C312FF" + "MsmKey" = "8:_234C6D11A40A484FB6D52A0AB7E19E31" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_312DACC8EE84ACAE70D28F41B8C0D16B" - "OwnerKey" = "8:_2A3E85F8471A4F88807B2908CC15C3C1" + "MsmKey" = "8:_2A3E85F8471A4F88807B2908CC15C3C1" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A1C6AEF5FE125A666A14760B70B82C8" - "OwnerKey" = "8:_EDF750E896A39C8DD89E2B6D8E7203D9" + "MsmKey" = "8:_2BF5AE3EC26D4C389A9F4B4CC9C312FF" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A1C6AEF5FE125A666A14760B70B82C8" - "OwnerKey" = "8:_312DACC8EE84ACAE70D28F41B8C0D16B" + "MsmKey" = "8:_533055EC0AA341AF82E6835194CAC52D" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_5A1C6AEF5FE125A666A14760B70B82C8" - "OwnerKey" = "8:_C7A4AFBFFDED3AC89C6FDE5275B1A673" + "OwnerKey" = "8:_8D4EA636775ADBB82867435965D53B32" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -63,6 +63,12 @@ } "Entry" { + "MsmKey" = "8:_61614740877E40FB84F172F3A04F9AFE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_69ED0D1617334217BD38E4759E2708F9" "OwnerKey" = "8:_AE8C35C8F09B5BC188C1210834642255" "MsmSig" = "8:_UNDEFINED" @@ -99,7 +105,19 @@ } "Entry" { - "MsmKey" = "8:_85793BACF768A05C98AD960E6E7EA78F" + "MsmKey" = "8:_8D4EA636775ADBB82867435965D53B32" + "OwnerKey" = "8:_74E061C838A5494DBDCB63B3378853D9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8D4EA636775ADBB82867435965D53B32" + "OwnerKey" = "8:_2BF5AE3EC26D4C389A9F4B4CC9C312FF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8D4EA636775ADBB82867435965D53B32" "OwnerKey" = "8:_2A3E85F8471A4F88807B2908CC15C3C1" "MsmSig" = "8:_UNDEFINED" } @@ -117,26 +135,20 @@ } "Entry" { - "MsmKey" = "8:_A811531E892E4EA89D3F2AB473AA0955" + "MsmKey" = "8:_A34FC6572796425098C6AF5060C78207" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AE8C35C8F09B5BC188C1210834642255" - "OwnerKey" = "8:_EDF750E896A39C8DD89E2B6D8E7203D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AE8C35C8F09B5BC188C1210834642255" - "OwnerKey" = "8:_312DACC8EE84ACAE70D28F41B8C0D16B" + "MsmKey" = "8:_A811531E892E4EA89D3F2AB473AA0955" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_AE8C35C8F09B5BC188C1210834642255" - "OwnerKey" = "8:_C7A4AFBFFDED3AC89C6FDE5275B1A673" + "OwnerKey" = "8:_8D4EA636775ADBB82867435965D53B32" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -153,14 +165,14 @@ } "Entry" { - "MsmKey" = "8:_C7A4AFBFFDED3AC89C6FDE5275B1A673" - "OwnerKey" = "8:_2BF5AE3EC26D4C389A9F4B4CC9C312FF" + "MsmKey" = "8:_CE3F871AE0E7479A926FA1D61D1D3D04" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EDF750E896A39C8DD89E2B6D8E7203D9" - "OwnerKey" = "8:_74E061C838A5494DBDCB63B3378853D9" + "MsmKey" = "8:_EA65C5D463534F6DABC9B97BCFB1E7BE" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -172,13 +184,7 @@ "Entry" { "MsmKey" = "8:_F1C7F0916944A2448DCC3C56D0908B51" - "OwnerKey" = "8:_312DACC8EE84ACAE70D28F41B8C0D16B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F1C7F0916944A2448DCC3C56D0908B51" - "OwnerKey" = "8:_C7A4AFBFFDED3AC89C6FDE5275B1A673" + "OwnerKey" = "8:_8D4EA636775ADBB82867435965D53B32" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -189,62 +195,44 @@ } "Entry" { - "MsmKey" = "8:_F1C7F0916944A2448DCC3C56D0908B51" - "OwnerKey" = "8:_EDF750E896A39C8DD89E2B6D8E7203D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F212E01AE6240FD28AC5668014EBFAF3" "OwnerKey" = "8:_74E061C838A5494DBDCB63B3378853D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FF6E3C56B18B460A1EA89B2CA0193DED" + "MsmKey" = "8:_F212E01AE6240FD28AC5668014EBFAF3" "OwnerKey" = "8:_2BF5AE3EC26D4C389A9F4B4CC9C312FF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_69ED0D1617334217BD38E4759E2708F9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" + "MsmKey" = "8:_F212E01AE6240FD28AC5668014EBFAF3" "OwnerKey" = "8:_2A3E85F8471A4F88807B2908CC15C3C1" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_85793BACF768A05C98AD960E6E7EA78F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_312DACC8EE84ACAE70D28F41B8C0D16B" + "OwnerKey" = "8:_69ED0D1617334217BD38E4759E2708F9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2BF5AE3EC26D4C389A9F4B4CC9C312FF" + "OwnerKey" = "8:_8D4EA636775ADBB82867435965D53B32" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FF6E3C56B18B460A1EA89B2CA0193DED" + "OwnerKey" = "8:_2A3E85F8471A4F88807B2908CC15C3C1" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C7A4AFBFFDED3AC89C6FDE5275B1A673" + "OwnerKey" = "8:_2BF5AE3EC26D4C389A9F4B4CC9C312FF" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -262,12 +250,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EDF750E896A39C8DD89E2B6D8E7203D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_5A1C6AEF5FE125A666A14760B70B82C8" "MsmSig" = "8:_UNDEFINED" } @@ -344,6 +326,14 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5" + { + "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.5" + } + } } } } @@ -394,6 +384,46 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_20CC678D7E864A76B5A18F0E3DFD4F35" + { + "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\click.wav" + "TargetName" = "8:click.wav" + "Tag" = "8:" + "Folder" = "8:_54D45B3ABA31488BB93FCC0DE2C4549C" + "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}:_234C6D11A40A484FB6D52A0AB7E19E31" + { + "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\error.wav" + "TargetName" = "8:error.wav" + "Tag" = "8:" + "Folder" = "8:_54D45B3ABA31488BB93FCC0DE2C4549C" + "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:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A3E85F8471A4F88807B2908CC15C3C1" { "AssemblyRegister" = "3:1" @@ -456,23 +486,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_312DACC8EE84ACAE70D28F41B8C0D16B" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_533055EC0AA341AF82E6835194CAC52D" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ButcherManage.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_312DACC8EE84ACAE70D28F41B8C0D16B" - { - "Name" = "8:ButcherManage.BO.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:ButcherManage.BO.DLL" - "TargetName" = "8:" + "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\di.wav" + "TargetName" = "8:di.wav" "Tag" = "8:" - "Folder" = "8:_4D4F2E4AC2FD4315BE224043E0B1A0E1" + "Folder" = "8:_54D45B3ABA31488BB93FCC0DE2C4549C" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -484,7 +503,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5A1C6AEF5FE125A666A14760B70B82C8" @@ -518,6 +537,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61614740877E40FB84F172F3A04F9AFE" + { + "SourcePath" = "8:..\\ButcherManage.Login\\bin\\Debug\\Images\\today.png" + "TargetName" = "8:today.png" + "Tag" = "8:" + "Folder" = "8:_77EADBE0B9E04134BCE2F673C0FF0C33" + "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:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_69ED0D1617334217BD38E4759E2708F9" { "AssemblyRegister" = "3:1" @@ -580,20 +619,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_85793BACF768A05C98AD960E6E7EA78F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8D4EA636775ADBB82867435965D53B32" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ButcherManage.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_85793BACF768A05C98AD960E6E7EA78F" + "_8D4EA636775ADBB82867435965D53B32" { - "Name" = "8:WinFormControl.DLL" + "Name" = "8:ButcherManage.BO.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:WinFormControl.DLL" + "SourcePath" = "8:ButcherManage.BO.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_4D4F2E4AC2FD4315BE224043E0B1A0E1" @@ -642,6 +681,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A34FC6572796425098C6AF5060C78207" + { + "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\longSucc.wav" + "TargetName" = "8:longSucc.wav" + "Tag" = "8:" + "Folder" = "8:_54D45B3ABA31488BB93FCC0DE2C4549C" + "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}:_A811531E892E4EA89D3F2AB473AA0955" { "SourcePath" = "8:..\\ButcherManage.Login\\bin\\Debug\\Config\\ServerUrlConfig.xml" @@ -713,23 +772,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C7A4AFBFFDED3AC89C6FDE5275B1A673" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CE3F871AE0E7479A926FA1D61D1D3D04" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ButcherManage.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_C7A4AFBFFDED3AC89C6FDE5275B1A673" - { - "Name" = "8:ButcherManage.BO.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:ButcherManage.BO.DLL" - "TargetName" = "8:" + "SourcePath" = "8:..\\..\\WinFormControl\\WinFormControl\\Sounds\\shotSucc.wav" + "TargetName" = "8:shotSucc.wav" "Tag" = "8:" - "Folder" = "8:_4D4F2E4AC2FD4315BE224043E0B1A0E1" + "Folder" = "8:_54D45B3ABA31488BB93FCC0DE2C4549C" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -741,26 +789,15 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EDF750E896A39C8DD89E2B6D8E7203D9" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EA65C5D463534F6DABC9B97BCFB1E7BE" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ButcherManage.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_EDF750E896A39C8DD89E2B6D8E7203D9" - { - "Name" = "8:ButcherManage.BO.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:ButcherManage.BO.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\ButcherManage.Login\\Images\\login.png" + "TargetName" = "8:login.png" "Tag" = "8:" - "Folder" = "8:_4D4F2E4AC2FD4315BE224043E0B1A0E1" + "Folder" = "8:_77EADBE0B9E04134BCE2F673C0FF0C33" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -772,7 +809,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F1C7F0916944A2448DCC3C56D0908B51" @@ -837,37 +874,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FF6E3C56B18B460A1EA89B2CA0193DED" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_FF6E3C56B18B460A1EA89B2CA0193DED" - { - "Name" = "8:WinFormControl.DLL" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:WinFormControl.DLL" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_4D4F2E4AC2FD4315BE224043E0B1A0E1" - "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:TRUE" - "IsolateTo" = "8:" - } } "FileType" { @@ -991,7 +997,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:青花瓷屠宰场管理" "ProductCode" = "8:{797DF02B-53CC-4040-BB58-8C07D8A948DE}" - "PackageCode" = "8:{024BA567-DFCC-4E04-9883-E1781D794A38}" + "PackageCode" = "8:{9AA449A7-4E2A-4F09-8506-ADBBF3826166}" "UpgradeCode" = "8:{305D5204-187C-42B4-B273-882F99FFC6AF}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" diff --git a/ButcherManage.Login/ButcherManage.Login.csproj b/ButcherManage.Login/ButcherManage.Login.csproj index 4178001..92c2ae4 100644 --- a/ButcherManage.Login/ButcherManage.Login.csproj +++ b/ButcherManage.Login/ButcherManage.Login.csproj @@ -73,29 +73,8 @@ Code - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - Designer @@ -108,6 +87,9 @@ ButcherManage.BO + + +