Move files to Nupgk and Core folders

ErikEJ · Jan 10, 2024 · 1ae5823 · 1ae5823
1 parent 46e37f7
commit 1ae5823
Show file tree

Hide file tree

Showing 224 changed files with 125 additions and 124 deletions.
diff --git a/.github/workflows/cli-tool.yml b/.github/workflows/cli-tool.yml
@@ -20,16 +20,16 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Package CLI 6
-      run: dotnet pack src\GUI\efcpt.6\efcpt.6.csproj -p:PackageVersion=6.1.${{ env.VERSION }}-nightly -p:InformationalVersion=6.1.${{ env.VERSION }}-nightly
+      run: dotnet pack src\Core\efcpt.6\efcpt.6.csproj -p:PackageVersion=6.1.${{ env.VERSION }}-nightly -p:InformationalVersion=6.1.${{ env.VERSION }}-nightly
 
     - name: Package CLI 7
-      run: dotnet pack src\GUI\efcpt.7\efcpt.7.csproj -p:PackageVersion=7.1.${{ env.VERSION }}-nightly -p:InformationalVersion=7.1.${{ env.VERSION }}-nightly
+      run: dotnet pack src\Core\efcpt.7\efcpt.7.csproj -p:PackageVersion=7.1.${{ env.VERSION }}-nightly -p:InformationalVersion=7.1.${{ env.VERSION }}-nightly
 
     - name: Package CLI 8
-      run: dotnet pack src\GUI\efcpt.8\efcpt.8.csproj -p:PackageVersion=8.1.${{ env.VERSION }}-nightly -p:InformationalVersion=8.1.${{ env.VERSION }}-nightly
+      run: dotnet pack src\Core\efcpt.8\efcpt.8.csproj -p:PackageVersion=8.1.${{ env.VERSION }}-nightly -p:InformationalVersion=8.1.${{ env.VERSION }}-nightly
 
     - name: Core test project
-      run: dotnet test src\GUI\NUnitTestCore\NUnitTestCore.csproj
+      run: dotnet test src\Core\NUnitTestCore\NUnitTestCore.csproj
       continue-on-error: false
 
     - name: Publish NuGet

diff --git a/.github/workflows/vsix.yml b/.github/workflows/vsix.yml
@@ -32,14 +32,14 @@ jobs:
       shell: pwsh
 
     - name: Restore
-      run: dotnet restore GUI/EFCorePowerTools.sln
+      run: dotnet restore EFCorePowerTools.sln
       working-directory: src
 
     - name: Setup MSBuild.exe
       uses: microsoft/[email protected]
 
     - name: Build
-      run: msbuild GUI/EFCorePowerTools.sln /property:Configuration=Release /p:DeployExtension=false /p:ZipPackageCompressionLevel=normal /v:m
+      run: msbuild EFCorePowerTools.sln /property:Configuration=Release /p:DeployExtension=false /p:ZipPackageCompressionLevel=normal /v:m
       working-directory: src
 
     - name: Move build output

