Skip to content

Commit 4585ae4

Browse files
akon47akon47
committed
Include VC++ Redist Merge Module in installer
1 parent 541aa5f commit 4585ae4

File tree

4 files changed

+120
-45
lines changed

4 files changed

+120
-45
lines changed

‎MediaEncoder/MediaEncoder.rc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#undef APSTUDIO_READONLY_SYMBOLS
1414

1515
/////////////////////////////////////////////////////////////////////////////
16-
// �ѱ���(���ѹα�) resources
16+
// Korean (Korea) resources
1717

1818
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)
1919
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
@@ -51,8 +51,8 @@ END
5151
//
5252

5353
VS_VERSION_INFO VERSIONINFO
54-
FILEVERSION 1,0,4,0
55-
PRODUCTVERSION 1,0,4,0
54+
FILEVERSION 1,0,5,0
55+
PRODUCTVERSION 1,0,5,0
5656
FILEFLAGSMASK 0x3fL
5757
#ifdef _DEBUG
5858
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
6767
BEGIN
6868
BLOCK "041204b0"
6969
BEGIN
70-
VALUE "FileVersion", "1.0.4.0"
70+
VALUE "FileVersion", "1.0.5.0"
7171
VALUE "InternalName", "MediaEnc.dll"
7272
VALUE "LegalCopyright", "Copyright (C) 2021"
7373
VALUE "OriginalFilename", "MediaEnc.dll"
7474
VALUE "ProductName", "MediaEncoder"
75-
VALUE "ProductVersion", "1.0.4.0"
75+
VALUE "ProductVersion", "1.0.5.0"
7676
END
7777
END
7878
BLOCK "VarFileInfo"
@@ -81,7 +81,7 @@ BEGIN
8181
END
8282
END
8383

84-
#endif // �ѱ���(���ѹα�) resources
84+
#endif // Korean (Korea) resources
8585
/////////////////////////////////////////////////////////////////////////////
8686

8787

‎ScreenRecorder/App.xaml.cs

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,11 @@ protected override void OnStartup(StartupEventArgs e)
2222
Mutex = new Mutex(true, AppConstants.AppName, out bool isNew);
2323
if (isNew)
2424
{
25-
if (!IsMicrosoftVisualCPlusPlus2019OrNewerAvailable())
26-
{
27-
MessageBox.Show("Please Install \"Microsoft Visual C++ 2019 or newer Redistributable (x64)\"");
28-
Environment.Exit(-2);
29-
}
30-
3125
VideoClockEvent.Start();
3226
AppManager.Instance.Initialize();
3327
AppConfig.Instance.WhenChanged(() =>
3428
{
35-
VideoClockEvent.Framerate = AppConfig.Instance.AdvancedSettings ?
29+
VideoClockEvent.Framerate = AppConfig.Instance.AdvancedSettings ?
3630
AppConfig.Instance.SelectedRecordFrameRate : 60;
3731
},
3832
nameof(AppConfig.SelectedRecordFrameRate),
@@ -62,24 +56,5 @@ protected override void OnExit(ExitEventArgs e)
6256

6357
base.OnExit(e);
6458
}
65-
66-
private bool IsMicrosoftVisualCPlusPlus2019OrNewerAvailable()
67-
{
68-
using (var depRegistryKey = Microsoft.Win32.Registry.ClassesRoot.OpenSubKey(@"Installer\Dependencies", false))
69-
{
70-
foreach (string subKeyName in depRegistryKey.GetSubKeyNames())
71-
{
72-
using (var registryKey = depRegistryKey.OpenSubKey(subKeyName))
73-
{
74-
if (registryKey.GetValue("DisplayName") is string displayName && Regex.IsMatch(displayName, "[cC]\\+\\+.*(?:2019|2022).*[xX]64"))
75-
{
76-
return true;
77-
}
78-
}
79-
}
80-
}
81-
82-
return false;
83-
}
8459
}
8560
}

‎ScreenRecorder/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
5151
// 기본값으로 할 수 있습니다.
5252
// [assembly: AssemblyVersion("1.0.*")]
53-
[assembly: AssemblyVersion("1.1.3.0")]
54-
[assembly: AssemblyFileVersion("1.1.3.0")]
53+
[assembly: AssemblyVersion("1.1.4.0")]
54+
[assembly: AssemblyFileVersion("1.1.4.0")]
5555
[assembly: System.Windows.Media.DisableDpiAwareness]

‎Setup/Setup.vdproj

