git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 9 Oct 2017 13:41:27 +0000 (13:41 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 9 Oct 2017 13:41:27 +0000 (13:41 +0000)
13 files changed:
client/DxPlay/DxPlay.csproj
client/IntegrationTests/IntegrationTests.csproj
client/Maestro/Maestro.csproj
client/Maestro/Properties/AssemblyInfo.cs
client/Maestro/Resources/configuration-nexio.json
client/Maestro/Sources/NexioRESTSource.cs
client/Maestro/Sources/NexioSourceItem.cs
client/Maestro/Splash.Designer.cs
client/Maestro/Splash.cs
client/MediaCube.sln
client/MediaCubeClient/MediaCubeClient.csproj
client/OctopusClient/OctopusClient.csproj
client/PlanAIRClient/TrafficClient.csproj

index 2f00b4fd0380707d87854f92b790ff1043d4498d..77c02b1e77123737ba17afb1c1d58c24c8396190 100644 (file)
     <GenerateManifests>true</GenerateManifests>\r
   </PropertyGroup>\r
   <PropertyGroup />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;USING_NET20</DefineConstants>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <FileAlignment>4096</FileAlignment>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
+    <OutputPath>bin\x86\Release\</OutputPath>\r
+    <DefineConstants>TRACE;USING_NET20</DefineConstants>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <Optimize>true</Optimize>\r
+    <FileAlignment>4096</FileAlignment>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="DirectShowLib, Version=2.1.0.28167, Culture=neutral, processorArchitecture=MSIL">\r
       <SpecificVersion>False</SpecificVersion>\r
index 4e056781527c9e1a67c20d442d6a2fbf4025f741..32dd0456349a802be2f4dc2f3c908831a351989c 100644 (file)
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
+    <OutputPath>bin\x86\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">\r
       <HintPath>..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>\r
index 24ddc1f252fb3593255c10bd8cf19c8c202234b3..6c8461244dc7440eeafb033749686eae2a8506c8 100644 (file)
@@ -30,7 +30,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>\r
     <WebPage>index.htm</WebPage>\r
     <ApplicationRevision>3</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
+    <ApplicationVersion>1.9.0.3</ApplicationVersion>\r
     <UseApplicationTrust>false</UseApplicationTrust>\r
     <CreateDesktopShortcut>true</CreateDesktopShortcut>\r
     <PublishWizardCompleted>true</PublishWizardCompleted>\r
   <PropertyGroup>\r
     <ApplicationIcon>Resources\mediacube_logo_small.ico</ApplicationIcon>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
+    <OutputPath>bin\x86\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="FluentFTP, Version=17.5.8.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">\r
       <HintPath>..\packages\FluentFTP.17.5.8\lib\net45\FluentFTP.dll</HintPath>\r
index b7890f4a619bdebd0bb0fcd162279f0992bd7543..c2622b566937223311c5ce4d1678cd361e22b4c3 100644 (file)
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.0.0")]\r
-[assembly: AssemblyFileVersion("1.0.0.0")]\r
+[assembly: AssemblyVersion("1.9.0.0")]\r
+[assembly: AssemblyFileVersion("1.9.0.0")]\r
index e226b0dec0dc02ce9ea340a3594dabe302fe5805..5964ad71a26137fbe6833399d4f75396e451e959 100644 (file)
@@ -1,6 +1,6 @@
 {\r
   "title": "PLAYOUT",\r
-  "active": false,\r
+  "active": true,\r
   "startInTray": false,\r
   "enableNameOverride": false,\r
   "player": {\r
   "source": {\r
     "$type": "NEXIOSource",\r
     "local": {\r
-      "address": "ws://localhost:8080/services/nexio"\r
+      "address": "ws://10.10.1.28:8080/services/nexio"\r
     },\r
     "remote": {\r
-      "address": "ftp://localhost:21/watch",\r
-      "userName": "dani",\r
-      "password": "dani"\r
+      "address": "ftp://10.10.1.55:2098",\r
+      "userName": "administrator",\r
+      "password": "system"\r
     }\r
   },\r
   "metadatas": [\r
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://localhost:8080/services/rest/octopus/",\r
+        "address": "http://10.10.1.28:8080/services/rest/octopus/",\r
         "userName": "dani",\r
         "password": "dani",\r
         "timeout": 1000\r
@@ -32,7 +32,7 @@
     {\r
       "$type": "TrafficMetadata",\r
       "server": {\r
-        "address": "Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;",\r
+        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
         "userName": "MAM",\r
         "password": "Echotv.hu",\r
         "timeout": 5\r
@@ -41,7 +41,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://localhost:8080/services/rest/jobengine/",\r
+        "address": "http://10.10.1.28:8080/services/rest/jobengine/",\r
         "userName": "dani",\r
         "password": "dani"\r
       }\r
   ],\r
   "targets": [\r
     {\r
-      "label": "Archive",\r
-      "processor": "FTPTargetProcessor",\r
-      "outputFormat": "%ID%-%SOURCENAME%",\r
-      "killDateDays": 1,\r
-      "remote": {\r
-        "address": "ftp://localhost:21/out",\r
-        "userName": "dani",\r
-        "password": "dani"\r
-      }\r
-    },\r
-    {\r
-      "label": "Ready",\r
+      "label": "Adásba",\r
       "processor": "FXPTargetProcessor",\r
-      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "outputFormat": "%ID%",\r
       "remote": {\r
-        "address": "ftp://localhost:22/out",\r
-        "userName": "dani",\r
-        "password": "dani"\r
+        "address": "ftp://10.10.1.100:21/READY",\r
+        "userName": "mediacube",\r
+        "password": "Broadca5T"\r
       }\r
     }\r
   ]\r
index cb801ea4d23130eb7bbeb5481290b16f7cd95161..f0f445e59ffc4f21a222e817bd26c0c41f1c2253 100644 (file)
@@ -15,6 +15,7 @@ using NLog;
 namespace Maestro.Sources {\r
     class NexioRESTSource : BindingList<NexioSourceItem>, ISource {\r
         private readonly NLog.Logger logger = LogManager.GetCurrentClassLogger();\r
+        private const string ID = "id";\r
         private const string LONGNAMEID = "longnameid";\r
         private const string RECORDDATE = "recorddate";\r
         private const string EXTAGENCY = "extagency";\r
@@ -123,6 +124,7 @@ namespace Maestro.Sources {
         }\r
 \r
         private void SetItem(ref NexioSourceItem item, JToken token) {\r
+            item.ID = token[ID].ToString();\r
             item.Name = token[LONGNAMEID].ToString();\r
             //item.Created = DateTime.Parse(token[RECORDDATE].ToString());\r
             item.Agency = token[EXTAGENCY].ToString();\r
@@ -139,39 +141,39 @@ namespace Maestro.Sources {
         }\r
 \r
         private void OnChanged(JToken token) {\r
-            string name = token[LONGNAMEID].ToString();\r
-            var item = Items.Where(x => x.Name == name).SingleOrDefault();\r
+            string id = token[ID].ToString();\r
+            var item = Items.Where(x => x.ID == id).SingleOrDefault();\r
             if (item != null) {\r
+                SetItem(ref item, token);\r
                 parent.SafeCall(() => {\r
-                    SetItem(ref item, token);\r
                     messageBus.Send(new ModifyFileActionMsg() {\r
-                        FileName = name,\r
+                        FileName = item.Name,\r
                         Source = parent\r
                     });\r
                 });\r
             }\r
-            Debug.WriteLine(string.Format("Changed {0}", name));\r
+            Debug.WriteLine(string.Format("Changed {0}", item.Name));\r
         }\r
 \r
         private void OnCreated(JToken token) {\r
-            string name = token[LONGNAMEID].ToString();\r
+            var item = CreateItem(token, true);\r
             parent.SafeCall(() => {\r
-                Insert(0, CreateItem(token, true));\r
+                Insert(0, item);\r
                 messageBus.Send(new CreateFileActionMsg() {\r
-                    FileName = name,\r
+                    FileName = item.Name,\r
                     Source = parent\r
                 });\r
             });\r
-            Debug.WriteLine(string.Format("Created {0}", name));\r
+            Debug.WriteLine(string.Format("Created {0}", item.Name));\r
         }\r
 \r
         private void OnDeleted(JToken d) {\r
-            string name = d[LONGNAMEID].ToString();\r
-            NexioSourceItem fileSourceItem = this.Where(item => item.Name.Equals(name)).First();\r
+            string id = d[ID].ToString();\r
+            var item = this.Where(item => item.ID.Equals(id)).First();\r
             parent.SafeCall(() => {\r
-                Remove(fileSourceItem);\r
+                Remove(item);\r
                 messageBus.Send(new RemoveFileActionMsg() {\r
-                    FileName = name,\r
+                    FileName = item.Name,\r
                     Source = parent\r
                 });\r
             });\r
index ea640ab5417d7334fd826b36e334635f43add067..db9cbf074c56e8e49f97610162ae552412ef0fe5 100644 (file)
@@ -10,6 +10,7 @@ namespace Maestro.Sources {
         private DateTime created;\r
         private DateTime modified;\r
         private string agency;\r
+        private string id;\r
 \r
         public event PropertyChangedEventHandler PropertyChanged;\r
 \r
@@ -64,5 +65,13 @@ namespace Maestro.Sources {
             }\r
         }\r
 \r
+        public string ID {\r
+            get { return id; }\r
+            set {\r
+                id = value;\r
+                NotifyPropertyChanged();\r
+            }\r
+        }\r
+\r
     }\r
 }\r
index b0c8932e3e26a450dc68178c69fbde965fd53820..21d593edbe1370c89d058dea48f61de99f2e1795 100644 (file)
@@ -28,6 +28,7 @@
             this.splashTimer = new System.Windows.Forms.Timer(this.components);\r
             this.imageList1 = new System.Windows.Forms.ImageList(this.components);\r
             this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
+            this.labelVersion = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
             this.pictureBox1.TabIndex = 0;\r
             this.pictureBox1.TabStop = false;\r
             // \r
+            // labelVersion\r
+            // \r
+            this.labelVersion.BackColor = System.Drawing.Color.Transparent;\r
+            this.labelVersion.Location = new System.Drawing.Point(-3, 281);\r
+            this.labelVersion.Name = "labelVersion";\r
+            this.labelVersion.Size = new System.Drawing.Size(323, 23);\r
+            this.labelVersion.TabIndex = 1;\r
+            this.labelVersion.Text = "label1";\r
+            this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
+            // \r
             // Splash\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -62,6 +73,7 @@
             this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));\r
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;\r
             this.ClientSize = new System.Drawing.Size(320, 349);\r
+            this.Controls.Add(this.labelVersion);\r
             this.Controls.Add(this.pictureBox1);\r
             this.DoubleBuffered = true;\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;\r
@@ -80,5 +92,6 @@
         private System.Windows.Forms.Timer splashTimer;\r
         private System.Windows.Forms.ImageList imageList1;\r
         private System.Windows.Forms.PictureBox pictureBox1;\r
+        private System.Windows.Forms.Label labelVersion;\r
     }\r
 }
\ No newline at end of file
index 5f92bcdcf51a7641081565c2d05d409757c5a61a..26f268da1ec7415f7dd0ad05ce2eb70dd7c6e51d 100644 (file)
@@ -2,8 +2,10 @@
 using System.Collections.Generic;\r
 using System.ComponentModel;\r
 using System.Data;\r
+using System.Diagnostics;\r
 using System.Drawing;\r
 using System.Linq;\r
+using System.Reflection;\r
 using System.Text;\r
 using System.Threading.Tasks;\r
 using System.Windows.Forms;\r
@@ -12,6 +14,13 @@ namespace Maestro {
     public partial class Splash : Form {\r
         public Splash() {\r
             InitializeComponent();\r
+            //Assembly assembly = Assembly.GetExecutingAssembly();\r
+            //FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);\r
+            //labelVersion.Text = fvi.FileVersion;\r
+\r
+            Version version = Assembly.GetEntryAssembly().GetName().Version;\r
+            labelVersion.ForeColor = Color.White;\r
+            labelVersion.Text = String.Format("v{0}.{1}.{2}", version.Major, version.Minor, version.Revision);\r
         }\r
 \r
         private void splashTimer_Tick(object sender, EventArgs e) {\r
index a6f1d99e8e4c5f6cc7992c9b93b7db6b7fe7049e..5664709896c5278f6c8b157145484171a53ec2f9 100644 (file)
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00\r
 # Visual Studio 15\r
-VisualStudioVersion = 15.0.26430.14\r
+VisualStudioVersion = 15.0.26430.15\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxPlay", "DxPlay\DxPlay.csproj", "{0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}"\r
 EndProject\r
@@ -30,8 +30,8 @@ Global
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.ActiveCfg = Debug|x64\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.Build.0 = Debug|x64\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.Build.0 = Debug|Any CPU\r
+               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.ActiveCfg = Debug|x86\r
+               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.Build.0 = Debug|x86\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.ActiveCfg = Release|x64\r
@@ -42,8 +42,8 @@ Global
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.Build.0 = Debug|Any CPU\r
+               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.ActiveCfg = Debug|x86\r
+               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.Build.0 = Debug|x86\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.ActiveCfg = Release|Any CPU\r
@@ -54,8 +54,8 @@ Global
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.Build.0 = Debug|Any CPU\r
+               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.ActiveCfg = Debug|x86\r
+               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.Build.0 = Debug|x86\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.ActiveCfg = Release|Any CPU\r
@@ -66,8 +66,8 @@ Global
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.Build.0 = Debug|Any CPU\r
+               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.ActiveCfg = Debug|x86\r
+               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.Build.0 = Debug|x86\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.ActiveCfg = Release|Any CPU\r
@@ -78,8 +78,8 @@ Global
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.Build.0 = Debug|Any CPU\r
+               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.ActiveCfg = Debug|x86\r
+               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.Build.0 = Debug|x86\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.ActiveCfg = Release|Any CPU\r
@@ -100,8 +100,8 @@ Global
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.Build.0 = Debug|Any CPU\r
+               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.ActiveCfg = Debug|x86\r
+               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.Build.0 = Debug|x86\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.ActiveCfg = Release|Any CPU\r
@@ -115,17 +115,17 @@ Global
        GlobalSection(TeamFoundationVersionControl) = preSolution\r
                SccNumberOfProjects = 8\r
                SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}\r
-               SccTeamFoundationServer = https://elgekko.visualstudio.com/\r
-               SccProjectUniqueName0 = MediaCubeClient\\MediaCubeClient.csproj\r
-               SccProjectName0 = MediaCubeClient\r
-               SccLocalPath0 = MediaCubeClient\r
-               SccProjectUniqueName1 = OctopusClient\\OctopusClient.csproj\r
-               SccProjectName1 = OctopusClient\r
-               SccLocalPath1 = OctopusClient\r
-               SccProjectUniqueName2 = PlanAIRClient\\TrafficClient.csproj\r
-               SccProjectName2 = PlanAIRClient\r
-               SccLocalPath2 = PlanAIRClient\r
-               SccLocalPath3 = .\r
+               SccTeamFoundationServer = https://tfs.userrendszerhaz.hu/tfs/defaultcollection\r
+               SccLocalPath0 = .\r
+               SccProjectUniqueName1 = MediaCubeClient\\MediaCubeClient.csproj\r
+               SccProjectName1 = MediaCubeClient\r
+               SccLocalPath1 = MediaCubeClient\r
+               SccProjectUniqueName2 = OctopusClient\\OctopusClient.csproj\r
+               SccProjectName2 = OctopusClient\r
+               SccLocalPath2 = OctopusClient\r
+               SccProjectUniqueName3 = PlanAIRClient\\TrafficClient.csproj\r
+               SccProjectName3 = PlanAIRClient\r
+               SccLocalPath3 = PlanAIRClient\r
                SccProjectUniqueName4 = AudioRecorder\\AudioRecorder.csproj\r
                SccProjectName4 = AudioRecorder\r
                SccLocalPath4 = AudioRecorder\r
index 3579d9c7bd94b13f46af5f08e995f3fb2857175b..5cacaf49073ba97b4a744dcac1ee65c0a0c6f4b2 100644 (file)
     <Prefer32Bit>false</Prefer32Bit>\r
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
+    <OutputPath>bin\x86\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Microsoft.CSharp" />\r
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">\r
index db5ac657a4af221c40d7d30d3c9f9e05f3b582ea..a649b628b540194111f3ca3b7ad76fa5f7692a7e 100644 (file)
   <PropertyGroup>\r
     <StartupObject />\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
+    <OutputPath>bin\x86\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">\r
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>\r
index 3760d93df4c82d25bb103e0a489b81fd77824fb0..d51df84a2f4ccfd1a7235591aae22b6fad9600a0 100644 (file)
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
+    <OutputPath>bin\x86\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x86</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="NLog">\r
       <HintPath>..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath>\r