diff --git a/src/GUI/.editorconfig → src/.editorconfig b/src/GUI/.editorconfig → src/.editorconfig
diff --git a/...dCore.161/DacFxStrongTypedCore.161.csproj → ...dCore.161/DacFxStrongTypedCore.161.csproj b/...dCore.161/DacFxStrongTypedCore.161.csproj → ...dCore.161/DacFxStrongTypedCore.161.csproj
diff --git a/...StrongTypedCore.161/Directory.Build.props → ...StrongTypedCore.161/Directory.Build.props b/...StrongTypedCore.161/Directory.Build.props → ...StrongTypedCore.161/Directory.Build.props
diff --git a/...FxStrongTypedCore.161/ISqlModelElement.cs → ...FxStrongTypedCore.161/ISqlModelElement.cs b/...FxStrongTypedCore.161/ISqlModelElement.cs → ...FxStrongTypedCore.161/ISqlModelElement.cs
diff --git a/...ypedCore.161/ISqlModelElementReference.cs → ...ypedCore.161/ISqlModelElementReference.cs b/...ypedCore.161/ISqlModelElementReference.cs → ...ypedCore.161/ISqlModelElementReference.cs
diff --git a/...UI/DacFxStrongTypedCore.161/Interfaces.cs → ...re/DacFxStrongTypedCore.161/Interfaces.cs b/...UI/DacFxStrongTypedCore.161/Interfaces.cs → ...re/DacFxStrongTypedCore.161/Interfaces.cs
diff --git a/src/GUI/DacFxStrongTypedCore.161/Key.snk → src/Core/DacFxStrongTypedCore.161/Key.snk b/src/GUI/DacFxStrongTypedCore.161/Key.snk → src/Core/DacFxStrongTypedCore.161/Key.snk
diff --git a/...FxStrongTypedCore.161/MarkerInterfaces.cs → ...FxStrongTypedCore.161/MarkerInterfaces.cs b/...FxStrongTypedCore.161/MarkerInterfaces.cs → ...FxStrongTypedCore.161/MarkerInterfaces.cs
diff --git a/...cFxStrongTypedCore.161/ModelExtensions.cs → ...cFxStrongTypedCore.161/ModelExtensions.cs b/...cFxStrongTypedCore.161/ModelExtensions.cs → ...cFxStrongTypedCore.161/ModelExtensions.cs
diff --git a/...ngTypedCore.161/ModelMessages.Designer.cs → ...ngTypedCore.161/ModelMessages.Designer.cs b/...ngTypedCore.161/ModelMessages.Designer.cs → ...ngTypedCore.161/ModelMessages.Designer.cs
diff --git a/...StrongTypedCore.161/ModelMessages.es.resx → ...StrongTypedCore.161/ModelMessages.es.resx b/...StrongTypedCore.161/ModelMessages.es.resx → ...StrongTypedCore.161/ModelMessages.es.resx
diff --git a/...cFxStrongTypedCore.161/ModelMessages.resx → ...cFxStrongTypedCore.161/ModelMessages.resx b/...cFxStrongTypedCore.161/ModelMessages.resx → ...cFxStrongTypedCore.161/ModelMessages.resx
diff --git a/...trongTypedCore.161/ModelUtilityMethods.cs → ...trongTypedCore.161/ModelUtilityMethods.cs b/...trongTypedCore.161/ModelUtilityMethods.cs → ...trongTypedCore.161/ModelUtilityMethods.cs
diff --git a/...FxStrongTypedCore.161/TSqlModelElement.cs → ...FxStrongTypedCore.161/TSqlModelElement.cs b/...FxStrongTypedCore.161/TSqlModelElement.cs → ...FxStrongTypedCore.161/TSqlModelElement.cs
diff --git a/...ypedCore.161/TSqlModelElementReference.cs → ...ypedCore.161/TSqlModelElementReference.cs b/...ypedCore.161/TSqlModelElementReference.cs → ...ypedCore.161/TSqlModelElementReference.cs
diff --git a/...acFxStrongTypedCore.161/TSqlTypedModel.cs → ...acFxStrongTypedCore.161/TSqlTypedModel.cs b/...acFxStrongTypedCore.161/TSqlTypedModel.cs → ...acFxStrongTypedCore.161/TSqlTypedModel.cs
diff --git a/...pedCore.161/UnresolvedElementException.cs → ...pedCore.161/UnresolvedElementException.cs b/...pedCore.161/UnresolvedElementException.cs → ...pedCore.161/UnresolvedElementException.cs
diff --git a/src/GUI/DacFxStrongTypedCore.161/Utils.cs → src/Core/DacFxStrongTypedCore.161/Utils.cs b/src/GUI/DacFxStrongTypedCore.161/Utils.cs → src/Core/DacFxStrongTypedCore.161/Utils.cs
diff --git a/...ore.161/VersionSpecificImplementations.cs → ...ore.161/VersionSpecificImplementations.cs b/...ore.161/VersionSpecificImplementations.cs → ...ore.161/VersionSpecificImplementations.cs
diff --git a/src/GUI/DacFxStrongTypedCore.161/model.cs → src/Core/DacFxStrongTypedCore.161/model.cs b/src/GUI/DacFxStrongTypedCore.161/model.cs → src/Core/DacFxStrongTypedCore.161/model.cs
diff --git a/...estCore/ClassicHumanizerPluralizerTest.cs → ...estCore/ClassicHumanizerPluralizerTest.cs b/...estCore/ClassicHumanizerPluralizerTest.cs → ...estCore/ClassicHumanizerPluralizerTest.cs
diff --git a/src/GUI/NUnitTestCore/CliObjectListTest.cs → src/Core/NUnitTestCore/CliObjectListTest.cs b/src/GUI/NUnitTestCore/CliObjectListTest.cs → src/Core/NUnitTestCore/CliObjectListTest.cs
diff --git a/...tTestCore/ConnectionStringResolverTest.cs → ...tTestCore/ConnectionStringResolverTest.cs b/...tTestCore/ConnectionStringResolverTest.cs → ...tTestCore/ConnectionStringResolverTest.cs
diff --git a/...TestCore/CustomHumanizerPluralizerTest.cs → ...TestCore/CustomHumanizerPluralizerTest.cs b/...TestCore/CustomHumanizerPluralizerTest.cs → ...TestCore/CustomHumanizerPluralizerTest.cs
diff --git a/...UnitTestCore/Dacpac/AdventureWorks.dacpac → ...UnitTestCore/Dacpac/AdventureWorks.dacpac b/...UnitTestCore/Dacpac/AdventureWorks.dacpac → ...UnitTestCore/Dacpac/AdventureWorks.dacpac
diff --git a/...TestCore/Dacpac/AdventureWorks2014.dacpac → ...TestCore/Dacpac/AdventureWorks2014.dacpac b/...TestCore/Dacpac/AdventureWorks2014.dacpac → ...TestCore/Dacpac/AdventureWorks2014.dacpac
diff --git a/src/GUI/NUnitTestCore/Dacpac/Chinook.dacpac → src/Core/NUnitTestCore/Dacpac/Chinook.dacpac b/src/GUI/NUnitTestCore/Dacpac/Chinook.dacpac → src/Core/NUnitTestCore/Dacpac/Chinook.dacpac
diff --git a/...TestCore/Dacpac/DacpacConsolidatorTest.cs → ...TestCore/Dacpac/DacpacConsolidatorTest.cs b/...TestCore/Dacpac/DacpacConsolidatorTest.cs → ...TestCore/Dacpac/DacpacConsolidatorTest.cs
diff --git a/src/GUI/NUnitTestCore/Dacpac/DacpacTest.cs → src/Core/NUnitTestCore/Dacpac/DacpacTest.cs b/src/GUI/NUnitTestCore/Dacpac/DacpacTest.cs → src/Core/NUnitTestCore/Dacpac/DacpacTest.cs
diff --git a/...GUI/NUnitTestCore/Dacpac/Issue1262.dacpac → ...ore/NUnitTestCore/Dacpac/Issue1262.dacpac b/...GUI/NUnitTestCore/Dacpac/Issue1262.dacpac → ...ore/NUnitTestCore/Dacpac/Issue1262.dacpac
diff --git a/src/GUI/NUnitTestCore/Dacpac/Issue208.dacpac → ...Core/NUnitTestCore/Dacpac/Issue208.dacpac b/src/GUI/NUnitTestCore/Dacpac/Issue208.dacpac → ...Core/NUnitTestCore/Dacpac/Issue208.dacpac
diff --git a/src/GUI/NUnitTestCore/Dacpac/Issue210.dacpac → ...Core/NUnitTestCore/Dacpac/Issue210.dacpac b/src/GUI/NUnitTestCore/Dacpac/Issue210.dacpac → ...Core/NUnitTestCore/Dacpac/Issue210.dacpac
diff --git a/...estCore/Dacpac/NorthwindProcedures.dacpac → ...estCore/Dacpac/NorthwindProcedures.dacpac b/...estCore/Dacpac/NorthwindProcedures.dacpac → ...estCore/Dacpac/NorthwindProcedures.dacpac
diff --git a/...UnitTestCore/Dacpac/NorthwindViews.dacpac → ...UnitTestCore/Dacpac/NorthwindViews.dacpac b/...UnitTestCore/Dacpac/NorthwindViews.dacpac → ...UnitTestCore/Dacpac/NorthwindViews.dacpac
diff --git a/src/GUI/NUnitTestCore/Dacpac/Temporal.dacpac → ...Core/NUnitTestCore/Dacpac/Temporal.dacpac b/src/GUI/NUnitTestCore/Dacpac/Temporal.dacpac → ...Core/NUnitTestCore/Dacpac/Temporal.dacpac
diff --git a/src/GUI/NUnitTestCore/Dacpac/TestDb.dacpac → src/Core/NUnitTestCore/Dacpac/TestDb.dacpac b/src/GUI/NUnitTestCore/Dacpac/TestDb.dacpac → src/Core/NUnitTestCore/Dacpac/TestDb.dacpac
diff --git a/...UI/NUnitTestCore/DbContextSplitterTest.cs → ...re/NUnitTestCore/DbContextSplitterTest.cs b/...UI/NUnitTestCore/DbContextSplitterTest.cs → ...re/NUnitTestCore/DbContextSplitterTest.cs
diff --git a/src/GUI/NUnitTestCore/Dgml/Aw2014Person.txt → src/Core/NUnitTestCore/Dgml/Aw2014Person.txt b/src/GUI/NUnitTestCore/Dgml/Aw2014Person.txt → src/Core/NUnitTestCore/Dgml/Aw2014Person.txt
diff --git a/...GUI/NUnitTestCore/Dgml/ChinookContext.txt → ...ore/NUnitTestCore/Dgml/ChinookContext.txt b/...GUI/NUnitTestCore/Dgml/ChinookContext.txt → ...ore/NUnitTestCore/Dgml/ChinookContext.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/DgmlTest.cs → src/Core/NUnitTestCore/Dgml/DgmlTest.cs b/src/GUI/NUnitTestCore/Dgml/DgmlTest.cs → src/Core/NUnitTestCore/Dgml/DgmlTest.cs
diff --git a/src/GUI/NUnitTestCore/Dgml/Identity.txt → src/Core/NUnitTestCore/Dgml/Identity.txt b/src/GUI/NUnitTestCore/Dgml/Identity.txt → src/Core/NUnitTestCore/Dgml/Identity.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/Issue604.txt → src/Core/NUnitTestCore/Dgml/Issue604.txt b/src/GUI/NUnitTestCore/Dgml/Issue604.txt → src/Core/NUnitTestCore/Dgml/Issue604.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/Issue687.txt → src/Core/NUnitTestCore/Dgml/Issue687.txt b/src/GUI/NUnitTestCore/Dgml/Issue687.txt → src/Core/NUnitTestCore/Dgml/Issue687.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/NoFk.txt → src/Core/NUnitTestCore/Dgml/NoFk.txt b/src/GUI/NUnitTestCore/Dgml/NoFk.txt → src/Core/NUnitTestCore/Dgml/NoFk.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/Northwind.txt → src/Core/NUnitTestCore/Dgml/Northwind.txt b/src/GUI/NUnitTestCore/Dgml/Northwind.txt → src/Core/NUnitTestCore/Dgml/Northwind.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/Pfizer.txt → src/Core/NUnitTestCore/Dgml/Pfizer.txt b/src/GUI/NUnitTestCore/Dgml/Pfizer.txt → src/Core/NUnitTestCore/Dgml/Pfizer.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/Samurai.txt → src/Core/NUnitTestCore/Dgml/Samurai.txt b/src/GUI/NUnitTestCore/Dgml/Samurai.txt → src/Core/NUnitTestCore/Dgml/Samurai.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/SingleNav.txt → src/Core/NUnitTestCore/Dgml/SingleNav.txt b/src/GUI/NUnitTestCore/Dgml/SingleNav.txt → src/Core/NUnitTestCore/Dgml/SingleNav.txt
diff --git a/src/GUI/NUnitTestCore/Dgml/longview50.txt → src/Core/NUnitTestCore/Dgml/longview50.txt b/src/GUI/NUnitTestCore/Dgml/longview50.txt → src/Core/NUnitTestCore/Dgml/longview50.txt
diff --git a/src/GUI/NUnitTestCore/Directory.Build.props → src/Core/NUnitTestCore/Directory.Build.props b/src/GUI/NUnitTestCore/Directory.Build.props → src/Core/NUnitTestCore/Directory.Build.props
diff --git a/src/GUI/NUnitTestCore/NUnitTestCore.csproj → src/Core/NUnitTestCore/NUnitTestCore.csproj b/src/GUI/NUnitTestCore/NUnitTestCore.csproj → src/Core/NUnitTestCore/NUnitTestCore.csproj
@@ -84,16 +84,16 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\ErikEJ.EntityFrameworkCore.DgmlBuilder\template.dgml" Link="template.dgml" />
+    <EmbeddedResource Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.DgmlBuilder\template.dgml" Link="template.dgml" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ErikEJ.EntityFrameworkCore.DgmlBuilder\ErikEJ.EntityFrameworkCore.DgmlBuilder.csproj" />
-    <ProjectReference Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.6.SqlServer.Dacpac.csproj" />
+    <ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.DgmlBuilder\ErikEJ.EntityFrameworkCore.DgmlBuilder.csproj" />
+    <ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.6.SqlServer.Dacpac.csproj" />
     <ProjectReference Include="..\RevEng.Core.60\RevEng.Core.60.csproj" />
   </ItemGroup>
 

