Removed Commons submodule and replaced by mindleaving.Commons NuGet-p…

…ackage.
mindleaving · Oct 18, 2018 · dde1b68 · dde1b68
1 parent 68a8589
commit dde1b68
Show file tree

Hide file tree

Showing 17 changed files with 111 additions and 42 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/CentralMonitorGUI/CentralMonitorGUI.csproj b/CentralMonitorGUI/CentralMonitorGUI.csproj
@@ -35,6 +35,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Commons, Version=1.1.13.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
       <HintPath>..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
     </Reference>
@@ -68,6 +74,7 @@
     <Compile Include="ViewModels\DataExplorerWindowViewModelFactory.cs" />
     <Compile Include="ViewModels\PatientDatabaseViewModel.cs" />
     <Compile Include="ViewModels\PatientMonitorViewModel.cs" />
+    <Compile Include="ViewModels\RelayCommand.cs" />
     <Compile Include="ViewModels\SelectedTime.cs" />
     <Compile Include="ViewModels\UpdateTrigger.cs" />
     <Compile Include="ViewModels\ViewModelBase.cs" />
@@ -188,10 +195,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Commons\Commons.csproj">
-      <Project>{D0E6B038-C939-487D-BB5E-A6270A0D18F5}</Project>
-      <Name>Commons</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NetworkCommunication\NetworkCommunication.csproj">
       <Project>{603afcc1-df38-4864-864b-0f604478963d}</Project>
       <Name>NetworkCommunication</Name>

diff --git a/CentralMonitorGUI/ViewModels/AnnotationDatabaseViewModel.cs b/CentralMonitorGUI/ViewModels/AnnotationDatabaseViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Input;
-using Commons.Wpf;
 using NetworkCommunication.DataStorage;
 using NetworkCommunication.Objects;
 

