From e61ecc83e9d697d843b76493c9761f0bb04d218f Mon Sep 17 00:00:00 2001 From: lithium0003 Date: Wed, 22 Feb 2017 08:21:45 +0900 Subject: [PATCH 1/5] Remove unused files --- TSviewACD/FFplay.cs | 160 ------------------------------------- TSviewACD/TSviewACD.csproj | 1 - 2 files changed, 161 deletions(-) delete mode 100644 TSviewACD/FFplay.cs diff --git a/TSviewACD/FFplay.cs b/TSviewACD/FFplay.cs deleted file mode 100644 index 9e03260..0000000 --- a/TSviewACD/FFplay.cs +++ /dev/null @@ -1,160 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace TSviewACD -{ - public class ffplayEOF_CanceledException : OperationCanceledException - { - } - - public class FFplay_process - { - const string exename = "ffplay.exe"; - Process coProcess; - static string commandline; - - public FFplay_process(string options = null) - { - if (!string.IsNullOrEmpty(options)) commandline = options; - commandline = fixArguments(commandline); - - var p = new Process(); - p.StartInfo.FileName = exename; - p.StartInfo.Arguments = commandline; - p.StartInfo.UseShellExecute = false; - p.StartInfo.RedirectStandardInput = true; - p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - - if (p.Start()) coProcess = p; - } - - private string fixArguments(string org_str) - { - // remove newline for combile lines - var str = org_str.Trim().Replace("\r", "").Replace("\n", ""); - // remove exe name - if (str.StartsWith(exename)) str = str.Substring(exename.Length); - if (str.StartsWith(Path.GetFileNameWithoutExtension(exename))) str = str.Substring(Path.GetFileNameWithoutExtension(exename).Length); - - str = " " + str + " "; - // input file must be pipe - if (!str.Contains(" - ") && !str.Contains(" -i pipe:0 ") && !str.Contains(" -i pipe ")) str = " - " + str; - // add autoexit - if (!str.Contains(" -autoexit ")) str += " -autoexit "; - return str.Trim(); - } - - public void Write(byte[] buffer, int index, int count) - { - if (coProcess?.HasExited == false) - { - try - { - coProcess.StandardInput.BaseStream.Write(buffer, index, count); - } - catch (IOException) - { - throw new ffplayEOF_CanceledException(); - } - } - else - { - throw new ffplayEOF_CanceledException(); - } - } - - public async Task Finish(CancellationToken cancellationToken = default(CancellationToken)) - { - if (coProcess == null) return; - if (coProcess.HasExited) return; - coProcess.StandardInput.BaseStream.Flush(); - coProcess.StandardInput.Close(); - while (!coProcess.HasExited) - await Task.Delay(1000, cancellationToken); - } - - public void Kill() - { - if (coProcess == null) return; - if (coProcess.HasExited) return; - coProcess.CloseMainWindow(); - if (coProcess.HasExited) return; - coProcess.Kill(); - while (!coProcess.HasExited) Thread.Sleep(1000); - } - - public void AddExitFunction(EventHandler func) - { - if (coProcess == null) return; - coProcess.Exited += func; - } - } - - public class WriteToFFplayEventArgs : EventArgs - { - public long Position; - } - - public delegate void WriteToFFplayEventHandler(object sender, WriteToFFplayEventArgs e); - - - public class FFplay_Stream : Stream - { - long _Position; - FFplay_process ffplay; - - public FFplay_Stream(FFplay_process FFplay = null) - { - _Position = 0; - ffplay = FFplay ?? new FFplay_process(); - } - - public override long Length { get { throw new NotSupportedException("not supported Length"); } } - public override bool CanRead { get { return false; } } - public override bool CanWrite { get { return true; } } - public override bool CanSeek { get { return false; } } - public override void Flush() { } - - public override long Position - { - get - { - return _Position; - } - set - { - throw new NotSupportedException("not supported SetPosition"); - } - } - - public override int Read(byte[] buffer, int offset, int count) - { - throw new NotSupportedException("not supported Read"); - } - - public override long Seek(long offset, SeekOrigin origin) - { - throw new NotSupportedException("not supported seek"); - } - - public override void SetLength(long value) - { - throw new NotSupportedException("not supported SetLength"); - } - - public override void Write(byte[] buffer, int offset, int count) - { - ffplay.Write(buffer, offset, count); - _Position += (count - offset); - data.Position = _Position; - WriteToFFplayEvent?.Invoke(this, data); - } - - public event WriteToFFplayEventHandler WriteToFFplayEvent; - private WriteToFFplayEventArgs data = new WriteToFFplayEventArgs(); - - } -} diff --git a/TSviewACD/TSviewACD.csproj b/TSviewACD/TSviewACD.csproj index 8522bfd..517e8cd 100644 --- a/TSviewACD/TSviewACD.csproj +++ b/TSviewACD/TSviewACD.csproj @@ -124,7 +124,6 @@ - Form From 3461ea4abd8daea2ea15f399e051c7880224004a Mon Sep 17 00:00:00 2001 From: lithium0003 Date: Wed, 22 Feb 2017 08:46:10 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=89=E3=81=A7=E3=83=88=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E3=83=B3=E3=82=92=E5=8F=96=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TSviewACD/FormLogin.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TSviewACD/FormLogin.cs b/TSviewACD/FormLogin.cs index 44c6d50..99e97fd 100644 --- a/TSviewACD/FormLogin.cs +++ b/TSviewACD/FormLogin.cs @@ -73,11 +73,11 @@ private async void webBrowser1_Navigated(object sender, WebBrowserNavigatedEvent try { var body = webBrowser1.DocumentText; - var i = body.IndexOf('{'); - var j = body.IndexOf('}'); + var i = body.IndexOf("
");
+                    var j = body.IndexOf("
", i); if (i < 0 || j < 0) return; - key = ParseResponse(body.Substring(i, j - i + 1)); + key = ParseResponse(body.Substring(i + 5, j - i - 5)); // Save refresh_token Config.refresh_token = key.refresh_token; Config.Save(); From 84b2151c6a25328d6bfe3aef6ddbd3b0a1e73f7a Mon Sep 17 00:00:00 2001 From: lithium0003 Date: Wed, 22 Feb 2017 21:30:12 +0900 Subject: [PATCH 3/5] =?UTF-8?q?FFmpeg=E3=83=97=E3=83=AC=E3=83=BC=E3=83=A4?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=82=A6=E3=82=A4=E3=83=B3=E3=83=89=E3=82=A6?= =?UTF-8?q?=E3=81=AE=E6=83=85=E5=A0=B1=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=83=97?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=AC=E3=82=B9=E3=83=90=E3=83=BC=E3=82=92?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=20=E5=B7=A6=E3=82=AF=E3=83=AA=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=92=E7=94=BB=E9=9D=A2=E8=A1=A8=E7=A4=BA=E3=81=AE?= =?UTF-8?q?=E5=88=87=E6=9B=BF=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ffmodule/ffmodule.cpp | 21 +++++++++++++++++++-- ffmodule/ffmodule.h | 4 +++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ffmodule/ffmodule.cpp b/ffmodule/ffmodule.cpp index 15a4365..b838fd2 100644 --- a/ffmodule/ffmodule.cpp +++ b/ffmodule/ffmodule.cpp @@ -2352,7 +2352,8 @@ namespace ffmodule { double ns; int hh, mm, ss; int tns, thh, tmm, tss; - tns = (int)(get_duration()); + pos_ratio = get_duration(); + tns = (int)pos_ratio; thh = tns / 3600; tmm = (tns % 3600) / 60; tss = (tns % 60); @@ -2364,6 +2365,7 @@ namespace ffmodule { ns -= video_clock_start / 1000000.0; else if (!isnan(audio_clock_start)) ns -= audio_clock_start / 1000000.0; + pos_ratio = ns / pos_ratio; hh = (int)(ns) / 3600; mm = ((int)(ns) % 3600) / 60; ss = ((int)(ns) % 60); @@ -2377,11 +2379,23 @@ namespace ffmodule { hh, mm, ss, (int)(ns * 1000), thh, tmm, tss, video_delay_to_audio * 1000); } } + SDL_SetRenderDrawColor(screen->renderer.get(), 32, 32, 255, 200); + SDL_SetRenderDrawBlendMode(screen->renderer.get(), SDL_BlendMode::SDL_BLENDMODE_BLEND); + SDL_Rect rect = { 0, screen->GetHight() - 50, screen->GetWidth() * pos_ratio, 50 }; + SDL_RenderFillRect(screen->renderer.get(), &rect); + SDL_SetRenderDrawColor(screen->renderer.get(), 0, 0, 0, 255); + SDL_SetRenderDrawBlendMode(screen->renderer.get(), SDL_BlendMode::SDL_BLENDMODE_NONE); + SDL_Color textColor = { 0, 255, 0, 0 }; std::shared_ptr textSurface(TTF_RenderText_Solid(font.get(), (overlay_text.empty()) ? out_text : overlay_text.c_str(), textColor), &SDL_FreeSurface); std::shared_ptr text(SDL_CreateTextureFromSurface(screen->renderer.get(), textSurface.get()), &SDL_DestroyTexture); int text_width = textSurface->w; int text_height = textSurface->h; + if (text_width > screen->GetWidth() / 2) { + double scale = screen->GetWidth() / 2.0 / text_width; + text_width = (int)(scale * text_width); + text_height = (int)(scale * text_height); + } int x = (screen->GetWidth() - text_width) / 2; int y = screen->GetHight() - 30 - text_height; x -= x % 50; @@ -2972,7 +2986,8 @@ namespace ffmodule { int tns, thh, tmm, tss; int ns, hh, mm, ss; tns = 1; - tns = (int)(get_duration()); + pos_ratio = get_duration(); + tns = (int)(pos_ratio); thh = tns / 3600; tmm = (tns % 3600) / 60; tss = (tns % 60); @@ -2988,6 +3003,7 @@ namespace ffmodule { tmpns -= (int64_t)(get_master_clock_start() / 1000000.0); ns = (int)(tmpns); } + pos_ratio = ns / pos_ratio; hh = ns / 3600; mm = (ns % 3600) / 60; ss = (ns % 60); @@ -3060,6 +3076,7 @@ namespace ffmodule { case SDL_BUTTON_LEFT: if (evnt.button.clicks == 2) parent->ToggleFullscreen(); + parent->display_on = !parent->display_on; break; case SDL_BUTTON_RIGHT: frac = (double)evnt.button.x / parent->screen->GetWidth(); diff --git a/ffmodule/ffmodule.h b/ffmodule/ffmodule.h index 335397a..4158dff 100644 --- a/ffmodule/ffmodule.h +++ b/ffmodule/ffmodule.h @@ -32,7 +32,7 @@ extern "C" { #include -#pragma comment(lib, "SDL2_ttf") +#pragma comment(lib, "SDL2_ttf.lib") #include #include @@ -251,6 +251,8 @@ namespace ffmodule { AV_SYNC_TYPE av_sync_type; double external_clock; /* external clock base */ + double pos_ratio; + bool seek_req; int seek_flags; int64_t seek_pos; From d9d8822f1a32a4902eec016e211901db67f3bfb0 Mon Sep 17 00:00:00 2001 From: lithium0003 Date: Wed, 22 Feb 2017 21:40:37 +0900 Subject: [PATCH 4/5] =?UTF-8?q?FFmpeg=E5=86=8D=E7=94=9F=E3=82=A6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=89=E3=82=A6=E3=81=A7=E3=83=97=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=83=AC=E3=82=B9=E3=83=90=E3=83=BC=E3=81=8C=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8=E3=81=8D?= =?UTF-8?q?=E3=81=AB=E3=80=81=E3=83=97=E3=83=AD=E3=82=B0=E3=83=AC=E3=82=B9?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=81=AE=E9=83=A8=E5=88=86=E3=82=92=E5=B7=A6?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=82=82=E3=81=97=E3=81=8F?= =?UTF-8?q?=E3=81=AF=E5=B7=A6=E3=83=89=E3=83=A9=E3=83=83=E3=82=B0=E3=81=A7?= =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=82=AF=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=20close=20#4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ffmodule/ffmodule.cpp | 12 ++++++++++++ ffmodule/ffmodule.h | 1 + 2 files changed, 13 insertions(+) diff --git a/ffmodule/ffmodule.cpp b/ffmodule/ffmodule.cpp index b838fd2..57cbddc 100644 --- a/ffmodule/ffmodule.cpp +++ b/ffmodule/ffmodule.cpp @@ -3059,6 +3059,11 @@ namespace ffmodule { parent->cursor_hidden = false; } parent->cursor_last_shown = av_gettime(); + if ((evnt.motion.state & SDL_BUTTON_LMASK) && (parent->display_on && evnt.motion.y > parent->screen->GetHight() - 50)) { + frac = (double)evnt.motion.x / parent->screen->GetWidth(); + parent->EventOnSeek(frac, true, false); + return 0; + } if (!(evnt.motion.state & SDL_BUTTON_RMASK)) return 0; if (parent->pFormatCtx->duration < 0) { @@ -3076,6 +3081,13 @@ namespace ffmodule { case SDL_BUTTON_LEFT: if (evnt.button.clicks == 2) parent->ToggleFullscreen(); + else { + if (parent->display_on && evnt.button.y > parent->screen->GetHight() - 50) { + frac = (double)evnt.button.x / parent->screen->GetWidth(); + parent->EventOnSeek(frac, true, true); + break; + } + } parent->display_on = !parent->display_on; break; case SDL_BUTTON_RIGHT: diff --git a/ffmodule/ffmodule.h b/ffmodule/ffmodule.h index 4158dff..26ea554 100644 --- a/ffmodule/ffmodule.h +++ b/ffmodule/ffmodule.h @@ -252,6 +252,7 @@ namespace ffmodule { double external_clock; /* external clock base */ double pos_ratio; + bool left_seek; bool seek_req; int seek_flags; From 3e47b772d83c004e9e176c17beaaed5523c49cc6 Mon Sep 17 00:00:00 2001 From: lithium0003 Date: Wed, 22 Feb 2017 21:59:39 +0900 Subject: [PATCH 5/5] v5.3.1.10222 --- Setup32bit/Setup32bit.vdproj | 103 +++++++++++++-------------- Setup64bit/Setup64bit.vdproj | 30 +++++--- TSviewACD/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/Setup32bit/Setup32bit.vdproj b/Setup32bit/Setup32bit.vdproj index 38f63e4..5b9382a 100644 --- a/Setup32bit/Setup32bit.vdproj +++ b/Setup32bit/Setup32bit.vdproj @@ -33,6 +33,12 @@ } "Entry" { + "MsmKey" = "8:_2C88F0C2CC423A49264726E684D846A0" + "OwnerKey" = "8:_9DA7F93EA8C34345A3A44DD3870C5623" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_3D37825765A54DACA13E7D8F53C8A97C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -129,18 +135,6 @@ } "Entry" { - "MsmKey" = "8:_BDE49949D2368A1FD07754214C697B53" - "OwnerKey" = "8:_9DA7F93EA8C34345A3A44DD3870C5623" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BDE49949D2368A1FD07754214C697B53" - "OwnerKey" = "8:_89199A3CEBA0446A9CEC8D7CA163FC96" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E482C4EEFCBC4DEE875B6EE2725D3410" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -166,25 +160,19 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9338F118CFD54DE90EA348A5383157E4" + "OwnerKey" = "8:_E482C4EEFCBC4DEE875B6EE2725D3410" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BDE49949D2368A1FD07754214C697B53" + "OwnerKey" = "8:_2C88F0C2CC423A49264726E684D846A0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E482C4EEFCBC4DEE875B6EE2725D3410" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_89199A3CEBA0446A9CEC8D7CA163FC96" + "OwnerKey" = "8:_9338F118CFD54DE90EA348A5383157E4" "MsmSig" = "8:_UNDEFINED" } } @@ -352,6 +340,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2C88F0C2CC423A49264726E684D846A0" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:ffmodule_conf, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64" + "ScatterAssemblies" + { + "_2C88F0C2CC423A49264726E684D846A0" + { + "Name" = "8:ffmodule_conf.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:ffmodule_conf.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_893A6354AC8049EF8592B19CE4F2EA43" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D37825765A54DACA13E7D8F53C8A97C" { "SourcePath" = "8:..\\external\\bin32\\LICENSE.SDL2.txt" @@ -499,11 +518,6 @@ "AssemblyAsmDisplayName" = "8:ffmodule, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { - "_89199A3CEBA0446A9CEC8D7CA163FC96" - { - "Name" = "8:ffmodule.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\Release\\ffmodule.dll" "TargetName" = "8:" @@ -570,6 +584,11 @@ "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { + "_9338F118CFD54DE90EA348A5383157E4" + { + "Name" = "8:System.Net.Http.dll" + "Attributes" = "3:512" + } } "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" @@ -669,32 +688,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BDE49949D2368A1FD07754214C697B53" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ffmodule_conf, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64" - "ScatterAssemblies" - { - } - "SourcePath" = "8:ffmodule_conf.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_893A6354AC8049EF8592B19CE4F2EA43" - "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:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC498653D02D487FA18F897303F0B039" { "SourcePath" = "8:..\\external\\bin32\\LICENSE.freetype.txt" @@ -802,15 +795,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:TSviewACD" - "ProductCode" = "8:{1B8CDC89-363A-4B5C-AFFB-5ED309FCC327}" - "PackageCode" = "8:{F557E55D-80ED-4BD7-AFFE-1F77F528177F}" + "ProductCode" = "8:{370544C3-DC60-4386-9098-216E06045523}" + "PackageCode" = "8:{12C29718-6C01-4BDE-9FFB-6C10057F811D}" "UpgradeCode" = "8:{2FB4F2BC-56CA-4C1F-88AE-F17A8AF5B9D2}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:5.3.0" + "ProductVersion" = "8:5.3.1" "Manufacturer" = "8:lithium03" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/Setup64bit/Setup64bit.vdproj b/Setup64bit/Setup64bit.vdproj index bcc635c..f50982f 100644 --- a/Setup64bit/Setup64bit.vdproj +++ b/Setup64bit/Setup64bit.vdproj @@ -51,13 +51,13 @@ } "Entry" { - "MsmKey" = "8:_81A9D0128E1A5163C562043C4B894E9E" + "MsmKey" = "8:_926282CAA5DB6592B7BC07722A70EA4E" "OwnerKey" = "8:_9EF8E958004C4CB4B65E85A6A271BB16" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_81A9D0128E1A5163C562043C4B894E9E" + "MsmKey" = "8:_926282CAA5DB6592B7BC07722A70EA4E" "OwnerKey" = "8:_F2CC19CFEBF44648AEA35821DE165D77" "MsmSig" = "8:_UNDEFINED" } @@ -166,25 +166,25 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EE87D4693607DA830341F2EE0B71A64E" + "OwnerKey" = "8:_F2CC19CFEBF44648AEA35821DE165D77" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_81A9D0128E1A5163C562043C4B894E9E" + "OwnerKey" = "8:_9EF8E958004C4CB4B65E85A6A271BB16" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9EF8E958004C4CB4B65E85A6A271BB16" + "OwnerKey" = "8:_926282CAA5DB6592B7BC07722A70EA4E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F2CC19CFEBF44648AEA35821DE165D77" + "OwnerKey" = "8:_EE87D4693607DA830341F2EE0B71A64E" "MsmSig" = "8:_UNDEFINED" } } @@ -412,13 +412,18 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_81A9D0128E1A5163C562043C4B894E9E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_926282CAA5DB6592B7BC07722A70EA4E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:ffmodule_conf, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64" "ScatterAssemblies" { + "_926282CAA5DB6592B7BC07722A70EA4E" + { + "Name" = "8:ffmodule_conf.dll" + "Attributes" = "3:512" + } } "SourcePath" = "8:ffmodule_conf.dll" "TargetName" = "8:" @@ -665,6 +670,11 @@ "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { + "_EE87D4693607DA830341F2EE0B71A64E" + { + "Name" = "8:System.Net.Http.dll" + "Attributes" = "3:512" + } } "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" @@ -802,15 +812,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:TSviewACD" - "ProductCode" = "8:{3973CBA9-DFA9-4A9F-9EFF-9C2B06B4E52B}" - "PackageCode" = "8:{A64C19C1-9DEC-4DC2-8D3F-C9213CDD5208}" + "ProductCode" = "8:{862FDEFC-AC5C-48F2-A10D-8F1E3F1D7564}" + "PackageCode" = "8:{7CDC45D3-E0A3-4AF1-B824-2E775B76C496}" "UpgradeCode" = "8:{35BB5569-D1AC-4F9A-861C-2B676D50BCC7}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:5.3.0" + "ProductVersion" = "8:5.3.1" "Manufacturer" = "8:lithium03" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/TSviewACD/Properties/AssemblyInfo.cs b/TSviewACD/Properties/AssemblyInfo.cs index da1e7e9..7eba165 100644 --- a/TSviewACD/Properties/AssemblyInfo.cs +++ b/TSviewACD/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.3.0.10218")] +[assembly: AssemblyVersion("5.3.1.10222")] [assembly: NeutralResourcesLanguage("")] //[assembly: AssemblyFileVersion("1.0.0.0")]