diff --git a/...e/ReplacingCandidateNamingServiceTests.cs → ...e/ReplacingCandidateNamingServiceTests.cs b/...e/ReplacingCandidateNamingServiceTests.cs → ...e/ReplacingCandidateNamingServiceTests.cs
diff --git a/...itTestCore/SqlServerTypeExtensionsTest.cs → ...itTestCore/SqlServerTypeExtensionsTest.cs b/...itTestCore/SqlServerTypeExtensionsTest.cs → ...itTestCore/SqlServerTypeExtensionsTest.cs
diff --git a/.../ColumnRemovingScaffoldingModelFactory.cs → .../ColumnRemovingScaffoldingModelFactory.cs b/.../ColumnRemovingScaffoldingModelFactory.cs → .../ColumnRemovingScaffoldingModelFactory.cs
diff --git a/...evEng.Core.60/ConnectionStringResolver.cs → ...evEng.Core.60/ConnectionStringResolver.cs b/...evEng.Core.60/ConnectionStringResolver.cs → ...evEng.Core.60/ConnectionStringResolver.cs
diff --git a/...vEng.Core.60/CustomTemplateFileService.cs → ...vEng.Core.60/CustomTemplateFileService.cs b/...vEng.Core.60/CustomTemplateFileService.cs → ...vEng.Core.60/CustomTemplateFileService.cs
diff --git a/src/GUI/RevEng.Core.60/DbContextExtensions → src/Core/RevEng.Core.60/DbContextExtensions b/src/GUI/RevEng.Core.60/DbContextExtensions → src/Core/RevEng.Core.60/DbContextExtensions
diff --git a/...I/RevEng.Core.60/DbContextExtensions.Sync → ...e/RevEng.Core.60/DbContextExtensions.Sync b/...I/RevEng.Core.60/DbContextExtensions.Sync → ...e/RevEng.Core.60/DbContextExtensions.Sync
diff --git a/src/GUI/RevEng.Core.60/DbContextSplitter.cs → src/Core/RevEng.Core.60/DbContextSplitter.cs b/src/GUI/RevEng.Core.60/DbContextSplitter.cs → src/Core/RevEng.Core.60/DbContextSplitter.cs
diff --git a/...evEng.Core.60/Dgml/DatabaseModelToDgml.cs → ...evEng.Core.60/Dgml/DatabaseModelToDgml.cs b/...evEng.Core.60/Dgml/DatabaseModelToDgml.cs → ...evEng.Core.60/Dgml/DatabaseModelToDgml.cs
diff --git a/src/GUI/RevEng.Core.60/Dgml/DgmlBuilder.cs → src/Core/RevEng.Core.60/Dgml/DgmlBuilder.cs b/src/GUI/RevEng.Core.60/Dgml/DgmlBuilder.cs → src/Core/RevEng.Core.60/Dgml/DgmlBuilder.cs
diff --git a/src/GUI/RevEng.Core.60/Dgml/DgmlHelper.cs → src/Core/RevEng.Core.60/Dgml/DgmlHelper.cs b/src/GUI/RevEng.Core.60/Dgml/DgmlHelper.cs → src/Core/RevEng.Core.60/Dgml/DgmlHelper.cs
diff --git a/....Core.60/Functions/IFunctionScaffolder.cs → ....Core.60/Functions/IFunctionScaffolder.cs b/....Core.60/Functions/IFunctionScaffolder.cs → ....Core.60/Functions/IFunctionScaffolder.cs
diff --git a/...ons/NotImplementedFunctionModelFactory.cs → ...ons/NotImplementedFunctionModelFactory.cs b/...ons/NotImplementedFunctionModelFactory.cs → ...ons/NotImplementedFunctionModelFactory.cs
diff --git a/...tions/NotImplementedFunctionScaffolder.cs → ...tions/NotImplementedFunctionScaffolder.cs b/...tions/NotImplementedFunctionScaffolder.cs → ...tions/NotImplementedFunctionScaffolder.cs
diff --git a/...unctions/SqlServerFunctionModelFactory.cs → ...unctions/SqlServerFunctionModelFactory.cs b/...unctions/SqlServerFunctionModelFactory.cs → ...unctions/SqlServerFunctionModelFactory.cs
diff --git a/.../Functions/SqlServerFunctionScaffolder.cs → .../Functions/SqlServerFunctionScaffolder.cs b/.../Functions/SqlServerFunctionScaffolder.cs → .../Functions/SqlServerFunctionScaffolder.cs
diff --git a/src/GUI/RevEng.Core.60/GlobalSuppressions.cs → ...Core/RevEng.Core.60/GlobalSuppressions.cs b/src/GUI/RevEng.Core.60/GlobalSuppressions.cs → ...Core/RevEng.Core.60/GlobalSuppressions.cs
diff --git a/...GUI/RevEng.Core.60/HumanizerPluralizer.cs → ...ore/RevEng.Core.60/HumanizerPluralizer.cs b/...GUI/RevEng.Core.60/HumanizerPluralizer.cs → ...ore/RevEng.Core.60/HumanizerPluralizer.cs
diff --git a/...Eng.Core.60/IReverseEngineerScaffolder.cs → ...Eng.Core.60/IReverseEngineerScaffolder.cs b/...Eng.Core.60/IReverseEngineerScaffolder.cs → ...Eng.Core.60/IReverseEngineerScaffolder.cs
diff --git a/src/GUI/RevEng.Core.60/LegacyPluralizer.cs → src/Core/RevEng.Core.60/LegacyPluralizer.cs b/src/GUI/RevEng.Core.60/LegacyPluralizer.cs → src/Core/RevEng.Core.60/LegacyPluralizer.cs
diff --git a/...Core.60/Mermaid/DatabaseModelToMermaid.cs → ...Core.60/Mermaid/DatabaseModelToMermaid.cs b/...Core.60/Mermaid/DatabaseModelToMermaid.cs → ...Core.60/Mermaid/DatabaseModelToMermaid.cs
diff --git a/...0/PatchedSqlServerDatabaseModelFactory.cs → ...0/PatchedSqlServerDatabaseModelFactory.cs b/...0/PatchedSqlServerDatabaseModelFactory.cs → ...0/PatchedSqlServerDatabaseModelFactory.cs
diff --git a/...ore.60/Procedures/IProcedureScaffolder.cs → ...ore.60/Procedures/IProcedureScaffolder.cs b/...ore.60/Procedures/IProcedureScaffolder.cs → ...ore.60/Procedures/IProcedureScaffolder.cs
diff --git a/...es/NotImplementedProcedureModelFactory.cs → ...es/NotImplementedProcedureModelFactory.cs b/...es/NotImplementedProcedureModelFactory.cs → ...es/NotImplementedProcedureModelFactory.cs
diff --git a/...ures/NotImplementedProcedureScaffolder.cs → ...ures/NotImplementedProcedureScaffolder.cs b/...ures/NotImplementedProcedureScaffolder.cs → ...ures/NotImplementedProcedureScaffolder.cs
diff --git a/...ImplementedServiceCollectionExtensions.cs → ...ImplementedServiceCollectionExtensions.cs b/...ImplementedServiceCollectionExtensions.cs → ...ImplementedServiceCollectionExtensions.cs
diff --git a/.../Procedures/SqlServerSqlTypeExtensions.cs → .../Procedures/SqlServerSqlTypeExtensions.cs b/.../Procedures/SqlServerSqlTypeExtensions.cs → .../Procedures/SqlServerSqlTypeExtensions.cs
diff --git a/...s/SqlServerStoredProcedureModelFactory.cs → ...s/SqlServerStoredProcedureModelFactory.cs b/...s/SqlServerStoredProcedureModelFactory.cs → ...s/SqlServerStoredProcedureModelFactory.cs
diff --git a/...res/SqlServerStoredProcedureScaffolder.cs → ...res/SqlServerStoredProcedureScaffolder.cs b/...res/SqlServerStoredProcedureScaffolder.cs → ...res/SqlServerStoredProcedureScaffolder.cs
diff --git a/...edProcedureServiceCollectionExtensions.cs → ...edProcedureServiceCollectionExtensions.cs b/...edProcedureServiceCollectionExtensions.cs → ...edProcedureServiceCollectionExtensions.cs
diff --git a/...ore.60/ReplacingCandidateNamingService.cs → ...ore.60/ReplacingCandidateNamingService.cs b/...ore.60/ReplacingCandidateNamingService.cs → ...ore.60/ReplacingCandidateNamingService.cs
diff --git a/src/GUI/RevEng.Core.60/RevEng.Core.60.csproj → ...Core/RevEng.Core.60/RevEng.Core.60.csproj b/src/GUI/RevEng.Core.60/RevEng.Core.60.csproj → ...Core/RevEng.Core.60/RevEng.Core.60.csproj
@@ -33,9 +33,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.6.SqlServer.Dacpac.csproj" />
+    <ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.6.SqlServer.Dacpac.csproj" />
     <ProjectReference Include="..\RevEng.Core.Abstractions\RevEng.Core.Abstractions.csproj" />
