From b39b98e45321c0e09e646eb045d73aebeb249e4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Mon, 24 Sep 2018 09:42:35 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31287 --- .../{dxplay.json => dxplay.json1} | 0 client/DxPlay/DxPlay.csproj | 2 +- client/DxPlay/DxPlayer.cs | 5 +- client/DxPlay/PlayerForm.cs | 51 ++++++------ client/DxPlay/PlayerGraph.cs | 1 + client/MCTool/MCTool.csproj | 20 +++++ .../Configuration/configuration-nle.json | 13 ++- client/Maestro/Maestro.csproj | 5 +- .../Configuration/ConfigurationInfo.cs | 2 + .../MaestroShared/Properties/AssemblyInfo.cs | 4 +- .../Targets/FTPTargetProcessor.cs | 34 ++++---- .../Targets/FXPTargetProcessor.cs | 27 +++--- .../MaestroShared/Targets/TargetProcessor.cs | 8 +- .../Targets/UNCTargetProcessor.cs | 19 ++++- client/MediaCube.sln | 82 ++++--------------- .../MetadataSelector/MetadataSelector.csproj | 18 ++++ .../NativeOctopusClient.csproj | 18 ++++ 17 files changed, 173 insertions(+), 136 deletions(-) rename client/DxPlay/Configuration/{dxplay.json => dxplay.json1} (100%) diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json1 similarity index 100% rename from client/DxPlay/Configuration/dxplay.json rename to client/DxPlay/Configuration/dxplay.json1 diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj index 491bf692..ada4f36e 100644 --- a/client/DxPlay/DxPlay.csproj +++ b/client/DxPlay/DxPlay.csproj @@ -243,7 +243,7 @@ Always - + Always diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs index 82fdefac..2fb0a3b0 100644 --- a/client/DxPlay/DxPlayer.cs +++ b/client/DxPlay/DxPlayer.cs @@ -1,7 +1,6 @@ using System; using System.Drawing; using System.Runtime.InteropServices; -using System.Diagnostics; using System.Windows.Forms; using System.Threading; @@ -182,7 +181,6 @@ namespace DxPlay { public void Seek(int value) { if (graph == null || graph.MediaSeeking == null) return; - double frameLength = (double)MEDIATIME_REFERENCE / MediaDescription.FrameRate; long avgTimePerFrame = (long)Math.Ceiling(MEDIATIME_REFERENCE / MediaDescription.FrameRate); long requestedPosition = (long)Math.Ceiling(value * frameLength); @@ -382,9 +380,10 @@ namespace DxPlay { } public int BufferCB(double SampleTime, IntPtr pBuffer, int BufferLen) { + //Thread.Sleep(1000); return 0; int frames = (int)Math.Abs(SampleTime * MediaDescription.FrameRate); - //logger.Debug("BufferCB frames {0}, sample time {1}", frames, SampleTime); + logger.Debug("BufferCB frames {0}, sample time {1}", frames, SampleTime); Font font = new Font("Tahoma", 30); string display = frames.ToString(); SizeF size = new SizeF(100, 100); diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 5306dd91..da571de8 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -143,22 +143,6 @@ namespace DxPlay { } } - private void OnPlayEvent() { - if (!IsHandleCreated || Disposing || IsDisposed || m_play == null) - return; - BeginInvoke((Action)(() => { - if (Disposing || IsDisposed || m_play == null) - return; - if (!trackBarAtUser) - playerControls.TrackBar.Value = m_play.CurrentTC.ZeroBasedFrames; - playerControls.CurrentTC.Text = m_play.CurrentTC.ToString(); - string labelStatusText = playerControls.Status.Text; - m_play.stringValues.TryGetValue(m_play.State, out labelStatusText); - playerControls.Status.Text = labelStatusText; - })); - } - - private void Form1_DragEnter(object sender, DragEventArgs e) { if (e.Data.GetDataPresent(DataFormats.FileDrop)) { string[] files = (string[])e.Data.GetData(DataFormats.FileDrop); @@ -378,18 +362,35 @@ namespace DxPlay { } result = true; break; - //case Keys.I: - // if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor)) - // SetActualPositionAsIn(); - // break; - //case Keys.O: - // if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor)) - // SetActualPositionAsOut(); - // break; + //case Keys.I: + // if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor)) + // SetActualPositionAsIn(); + // break; + //case Keys.O: + // if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor)) + // SetActualPositionAsOut(); + // break; } + return result; } + private void OnPlayEvent() { + return; + if (!IsHandleCreated || Disposing || IsDisposed || m_play == null) + return; + BeginInvoke((Action)(() => { + if (Disposing || IsDisposed || m_play == null) + return; + if (!trackBarAtUser) + playerControls.TrackBar.Value = m_play.CurrentTC.ZeroBasedFrames; + playerControls.CurrentTC.Text = m_play.CurrentTC.ToString(); + string labelStatusText = playerControls.Status.Text; + m_play.stringValues.TryGetValue(m_play.State, out labelStatusText); + playerControls.Status.Text = labelStatusText; + })); + } + private void PlayerForm_FormClosing(object sender, FormClosingEventArgs e) { //if (m_play != null) // m_play.Dispose(); @@ -591,7 +592,7 @@ namespace DxPlay { return; try { - + m_play.Dispose(); model.Approve(); trafficBrowser.ClearSelection(); diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs index c9e38838..defadfbb 100644 --- a/client/DxPlay/PlayerGraph.cs +++ b/client/DxPlay/PlayerGraph.cs @@ -45,6 +45,7 @@ namespace DxPlay { SearchAudioTracks(splitter); EnableDeinterlace(videoDecoder); + } catch (Exception e) { logger.Error(e.Message); } diff --git a/client/MCTool/MCTool.csproj b/client/MCTool/MCTool.csproj index 4c76c7ee..5e2f893f 100644 --- a/client/MCTool/MCTool.csproj +++ b/client/MCTool/MCTool.csproj @@ -35,6 +35,26 @@ prompt 4 + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json index 4231532d..4040a89d 100644 --- a/client/Maestro/Configuration/configuration-nle.json +++ b/client/Maestro/Configuration/configuration-nle.json @@ -104,7 +104,6 @@ "killDateDays": 7, "disableFileVersioning": true, "agency": "MAESTRO-NLE", - "reference": [ "Octopus mappába küldés", "Megtekintőbe küldés" ], "remote": { "address": "ftp://10.10.1.55:2098", "userName": "administrator", @@ -170,6 +169,18 @@ "timeout": 1000 } }, + { + "label": "Helyi küldés", + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%", + "deleteAfterCopy": true, + "tag": "Betöltés", + "killDateDays": 0, + "remote": { + "address": "file://c:\\_video", + "timeout": 1000 + } + }, { "label": "Archiválás", "processor": "FTPTargetProcessor", diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index 6ec0cb72..4084a1a9 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -120,9 +120,6 @@ MinimumRecommendedRules.ruleset - - ..\packages\FluentFTP.19.1.1\lib\net45\FluentFTP.dll - ..\packages\LinkDotNet.MessageBus.0.1.1\lib\LinkDotNet.MessageHandling.dll @@ -335,8 +332,8 @@ - PreserveNewest Designer + Always Designer diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index 00e5f631..df846994 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -110,6 +110,8 @@ namespace MaestroShared.Configuration { public string PathMorpheusMetadata { get; set; } public bool DisableFileVersioning { get; set; } public bool EnableOverride { get; set; } + public bool DeleteAfterCopy { get; set; } //csak UNC source esetén! + public bool TemporaryCopy { get; set; } //Nexio esetén nem veszi figyelembe! public bool SendEmailOnError { get; set; } public string ErrorEmailRecipient { get; set; } public string ErrorEmailPattern { get; set; } diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index 329d8b27..444c2585 100644 --- a/client/MaestroShared/Properties/AssemblyInfo.cs +++ b/client/MaestroShared/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("2.0.8.4")] -[assembly: AssemblyFileVersion("2.0.8.4")] +[assembly: AssemblyVersion("2.0.8.5")] +[assembly: AssemblyFileVersion("2.0.8.5")] diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs index c0d6b3e6..7d7fbd58 100644 --- a/client/MaestroShared/Targets/FTPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs @@ -6,7 +6,6 @@ using System; using System.IO; using System.Linq; using System.Net; -using System.Text; using System.Windows.Forms; namespace MaestroShared.Targets { @@ -14,7 +13,7 @@ namespace MaestroShared.Targets { public class FTPTargetProcessor : UNCTargetProcessor { private const string PATTERN_CONCAT = "{0}{1}"; private const string _226 = "226"; - private const string UPLOAD_ERROR = "Feltöltési hiba."; + protected const string UPLOAD_ERROR = "Feltöltési hiba."; private const string _200 = "200"; private const string SITE0011 = "SITE 0011"; private const string _1211 = "1211"; @@ -37,8 +36,7 @@ namespace MaestroShared.Targets { if (relativePath.StartsWith(SLASH)) relativePath = relativePath.Substring(1); Input = new Uri(Path.Combine(address, relativePath, parameters.InputFileName)).LocalPath; - } - else + } else Input = new Uri(Path.Combine(address, parameters.InputFileName)).LocalPath; inputFile = new FileInfo(Input); @@ -52,7 +50,7 @@ namespace MaestroShared.Targets { protected bool IsNexioServer(FtpClient ftpClient) { bool result = false; //Device Type Request - FtpReply reply = targetFTP.Execute(SITE0011); + FtpReply reply = ftpClient.Execute(SITE0011); if (_200.Equals(reply.Code)) result = reply.Message != null && reply.Message.Contains(_1211); return result; @@ -95,16 +93,18 @@ namespace MaestroShared.Targets { } protected override void UploadFile() { + string targetFilePath = OutputName; + if (Parameters.TargetConfig.TemporaryCopy) + targetFilePath = OutputName + ".tmp"; + using (FileStream istream = File.OpenRead(Input)) { - using (Stream ostream = targetFTP.OpenWrite(OutputName)) { + using (Stream ostream = targetFTP.OpenWrite(targetFilePath)) { try { CopyStream(istream, inputFile.Length, ostream); - } - catch (Exception e) { + } catch (Exception e) { logger.Error(e.Message); throw e; - } - finally { + } finally { ostream.Close(); } } @@ -112,18 +112,21 @@ namespace MaestroShared.Targets { FtpReply reply = targetFTP.GetReply(); if (!reply.Success || !_226.Equals(reply.Code)) throw new Exception(UPLOAD_ERROR); + + if (Parameters.TargetConfig.TemporaryCopy) { + if (!targetFTP.MoveFile(targetFilePath, OutputName)) + throw new Exception(UPLOAD_ERROR); + } } protected override void UploadContent(string outputPath, byte[] content) { using (Stream ostream = targetFTP.OpenWrite(outputPath, FtpDataType.Binary, false)) { try { ostream.Write(content, 0, content.Length); - } - catch (Exception e) { + } catch (Exception e) { logger.Error(e.Message); throw e; - } - finally { + } finally { ostream.Close(); } } @@ -137,8 +140,7 @@ namespace MaestroShared.Targets { long x = -1; try { x = targetFTP.GetFileSize(path); - } - catch (Exception e) { + } catch (Exception e) { logger.Warn(e.Message); } return x > -1; diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs index 2514ab07..e1ee7d3e 100644 --- a/client/MaestroShared/Targets/FXPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs @@ -48,15 +48,12 @@ namespace MaestroShared.Targets { try { sourceFTP = CreateClient(sourceConfig.Remote); - logger.Info("1 " + IsNexioServer(sourceFTP)); - string input = Uri.UnescapeDataString(inputUri.AbsolutePath); sourceFileLength = sourceFTP.GetFileSize(input); - if (Parameters.TargetConfig.NexioServer) + bool nexioTarget = IsNexioServer(targetFTP); + if (nexioTarget) sourceFileLength = sourceFileLength / 2; - logger.Info("2 " + IsNexioServer(sourceFTP)); - FtpReply replyPASV = targetFTP.Execute("PASV"); if (!replyPASV.Success) throw new Exception(replyPASV.ErrorMessage); @@ -69,15 +66,10 @@ namespace MaestroShared.Targets { if (!replyPORT.Success) throw new Exception(replyPORT.ErrorMessage); - logger.Info("3 " + IsNexioServer(sourceFTP)); - - FtpReply sourceReplyTYPE = sourceFTP.Execute("TYPE I"); if (!sourceReplyTYPE.Success) throw new Exception(sourceReplyTYPE.ErrorMessage); - logger.Info("4 " + IsNexioServer(sourceFTP)); - if (input.LastIndexOf("/") == 0) input = input.Replace("/", ""); FtpReply replyRETR = sourceFTP.Execute("RETR " + input); @@ -91,19 +83,22 @@ namespace MaestroShared.Targets { throw new Exception(replyRETR.ErrorMessage); } - logger.Info("5 " + IsNexioServer(sourceFTP)); - FtpReply targetReplyTYPE = targetFTP.Execute("TYPE I"); if (!targetReplyTYPE.Success) throw new Exception(targetReplyTYPE.ErrorMessage); string currentWorkingDir = targetFTP.GetWorkingDirectory(); logger.Debug("Current target working directory is {0}", currentWorkingDir); - FtpReply replySTOR = targetFTP.Execute("STOR " + OutputName); + + bool useTemporaryName = !nexioTarget && Parameters.TargetConfig.TemporaryCopy; + string targetFilePath = OutputName; + if (useTemporaryName) + targetFilePath = OutputName + ".tmp"; + + FtpReply replySTOR = targetFTP.Execute("STOR " + targetFilePath); if (!replySTOR.Success) throw new Exception(replySTOR.ErrorMessage); - monitorFTP = CreateClient(Parameters.TargetConfig.Remote); monitorFTP.SetWorkingDirectory(workingDir); FtpReply monitorReplyTYPE = monitorFTP.Execute("TYPE I"); @@ -131,6 +126,10 @@ namespace MaestroShared.Targets { } Thread.Sleep(1000); } + if (useTemporaryName) { + if (!targetFTP.MoveFile(targetFilePath, OutputName)) + throw new Exception(UPLOAD_ERROR); + } } catch (Exception e) { throw e; diff --git a/client/MaestroShared/Targets/TargetProcessor.cs b/client/MaestroShared/Targets/TargetProcessor.cs index e32f3b38..f28e2493 100644 --- a/client/MaestroShared/Targets/TargetProcessor.cs +++ b/client/MaestroShared/Targets/TargetProcessor.cs @@ -36,7 +36,13 @@ namespace MaestroShared.Targets { public static ITargetProcessor Create(string processorName) { string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, processorName); Type type = typeof(ITargetProcessor).Assembly.GetType(typeName); - return Activator.CreateInstance(type) as ITargetProcessor; + ITargetProcessor result = null; + try { + result = Activator.CreateInstance(type) as ITargetProcessor; + } catch (Exception ex) { + + } + return result; } public virtual void Initialize(Control parent, TargetProcessorParameter parameters) { diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 5d5339f2..77615dfc 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -263,6 +263,17 @@ namespace MaestroShared.Targets { } protected virtual void AfterExecute() { + + if (Parameters.SourceConfig is UNCSource && Parameters.TargetConfig.DeleteAfterCopy) { + logger.Debug("Deleting source: " + Input); + try { + if (FileExists(inputFile.FullName)) + DeleteFile(inputFile.FullName); + } catch (Exception e) { + logger.Error(e.Message); + } + } + logger.Trace(Strings.ENTRY); Finished = DateTime.Now; workFlowAction.finished = Finished; @@ -388,7 +399,13 @@ namespace MaestroShared.Targets { protected virtual void UploadFile() { int pbCancel = 0; - Win32File.CopyFileEx(Input, Output, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE); + string targetFilePath = Output; + if (Parameters.TargetConfig.TemporaryCopy) + targetFilePath = Output + ".tmp"; + if (Win32File.CopyFileEx(Input, targetFilePath, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE) + && Parameters.TargetConfig.TemporaryCopy) { + File.Move(targetFilePath, Output); + } } protected virtual string GetOutputFilePath(string path, string fileName) { diff --git a/client/MediaCube.sln b/client/MediaCube.sln index 587ed209..fc2f9f4b 100644 --- a/client/MediaCube.sln +++ b/client/MediaCube.sln @@ -36,116 +36,62 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeOctopusClient", "Nati EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.ActiveCfg = Debug|x64 {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.Build.0 = Debug|x64 - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.Build.0 = Release|Any CPU {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.ActiveCfg = Release|x64 {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.Build.0 = Release|x64 - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.ActiveCfg = Debug|x64 {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.Build.0 = Debug|x64 - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.Build.0 = Release|Any CPU {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.ActiveCfg = Release|x64 {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.Build.0 = Release|x64 - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.ActiveCfg = Debug|x64 {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.Build.0 = Debug|x64 - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.Build.0 = Release|Any CPU {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.ActiveCfg = Release|x64 {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.Build.0 = Release|x64 - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.ActiveCfg = Debug|x64 {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.Build.0 = Debug|x64 - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.Build.0 = Release|Any CPU {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.ActiveCfg = Release|x64 {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.Build.0 = Release|x64 - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.ActiveCfg = Debug|x64 {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.Build.0 = Debug|x64 - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.Build.0 = Release|Any CPU {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.ActiveCfg = Release|x64 {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.Build.0 = Release|x64 - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.Build.0 = Debug|Any CPU {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.ActiveCfg = Debug|x64 {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.Build.0 = Debug|x64 - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.Build.0 = Release|Any CPU {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.ActiveCfg = Release|x64 {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.Build.0 = Release|x64 - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.ActiveCfg = Debug|x64 {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.Build.0 = Debug|x64 - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.Build.0 = Release|Any CPU {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.ActiveCfg = Release|x64 {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.Build.0 = Release|x64 - {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.ActiveCfg = Debug|x64 {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.Build.0 = Debug|x64 - {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.Build.0 = Release|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.ActiveCfg = Release|x64 {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.Build.0 = Release|x64 - {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.ActiveCfg = Debug|x64 {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.Build.0 = Debug|x64 - {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.Build.0 = Release|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.ActiveCfg = Release|x64 {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.Build.0 = Release|x64 - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.ActiveCfg = Debug|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.Build.0 = Debug|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.Build.0 = Release|Any CPU + {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.ActiveCfg = Debug|x64 + {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.Build.0 = Debug|x64 {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.ActiveCfg = Release|x64 {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.Build.0 = Release|x64 - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.ActiveCfg = Debug|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.Build.0 = Debug|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.Build.0 = Release|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.ActiveCfg = Release|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.Build.0 = Release|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.ActiveCfg = Debug|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.Build.0 = Debug|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.Build.0 = Release|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.ActiveCfg = Release|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.Build.0 = Release|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.ActiveCfg = Debug|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.Build.0 = Debug|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.Build.0 = Release|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.ActiveCfg = Release|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.Build.0 = Release|Any CPU + {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.ActiveCfg = Debug|x64 + {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.Build.0 = Debug|x64 + {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.ActiveCfg = Release|x64 + {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.Build.0 = Release|x64 + {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.ActiveCfg = Debug|x64 + {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.Build.0 = Debug|x64 + {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.ActiveCfg = Release|x64 + {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.Build.0 = Release|x64 + {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.ActiveCfg = Debug|x64 + {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.Build.0 = Debug|x64 + {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.ActiveCfg = Release|x64 + {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/client/MetadataSelector/MetadataSelector.csproj b/client/MetadataSelector/MetadataSelector.csproj index bf4d9ae3..64e0ca12 100644 --- a/client/MetadataSelector/MetadataSelector.csproj +++ b/client/MetadataSelector/MetadataSelector.csproj @@ -33,6 +33,24 @@ prompt 4 + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + ..\packages\LinkDotNet.MessageBus.0.1.1\lib\LinkDotNet.MessageHandling.dll diff --git a/client/NativeOctopusClient/NativeOctopusClient.csproj b/client/NativeOctopusClient/NativeOctopusClient.csproj index 9b89ea4c..a0874dc3 100644 --- a/client/NativeOctopusClient/NativeOctopusClient.csproj +++ b/client/NativeOctopusClient/NativeOctopusClient.csproj @@ -33,6 +33,24 @@ prompt 4 + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + ..\packages\LinkDotNet.MessageBus.Contracts.0.1.1\lib\LinkDotNet.MessageHandling.Contracts.dll -- 2.54.0