Merge pull request #499 from MarkMpn/v9-fixes

V9 fixes
MarkMpn · Jul 4, 2024 · 6bcea62 · 6bcea62
2 parents a4bd989 + 6ae0116
commit 6bcea62
Show file tree

Hide file tree

Showing 78 changed files with 5,980 additions and 686 deletions.
diff --git a/MarkMpn.Sql4Cds.Controls/MarkMpn.Sql4Cds.Controls.csproj b/MarkMpn.Sql4Cds.Controls/MarkMpn.Sql4Cds.Controls.csproj
@@ -59,12 +59,6 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine.NetFx\MarkMpn.Sql4Cds.Engine.NetFx.csproj">
-      <Project>{23288bb2-0d6f-4329-9a5c-4c659567a652}</Project>
-      <Name>MarkMpn.Sql4Cds.Engine.NetFx</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Key.snk" />
   </ItemGroup>
@@ -170,6 +164,12 @@
   <ItemGroup>
     <EmbeddedResource Include="Images\XmlWriterNode.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.csproj">
+      <Project>{c77b731d-e55c-4197-b96c-2b23eb9f56ef}</Project>
+      <Name>MarkMpn.Sql4Cds.Engine</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PostBuildEvent>copy $(TargetDir)MarkMpn.Sql4Cds.Controls.dll %25appdata%25\MscrmTools\XrmToolBox\Plugins\MarkMpn.Sql4Cds</PostBuildEvent>

diff --git a/...pn.Sql4Cds.DebugVisualizer.DebugeeSide/MarkMpn.Sql4Cds.DebugVisualizer.DebugeeSide.csproj b/...pn.Sql4Cds.DebugVisualizer.DebugeeSide/MarkMpn.Sql4Cds.DebugVisualizer.DebugeeSide.csproj
@@ -12,8 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine.NetCore\MarkMpn.Sql4Cds.Engine.NetCore.csproj" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine.NetFx\MarkMpn.Sql4Cds.Engine.NetFx.csproj" Condition="'$(TargetFramework)' == 'net462'" />
+    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/....Sql4Cds.DebugVisualizer.DebuggerSide/MarkMpn.Sql4Cds.DebugVisualizer.DebuggerSide.csproj b/....Sql4Cds.DebugVisualizer.DebuggerSide/MarkMpn.Sql4Cds.DebugVisualizer.DebuggerSide.csproj
@@ -43,6 +43,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MarkMpn.Sql4Cds.Controls\MarkMpn.Sql4Cds.Controls.csproj" />
-    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine.NetFx\MarkMpn.Sql4Cds.Engine.NetFx.csproj" />
+    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.csproj" />
   </ItemGroup>
 </Project>
diff --git a/MarkMpn.Sql4Cds.Engine.NetCore/MarkMpn.Sql4Cds.Engine.NetCore.csproj b/MarkMpn.Sql4Cds.Engine.NetCore/MarkMpn.Sql4Cds.Engine.NetCore.csproj
diff --git a/MarkMpn.Sql4Cds.Engine.NetFx/MarkMpn.Sql4Cds.Engine.NetFx.csproj b/MarkMpn.Sql4Cds.Engine.NetFx/MarkMpn.Sql4Cds.Engine.NetFx.csproj
diff --git a/MarkMpn.Sql4Cds.Engine.NetFx/Properties/AssemblyInfo.cs b/MarkMpn.Sql4Cds.Engine.NetFx/Properties/AssemblyInfo.cs
diff --git a/MarkMpn.Sql4Cds.Engine.NetFx/Properties/Resources.Designer.cs b/MarkMpn.Sql4Cds.Engine.NetFx/Properties/Resources.Designer.cs
diff --git a/MarkMpn.Sql4Cds.Engine.NetFx/Properties/Resources.resx b/MarkMpn.Sql4Cds.Engine.NetFx/Properties/Resources.resx