Merge remote-tracking branch 'remotes/origin/feature/Intellisense' in…

…to feature/XSharpCompiler
X-Sharp · Mar 5, 2024 · 799b3ba · 799b3ba
2 parents 05f482c + 83a80f0
commit 799b3ba
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 108 deletions.
diff --git a/src/Tests/VFPXPorterTest/Properties/AssemblyInfo.prg b/src/Tests/VFPXPorterTest/Properties/AssemblyInfo.prg
@@ -8,30 +8,4 @@ USING System.Runtime.InteropServices
 //
 [assembly: AssemblyTitle("VFPXPorterTest")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VFPXPorterTest")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(FALSE)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("421a1a64-a17d-451e-b7e0-dbf3a173b65d")]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/Tests/VFPXPorterTest/VFPXPorterTest.xsproj b/src/Tests/VFPXPorterTest/VFPXPorterTest.xsproj
@@ -54,6 +54,12 @@
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Common\commonAssemblyInfo.prg">
+      <Link>Properties\commonAssemblyInfo.prg</Link>
+    </Compile>
+    <Compile Include="..\..\Common\constants.prg">
+      <Link>Properties\constants.prg</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.prg">
       <SubType>Code</SubType>
     </Compile>

diff --git a/src/Tools/VFPXPorter/Source/VFPXPorter/Properties/AssemblyInfo.prg b/src/Tools/VFPXPorter/Source/VFPXPorter/Properties/AssemblyInfo.prg
@@ -1,28 +1,4 @@
 using System.Reflection
 using System.Runtime.CompilerServices
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
 [assembly: AssemblyTitle("VFPXPorter")]
 [assembly: AssemblyDescription("XPorter Application for VPF Projects,Forms,Libraries,...")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VFPXPorter")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/Tools/VFPXPorter/Source/VFPXPorter/VFPXPorter.xsproj b/src/Tools/VFPXPorter/Source/VFPXPorter/VFPXPorter.xsproj
@@ -85,6 +85,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Common\commonAssemblyInfo.prg">
+      <Link>Properties\commonAssemblyInfo.prg</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\Common\constants.prg">
+      <Link>Properties\constants.prg</Link>
+    </Compile>
     <Compile Include="AboutDialog.Designer.prg">
       <DependentUpon>AboutDialog.prg</DependentUpon>
     </Compile>

diff --git a/src/Tools/VFPXPorter/Source/VFPXPorterCmd/Properties/AssemblyInfo.prg b/src/Tools/VFPXPorter/Source/VFPXPorterCmd/Properties/AssemblyInfo.prg
@@ -8,30 +8,3 @@ USING System.Runtime.InteropServices
 //
 [assembly: AssemblyTitle("FabVFPXPorterCmd")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FabVFPXPorterCmd")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(FALSE)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8ffa9199-e4a3-4ac4-9a97-9ba2ac8d13cd")]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/Tools/VFPXPorter/Source/VFPXPorterCmd/VFPXPorterCmd.xsproj b/src/Tools/VFPXPorter/Source/VFPXPorterCmd/VFPXPorterCmd.xsproj
@@ -54,6 +54,12 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Common\commonAssemblyInfo.prg">
+      <Link>Properties\commonAssemblyInfo.prg</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\Common\constants.prg">
+      <Link>Properties\constants.prg</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.prg">
       <SubType>Code</SubType>
     </Compile>

diff --git a/src/Tools/VFPXPorter/Source/VFPXPorterLib/Properties/AssemblyInfo.prg b/src/Tools/VFPXPorter/Source/VFPXPorterLib/Properties/AssemblyInfo.prg
@@ -8,30 +8,3 @@ USING System.Runtime.InteropServices
 //
 [assembly: AssemblyTitle("VFPXPorterLib")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VFPXPorterLib")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(FALSE)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("71f46150-aad7-4ed1-8e3f-263698800ba7")]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/Tools/VFPXPorter/Source/VFPXPorterLib/VFPXPorterLib.xsproj b/src/Tools/VFPXPorter/Source/VFPXPorterLib/VFPXPorterLib.xsproj
@@ -73,6 +73,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Common\commonAssemblyInfo.prg">
+      <Link>Properties\commonAssemblyInfo.prg</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\Common\constants.prg">
+      <Link>Properties\constants.prg</Link>
+    </Compile>
     <Compile Include="BlockCode.prg" />
     <Compile Include="IXPorterWorker.prg" />
     <Compile Include="SCXVCXEntity.prg" />

diff --git a/src/VFPXPorter.sln b/src/VFPXPorter.sln
@@ -5,10 +5,10 @@ VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C6CBB0DC-CDFC-4840-BCBC-49D0E8641BB4}"
 	ProjectSection(SolutionItems) = preProject
-		DocumentationAndRules.md = DocumentationAndRules.md
-		ExportAdvices.md = ExportAdvices.md
-		README.md = README.md
-		Todo.md = Todo.md
+		Tools\VFPXPorter\DocumentationAndRules.md = Tools\VFPXPorter\DocumentationAndRules.md
+		Tools\VFPXPorter\ExportAdvices.md = Tools\VFPXPorter\ExportAdvices.md
+		Tools\VFPXPorter\README.md = Tools\VFPXPorter\README.md
+		Tools\VFPXPorter\Todo.md = Tools\VFPXPorter\Todo.md
 	EndProjectSection
 EndProject
 Project("{AA6C8D78-22FF-423A-9C7C-5F2393824E04}") = "VFPXPorter", "Tools\VFPXPorter\Source\VFPXPorter\VFPXPorter.xsproj", "{23BB62E9-A405-416A-B0A5-0E4E178B839F}"