Skip to content

Commit 6b5175a

Browse files
skanmeraskanmera
committed
Update assemblies and installer version.
1 parent 207e538 commit 6b5175a

File tree

2 files changed

+107
-107
lines changed

2 files changed

+107
-107
lines changed

‎ExcelMerge.Installer/ExcelMerge.Installer.vdproj

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
"Entry"
191191
{
192192
"MsmKey" = "8:_2501FC2CED1E63C91A07C323AA6D2629"
193-
"OwnerKey" = "8:_646065E0029F5E7D46B2CAFEA26ECBBD"
193+
"OwnerKey" = "8:_A095D2F1F950A6CAAE266EE45F153839"
194194
"MsmSig" = "8:_UNDEFINED"
195195
}
196196
"Entry"
@@ -256,7 +256,7 @@
256256
"Entry"
257257
{
258258
"MsmKey" = "8:_42BBF9945B7B46552C9A6FF361F4E5B3"
259-
"OwnerKey" = "8:_49ADC1F6D51D651366C943B1E5A6419A"
259+
"OwnerKey" = "8:_8909B343BA3F01F21DD40010144B9A06"
260260
"MsmSig" = "8:_UNDEFINED"
261261
}
262262
"Entry"
@@ -327,56 +327,50 @@
327327
}
328328
"Entry"
329329
{
330-
"MsmKey" = "8:_49ADC1F6D51D651366C943B1E5A6419A"
330+
"MsmKey" = "8:_4E03B9593D202C31B6844F07F65DC7B6"
331331
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
332332
"MsmSig" = "8:_UNDEFINED"
333333
}
334334
"Entry"
335335
{
336-
"MsmKey" = "8:_4E03B9593D202C31B6844F07F65DC7B6"
337-
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
336+
"MsmKey" = "8:_505C36760E25D615FDB521318AB738BB"
337+
"OwnerKey" = "8:_907EBFBE0D9B47CB9B17B9F92E71C61D"
338338
"MsmSig" = "8:_UNDEFINED"
339339
}
340340
"Entry"
341341
{
342-
"MsmKey" = "8:_511C06C38C0B1DEAF45933118E2F5BAC"
342+
"MsmKey" = "8:_505C36760E25D615FDB521318AB738BB"
343343
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
344344
"MsmSig" = "8:_UNDEFINED"
345345
}
346346
"Entry"
347347
{
348-
"MsmKey" = "8:_511C06C38C0B1DEAF45933118E2F5BAC"
349-
"OwnerKey" = "8:_2D1A10EEB1763AAAA22CFC26E6E0D67E"
348+
"MsmKey" = "8:_505C36760E25D615FDB521318AB738BB"
349+
"OwnerKey" = "8:_8909B343BA3F01F21DD40010144B9A06"
350350
"MsmSig" = "8:_UNDEFINED"
351351
}
352352
"Entry"
353353
{
354-
"MsmKey" = "8:_561104F2877890F39FC33814BA6162E7"
354+
"MsmKey" = "8:_511C06C38C0B1DEAF45933118E2F5BAC"
355355
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
356356
"MsmSig" = "8:_UNDEFINED"
357357
}
358358
"Entry"
359359
{
360-
"MsmKey" = "8:_563536DBCCF44394BDB93E2B9C004FED"
361-
"OwnerKey" = "8:_UNDEFINED"
362-
"MsmSig" = "8:_UNDEFINED"
363-
}
364-
"Entry"
365-
{
366-
"MsmKey" = "8:_56501E7C9D4F50B2886701BD52D38628"
367-
"OwnerKey" = "8:_907EBFBE0D9B47CB9B17B9F92E71C61D"
360+
"MsmKey" = "8:_511C06C38C0B1DEAF45933118E2F5BAC"
361+
"OwnerKey" = "8:_2D1A10EEB1763AAAA22CFC26E6E0D67E"
368362
"MsmSig" = "8:_UNDEFINED"
369363
}
370364
"Entry"
371365
{
372-
"MsmKey" = "8:_56501E7C9D4F50B2886701BD52D38628"
366+
"MsmKey" = "8:_561104F2877890F39FC33814BA6162E7"
373367
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
374368
"MsmSig" = "8:_UNDEFINED"
375369
}
376370
"Entry"
377371
{
378-
"MsmKey" = "8:_56501E7C9D4F50B2886701BD52D38628"
379-
"OwnerKey" = "8:_49ADC1F6D51D651366C943B1E5A6419A"
372+
"MsmKey" = "8:_563536DBCCF44394BDB93E2B9C004FED"
373+
"OwnerKey" = "8:_UNDEFINED"
380374
"MsmSig" = "8:_UNDEFINED"
381375
}
382376
"Entry"
@@ -423,12 +417,6 @@
423417
}
424418
"Entry"
425419
{
426-
"MsmKey" = "8:_646065E0029F5E7D46B2CAFEA26ECBBD"
427-
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
428-
"MsmSig" = "8:_UNDEFINED"
429-
}
430-
"Entry"
431-
{
432420
"MsmKey" = "8:_682F851052D3A607ACCECDDB6885C5D3"
433421
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
434422
"MsmSig" = "8:_UNDEFINED"
@@ -472,7 +460,7 @@
472460
"Entry"
473461
{
474462
"MsmKey" = "8:_76A6FAB1D6ED0ECA44C95666C7EEC1A7"
475-
"OwnerKey" = "8:_49ADC1F6D51D651366C943B1E5A6419A"
463+
"OwnerKey" = "8:_8909B343BA3F01F21DD40010144B9A06"
476464
"MsmSig" = "8:_UNDEFINED"
477465
}
478466
"Entry"
@@ -579,6 +567,12 @@
579567
}
580568
"Entry"
581569
{
570+
"MsmKey" = "8:_8909B343BA3F01F21DD40010144B9A06"
571+
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
572+
"MsmSig" = "8:_UNDEFINED"
573+
}
574+
"Entry"
575+
{
582576
"MsmKey" = "8:_8D4F1B913B8D69B3279ED632895DAA3F"
583577
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
584578
"MsmSig" = "8:_UNDEFINED"
@@ -627,6 +621,12 @@
627621
}
628622
"Entry"
629623
{
624+
"MsmKey" = "8:_A095D2F1F950A6CAAE266EE45F153839"
625+
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
626+
"MsmSig" = "8:_UNDEFINED"
627+
}
628+
"Entry"
629+
{
630630
"MsmKey" = "8:_A57FFC9591026CE9313120C1878979B2"
631631
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
632632
"MsmSig" = "8:_UNDEFINED"
@@ -886,19 +886,19 @@
886886
"Entry"
887887
{
888888
"MsmKey" = "8:_UNDEFINED"
889-
"OwnerKey" = "8:_646065E0029F5E7D46B2CAFEA26ECBBD"
889+
"OwnerKey" = "8:_A095D2F1F950A6CAAE266EE45F153839"
890890
"MsmSig" = "8:_UNDEFINED"
891891
}
892892
"Entry"
893893
{
894894
"MsmKey" = "8:_UNDEFINED"
895-
"OwnerKey" = "8:_49ADC1F6D51D651366C943B1E5A6419A"
895+
"OwnerKey" = "8:_8909B343BA3F01F21DD40010144B9A06"
896896
"MsmSig" = "8:_UNDEFINED"
897897
}
898898
"Entry"
899899
{
900900
"MsmKey" = "8:_UNDEFINED"
901-
"OwnerKey" = "8:_56501E7C9D4F50B2886701BD52D38628"
901+
"OwnerKey" = "8:_505C36760E25D615FDB521318AB738BB"
902902
"MsmSig" = "8:_UNDEFINED"
903903
}
904904
"Entry"
@@ -2530,20 +2530,20 @@
25302530
"IsDependency" = "11:TRUE"
25312531
"IsolateTo" = "8:"
25322532
}
2533-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_49ADC1F6D51D651366C943B1E5A6419A"
2533+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4E03B9593D202C31B6844F07F65DC7B6"
25342534
{
25352535
"AssemblyRegister" = "3:1"
25362536
"AssemblyIsInGAC" = "11:FALSE"
2537-
"AssemblyAsmDisplayName" = "8:ExcelMerge, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
2537+
"AssemblyAsmDisplayName" = "8:System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
25382538
"ScatterAssemblies"
25392539
{
2540-
"_49ADC1F6D51D651366C943B1E5A6419A"
2540+
"_4E03B9593D202C31B6844F07F65DC7B6"
25412541
{
2542-
"Name" = "8:ExcelMerge.dll"
2542+
"Name" = "8:System.ServiceModel.NetTcp.dll"
25432543
"Attributes" = "3:512"
25442544
}
25452545
}
2546-
"SourcePath" = "8:ExcelMerge.dll"
2546+
"SourcePath" = "8:System.ServiceModel.NetTcp.dll"
25472547
"TargetName" = "8:"
25482548
"Tag" = "8:"
25492549
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
@@ -2561,20 +2561,20 @@
25612561
"IsDependency" = "11:TRUE"
25622562
"IsolateTo" = "8:"
25632563
}
2564-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4E03B9593D202C31B6844F07F65DC7B6"
2564+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_505C36760E25D615FDB521318AB738BB"
25652565
{
25662566
"AssemblyRegister" = "3:1"
25672567
"AssemblyIsInGAC" = "11:FALSE"
2568-
"AssemblyAsmDisplayName" = "8:System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
2568+
"AssemblyAsmDisplayName" = "8:NetDiff, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
25692569
"ScatterAssemblies"
25702570
{
2571-
"_4E03B9593D202C31B6844F07F65DC7B6"
2571+
"_505C36760E25D615FDB521318AB738BB"
25722572
{
2573-
"Name" = "8:System.ServiceModel.NetTcp.dll"
2573+
"Name" = "8:NetDiff.dll"
25742574
"Attributes" = "3:512"
25752575
}
25762576
}
2577-
"SourcePath" = "8:System.ServiceModel.NetTcp.dll"
2577+
"SourcePath" = "8:NetDiff.dll"
25782578
"TargetName" = "8:"
25792579
"Tag" = "8:"
25802580
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
@@ -2674,37 +2674,6 @@
26742674
"IsDependency" = "11:FALSE"
26752675
"IsolateTo" = "8:"
26762676
}
2677-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_56501E7C9D4F50B2886701BD52D38628"
2678-
{
2679-
"AssemblyRegister" = "3:1"
2680-
"AssemblyIsInGAC" = "11:FALSE"
2681-
"AssemblyAsmDisplayName" = "8:NetDiff, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
2682-
"ScatterAssemblies"
2683-
{
2684-
"_56501E7C9D4F50B2886701BD52D38628"
2685-
{
2686-
"Name" = "8:NetDiff.dll"
2687-
"Attributes" = "3:512"
2688-
}
2689-
}
2690-
"SourcePath" = "8:NetDiff.dll"
2691-
"TargetName" = "8:"
2692-
"Tag" = "8:"
2693-
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
2694-
"Condition" = "8:"
2695-
"Transitive" = "11:FALSE"
2696-
"Vital" = "11:TRUE"
2697-
"ReadOnly" = "11:FALSE"
2698-
"Hidden" = "11:FALSE"
2699-
"System" = "11:FALSE"
2700-
"Permanent" = "11:FALSE"
2701-
"SharedLegacy" = "11:FALSE"
2702-
"PackageAs" = "3:1"
2703-
"Register" = "3:1"
2704-
"Exclude" = "11:FALSE"
2705-
"IsDependency" = "11:TRUE"
2706-
"IsolateTo" = "8:"
2707-
}
27082677
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5D7DEA2A6F3A54C9DA5345E7470490E4"
27092678
{
27102679
"AssemblyRegister" = "3:1"
@@ -2798,37 +2767,6 @@
27982767
"IsDependency" = "11:TRUE"
27992768
"IsolateTo" = "8:"
28002769
}
2801-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_646065E0029F5E7D46B2CAFEA26ECBBD"
2802-
{
2803-
"AssemblyRegister" = "3:1"
2804-
"AssemblyIsInGAC" = "11:FALSE"
2805-
"AssemblyAsmDisplayName" = "8:FastWpfGrid, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
2806-
"ScatterAssemblies"
2807-
{
2808-
"_646065E0029F5E7D46B2CAFEA26ECBBD"
2809-
{
2810-
"Name" = "8:FastWpfGrid.dll"
2811-
"Attributes" = "3:512"
2812-
}
2813-
}
2814-
"SourcePath" = "8:FastWpfGrid.dll"
2815-
"TargetName" = "8:"
2816-
"Tag" = "8:"
2817-
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
2818-
"Condition" = "8:"
2819-
"Transitive" = "11:FALSE"
2820-
"Vital" = "11:TRUE"
2821-
"ReadOnly" = "11:FALSE"
2822-
"Hidden" = "11:FALSE"
2823-
"System" = "11:FALSE"
2824-
"Permanent" = "11:FALSE"
2825-
"SharedLegacy" = "11:FALSE"
2826-
"PackageAs" = "3:1"
2827-
"Register" = "3:1"
2828-
"Exclude" = "11:FALSE"
2829-
"IsDependency" = "11:TRUE"
2830-
"IsolateTo" = "8:"
2831-
}
28322770
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_682F851052D3A607ACCECDDB6885C5D3"
28332771
{
28342772
"AssemblyRegister" = "3:1"
@@ -3294,6 +3232,37 @@
32943232
"IsDependency" = "11:TRUE"
32953233
"IsolateTo" = "8:"
32963234
}
3235+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8909B343BA3F01F21DD40010144B9A06"
3236+
{
3237+
"AssemblyRegister" = "3:1"
3238+
"AssemblyIsInGAC" = "11:FALSE"
3239+
"AssemblyAsmDisplayName" = "8:ExcelMerge, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
3240+
"ScatterAssemblies"
3241+
{
3242+
"_8909B343BA3F01F21DD40010144B9A06"
3243+
{
3244+
"Name" = "8:ExcelMerge.dll"
3245+
"Attributes" = "3:512"
3246+
}
3247+
}
3248+
"SourcePath" = "8:ExcelMerge.dll"
3249+
"TargetName" = "8:"
3250+
"Tag" = "8:"
3251+
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
3252+
"Condition" = "8:"
3253+
"Transitive" = "11:FALSE"
3254+
"Vital" = "11:TRUE"
3255+
"ReadOnly" = "11:FALSE"
3256+
"Hidden" = "11:FALSE"
3257+
"System" = "11:FALSE"
3258+
"Permanent" = "11:FALSE"
3259+
"SharedLegacy" = "11:FALSE"
3260+
"PackageAs" = "3:1"
3261+
"Register" = "3:1"
3262+
"Exclude" = "11:FALSE"
3263+
"IsDependency" = "11:TRUE"
3264+
"IsolateTo" = "8:"
3265+
}
32973266
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8D4F1B913B8D69B3279ED632895DAA3F"
32983267
{
32993268
"AssemblyRegister" = "3:1"
@@ -3480,6 +3449,37 @@
34803449
"IsDependency" = "11:TRUE"
34813450
"IsolateTo" = "8:"
34823451
}
3452+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A095D2F1F950A6CAAE266EE45F153839"
3453+
{
3454+
"AssemblyRegister" = "3:1"
3455+
"AssemblyIsInGAC" = "11:FALSE"
3456+
"AssemblyAsmDisplayName" = "8:FastWpfGrid, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
3457+
"ScatterAssemblies"
3458+
{
3459+
"_A095D2F1F950A6CAAE266EE45F153839"
3460+
{
3461+
"Name" = "8:FastWpfGrid.dll"
3462+
"Attributes" = "3:512"
3463+
}
3464+
}
3465+
"SourcePath" = "8:FastWpfGrid.dll"
3466+
"TargetName" = "8:"
3467+
"Tag" = "8:"
3468+
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
3469+
"Condition" = "8:"
3470+
"Transitive" = "11:FALSE"
3471+
"Vital" = "11:TRUE"
3472+
"ReadOnly" = "11:FALSE"
3473+
"Hidden" = "11:FALSE"
3474+
"System" = "11:FALSE"
3475+
"Permanent" = "11:FALSE"
3476+
"SharedLegacy" = "11:FALSE"
3477+
"PackageAs" = "3:1"
3478+
"Register" = "3:1"
3479+
"Exclude" = "11:FALSE"
3480+
"IsDependency" = "11:TRUE"
3481+
"IsolateTo" = "8:"
3482+
}
34833483
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A57FFC9591026CE9313120C1878979B2"
34843484
{
34853485
"AssemblyRegister" = "3:1"
@@ -4198,15 +4198,15 @@
41984198
{
41994199
"Name" = "8:Microsoft Visual Studio"
42004200
"ProductName" = "8:ExcelMerge"
4201-
"ProductCode" = "8:{9D6E0C39-20C4-4FBC-8C27-A11CF4E8CD8D}"
4202-
"PackageCode" = "8:{ECBE40E0-86E3-457F-964E-1A689324A492}"
4201+
"ProductCode" = "8:{D0358FA0-F67A-4C20-B394-BC3975D50892}"
4202+
"PackageCode" = "8:{574F7012-988B-4CEF-B978-7DE22ADD9D0F}"
42034203
"UpgradeCode" = "8:{BCE73A99-B5CE-4C2E-A955-2E0922068237}"
42044204
"AspNetVersion" = "8:4.0.30319.0"
42054205
"RestartWWWService" = "11:FALSE"
42064206
"RemovePreviousVersions" = "11:TRUE"
42074207
"DetectNewerInstalledVersion" = "11:TRUE"
42084208
"InstallAllUsers" = "11:FALSE"
4209-
"ProductVersion" = "8:1.2.0"
4209+
"ProductVersion" = "8:1.2.1"
42104210
"Manufacturer" = "8:skanmera"
42114211
"ARPHELPTELEPHONE" = "8:"
42124212
"ARPHELPLINK" = "8:"

‎ExcelMerge/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
3333
// 既定値にすることができます:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.2.0.0")]
36-
[assembly: AssemblyFileVersion("1.2.0.0")]
35+
[assembly: AssemblyVersion("1.2.1.0")]
36+
[assembly: AssemblyFileVersion("1.2.1.0")]

0 commit comments

Comments
 (0)