-    <ProjectReference Include="..\RevEng.Shared\RevEng.Common.csproj" />
+    <ProjectReference Include="..\..\GUI\RevEng.Shared\RevEng.Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...re.60/ReverseEngineerOptionsExtensions.cs → ...re.60/ReverseEngineerOptionsExtensions.cs b/...re.60/ReverseEngineerOptionsExtensions.cs → ...re.60/ReverseEngineerOptionsExtensions.cs
diff --git a/...ore.60/ReverseEngineerResultExtensions.cs → ...ore.60/ReverseEngineerResultExtensions.cs b/...ore.60/ReverseEngineerResultExtensions.cs → ...ore.60/ReverseEngineerResultExtensions.cs
diff --git a/...I/RevEng.Core.60/ReverseEngineerRunner.cs → ...e/RevEng.Core.60/ReverseEngineerRunner.cs b/...I/RevEng.Core.60/ReverseEngineerRunner.cs → ...e/RevEng.Core.60/ReverseEngineerRunner.cs
diff --git a/...vEng.Core.60/ReverseEngineerScaffolder.cs → ...vEng.Core.60/ReverseEngineerScaffolder.cs b/...vEng.Core.60/ReverseEngineerScaffolder.cs → ...vEng.Core.60/ReverseEngineerScaffolder.cs
diff --git a/...ng.Core.60/Routines/IRoutineScaffolder.cs → ...ng.Core.60/Routines/IRoutineScaffolder.cs b/...ng.Core.60/Routines/IRoutineScaffolder.cs → ...ng.Core.60/Routines/IRoutineScaffolder.cs
diff --git a/.../Routines/SqlServerRoutineModelFactory.cs → .../Routines/SqlServerRoutineModelFactory.cs b/.../Routines/SqlServerRoutineModelFactory.cs → .../Routines/SqlServerRoutineModelFactory.cs
diff --git a/...60/Routines/SqlServerRoutineScaffolder.cs → ...60/Routines/SqlServerRoutineScaffolder.cs b/...60/Routines/SqlServerRoutineScaffolder.cs → ...60/Routines/SqlServerRoutineScaffolder.cs
diff --git a/.../RevEng.Core.60/ServiceProviderBuilder.cs → .../RevEng.Core.60/ServiceProviderBuilder.cs b/.../RevEng.Core.60/ServiceProviderBuilder.cs → .../RevEng.Core.60/ServiceProviderBuilder.cs
diff --git a/src/GUI/RevEng.Core.60/SkuHelper.cs → src/Core/RevEng.Core.60/SkuHelper.cs b/src/GUI/RevEng.Core.60/SkuHelper.cs → src/Core/RevEng.Core.60/SkuHelper.cs
diff --git a/src/GUI/RevEng.Core.60/SqlServerHelper.cs → src/Core/RevEng.Core.60/SqlServerHelper.cs b/src/GUI/RevEng.Core.60/SqlServerHelper.cs → src/Core/RevEng.Core.60/SqlServerHelper.cs
diff --git a/src/GUI/RevEng.Core.60/TableListBuilder.cs → src/Core/RevEng.Core.60/TableListBuilder.cs b/src/GUI/RevEng.Core.60/TableListBuilder.cs → src/Core/RevEng.Core.60/TableListBuilder.cs
diff --git a/...0/PatchedSqlServerDatabaseModelFactory.cs → ...0/PatchedSqlServerDatabaseModelFactory.cs b/...0/PatchedSqlServerDatabaseModelFactory.cs → ...0/PatchedSqlServerDatabaseModelFactory.cs
diff --git a/src/GUI/RevEng.Core.70/RevEng.Core.70.csproj → ...Core/RevEng.Core.70/RevEng.Core.70.csproj b/src/GUI/RevEng.Core.70/RevEng.Core.70.csproj → ...Core/RevEng.Core.70/RevEng.Core.70.csproj
@@ -50,9 +50,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj" />
+		<ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj" />
 		<ProjectReference Include="..\RevEng.Core.Abstractions\RevEng.Core.Abstractions.csproj" />
