diff --git a/src/ClassTable Installer/ClassTable Installer.vdproj b/src/ClassTable Installer/ClassTable Installer.vdproj index 123faed..dbd8296 100644 --- a/src/ClassTable Installer/ClassTable Installer.vdproj +++ b/src/ClassTable Installer/ClassTable Installer.vdproj @@ -15,86 +15,80 @@ { "Entry" { - "MsmKey" = "8:_087397A2E98AD52FA154967049128D8D" + "MsmKey" = "8:_15E3E2E883CA9E63C24D12E0CE1FBF08" "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_09AB3045269BF1C1CD69B416F6955176" - "OwnerKey" = "8:_52F948F3FF19AB0B3D6B27F7A1D9B5F8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_09AB3045269BF1C1CD69B416F6955176" + "MsmKey" = "8:_26E60CC3BE74B8B54F5FB049C656707F" "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1FDFE45C043554C8801CB802FE4BE093" - "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" + "MsmKey" = "8:_32C447D273B04A61B090EEA10F8471FC" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_26E60CC3BE74B8B54F5FB049C656707F" - "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" + "MsmKey" = "8:_355685E322F14581B0FDB53F1809C340" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_32C447D273B04A61B090EEA10F8471FC" + "MsmKey" = "8:_783A8960C3A445BA8E9AEE7CB0433965" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_355685E322F14581B0FDB53F1809C340" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7DC298FADF8BEC4EC535F1ED77459055" + "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_52F948F3FF19AB0B3D6B27F7A1D9B5F8" + "MsmKey" = "8:_8B903D9E1BC608E598A13538D6E32C29" "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_783A8960C3A445BA8E9AEE7CB0433965" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_8E84ED407368E710D7BA18FFA61929EB" + "OwnerKey" = "8:_15E3E2E883CA9E63C24D12E0CE1FBF08" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B33EF22FEB9545ACB596FE5A97AD2E93" + "MsmKey" = "8:_8E84ED407368E710D7BA18FFA61929EB" "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E078FE513E1E5D8395481CC006CB5C2C" - "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" + "MsmKey" = "8:_D49738DA795A4B85C13031308D582879" + "OwnerKey" = "8:_15E3E2E883CA9E63C24D12E0CE1FBF08" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC241D4ACA4FC02856527CD4C0C62AE0" - "OwnerKey" = "8:_52F948F3FF19AB0B3D6B27F7A1D9B5F8" + "MsmKey" = "8:_D49738DA795A4B85C13031308D582879" + "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC241D4ACA4FC02856527CD4C0C62AE0" + "MsmKey" = "8:_E078FE513E1E5D8395481CC006CB5C2C" "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E078FE513E1E5D8395481CC006CB5C2C" + "MsmKey" = "8:_F1D01FB7F33F2339D9BA4E87D34F3CE6" + "OwnerKey" = "8:_355685E322F14581B0FDB53F1809C340" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -106,37 +100,37 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B33EF22FEB9545ACB596FE5A97AD2E93" + "OwnerKey" = "8:_8B903D9E1BC608E598A13538D6E32C29" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_087397A2E98AD52FA154967049128D8D" + "OwnerKey" = "8:_F1D01FB7F33F2339D9BA4E87D34F3CE6" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1FDFE45C043554C8801CB802FE4BE093" + "OwnerKey" = "8:_7DC298FADF8BEC4EC535F1ED77459055" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_52F948F3FF19AB0B3D6B27F7A1D9B5F8" + "OwnerKey" = "8:_15E3E2E883CA9E63C24D12E0CE1FBF08" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FC241D4ACA4FC02856527CD4C0C62AE0" + "OwnerKey" = "8:_8E84ED407368E710D7BA18FFA61929EB" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_09AB3045269BF1C1CD69B416F6955176" + "OwnerKey" = "8:_D49738DA795A4B85C13031308D582879" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -145,6 +139,12 @@ "OwnerKey" = "8:_26E60CC3BE74B8B54F5FB049C656707F" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E078FE513E1E5D8395481CC006CB5C2C" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -240,20 +240,20 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_087397A2E98AD52FA154967049128D8D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_15E3E2E883CA9E63C24D12E0CE1FBF08" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:PresentationFramework.Aero2, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_087397A2E98AD52FA154967049128D8D" + "_15E3E2E883CA9E63C24D12E0CE1FBF08" { - "Name" = "8:PresentationFramework.Aero2.dll" + "Name" = "8:ClosedXML.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:PresentationFramework.Aero2.dll" + "SourcePath" = "8:ClosedXML.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" @@ -271,20 +271,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_09AB3045269BF1C1CD69B416F6955176" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_26E60CC3BE74B8B54F5FB049C656707F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:DocumentFormat.OpenXml, Version=2.13.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_09AB3045269BF1C1CD69B416F6955176" + "_26E60CC3BE74B8B54F5FB049C656707F" { - "Name" = "8:DocumentFormat.OpenXml.dll" + "Name" = "8:System.Net.Http.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:DocumentFormat.OpenXml.dll" + "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" @@ -302,52 +302,30 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1FDFE45C043554C8801CB802FE4BE093" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_32C447D273B04A61B090EEA10F8471FC" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_1FDFE45C043554C8801CB802FE4BE093" - { - "Name" = "8:Newtonsoft.Json.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Newtonsoft.Json.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\ClassTable\\TableFile.xlsx" + "TargetName" = "8:TableFile.xlsx" "Tag" = "8:" - "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" + "Folder" = "8:_B7C26A0CA6A342DEAA3CA2EF3670DDCC" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" - "Permanent" = "11:FALSE" + "Permanent" = "11:TRUE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_26E60CC3BE74B8B54F5FB049C656707F" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_783A8960C3A445BA8E9AEE7CB0433965" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_26E60CC3BE74B8B54F5FB049C656707F" - { - "Name" = "8:System.Net.Http.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Net.Http.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\ClassTable\\Resource\\Icons\\TableIcon.ico" + "TargetName" = "8:TableIcon.ico" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" "Condition" = "8:" @@ -361,43 +339,54 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_32C447D273B04A61B090EEA10F8471FC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7DC298FADF8BEC4EC535F1ED77459055" { - "SourcePath" = "8:..\\ClassTable\\TableFile.xlsx" - "TargetName" = "8:TableFile.xlsx" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_7DC298FADF8BEC4EC535F1ED77459055" + { + "Name" = "8:Newtonsoft.Json.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Newtonsoft.Json.dll" + "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_B7C26A0CA6A342DEAA3CA2EF3670DDCC" + "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" - "Permanent" = "11:TRUE" + "Permanent" = "11:FALSE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_52F948F3FF19AB0B3D6B27F7A1D9B5F8" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8B903D9E1BC608E598A13538D6E32C29" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.IO.Packaging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_52F948F3FF19AB0B3D6B27F7A1D9B5F8" + "_8B903D9E1BC608E598A13538D6E32C29" { - "Name" = "8:ClosedXML.dll" + "Name" = "8:System.IO.Packaging.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ClosedXML.dll" + "SourcePath" = "8:System.IO.Packaging.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" @@ -415,10 +404,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_783A8960C3A445BA8E9AEE7CB0433965" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E84ED407368E710D7BA18FFA61929EB" { - "SourcePath" = "8:..\\ClassTable\\Resource\\Icons\\TableIcon.ico" - "TargetName" = "8:TableIcon.ico" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_8E84ED407368E710D7BA18FFA61929EB" + { + "Name" = "8:ExcelNumberFormat.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:ExcelNumberFormat.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" "Condition" = "8:" @@ -432,23 +432,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B33EF22FEB9545ACB596FE5A97AD2E93" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D49738DA795A4B85C13031308D582879" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.IO.Packaging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:DocumentFormat.OpenXml, Version=2.13.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B33EF22FEB9545ACB596FE5A97AD2E93" + "_D49738DA795A4B85C13031308D582879" { - "Name" = "8:System.IO.Packaging.dll" + "Name" = "8:DocumentFormat.OpenXml.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.IO.Packaging.dll" + "SourcePath" = "8:DocumentFormat.OpenXml.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" @@ -497,20 +497,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FC241D4ACA4FC02856527CD4C0C62AE0" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F1D01FB7F33F2339D9BA4E87D34F3CE6" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:PresentationFramework.Aero2, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FC241D4ACA4FC02856527CD4C0C62AE0" + "_F1D01FB7F33F2339D9BA4E87D34F3CE6" { - "Name" = "8:ExcelNumberFormat.dll" + "Name" = "8:PresentationFramework.Aero2.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ExcelNumberFormat.dll" + "SourcePath" = "8:PresentationFramework.Aero2.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" @@ -628,15 +628,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:ClassTable" - "ProductCode" = "8:{B9F6DF18-FD48-43DC-9ED9-918DD8C034AF}" - "PackageCode" = "8:{33C3ADC1-21C7-442C-A4F0-50B6CFC54D6F}" + "ProductCode" = "8:{4F03767F-CB2B-4658-B728-D57F9050D901}" + "PackageCode" = "8:{1845679D-A218-4748-802B-98029C9E752D}" "UpgradeCode" = "8:{F3F2D9FF-E3BA-4640-9AEA-FA305BEA589D}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.7.0" + "ProductVersion" = "8:1.7.1" "Manufacturer" = "8:ATHS Studio" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://MyBlueHorizon.github.io/ClassTable" @@ -1256,7 +1256,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_355685E322F14581B0FDB53F1809C340" { - "SourcePath" = "8:..\\ClassTable\\obj\\Release\\ClassTable.exe" + "SourcePath" = "8:" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_F796734E1F3A46538ED6F6E676F77505" diff --git a/src/ClassTable/My Project/AssemblyInfo.vb b/src/ClassTable/My Project/AssemblyInfo.vb index 42c5fd0..9d0e6ee 100644 --- a/src/ClassTable/My Project/AssemblyInfo.vb +++ b/src/ClassTable/My Project/AssemblyInfo.vb @@ -14,7 +14,7 @@ Imports System.Windows - + @@ -55,5 +55,5 @@ Imports System.Windows '通过使用 "*"，如下所示: ' - - + +