Merge with new folder structure
authorThomas
Wed, 11 Nov 2020 12:15:53 +0100
changeset 3337 4cd26b80d0cd
parent 3336 a7b84e234579 (current diff)
parent 3335 5f779469d89c (diff)
child 3338 7edaa142ec59
child 3339 d9dc53835e05
child 3343 76d05fcbf5ce
Merge with new folder structure
ThisAddIn.cs
pep_test.snk
--- a/ThisAddIn.cs	Tue Nov 03 14:04:57 2020 +0100
+++ b/ThisAddIn.cs	Wed Nov 11 12:15:53 2020 +0100
@@ -2209,7 +2209,7 @@
             // In Debug mode, launch adapter if needed
             if (Process.GetProcessesByName("pEpCOMServerAdapter")?.Length < 1)
             {
-                Process.Start(Path.Combine(Environment.CurrentDirectory, "..", "..", "..", "Debug", "pEpCOMServerAdapter.exe"));
+                Process.Start(Path.Combine(Environment.CurrentDirectory, "..", "..", "..", "..", "pEpForWindowsAdapterSolution", "Debug", "pEpCOMServerAdapter.exe"));
             }
 #endif
             // Set main thread id
--- a/pEpForOutlook.csproj	Tue Nov 03 14:04:57 2020 +0100
+++ b/pEpForOutlook.csproj	Wed Nov 11 12:15:53 2020 +0100
@@ -268,20 +268,16 @@
     <Reference Include="Office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="pEpCOMServerAdapter.Interop" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\Debug\pEpCOMServerAdapter.Interop.dll</HintPath>
+    <Reference Include="pEpCOMServerAdapter.Interop" Condition="'$(Configuration)'=='Enterprise'">
+      <HintPath>..\..\pEpForWindowsAdapterSolution\Release\pEpCOMServerAdapter.Interop.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="pEpCOMServerAdapter.Interop" Condition="'$(Configuration)'=='Release'">
-      <HintPath>..\Release\pEpCOMServerAdapter.Interop.dll</HintPath>
+      <HintPath>..\..\pEpForWindowsAdapterSolution\Release\pEpCOMServerAdapter.Interop.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
-    <Reference Include="pEpCOMServerAdapter.Interop" Condition="'$(Configuration)'=='ReaderRelease'">
-      <HintPath>..\Release\pEpCOMServerAdapter.Interop.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="pEpCOMServerAdapter.Interop" Condition="'$(Configuration)'=='Enterprise'">
-      <HintPath>..\Release\pEpCOMServerAdapter.Interop.dll</HintPath>
+    <Reference Include="pEpCOMServerAdapter.Interop" Condition="'$(Configuration)'=='Debug'">
+      <HintPath>..\..\pEpForWindowsAdapterSolution\Debug\pEpCOMServerAdapter.Interop.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -553,7 +549,6 @@
     <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="pEp_2_TemporaryKey.pfx" />
-    <None Include="pep_test.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
Binary file pep_test.snk has changed