-		<ProjectReference Include="..\RevEng.Shared\RevEng.Common.csproj" />
+		<ProjectReference Include="..\..\GUI\RevEng.Shared\RevEng.Common.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj → ...Core/RevEng.Core.80/RevEng.Core.80.csproj b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj → ...Core/RevEng.Core.80/RevEng.Core.80.csproj
@@ -49,9 +49,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj" />
+		<ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj" />
 		<ProjectReference Include="..\RevEng.Core.Abstractions\RevEng.Core.Abstractions.csproj" />
-		<ProjectReference Include="..\RevEng.Shared\RevEng.Common.csproj" />
+		<ProjectReference Include="..\..\GUI\RevEng.Shared\RevEng.Common.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/...Eng.Core.80/SqlServerTypeMappingSource.cs → ...Eng.Core.80/SqlServerTypeMappingSource.cs b/...Eng.Core.80/SqlServerTypeMappingSource.cs → ...Eng.Core.80/SqlServerTypeMappingSource.cs
diff --git a/...g.Core.Abstractions/GlobalSuppressions.cs → ...g.Core.Abstractions/GlobalSuppressions.cs b/...g.Core.Abstractions/GlobalSuppressions.cs → ...g.Core.Abstractions/GlobalSuppressions.cs
diff --git a/...ore.Abstractions/IFunctionModelFactory.cs → ...ore.Abstractions/IFunctionModelFactory.cs b/...ore.Abstractions/IFunctionModelFactory.cs → ...ore.Abstractions/IFunctionModelFactory.cs
diff --git a/...re.Abstractions/IProcedureModelFactory.cs → ...re.Abstractions/IProcedureModelFactory.cs b/...re.Abstractions/IProcedureModelFactory.cs → ...re.Abstractions/IProcedureModelFactory.cs
diff --git a/...ng.Core.Abstractions/Metadata/Function.cs → ...ng.Core.Abstractions/Metadata/Function.cs b/...ng.Core.Abstractions/Metadata/Function.cs → ...ng.Core.Abstractions/Metadata/Function.cs
diff --git a/....Abstractions/Metadata/ModuleParameter.cs → ....Abstractions/Metadata/ModuleParameter.cs b/....Abstractions/Metadata/ModuleParameter.cs → ....Abstractions/Metadata/ModuleParameter.cs
diff --git a/...tractions/Metadata/ModuleResultElement.cs → ...tractions/Metadata/ModuleResultElement.cs b/...tractions/Metadata/ModuleResultElement.cs → ...tractions/Metadata/ModuleResultElement.cs
diff --git a/...g.Core.Abstractions/Metadata/Procedure.cs → ...g.Core.Abstractions/Metadata/Procedure.cs b/...g.Core.Abstractions/Metadata/Procedure.cs → ...g.Core.Abstractions/Metadata/Procedure.cs
diff --git a/...Eng.Core.Abstractions/Metadata/Routine.cs → ...Eng.Core.Abstractions/Metadata/Routine.cs b/...Eng.Core.Abstractions/Metadata/Routine.cs → ...Eng.Core.Abstractions/Metadata/Routine.cs
diff --git a/...ore.Abstractions/Metadata/RoutineModel.cs → ...ore.Abstractions/Metadata/RoutineModel.cs b/...ore.Abstractions/Metadata/RoutineModel.cs → ...ore.Abstractions/Metadata/RoutineModel.cs
diff --git a/...re.Abstractions/Metadata/SqlObjectBase.cs → ...re.Abstractions/Metadata/SqlObjectBase.cs b/...re.Abstractions/Metadata/SqlObjectBase.cs → ...re.Abstractions/Metadata/SqlObjectBase.cs
diff --git a/...Abstractions/ModuleModelFactoryOptions.cs → ...Abstractions/ModuleModelFactoryOptions.cs b/...Abstractions/ModuleModelFactoryOptions.cs → ...Abstractions/ModuleModelFactoryOptions.cs
diff --git a/...e.Abstractions/ModuleScaffolderOptions.cs → ...e.Abstractions/ModuleScaffolderOptions.cs b/...e.Abstractions/ModuleScaffolderOptions.cs → ...e.Abstractions/ModuleScaffolderOptions.cs
diff --git a/...tractions/RevEng.Core.Abstractions.csproj → ...tractions/RevEng.Core.Abstractions.csproj b/...tractions/RevEng.Core.Abstractions.csproj → ...tractions/RevEng.Core.Abstractions.csproj
diff --git a/src/GUI/RevEng.Core.Abstractions/key.snk → src/Core/RevEng.Core.Abstractions/key.snk b/src/GUI/RevEng.Core.Abstractions/key.snk → src/Core/RevEng.Core.Abstractions/key.snk
diff --git a/src/GUI/efcpt.6/efcpt.6.csproj → src/Core/efcpt.6/efcpt.6.csproj b/src/GUI/efcpt.6/efcpt.6.csproj → src/Core/efcpt.6/efcpt.6.csproj
diff --git a/src/GUI/efcpt.7/Constants.cs → src/Core/efcpt.7/Constants.cs b/src/GUI/efcpt.7/Constants.cs → src/Core/efcpt.7/Constants.cs
diff --git a/...UI/efcpt.7/Extensions/ObjectExtensions.cs → ...re/efcpt.7/Extensions/ObjectExtensions.cs b/...UI/efcpt.7/Extensions/ObjectExtensions.cs → ...re/efcpt.7/Extensions/ObjectExtensions.cs
diff --git a/...cpt.7/HostedServices/HostConfiguration.cs → ...cpt.7/HostedServices/HostConfiguration.cs b/...cpt.7/HostedServices/HostConfiguration.cs → ...cpt.7/HostedServices/HostConfiguration.cs
diff --git a/...I/efcpt.7/HostedServices/HostedService.cs → ...e/efcpt.7/HostedServices/HostedService.cs b/...I/efcpt.7/HostedServices/HostedService.cs → ...e/efcpt.7/HostedServices/HostedService.cs
diff --git a/...stedServices/RegisterDependentServices.cs → ...stedServices/RegisterDependentServices.cs b/...stedServices/RegisterDependentServices.cs → ...stedServices/RegisterDependentServices.cs
diff --git a/...7/HostedServices/ScaffoldHostedService.cs → ...7/HostedServices/ScaffoldHostedService.cs b/...7/HostedServices/ScaffoldHostedService.cs → ...7/HostedServices/ScaffoldHostedService.cs
diff --git a/src/GUI/efcpt.7/Options/ScaffoldOptions.cs → src/Core/efcpt.7/Options/ScaffoldOptions.cs b/src/GUI/efcpt.7/Options/ScaffoldOptions.cs → src/Core/efcpt.7/Options/ScaffoldOptions.cs
diff --git a/src/GUI/efcpt.7/Program.cs → src/Core/efcpt.7/Program.cs b/src/GUI/efcpt.7/Program.cs → src/Core/efcpt.7/Program.cs
diff --git a/src/GUI/efcpt.7/Services/DisplayService.cs → src/Core/efcpt.7/Services/DisplayService.cs b/src/GUI/efcpt.7/Services/DisplayService.cs → src/Core/efcpt.7/Services/DisplayService.cs
diff --git a/src/GUI/efcpt.7/Services/PackageService.cs → src/Core/efcpt.7/Services/PackageService.cs b/src/GUI/efcpt.7/Services/PackageService.cs → src/Core/efcpt.7/Services/PackageService.cs
diff --git a/src/GUI/efcpt.7/efcpt-readme.md → src/Core/efcpt.7/efcpt-readme.md b/src/GUI/efcpt.7/efcpt-readme.md → src/Core/efcpt.7/efcpt-readme.md
diff --git a/src/GUI/efcpt.7/efcpt.7.csproj → src/Core/efcpt.7/efcpt.7.csproj b/src/GUI/efcpt.7/efcpt.7.csproj → src/Core/efcpt.7/efcpt.7.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="..\lib\T4_703.zip" Link="T4_703.zip">
+    <Content Include="..\..\GUI\lib\T4_703.zip" Link="T4_703.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="efcpt-readme.md">

