Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a2ef65a

Browse files
skanmeraskanmera
committedJan 4, 2018
Update installer and assemblies version.
1 parent a4772c6 commit a2ef65a

File tree

2 files changed

+130
-130
lines changed

2 files changed

+130
-130
lines changed
 

‎ExcelMerge.GUI/Properties/AssemblyInfo.cs

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

‎ExcelMerge.Installer/ExcelMerge.Installer.vdproj

Lines changed: 128 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@
8888
"Entry"
8989
{
9090
"MsmKey" = "8:_1151C62D35B8F006FFF7DE160BA66784"
91-
"OwnerKey" = "8:_49784780075C59AA56F994244FB3EFB7"
91+
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
9292
"MsmSig" = "8:_UNDEFINED"
9393
}
9494
"Entry"
9595
{
9696
"MsmKey" = "8:_1151C62D35B8F006FFF7DE160BA66784"
97-
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
97+
"OwnerKey" = "8:_A1AF4561128A1C69623D7C4DFE670B1B"
9898
"MsmSig" = "8:_UNDEFINED"
9999
}
100100
"Entry"
@@ -309,12 +309,6 @@
309309
}
310310
"Entry"
311311
{
312-
"MsmKey" = "8:_49784780075C59AA56F994244FB3EFB7"
313-
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
314-
"MsmSig" = "8:_UNDEFINED"
315-
}
316-
"Entry"
317-
{
318312
"MsmKey" = "8:_4E03B9593D202C31B6844F07F65DC7B6"
319313
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
320314
"MsmSig" = "8:_UNDEFINED"
@@ -381,6 +375,24 @@
381375
}
382376
"Entry"
383377
{
378+
"MsmKey" = "8:_60A920C64D289957316B73B465B1BA00"
379+
"OwnerKey" = "8:_907EBFBE0D9B47CB9B17B9F92E71C61D"
380+
"MsmSig" = "8:_UNDEFINED"
381+
}
382+
"Entry"
383+
{
384+
"MsmKey" = "8:_60A920C64D289957316B73B465B1BA00"
385+
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
386+
"MsmSig" = "8:_UNDEFINED"
387+
}
388+
"Entry"
389+
{
390+
"MsmKey" = "8:_60A920C64D289957316B73B465B1BA00"
391+
"OwnerKey" = "8:_A1AF4561128A1C69623D7C4DFE670B1B"
392+
"MsmSig" = "8:_UNDEFINED"
393+
}
394+
"Entry"
395+
{
384396
"MsmKey" = "8:_61E9AB4D70199CD69392D7A20C6598E6"
385397
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
386398
"MsmSig" = "8:_UNDEFINED"
@@ -454,7 +466,7 @@
454466
"Entry"
455467
{
456468
"MsmKey" = "8:_6CF3F5BFBBBC8ED7F0BBCC7C8A03628A"
457-
"OwnerKey" = "8:_7A05D2F71DE89FC7FE4FA65EF8018466"
469+
"OwnerKey" = "8:_DD1498699C36C412ADB56C50EB06B85E"
458470
"MsmSig" = "8:_UNDEFINED"
459471
}
460472
"Entry"
@@ -477,12 +489,6 @@
477489
}
478490
"Entry"
479491
{
480-
"MsmKey" = "8:_7A05D2F71DE89FC7FE4FA65EF8018466"
481-
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
482-
"MsmSig" = "8:_UNDEFINED"
483-
}
484-
"Entry"
485-
{
486492
"MsmKey" = "8:_7BE2ED3241566DEE18D7F85F6452570E"
487493
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
488494
"MsmSig" = "8:_UNDEFINED"
@@ -567,6 +573,12 @@
567573
}
568574
"Entry"
569575
{
576+
"MsmKey" = "8:_A1AF4561128A1C69623D7C4DFE670B1B"
577+
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
578+
"MsmSig" = "8:_UNDEFINED"
579+
}
580+
"Entry"
581+
{
570582
"MsmKey" = "8:_A57FFC9591026CE9313120C1878979B2"
571583
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
572584
"MsmSig" = "8:_UNDEFINED"
@@ -580,13 +592,13 @@
580592
"Entry"
581593
{
582594
"MsmKey" = "8:_A73B587664BEC52AAE274FD6253E0F12"
583-
"OwnerKey" = "8:_49784780075C59AA56F994244FB3EFB7"
595+
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
584596
"MsmSig" = "8:_UNDEFINED"
585597
}
586598
"Entry"
587599
{
588600
"MsmKey" = "8:_A73B587664BEC52AAE274FD6253E0F12"
589-
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
601+
"OwnerKey" = "8:_A1AF4561128A1C69623D7C4DFE670B1B"
590602
"MsmSig" = "8:_UNDEFINED"
591603
}
592604
"Entry"
@@ -735,30 +747,18 @@
735747
}
736748
"Entry"
737749
{
738-
"MsmKey" = "8:_DC777F5ABEFED40FB0F1B4A7F2101180"
739-
"OwnerKey" = "8:_907EBFBE0D9B47CB9B17B9F92E71C61D"
750+
"MsmKey" = "8:_DC85CA11362B4F3BACBEF92049A26771"
751+
"OwnerKey" = "8:_UNDEFINED"
740752
"MsmSig" = "8:_UNDEFINED"
741753
}
742754
"Entry"
743755
{
744-
"MsmKey" = "8:_DC777F5ABEFED40FB0F1B4A7F2101180"
756+
"MsmKey" = "8:_DD1498699C36C412ADB56C50EB06B85E"
745757
"OwnerKey" = "8:_9B52A74683D24608831CFF5F2DFEB145"
746758
"MsmSig" = "8:_UNDEFINED"
747759
}
748760
"Entry"
749761
{
750-
"MsmKey" = "8:_DC777F5ABEFED40FB0F1B4A7F2101180"
751-
"OwnerKey" = "8:_49784780075C59AA56F994244FB3EFB7"
752-
"MsmSig" = "8:_UNDEFINED"
753-
}
754-
"Entry"
755-
{
756-
"MsmKey" = "8:_DC85CA11362B4F3BACBEF92049A26771"
757-
"OwnerKey" = "8:_UNDEFINED"
758-
"MsmSig" = "8:_UNDEFINED"
759-
}
760-
"Entry"
761-
{
762762
"MsmKey" = "8:_DF0002B1B69646DDC157CD6BD1199ABA"
763763
"OwnerKey" = "8:_1151C62D35B8F006FFF7DE160BA66784"
764764
"MsmSig" = "8:_UNDEFINED"
@@ -886,24 +886,6 @@
886886
"Entry"
887887
{
888888
"MsmKey" = "8:_UNDEFINED"
889-
"OwnerKey" = "8:_7A05D2F71DE89FC7FE4FA65EF8018466"
890-
"MsmSig" = "8:_UNDEFINED"
891-
}
892-
"Entry"
893-
{
894-
"MsmKey" = "8:_UNDEFINED"
895-
"OwnerKey" = "8:_49784780075C59AA56F994244FB3EFB7"
896-
"MsmSig" = "8:_UNDEFINED"
897-
}
898-
"Entry"
899-
{
900-
"MsmKey" = "8:_UNDEFINED"
901-
"OwnerKey" = "8:_DC777F5ABEFED40FB0F1B4A7F2101180"
902-
"MsmSig" = "8:_UNDEFINED"
903-
}
904-
"Entry"
905-
{
906-
"MsmKey" = "8:_UNDEFINED"
907889
"OwnerKey" = "8:_DC85CA11362B4F3BACBEF92049A26771"
908890
"MsmSig" = "8:_UNDEFINED"
909891
}
@@ -1012,6 +994,18 @@
1012994
"Entry"
1013995
{
1014996
"MsmKey" = "8:_UNDEFINED"
997+
"OwnerKey" = "8:_DD1498699C36C412ADB56C50EB06B85E"
998+
"MsmSig" = "8:_UNDEFINED"
999+
}
1000+
"Entry"
1001+
{
1002+
"MsmKey" = "8:_UNDEFINED"
1003+
"OwnerKey" = "8:_A1AF4561128A1C69623D7C4DFE670B1B"
1004+
"MsmSig" = "8:_UNDEFINED"
1005+
}
1006+
"Entry"
1007+
{
1008+
"MsmKey" = "8:_UNDEFINED"
10151009
"OwnerKey" = "8:_6CF3F5BFBBBC8ED7F0BBCC7C8A03628A"
10161010
"MsmSig" = "8:_UNDEFINED"
10171011
}
@@ -1366,6 +1360,12 @@
13661360
"Entry"
13671361
{
13681362
"MsmKey" = "8:_UNDEFINED"
1363+
"OwnerKey" = "8:_60A920C64D289957316B73B465B1BA00"
1364+
"MsmSig" = "8:_UNDEFINED"
1365+
}
1366+
"Entry"
1367+
{
1368+
"MsmKey" = "8:_UNDEFINED"
13691369
"OwnerKey" = "8:_1ECDA8A9059B458DB6AE85651401102E"
13701370
"MsmSig" = "8:_UNDEFINED"
13711371
}
@@ -2406,37 +2406,6 @@
24062406
"IsDependency" = "11:TRUE"
24072407
"IsolateTo" = "8:"
24082408
}
2409-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_49784780075C59AA56F994244FB3EFB7"
2410-
{
2411-
"AssemblyRegister" = "3:1"
2412-
"AssemblyIsInGAC" = "11:FALSE"
2413-
"AssemblyAsmDisplayName" = "8:ExcelMerge, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL"
2414-
"ScatterAssemblies"
2415-
{
2416-
"_49784780075C59AA56F994244FB3EFB7"
2417-
{
2418-
"Name" = "8:ExcelMerge.dll"
2419-
"Attributes" = "3:512"
2420-
}
2421-
}
2422-
"SourcePath" = "8:ExcelMerge.dll"
2423-
"TargetName" = "8:"
2424-
"Tag" = "8:"
2425-
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
2426-
"Condition" = "8:"
2427-
"Transitive" = "11:FALSE"
2428-
"Vital" = "11:TRUE"
2429-
"ReadOnly" = "11:FALSE"
2430-
"Hidden" = "11:FALSE"
2431-
"System" = "11:FALSE"
2432-
"Permanent" = "11:FALSE"
2433-
"SharedLegacy" = "11:FALSE"
2434-
"PackageAs" = "3:1"
2435-
"Register" = "3:1"
2436-
"Exclude" = "11:FALSE"
2437-
"IsDependency" = "11:TRUE"
2438-
"IsolateTo" = "8:"
2439-
}
24402409
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4E03B9593D202C31B6844F07F65DC7B6"
24412410
{
24422411
"AssemblyRegister" = "3:1"
@@ -2674,6 +2643,37 @@
26742643
"IsDependency" = "11:TRUE"
26752644
"IsolateTo" = "8:"
26762645
}
2646+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_60A920C64D289957316B73B465B1BA00"
2647+
{
2648+
"AssemblyRegister" = "3:1"
2649+
"AssemblyIsInGAC" = "11:FALSE"
2650+
"AssemblyAsmDisplayName" = "8:NetDiff, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
2651+
"ScatterAssemblies"
2652+
{
2653+
"_60A920C64D289957316B73B465B1BA00"
2654+
{
2655+
"Name" = "8:NetDiff.dll"
2656+
"Attributes" = "3:512"
2657+
}
2658+
}
2659+
"SourcePath" = "8:NetDiff.dll"
2660+
"TargetName" = "8:"
2661+
"Tag" = "8:"
2662+
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
2663+
"Condition" = "8:"
2664+
"Transitive" = "11:FALSE"
2665+
"Vital" = "11:TRUE"
2666+
"ReadOnly" = "11:FALSE"
2667+
"Hidden" = "11:FALSE"
2668+
"System" = "11:FALSE"
2669+
"Permanent" = "11:FALSE"
2670+
"SharedLegacy" = "11:FALSE"
2671+
"PackageAs" = "3:1"
2672+
"Register" = "3:1"
2673+
"Exclude" = "11:FALSE"
2674+
"IsDependency" = "11:TRUE"
2675+
"IsolateTo" = "8:"
2676+
}
26772677
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_61E9AB4D70199CD69392D7A20C6598E6"
26782678
{
26792679
"AssemblyRegister" = "3:1"
@@ -2891,37 +2891,6 @@
28912891
"IsDependency" = "11:TRUE"
28922892
"IsolateTo" = "8:"
28932893
}
2894-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7A05D2F71DE89FC7FE4FA65EF8018466"
2895-
{
2896-
"AssemblyRegister" = "3:1"
2897-
"AssemblyIsInGAC" = "11:FALSE"
2898-
"AssemblyAsmDisplayName" = "8:FastWpfGrid, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL"
2899-
"ScatterAssemblies"
2900-
{
2901-
"_7A05D2F71DE89FC7FE4FA65EF8018466"
2902-
{
2903-
"Name" = "8:FastWpfGrid.dll"
2904-
"Attributes" = "3:512"
2905-
}
2906-
}
2907-
"SourcePath" = "8:FastWpfGrid.dll"
2908-
"TargetName" = "8:"
2909-
"Tag" = "8:"
2910-
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
2911-
"Condition" = "8:"
2912-
"Transitive" = "11:FALSE"
2913-
"Vital" = "11:TRUE"
2914-
"ReadOnly" = "11:FALSE"
2915-
"Hidden" = "11:FALSE"
2916-
"System" = "11:FALSE"
2917-
"Permanent" = "11:FALSE"
2918-
"SharedLegacy" = "11:FALSE"
2919-
"PackageAs" = "3:1"
2920-
"Register" = "3:1"
2921-
"Exclude" = "11:FALSE"
2922-
"IsDependency" = "11:TRUE"
2923-
"IsolateTo" = "8:"
2924-
}
29252894
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7BE2ED3241566DEE18D7F85F6452570E"
29262895
{
29272896
"AssemblyRegister" = "3:1"
@@ -2957,7 +2926,7 @@
29572926
{
29582927
"AssemblyRegister" = "3:1"
29592928
"AssemblyIsInGAC" = "11:FALSE"
2960-
"AssemblyAsmDisplayName" = "8:ExcelMerge.GUI.resources, Version=1.3.2.0, Culture=ja-JP, processorArchitecture=MSIL"
2929+
"AssemblyAsmDisplayName" = "8:ExcelMerge.GUI.resources, Version=1.3.3.0, Culture=ja-JP, processorArchitecture=MSIL"
29612930
"ScatterAssemblies"
29622931
{
29632932
"_7EECB1668C9D438BB788A7955D591C2A"
@@ -3294,6 +3263,37 @@
32943263
"IsDependency" = "11:TRUE"
32953264
"IsolateTo" = "8:"
32963265
}
3266+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A1AF4561128A1C69623D7C4DFE670B1B"
3267+
{
3268+
"AssemblyRegister" = "3:1"
3269+
"AssemblyIsInGAC" = "11:FALSE"
3270+
"AssemblyAsmDisplayName" = "8:ExcelMerge, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL"
3271+
"ScatterAssemblies"
3272+
{
3273+
"_A1AF4561128A1C69623D7C4DFE670B1B"
3274+
{
3275+
"Name" = "8:ExcelMerge.dll"
3276+
"Attributes" = "3:512"
3277+
}
3278+
}
3279+
"SourcePath" = "8:ExcelMerge.dll"
3280+
"TargetName" = "8:"
3281+
"Tag" = "8:"
3282+
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
3283+
"Condition" = "8:"
3284+
"Transitive" = "11:FALSE"
3285+
"Vital" = "11:TRUE"
3286+
"ReadOnly" = "11:FALSE"
3287+
"Hidden" = "11:FALSE"
3288+
"System" = "11:FALSE"
3289+
"Permanent" = "11:FALSE"
3290+
"SharedLegacy" = "11:FALSE"
3291+
"PackageAs" = "3:1"
3292+
"Register" = "3:1"
3293+
"Exclude" = "11:FALSE"
3294+
"IsDependency" = "11:TRUE"
3295+
"IsolateTo" = "8:"
3296+
}
32973297
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A57FFC9591026CE9313120C1878979B2"
32983298
{
32993299
"AssemblyRegister" = "3:1"
@@ -3821,20 +3821,20 @@
38213821
"IsDependency" = "11:TRUE"
38223822
"IsolateTo" = "8:"
38233823
}
3824-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DC777F5ABEFED40FB0F1B4A7F2101180"
3824+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DC85CA11362B4F3BACBEF92049A26771"
38253825
{
38263826
"AssemblyRegister" = "3:1"
38273827
"AssemblyIsInGAC" = "11:FALSE"
3828-
"AssemblyAsmDisplayName" = "8:NetDiff, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
3828+
"AssemblyAsmDisplayName" = "8:ServerRegistrationManager, Version=2.2.0.0, Culture=neutral, PublicKeyToken=68bd4561cc3495fc, processorArchitecture=MSIL"
38293829
"ScatterAssemblies"
38303830
{
3831-
"_DC777F5ABEFED40FB0F1B4A7F2101180"
3831+
"_DC85CA11362B4F3BACBEF92049A26771"
38323832
{
3833-
"Name" = "8:NetDiff.dll"
3833+
"Name" = "8:srm.exe"
38343834
"Attributes" = "3:512"
38353835
}
38363836
}
3837-
"SourcePath" = "8:NetDiff.dll"
3837+
"SourcePath" = "8:srm.exe"
38383838
"TargetName" = "8:"
38393839
"Tag" = "8:"
38403840
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
@@ -3849,23 +3849,23 @@
38493849
"PackageAs" = "3:1"
38503850
"Register" = "3:1"
38513851
"Exclude" = "11:FALSE"
3852-
"IsDependency" = "11:TRUE"
3852+
"IsDependency" = "11:FALSE"
38533853
"IsolateTo" = "8:"
38543854
}
3855-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DC85CA11362B4F3BACBEF92049A26771"
3855+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD1498699C36C412ADB56C50EB06B85E"
38563856
{
38573857
"AssemblyRegister" = "3:1"
38583858
"AssemblyIsInGAC" = "11:FALSE"
3859-
"AssemblyAsmDisplayName" = "8:ServerRegistrationManager, Version=2.2.0.0, Culture=neutral, PublicKeyToken=68bd4561cc3495fc, processorArchitecture=MSIL"
3859+
"AssemblyAsmDisplayName" = "8:FastWpfGrid, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL"
38603860
"ScatterAssemblies"
38613861
{
3862-
"_DC85CA11362B4F3BACBEF92049A26771"
3862+
"_DD1498699C36C412ADB56C50EB06B85E"
38633863
{
3864-
"Name" = "8:srm.exe"
3864+
"Name" = "8:FastWpfGrid.dll"
38653865
"Attributes" = "3:512"
38663866
}
38673867
}
3868-
"SourcePath" = "8:srm.exe"
3868+
"SourcePath" = "8:FastWpfGrid.dll"
38693869
"TargetName" = "8:"
38703870
"Tag" = "8:"
38713871
"Folder" = "8:_D648CFD0AFD3475D8CEEE8E7B3BCCE6F"
@@ -3880,7 +3880,7 @@
38803880
"PackageAs" = "3:1"
38813881
"Register" = "3:1"
38823882
"Exclude" = "11:FALSE"
3883-
"IsDependency" = "11:FALSE"
3883+
"IsDependency" = "11:TRUE"
38843884
"IsolateTo" = "8:"
38853885
}
38863886
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF0002B1B69646DDC157CD6BD1199ABA"
@@ -4198,15 +4198,15 @@
41984198
{
41994199
"Name" = "8:Microsoft Visual Studio"
42004200
"ProductName" = "8:ExcelMerge"
4201-
"ProductCode" = "8:{F8E471D1-88D0-48EF-A62B-20F8477E262C}"
4202-
"PackageCode" = "8:{03F221F8-2CB0-4305-B6FF-05F39BE0A477}"
4201+
"ProductCode" = "8:{F5816B3D-CB8D-43A5-A0EF-AFF858B4F778}"
4202+
"PackageCode" = "8:{F8464514-544E-4D0A-A18E-03F662084A0C}"
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.3.3"
4209+
"ProductVersion" = "8:1.3.4"
42104210
"Manufacturer" = "8:skanmera"
42114211
"ARPHELPTELEPHONE" = "8:"
42124212
"ARPHELPLINK" = "8:"

0 commit comments

Comments
 (0)
Please sign in to comment.