Changed FetchXml project to shared project

MarkMpn · Jan 3, 2022 · 2799ca8 · 2799ca8
1 parent f61b03c
commit 2799ca8
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 143 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/MarkMpn.Sql4Cds.Engine.FetchXml.Tests.csproj b/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/MarkMpn.Sql4Cds.Engine.FetchXml.Tests.csproj
@@ -130,12 +130,7 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine.FetchXml\MarkMpn.Sql4Cds.Engine.FetchXml.csproj">
-      <Project>{ca534229-43ff-4bd4-9c60-182f56936ac3}</Project>
-      <Name>MarkMpn.Sql4Cds.Engine.FetchXml</Name>
-    </ProjectReference>
-  </ItemGroup>
+  <Import Project="..\MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.FetchXml.projitems" Label="Shared" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml/MarkMpn.Sql4Cds.Engine.FetchXml.csproj b/MarkMpn.Sql4Cds.Engine.FetchXml/MarkMpn.Sql4Cds.Engine.FetchXml.csproj
diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml/Properties/AssemblyInfo.cs b/MarkMpn.Sql4Cds.Engine.FetchXml/Properties/AssemblyInfo.cs
diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml/packages.config b/MarkMpn.Sql4Cds.Engine.FetchXml/packages.config
diff --git a/...ml/MarkMpn.Sql4Cds.Engine.FetchXml.nuspec → ...ne/MarkMpn.Sql4Cds.Engine.FetchXml.nuspec b/...ml/MarkMpn.Sql4Cds.Engine.FetchXml.nuspec → ...ne/MarkMpn.Sql4Cds.Engine.FetchXml.nuspec
@@ -17,11 +17,11 @@
     <tags>FetchXML SQL CDS</tags>
   </metadata>
   <files>
-    <file src="..\MarkMpn.Sql4Cds.Engine\AttributeMetadataCache.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\AttributeMetadataCache.cs" />
-    <file src="..\MarkMpn.Sql4Cds.Engine\DisconnectedException.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\DisconnectedException.cs" />
-    <file src="..\MarkMpn.Sql4Cds.Engine\FetchXml.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\FetchXml.cs" />
-    <file src="..\MarkMpn.Sql4Cds.Engine\FetchXml2Sql.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\FetchXml2Sql.cs" />
-    <file src="..\MarkMpn.Sql4Cds.Engine\IAttributeMetadataCache.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\IAttributeMetadataCache.cs" />
+    <file src="AttributeMetadataCache.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\AttributeMetadataCache.cs" />
+    <file src="DisconnectedException.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\DisconnectedException.cs" />
+    <file src="FetchXml.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\FetchXml.cs" />
+    <file src="FetchXml2Sql.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\FetchXml2Sql.cs" />
+    <file src="IAttributeMetadataCache.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\IAttributeMetadataCache.cs" />
     <file src="ScriptDom.cs" target="content\App_Packages\MarkMpn.Sql4Cds.Engine\ScriptDom.cs" />
   </files>
 </package>
diff --git a/MarkMpn.Sql4Cds.Engine/MarkMpn.Sql4Cds.Engine.FetchXml.projitems b/MarkMpn.Sql4Cds.Engine/MarkMpn.Sql4Cds.Engine.FetchXml.projitems
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>460a4174-b9ea-413a-af83-c27c0686e98f</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>MarkMpn.Sql4Cds.Engine.FetchXml</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)ScriptDom.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AttributeMetadataCache.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DisconnectedException.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FetchXml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FetchXml2Sql.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IAttributeMetadataCache.cs" />
+  </ItemGroup>
+</Project>
diff --git a/MarkMpn.Sql4Cds.Engine/MarkMpn.Sql4Cds.Engine.FetchXml.shproj b/MarkMpn.Sql4Cds.Engine/MarkMpn.Sql4Cds.Engine.FetchXml.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>460a4174-b9ea-413a-af83-c27c0686e98f</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="MarkMpn.Sql4Cds.Engine.FetchXml.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/MarkMpn.Sql4Cds.Engine/MarkMpn.Sql4Cds.Engine.projitems b/MarkMpn.Sql4Cds.Engine/MarkMpn.Sql4Cds.Engine.projitems
@@ -106,6 +106,5 @@
     <None Include="$(MSBuildThisFileDirectory)FetchXml.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)MarkMpn.Sql4Cds.Engine.nuspec" />
   </ItemGroup>
 </Project>
diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml/ScriptDom.cs → MarkMpn.Sql4Cds.Engine/ScriptDom.cs b/MarkMpn.Sql4Cds.Engine.FetchXml/ScriptDom.cs → MarkMpn.Sql4Cds.Engine/ScriptDom.cs
diff --git a/MarkMpn.Sql4Cds.sln b/MarkMpn.Sql4Cds.sln
@@ -18,19 +18,21 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MarkMpn.Sql4Cds.SSMS.Setup"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkMpn.Sql4Cds.Tests", "MarkMpn.Sql4Cds.Tests\MarkMpn.Sql4Cds.Tests.csproj", "{081AA0FB-A019-430A-B05A-F55CAC7C50FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkMpn.Sql4Cds.Engine.FetchXml", "MarkMpn.Sql4Cds.Engine.FetchXml\MarkMpn.Sql4Cds.Engine.FetchXml.csproj", "{CA534229-43FF-4BD4-9C60-182F56936AC3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkMpn.Sql4Cds.Engine.FetchXml.Tests", "MarkMpn.Sql4Cds.Engine.FetchXml.Tests\MarkMpn.Sql4Cds.Engine.FetchXml.Tests.csproj", "{69F7D111-3542-4E31-A0F8-E544F9FFA587}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MarkMpn.Sql4Cds.Engine", "MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.shproj", "{BCF89341-E1A6-4106-9C12-1E15C9E7C58B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkMpn.Sql4Cds.Engine.NetFx", "MarkMpn.Sql4Cds.Engine.NetFx\MarkMpn.Sql4Cds.Engine.NetFx.csproj", "{23288BB2-0D6F-4329-9A5C-4C659567A652}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkMpn.Sql4Cds.Engine.NetCore", "MarkMpn.Sql4Cds.Engine.NetCore\MarkMpn.Sql4Cds.Engine.NetCore.csproj", "{A570CBCA-D09C-40D5-A318-A95C8FBBD593}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkMpn.Sql4Cds.Engine.NetCore", "MarkMpn.Sql4Cds.Engine.NetCore\MarkMpn.Sql4Cds.Engine.NetCore.csproj", "{A570CBCA-D09C-40D5-A318-A95C8FBBD593}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MarkMpn.Sql4Cds.Engine.FetchXml", "MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.FetchXml.shproj", "{460A4174-B9EA-413A-AF83-C27C0686E98F}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.projitems*{23288bb2-0d6f-4329-9a5c-4c659567a652}*SharedItemsImports = 4
+		MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.FetchXml.projitems*{460a4174-b9ea-413a-af83-c27c0686e98f}*SharedItemsImports = 13
+		MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.FetchXml.projitems*{69f7d111-3542-4e31-a0f8-e544f9ffa587}*SharedItemsImports = 4
 		MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.projitems*{a570cbca-d09c-40d5-a318-a95c8fbbd593}*SharedItemsImports = 5
 		MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.projitems*{bcf89341-e1a6-4106-9c12-1e15c9e7c58b}*SharedItemsImports = 13
 	EndGlobalSection
@@ -86,14 +88,6 @@ Global
 		{081AA0FB-A019-430A-B05A-F55CAC7C50FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{081AA0FB-A019-430A-B05A-F55CAC7C50FD}.Release|x86.ActiveCfg = Release|Any CPU
 		{081AA0FB-A019-430A-B05A-F55CAC7C50FD}.Release|x86.Build.0 = Release|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Debug|x86.Build.0 = Debug|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Release|x86.ActiveCfg = Release|Any CPU
-		{CA534229-43FF-4BD4-9C60-182F56936AC3}.Release|x86.Build.0 = Release|Any CPU
 		{69F7D111-3542-4E31-A0F8-E544F9FFA587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69F7D111-3542-4E31-A0F8-E544F9FFA587}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69F7D111-3542-4E31-A0F8-E544F9FFA587}.Debug|x86.ActiveCfg = Debug|Any CPU