Lines changed: 111 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
}
4646
"Entry"
4747
{
48+
"MsmKey" = "8:_176BC3484F384D259F573393B25FAEC1"
49+
"OwnerKey" = "8:_UNDEFINED"
50+
"MsmSig" = "8:_UNDEFINED"
51+
}
52+
"Entry"
53+
{
4854
"MsmKey" = "8:_1C7CBE96084EDA5D5B405F1164ACCE14"
4955
"OwnerKey" = "8:_3C6494BFE21840E7A935CA4596E91F15"
5056
"MsmSig" = "8:_UNDEFINED"
@@ -69,6 +75,12 @@
6975
}
7076
"Entry"
7177
{
78+
"MsmKey" = "8:_1F9B57CAFCBE4082BF61416CC3EEDA15"
79+
"OwnerKey" = "8:_UNDEFINED"
80+
"MsmSig" = "8:_UNDEFINED"
81+
}
82+
"Entry"
83+
{
7284
"MsmKey" = "8:_2521A76A87F28B23B43ECE2FA8DBE29B"
7385
"OwnerKey" = "8:_3C6494BFE21840E7A935CA4596E91F15"
7486
"MsmSig" = "8:_UNDEFINED"
@@ -171,6 +183,18 @@
171183
}
172184
"Entry"
173185
{
186+
"MsmKey" = "8:_4F6675E5329849B2A64FBB9C17439C03"
187+
"OwnerKey" = "8:_UNDEFINED"
188+
"MsmSig" = "8:_UNDEFINED"
189+
}
190+
"Entry"
191+
{
192+
"MsmKey" = "8:_5A655FBA845C420E91B417E14EE33834"
193+
"OwnerKey" = "8:_UNDEFINED"
194+
"MsmSig" = "8:_UNDEFINED"
195+
}
196+
"Entry"
197+
{
174198
"MsmKey" = "8:_5EEC94338A9840C583F6582F947A0587"
175199
"OwnerKey" = "8:_UNDEFINED"
176200
"MsmSig" = "8:_UNDEFINED"
@@ -273,6 +297,12 @@
273297
}
274298
"Entry"
275299
{
300+
"MsmKey" = "8:_982F9BEDE1A4481F9913ED1F132074CB"
301+
"OwnerKey" = "8:_UNDEFINED"
302+
"MsmSig" = "8:_UNDEFINED"
303+
}
304+
"Entry"
305+
{
276306
"MsmKey" = "8:_98470FDB4AC2FFA6CFB2592FF6AD17D4"
277307
"OwnerKey" = "8:_3C6494BFE21840E7A935CA4596E91F15"
278308
"MsmSig" = "8:_UNDEFINED"
@@ -376,6 +406,12 @@
376406
"Entry"
377407
{
378408
"MsmKey" = "8:_UNDEFINED"
409+
"OwnerKey" = "8:_1CA83616006F6FF89986A6A496A90EAC"
410+
"MsmSig" = "8:_UNDEFINED"
411+
}
412+
"Entry"
413+
{
414+
"MsmKey" = "8:_UNDEFINED"
379415
"OwnerKey" = "8:_D6F63F37F4661857FC2726DBDCC6282C"
380416
"MsmSig" = "8:_UNDEFINED"
381417
}
@@ -430,12 +466,6 @@
430466
"Entry"
431467
{
432468
"MsmKey" = "8:_UNDEFINED"
433-
"OwnerKey" = "8:_1CA83616006F6FF89986A6A496A90EAC"
434-
"MsmSig" = "8:_UNDEFINED"
435-
}
436-
"Entry"
437-
{
438-
"MsmKey" = "8:_UNDEFINED"
439469
"OwnerKey" = "8:_1C7CBE96084EDA5D5B405F1164ACCE14"
440470
"MsmSig" = "8:_UNDEFINED"
441471
}
@@ -483,7 +513,7 @@
483513
"DisplayName" = "8:Release"
484514
"IsDebugOnly" = "11:FALSE"
485515
"IsReleaseOnly" = "11:TRUE"
486-
"OutputFilename" = "8:..\\bin\\x64\\Release_Setup\\ScreenRecorder_Setup_1.1.3.msi"
516+
"OutputFilename" = "8:..\\bin\\x64\\Release_Setup\\ScreenRecorder_Setup_1.1.4.msi"
487517
"PackageFilesAs" = "3:2"
488518
"PackageFileSize" = "3:-2147483648"
489519
"CabType" = "3:1"
@@ -1527,23 +1557,23 @@
15271557
{
15281558
"Name" = "8:Microsoft Visual Studio"
15291559
"ProductName" = "8:ScreenRecorder"
1530-
"ProductCode" = "8:{98734EC4-1E4E-4548-B435-BBCFCB6F560D}"
1531-
"PackageCode" = "8:{89CD6820-8448-4E83-BFFF-9EBA08A505C5}"
1560+
"ProductCode" = "8:{54929989-659D-4E84-B2A2-4FCE0285888F}"
1561+
"PackageCode" = "8:{1D3594D8-7D3F-4FAA-8D44-FA8B27192640}"
15321562
"UpgradeCode" = "8:{75B87256-B559-4CF6-ABE6-AEF9F61BD36D}"
15331563
"AspNetVersion" = "8:4.0.30319.0"
15341564
"RestartWWWService" = "11:FALSE"
15351565
"RemovePreviousVersions" = "11:TRUE"
15361566
"DetectNewerInstalledVersion" = "11:TRUE"
15371567
"InstallAllUsers" = "11:FALSE"
1538-
"ProductVersion" = "8:1.1.3"
1568+
"ProductVersion" = "8:1.1.4"
15391569
"Manufacturer" = "8:kimhwan"
15401570
"ARPHELPTELEPHONE" = "8:"
15411571
"ARPHELPLINK" = "8:https://github.com/akon47/ScreenRecorder"
15421572
"Title" = "8:ScreenRecorder Setup"
15431573
"Subject" = "8:ScreenRecorder"
15441574
"ARPCONTACT" = "8:kimhwan"
15451575
"Keywords" = "8:"
1546-
"ARPCOMMENTS" = "8:"
1576+
"ARPCOMMENTS" = "8:A simple recording program with the ability to record screens and audio on your computer."
15471577
"ARPURLINFOABOUT" = "8:https://github.com/akon47/ScreenRecorder"
15481578
"ARPPRODUCTICON" = "8:_3C6494BFE21840E7A935CA4596E91F15"
15491579
"ARPIconIndex" = "3:32512"
@@ -2164,6 +2194,76 @@
21642194
}
21652195
"MergeModule"
21662196
{
2197+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_176BC3484F384D259F573393B25FAEC1"
2198+
{
2199+
"UseDynamicProperties" = "11:TRUE"
2200+
"IsDependency" = "11:FALSE"
2201+
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\VC\\Redist\\MSVC\\v142\\MergeModules\\Microsoft_VC142_CXXAMP_x64.msm"
2202+
"Properties"
2203+
{
2204+
}
2205+
"LanguageId" = "3:0"
2206+
"Exclude" = "11:FALSE"
2207+
"Folder" = "8:"
2208+
"Feature" = "8:"
2209+
"IsolateTo" = "8:"
2210+
}
2211+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1F9B57CAFCBE4082BF61416CC3EEDA15"
2212+
{
2213+
"UseDynamicProperties" = "11:TRUE"
2214+
"IsDependency" = "11:FALSE"
2215+
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\VC\\Redist\\MSVC\\v142\\MergeModules\\Microsoft_VC142_OpenMP_x64.msm"
2216+
"Properties"
2217+
{
2218+
}
2219+
"LanguageId" = "3:0"
2220+
"Exclude" = "11:FALSE"
2221+
"Folder" = "8:"
2222+
"Feature" = "8:"
2223+
"IsolateTo" = "8:"
2224+
}
2225+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4F6675E5329849B2A64FBB9C17439C03"
2226+
{
2227+
"UseDynamicProperties" = "11:TRUE"
2228+
"IsDependency" = "11:FALSE"
2229+
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\VC\\Redist\\MSVC\\v142\\MergeModules\\Microsoft_VC142_MFC_x64.msm"
2230+
"Properties"
2231+
{
2232+
}
2233+
"LanguageId" = "3:0"
2234+
"Exclude" = "11:FALSE"
2235+
"Folder" = "8:"
2236+
"Feature" = "8:"
2237+
"IsolateTo" = "8:"
2238+
}
2239+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_5A655FBA845C420E91B417E14EE33834"
2240+
{
2241+
"UseDynamicProperties" = "11:TRUE"
2242+
"IsDependency" = "11:FALSE"
2243+
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\VC\\Redist\\MSVC\\v142\\MergeModules\\Microsoft_VC142_MFCLOC_x64.msm"
2244+
"Properties"
2245+
{
2246+
}
2247+
"LanguageId" = "3:0"
2248+
"Exclude" = "11:FALSE"
2249+
"Folder" = "8:"
2250+
"Feature" = "8:"
2251+
"IsolateTo" = "8:"
2252+
}
2253+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_982F9BEDE1A4481F9913ED1F132074CB"
2254+
{
2255+
"UseDynamicProperties" = "11:TRUE"
2256+
"IsDependency" = "11:FALSE"
2257+
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\VC\\Redist\\MSVC\\v142\\MergeModules\\Microsoft_VC142_CRT_x64.msm"
2258+
"Properties"
2259+
{
2260+
}
2261+
"LanguageId" = "3:0"
2262+
"Exclude" = "11:FALSE"
2263+
"Folder" = "8:"
2264+
"Feature" = "8:"
2265+
"IsolateTo" = "8:"
2266+
}
21672267
}
21682268
"ProjectOutput"
21692269
{

0 commit comments

Comments
 (0)