Merge pull request #30 from ankeshdave/dev-current

Dev current [ci skip]
Dashbrd · Sep 25, 2015 · a53eef7 · a53eef7
2 parents 9dfae9a + 93163fc
commit a53eef7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 23 deletions.
diff --git a/...CalendarSyncPlus/CalendarSyncPlus.OutlookServices/CalendarSyncPlus.OutlookServices.csproj b/...CalendarSyncPlus/CalendarSyncPlus.OutlookServices/CalendarSyncPlus.OutlookServices.csproj
@@ -35,12 +35,24 @@
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\Libraries\Microsoft.Office.Interop.Outlook.dll</HintPath>
+    </Reference>
+    <Reference Include="OFFICE, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\Libraries\OFFICE.DLL</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.CSharp">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WpfApplicationFramework, Version=3.1.0.450, Culture=neutral, PublicKeyToken=1d6a5af5fe952afb, processorArchitecture=MSIL">
@@ -84,24 +96,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="Microsoft.Office.Core">
-      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>8</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Interop.Outlook">
-      <Guid>{00062FFF-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>9</VersionMajor>
-      <VersionMinor>6</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>

diff --git a/src/CalendarSyncPlus/CalendarSyncPlus.sln b/src/CalendarSyncPlus/CalendarSyncPlus.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{11857CAB-6668-43F6-B3BA-DBFF74169EC1}"
 	ProjectSection(SolutionItems) = preProject
@@ -48,6 +48,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CalendarSyncPlus.Bootstrapp
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2F6B0B33-44F6-40B5-BF03-D9C4E16C7964}"
 	ProjectSection(SolutionItems) = preProject
+		Libraries\Microsoft.Office.Interop.Outlook.dll = Libraries\Microsoft.Office.Interop.Outlook.dll
+		Libraries\OFFICE.DLL = Libraries\OFFICE.DLL
 		Libraries\WixBalExtensionExt.dll = Libraries\WixBalExtensionExt.dll
 		Libraries\WpfApplicationFramework.dll = Libraries\WpfApplicationFramework.dll
 	EndProjectSection

diff --git a/src/CalendarSyncPlus/Libraries/Microsoft.Office.Interop.Outlook.dll b/src/CalendarSyncPlus/Libraries/Microsoft.Office.Interop.Outlook.dll
diff --git a/src/CalendarSyncPlus/Libraries/OFFICE.DLL b/src/CalendarSyncPlus/Libraries/OFFICE.DLL
diff --git a/src/CalendarSyncPlus/Shared/AssemblyInfo.cs b/src/CalendarSyncPlus/Shared/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.4.1.6")]
-[assembly: AssemblyFileVersion("1.4.1.6")]
+[assembly: AssemblyVersion("1.4.1.9")]
+[assembly: AssemblyFileVersion("1.4.1.9")]