diff --git a/CentralMonitorGUI/ViewModels/AnnotationNoteViewModel.cs b/CentralMonitorGUI/ViewModels/AnnotationNoteViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Windows.Input;
-using Commons.Wpf;
 
 namespace CentralMonitorGUI.ViewModels
 {

diff --git a/CentralMonitorGUI/ViewModels/DataExplorerWindowViewModel.cs b/CentralMonitorGUI/ViewModels/DataExplorerWindowViewModel.cs
@@ -6,7 +6,6 @@
 using System.Windows.Input;
 using CentralMonitorGUI.Views;
 using Commons.Mathematics;
-using Commons.Wpf;
 using NetworkCommunication;
 using NetworkCommunication.DataStorage;
 using NetworkCommunication.Objects;

diff --git a/CentralMonitorGUI/ViewModels/MainViewModel.cs b/CentralMonitorGUI/ViewModels/MainViewModel.cs
@@ -6,7 +6,6 @@
 using System.Windows.Input;
 using System.Windows.Threading;
 using CentralMonitorGUI.Views;
-using Commons.Wpf;
 using NetworkCommunication.DataStorage;
 using NetworkCommunication.Objects;
 

diff --git a/CentralMonitorGUI/ViewModels/PatientDatabaseViewModel.cs b/CentralMonitorGUI/ViewModels/PatientDatabaseViewModel.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Windows.Input;
 using CentralMonitorGUI.Views;
-using Commons.Wpf;
 using NetworkCommunication.DataStorage;
 using NetworkCommunication.Objects;
 

diff --git a/CentralMonitorGUI/ViewModels/PatientMonitorViewModel.cs b/CentralMonitorGUI/ViewModels/PatientMonitorViewModel.cs
@@ -7,7 +7,6 @@
 using System.Windows.Media;
 using System.Windows.Threading;
 using CentralMonitorGUI.Views;
-using Commons.Wpf;
 using NetworkCommunication;
 using NetworkCommunication.DataStorage;
 using NetworkCommunication.Objects;

diff --git a/CentralMonitorGUI/ViewModels/RelayCommand.cs b/CentralMonitorGUI/ViewModels/RelayCommand.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Windows.Input;
+
+namespace CentralMonitorGUI.ViewModels
+{
+    public class RelayCommand : ICommand
+    {
+        private readonly Action action;
+        private readonly Func<bool> canExecute;
+
+        public RelayCommand(Action action)
+        {
+            this.action = action;
+            canExecute = () => true;
+        }
+        public RelayCommand(Action action, Func<bool> canExecute)
+        {
+            this.action = action;
+            this.canExecute = canExecute;
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            return canExecute();
+        }
+
+        public void Execute(object parameter)
+        {
+            action();
+        }
+
+        public event EventHandler CanExecuteChanged;
+    }
+
+    public class RelayCommand<T> : ICommand
+    {
+        private readonly Action<T> action;
+        private readonly Func<bool> canExecute;
+
+        public RelayCommand(Action<T> action)
+        {
+            this.action = action;
+            canExecute = () => true;
+        }
+        public RelayCommand(Action<T> action, Func<bool> canExecute)
+        {
+            this.action = action;
+            this.canExecute = canExecute;
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            return canExecute();
+        }
+
+        public void Execute(object parameter)
+        {
+            action((T)parameter);
+        }
+
+        public event EventHandler CanExecuteChanged;
+    }
+}
diff --git a/CentralMonitorGUI/packages.config b/CentralMonitorGUI/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="mindleaving.Commons" version="1.1.13" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
   <package id="OxyPlot.Core" version="1.0.0" targetFramework="net461" />
   <package id="OxyPlot.Wpf" version="1.0.0" targetFramework="net461" />
 </packages>
diff --git a/Commons b/Commons
diff --git a/GEDash4000.sln b/GEDash4000.sln
@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkCommunicationTest",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CentralMonitorGUI", "CentralMonitorGUI\CentralMonitorGUI.csproj", "{C165D3A0-735F-4E2F-BBB5-464A37213FBF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commons", "Commons\Commons.csproj", "{D0E6B038-C939-487D-BB5E-A6270A0D18F5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealforceEcgFileDecoder", "HealforceEcgFileDecoder\HealforceEcgFileDecoder.csproj", "{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}"
 EndProject
 Global
@@ -31,10 +29,6 @@ Global
 		{C165D3A0-735F-4E2F-BBB5-464A37213FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C165D3A0-735F-4E2F-BBB5-464A37213FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C165D3A0-735F-4E2F-BBB5-464A37213FBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/HealforceEcgFileDecoder/HealforceEcgFileDecoder.csproj b/HealforceEcgFileDecoder/HealforceEcgFileDecoder.csproj
@@ -32,6 +32,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Commons, Version=1.1.13.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -48,11 +52,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Commons\Commons.csproj">
-      <Project>{D0E6B038-C939-487D-BB5E-A6270A0D18F5}</Project>
-      <Name>Commons</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/NetworkCommunication/NetworkCommunication.csproj b/NetworkCommunication/NetworkCommunication.csproj
@@ -32,6 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Commons, Version=1.1.13.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
@@ -114,12 +120,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Commons\Commons.csproj">
-      <Project>{D0E6B038-C939-487D-BB5E-A6270A0D18F5}</Project>
-      <Name>Commons</Name>
-    </ProjectReference>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/NetworkCommunication/packages.config b/NetworkCommunication/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mindleaving.Commons" version="1.1.13" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+</packages>
diff --git a/NetworkCommunicationTest/NetworkCommunicationTest.csproj b/NetworkCommunicationTest/NetworkCommunicationTest.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +12,8 @@
     <AssemblyName>NetworkCommunicationTest</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -30,8 +33,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="Commons, Version=1.1.13.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -50,13 +59,6 @@
     <Compile Include="WaveformTimestampCorrection.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Commons\Commons.csproj">
-      <Project>{D0E6B038-C939-487D-BB5E-A6270A0D18F5}</Project>
-      <Name>Commons</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NetworkCommunication\NetworkCommunication.csproj">
       <Project>{603AFCC1-DF38-4864-864B-0F604478963D}</Project>
       <Name>NetworkCommunication</Name>
@@ -65,5 +67,14 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+  </Target>
 </Project>
diff --git a/NetworkCommunicationTest/packages.config b/NetworkCommunicationTest/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.9.0" targetFramework="net461" />
+  <package id="mindleaving.Commons" version="1.1.13" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+  <package id="NUnit" version="3.11.0" targetFramework="net461" />
 </packages>