diff --git a/src/GUI/efcpt.7/readme.md → src/Core/efcpt.7/readme.md b/src/GUI/efcpt.7/readme.md → src/Core/efcpt.7/readme.md
diff --git a/src/GUI/efcpt.8/efcpt.8.csproj → src/Core/efcpt.8/efcpt.8.csproj b/src/GUI/efcpt.8/efcpt.8.csproj → src/Core/efcpt.8/efcpt.8.csproj
diff --git a/src/GUI/efpt60.core/Build60CmdlineTool.cmd → src/Core/efpt60.core/Build60CmdlineTool.cmd b/src/GUI/efpt60.core/Build60CmdlineTool.cmd → src/Core/efpt60.core/Build60CmdlineTool.cmd
diff --git a/src/GUI/efpt60.core/EFCoreCompareBuilder.cs → src/Core/efpt60.core/EFCoreCompareBuilder.cs b/src/GUI/efpt60.core/EFCoreCompareBuilder.cs → src/Core/efpt60.core/EFCoreCompareBuilder.cs
diff --git a/...UI/efpt60.core/EFCoreMigrationsBuilder.cs → ...re/efpt60.core/EFCoreMigrationsBuilder.cs b/...UI/efpt60.core/EFCoreMigrationsBuilder.cs → ...re/efpt60.core/EFCoreMigrationsBuilder.cs
diff --git a/src/GUI/efpt60.core/EFCoreModelBuilder.cs → src/Core/efpt60.core/EFCoreModelBuilder.cs b/src/GUI/efpt60.core/EFCoreModelBuilder.cs → src/Core/efpt60.core/EFCoreModelBuilder.cs
diff --git a/src/GUI/efpt60.core/GlobalSuppressions.cs → src/Core/efpt60.core/GlobalSuppressions.cs b/src/GUI/efpt60.core/GlobalSuppressions.cs → src/Core/efpt60.core/GlobalSuppressions.cs
diff --git a/src/GUI/efpt60.core/Program.cs → src/Core/efpt60.core/Program.cs b/src/GUI/efpt60.core/Program.cs → src/Core/efpt60.core/Program.cs
diff --git a/src/GUI/efpt60.core/efpt60.core.csproj → src/Core/efpt60.core/efpt60.core.csproj b/src/GUI/efpt60.core/efpt60.core.csproj → src/Core/efpt60.core/efpt60.core.csproj
diff --git a/src/GUI/efpt70.core/Build70CmdlineTool.cmd → src/Core/efpt70.core/Build70CmdlineTool.cmd b/src/GUI/efpt70.core/Build70CmdlineTool.cmd → src/Core/efpt70.core/Build70CmdlineTool.cmd
diff --git a/src/GUI/efpt70.core/efpt70.core.csproj → src/Core/efpt70.core/efpt70.core.csproj b/src/GUI/efpt70.core/efpt70.core.csproj → src/Core/efpt70.core/efpt70.core.csproj
diff --git a/...UI/efpt70sc.core/Build70ScCmdlineTool.cmd → ...re/efpt70sc.core/Build70ScCmdlineTool.cmd b/...UI/efpt70sc.core/Build70ScCmdlineTool.cmd → ...re/efpt70sc.core/Build70ScCmdlineTool.cmd
diff --git a/src/GUI/efpt70sc.core/efpt70sc.core.csproj → src/Core/efpt70sc.core/efpt70sc.core.csproj b/src/GUI/efpt70sc.core/efpt70sc.core.csproj → src/Core/efpt70sc.core/efpt70sc.core.csproj
diff --git a/src/GUI/efpt80.core/Build80CmdlineTool.cmd → src/Core/efpt80.core/Build80CmdlineTool.cmd b/src/GUI/efpt80.core/Build80CmdlineTool.cmd → src/Core/efpt80.core/Build80CmdlineTool.cmd
diff --git a/src/GUI/efpt80.core/efpt80.core.csproj → src/Core/efpt80.core/efpt80.core.csproj b/src/GUI/efpt80.core/efpt80.core.csproj → src/Core/efpt80.core/efpt80.core.csproj
diff --git a/src/GUI/efreveng60/BuildCmdlineTool.cmd → src/Core/efreveng60/BuildCmdlineTool.cmd b/src/GUI/efreveng60/BuildCmdlineTool.cmd → src/Core/efreveng60/BuildCmdlineTool.cmd
diff --git a/src/GUI/efreveng60/GlobalSuppressions.cs → src/Core/efreveng60/GlobalSuppressions.cs b/src/GUI/efreveng60/GlobalSuppressions.cs → src/Core/efreveng60/GlobalSuppressions.cs
diff --git a/src/GUI/efreveng60/Program.cs → src/Core/efreveng60/Program.cs b/src/GUI/efreveng60/Program.cs → src/Core/efreveng60/Program.cs
diff --git a/...GUI/efreveng60/TestFiles/DbProject.dacpac → ...ore/efreveng60/TestFiles/DbProject.dacpac b/...GUI/efreveng60/TestFiles/DbProject.dacpac → ...ore/efreveng60/TestFiles/DbProject.dacpac
diff --git a/src/GUI/efreveng60/TestFiles/M2MBug.json → src/Core/efreveng60/TestFiles/M2MBug.json b/src/GUI/efreveng60/TestFiles/M2MBug.json → src/Core/efreveng60/TestFiles/M2MBug.json
diff --git a/src/GUI/efreveng60/TestFiles/dacbugtest.txt → src/Core/efreveng60/TestFiles/dacbugtest.txt b/src/GUI/efreveng60/TestFiles/dacbugtest.txt → src/Core/efreveng60/TestFiles/dacbugtest.txt
diff --git a/src/GUI/efreveng60/TestFiles/dacpaclist.txt → src/Core/efreveng60/TestFiles/dacpaclist.txt b/src/GUI/efreveng60/TestFiles/dacpaclist.txt → src/Core/efreveng60/TestFiles/dacpaclist.txt
diff --git a/src/GUI/efreveng60/TestFiles/dacpactest.txt → src/Core/efreveng60/TestFiles/dacpactest.txt b/src/GUI/efreveng60/TestFiles/dacpactest.txt → src/Core/efreveng60/TestFiles/dacpactest.txt
diff --git a/src/GUI/efreveng60/TestFiles/dgml.txt → src/Core/efreveng60/TestFiles/dgml.txt b/src/GUI/efreveng60/TestFiles/dgml.txt → src/Core/efreveng60/TestFiles/dgml.txt
diff --git a/...I/efreveng60/TestFiles/ef7playground.json → ...e/efreveng60/TestFiles/ef7playground.json b/...I/efreveng60/TestFiles/ef7playground.json → ...e/efreveng60/TestFiles/ef7playground.json
diff --git a/.../efreveng60/TestFiles/efptChinookM2M.json → .../efreveng60/TestFiles/efptChinookM2M.json b/.../efreveng60/TestFiles/efptChinookM2M.json → .../efreveng60/TestFiles/efptChinookM2M.json
diff --git a/src/GUI/efreveng60/TestFiles/efreveng.txt → src/Core/efreveng60/TestFiles/efreveng.txt b/src/GUI/efreveng60/TestFiles/efreveng.txt → src/Core/efreveng60/TestFiles/efreveng.txt
diff --git a/...UI/efreveng60/TestFiles/efrevengplain.txt → ...re/efreveng60/TestFiles/efrevengplain.txt b/...UI/efreveng60/TestFiles/efrevengplain.txt → ...re/efreveng60/TestFiles/efrevengplain.txt
diff --git a/src/GUI/efreveng60/TestFiles/fulltest.json → src/Core/efreveng60/TestFiles/fulltest.json b/src/GUI/efreveng60/TestFiles/fulltest.json → src/Core/efreveng60/TestFiles/fulltest.json
diff --git a/src/GUI/efreveng60/TestFiles/fulltest.txt → src/Core/efreveng60/TestFiles/fulltest.txt b/src/GUI/efreveng60/TestFiles/fulltest.txt → src/Core/efreveng60/TestFiles/fulltest.txt
diff --git a/...0/TestFiles/fulltestMultiResult.Sync.json → ...0/TestFiles/fulltestMultiResult.Sync.json b/...0/TestFiles/fulltestMultiResult.Sync.json → ...0/TestFiles/fulltestMultiResult.Sync.json
diff --git a/...veng60/TestFiles/fulltestMultiResult.json → ...veng60/TestFiles/fulltestMultiResult.json b/...veng60/TestFiles/fulltestMultiResult.json → ...veng60/TestFiles/fulltestMultiResult.json
diff --git a/...estFiles/fulltestProceduresOnly.Sync.json → ...estFiles/fulltestProceduresOnly.Sync.json b/...estFiles/fulltestProceduresOnly.Sync.json → ...estFiles/fulltestProceduresOnly.Sync.json
diff --git a/...g60/TestFiles/fulltestProceduresOnly.json → ...g60/TestFiles/fulltestProceduresOnly.json b/...g60/TestFiles/fulltestProceduresOnly.json → ...g60/TestFiles/fulltestProceduresOnly.json
diff --git a/src/GUI/efreveng60/TestFiles/fulltestdac.txt → ...Core/efreveng60/TestFiles/fulltestdac.txt b/src/GUI/efreveng60/TestFiles/fulltestdac.txt → ...Core/efreveng60/TestFiles/fulltestdac.txt
diff --git a/src/GUI/efreveng60/TestFiles/measure.ps1 → src/Core/efreveng60/TestFiles/measure.ps1 b/src/GUI/efreveng60/TestFiles/measure.ps1 → src/Core/efreveng60/TestFiles/measure.ps1
diff --git a/src/GUI/efreveng60/TestFiles/portfolio.json → src/Core/efreveng60/TestFiles/portfolio.json b/src/GUI/efreveng60/TestFiles/portfolio.json → src/Core/efreveng60/TestFiles/portfolio.json
diff --git a/src/GUI/efreveng60/TestFiles/sproc.Sync.txt → src/Core/efreveng60/TestFiles/sproc.Sync.txt b/src/GUI/efreveng60/TestFiles/sproc.Sync.txt → src/Core/efreveng60/TestFiles/sproc.Sync.txt
diff --git a/src/GUI/efreveng60/TestFiles/sproc.txt → src/Core/efreveng60/TestFiles/sproc.txt b/src/GUI/efreveng60/TestFiles/sproc.txt → src/Core/efreveng60/TestFiles/sproc.txt
diff --git a/src/GUI/efreveng60/TestFiles/sqlite.txt → src/Core/efreveng60/TestFiles/sqlite.txt b/src/GUI/efreveng60/TestFiles/sqlite.txt → src/Core/efreveng60/TestFiles/sqlite.txt
diff --git a/src/GUI/efreveng60/TestFiles/tablelist.txt → src/Core/efreveng60/TestFiles/tablelist.txt b/src/GUI/efreveng60/TestFiles/tablelist.txt → src/Core/efreveng60/TestFiles/tablelist.txt
diff --git a/src/GUI/efreveng60/efreveng60.csproj → src/Core/efreveng60/efreveng60.csproj b/src/GUI/efreveng60/efreveng60.csproj → src/Core/efreveng60/efreveng60.csproj
diff --git a/src/GUI/efreveng70/BuildCmdlineTool.cmd → src/Core/efreveng70/BuildCmdlineTool.cmd b/src/GUI/efreveng70/BuildCmdlineTool.cmd → src/Core/efreveng70/BuildCmdlineTool.cmd
diff --git a/src/GUI/efreveng70/efreveng70.csproj → src/Core/efreveng70/efreveng70.csproj b/src/GUI/efreveng70/efreveng70.csproj → src/Core/efreveng70/efreveng70.csproj
diff --git a/src/GUI/efreveng80/BuildCmdlineTool.cmd → src/Core/efreveng80/BuildCmdlineTool.cmd b/src/GUI/efreveng80/BuildCmdlineTool.cmd → src/Core/efreveng80/BuildCmdlineTool.cmd
diff --git a/src/GUI/efreveng80/efreveng80.csproj → src/Core/efreveng80/efreveng80.csproj b/src/GUI/efreveng80/efreveng80.csproj → src/Core/efreveng80/efreveng80.csproj
diff --git a/src/GUI/Directory.Build.Props → src/Directory.Build.Props b/src/GUI/Directory.Build.Props → src/Directory.Build.Props