diff --git a/.gitignore b/.gitignore
index 7e09cdd..d095482 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
packages
*.user
*.coverage
+/.vs/*
diff --git a/Logging/Logging.csproj b/Logging/Logging.csproj
index 6db58e9..195eb1e 100644
--- a/Logging/Logging.csproj
+++ b/Logging/Logging.csproj
@@ -24,11 +24,29 @@
pdbonly
true
- bin\Release\
+ bin\x86\Release\
TRACE
prompt
4
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/RInterop/DependencyFactory.cs b/RInterop/DependencyFactory.cs
index ae32ee8..0ee9da8 100644
--- a/RInterop/DependencyFactory.cs
+++ b/RInterop/DependencyFactory.cs
@@ -10,7 +10,11 @@ namespace RInterop
var container = new UnityContainer();
Container = container;
Container.RegisterInstance(new TraceLogger("%temp%", "RInterop"));
- Resolve().LogInformation("Completed registering dependencies");
+ var logger = Resolve();
+ var version = Assembly.GetExecutingAssembly().GetCustomAttribute(typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
+ logger.LogInformation(string.Format("Starting RInterop {0}", version != null ? version.Version : "N/A"));
+ logger.LogInformation(string.Format("Install Location {0}", System.AppDomain.CurrentDomain.BaseDirectory));
+ logger.LogInformation("Completed registering dependencies");
}
public static IUnityContainer Container { get; private set; }
diff --git a/RInterop/RInterop.csproj b/RInterop/RInterop.csproj
index 4f3dcb4..18c619a 100644
--- a/RInterop/RInterop.csproj
+++ b/RInterop/RInterop.csproj
@@ -32,14 +32,37 @@
pdbonly
true
- bin\Release\
+ bin\x86\Release\
TRACE
prompt
4
+ false
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ true
+ bin\x64\Debug\
+ CODE_ANALYSIS;DEBUG;TRACE
+ full
+ x64
+ true
+ false
+ prompt
+ ManagedMinimumRules.ruleset
+ true
+
..\packages\Bond.Core.CSharp.5.2.0\lib\net45\Bond.dll
@@ -65,9 +88,8 @@
..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll
True
-
- ..\packages\DynamicInterop.0.7.4\lib\net40\DynamicInterop.dll
- True
+
+ ..\packages\DynamicInterop.0.8.1\lib\netstandard1.2\DynamicInterop.dll
..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll
@@ -89,13 +111,11 @@
..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.dll
- True
+
+ ..\packages\R.NET.1.7.0\lib\net40\RDotNet.dll
-
- ..\packages\R.NET.Community.1.6.5\lib\net40\RDotNet.NativeLibrary.dll
- True
+
+ ..\packages\R.NET.1.7.0\lib\net40\RDotNet.NativeLibrary.dll
diff --git a/RInterop/Service.cs b/RInterop/Service.cs
index a09f552..49d3898 100644
--- a/RInterop/Service.cs
+++ b/RInterop/Service.cs
@@ -53,6 +53,7 @@ namespace RInterop
private void HostOnOpened(object sender, EventArgs eventArgs)
{
DependencyFactory.Resolve().LogInformation("Service is available. Press to exit.");
+ DependencyFactory.Resolve().LogInformation(string.Format(CultureInfo.InvariantCulture, @"R Path : ""{0}""", new RDotNet.NativeLibrary.NativeUtility().FindRPath()));
_startedEvent.Set();
}
diff --git a/RInterop/packages.config b/RInterop/packages.config
index 219f8c9..32e2ea7 100644
--- a/RInterop/packages.config
+++ b/RInterop/packages.config
@@ -5,9 +5,10 @@
-
+
-
+
+
\ No newline at end of file