From 5f2f2d2c03b15a1a9bbe1dd4146e64acc5c4b014 Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <ejlskov@hotmail.com>
Date: Thu, 2 Nov 2023 10:23:49 +0100
Subject: [PATCH] Add EF Core 8 dacpac nuget

---
 src/GUI/EFCorePowerTools.sln                  |  15 ++++
 ...ityFrameworkCore.7.SqlServer.Dacpac.csproj |   4 -
 ...ityFrameworkCore.8.SqlServer.Dacpac.csproj |  84 ++++++++++++++++++
 .../Key.snk                                   | Bin 0 -> 596 bytes
 src/GUI/RevEng.Core.80/RevEng.Core.80.csproj  |   2 +-
 5 files changed, 100 insertions(+), 5 deletions(-)
 create mode 100644 src/GUI/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj
 create mode 100644 src/GUI/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac/Key.snk

diff --git a/src/GUI/EFCorePowerTools.sln b/src/GUI/EFCorePowerTools.sln
index 3eb27eca2..2f94458b4 100644
--- a/src/GUI/EFCorePowerTools.sln
+++ b/src/GUI/EFCorePowerTools.sln
@@ -74,6 +74,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "efcpt.8", "efcpt.8\efcpt.8.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "efcpt.7", "efcpt.7\efcpt.7.csproj", "{4130DB41-57DA-45B4-81C3-F56558165B32}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac", "ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj", "{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -408,6 +410,18 @@ Global
 		{4130DB41-57DA-45B4-81C3-F56558165B32}.Release|arm64.Build.0 = Release|Any CPU
 		{4130DB41-57DA-45B4-81C3-F56558165B32}.Release|x86.ActiveCfg = Release|Any CPU
 		{4130DB41-57DA-45B4-81C3-F56558165B32}.Release|x86.Build.0 = Release|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Debug|arm64.Build.0 = Debug|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Debug|x86.Build.0 = Debug|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Release|arm64.Build.0 = Release|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -437,6 +451,7 @@ Global
 		{16D89786-81FB-4675-A78B-64352A7E4EB3} = {D1EDDE24-5DC8-407E-BE37-77AD0B75759D}
 		{373A097C-3781-4016-8F7E-1647B4830A77} = {F33E4994-452C-4C09-9FB5-C2E17D0884B6}
 		{4130DB41-57DA-45B4-81C3-F56558165B32} = {F33E4994-452C-4C09-9FB5-C2E17D0884B6}
+		{F0CC7C3F-4462-444F-8834-D6BF3FA1473D} = {8B7992B9-F570-4E74-8AE4-F9436BD7CBEF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BFF7B9CC-46C9-4547-9FA1-D17E2A89613C}
diff --git a/src/GUI/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj b/src/GUI/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj
index 4c236275c..fdd80a9e1 100644
--- a/src/GUI/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj
+++ b/src/GUI/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj
@@ -27,10 +27,6 @@
 	  <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
   
-  <PropertyGroup>
-		<DefineConstants>TRACE;DEBUG;CORE70</DefineConstants>
-	</PropertyGroup>  
-
   <ItemGroup>
     <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\CustomData.cs" Link="DacpacConsolidate\CustomData.cs" />
     <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\DacpacConsolidator.cs" Link="DacpacConsolidate\DacpacConsolidator.cs" />
diff --git a/src/GUI/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj b/src/GUI/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj
new file mode 100644
index 000000000..e12f4a692
--- /dev/null
+++ b/src/GUI/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj
@@ -0,0 +1,84 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <PackageId>ErikEJ.EntityFrameworkCore.SqlServer.Dacpac</PackageId>
+    <PackageVersion>8.0.0-rc.1</PackageVersion>	  
+    <NoWarn>$(NoWarn);EF1001</NoWarn>	  
+    <Authors>ErikEJ</Authors>
+    <Description>Enables reverse engineering an EF Core model from a data-tier application package (DACPAC).</Description>
+    <PackageProjectUrl>https://github.com/ErikEJ/EFCorePowerTools</PackageProjectUrl>
+    <PackageReleaseNotes>For EF Core 8.0 with DacFX 162</PackageReleaseNotes>
+	  <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageTags>DbContext;EntityFramework;SqlServer;DACPAC;EFCore;EntityFrameworkCore</PackageTags>
+    <RootNamespace>ErikEJ.EntityFrameworkCore.SqlServer</RootNamespace>
+	  <MinClientVersion>5.0</MinClientVersion>	  
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	  <PackageReadmeFile>readme.md</PackageReadmeFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyName>ErikEJ.EntityFrameworkCore.SqlServer.Dacpac</AssemblyName>
+	<PublishRepositoryUrl>true</PublishRepositoryUrl>
+	<EmbedUntrackedSources>true</EmbedUntrackedSources>
+	<DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(CI)' == 'True'">
+	  <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\CustomData.cs" Link="DacpacConsolidate\CustomData.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\DacpacConsolidator.cs" Link="DacpacConsolidate\DacpacConsolidator.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\DacpacMerger.cs" Link="DacpacConsolidate\DacpacMerger.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\DacpacXml.cs" Link="DacpacConsolidate\DacpacXml.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\HeaderParser.cs" Link="DacpacConsolidate\HeaderParser.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\DacpacConsolidate\Metadata.cs" Link="DacpacConsolidate\Metadata.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\Design\SqlServerDacpacDesignTimeServices.cs" Link="Design\SqlServerDacpacDesignTimeServices.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\Scaffolding\SqlServerDacpacDatabaseModelFactory.cs" Link="Scaffolding\SqlServerDacpacDatabaseModelFactory.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\Scaffolding\SqlServerDacpacDatabaseModelFactoryOptions.cs" Link="Scaffolding\SqlServerDacpacDatabaseModelFactoryOptions.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\Scaffolding\SqlServerDacpacStoredProcedureModelFactory.cs" Link="Scaffolding\SqlServerDacpacStoredProcedureModelFactory.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\AliasResolutionVisitor.cs" Link="SqlSharpener\AliasResolutionVisitor.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\DataType.cs" Link="SqlSharpener\DataType.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\DataTypeHelper.cs" Link="SqlSharpener\DataTypeHelper.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\Model\Column.cs" Link="SqlSharpener\Model\Column.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\Model\Procedure.cs" Link="SqlSharpener\Model\Procedure.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\Model\Select.cs" Link="SqlSharpener\Model\Select.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\Model\SelectColumn.cs" Link="SqlSharpener\Model\SelectColumn.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\Model\Table.cs" Link="SqlSharpener\Model\Table.cs" />
+    <Compile Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\SqlSharpener\SelectVisitor.cs" Link="SqlSharpener\SelectVisitor.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.2.23480.1" />
+    <PackageReference Include="Microsoft.SqlServer.DacFx" Version="162.1.167" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />	  
+  </ItemGroup>
+
+	<ItemGroup>
+		<None Include="..\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\readme.md" Link="readme.md" Pack="true" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+	    <ProjectReference Include="..\DacFxStrongTypedCore.161\DacFxStrongTypedCore.161.csproj">
+           <PrivateAssets>all</PrivateAssets>
+        </ProjectReference>
+		<ProjectReference Include="..\RevEng.Core.Abstractions\RevEng.Core.Abstractions.csproj">
+		   <PrivateAssets>all</PrivateAssets>
+		</ProjectReference>
+	</ItemGroup>
+
+	<ItemGroup>
+	    <None Include="..\DacFxStrongTypedCore.161\bin\$(Configuration)\netstandard2.1\DacFxStrongTypedCore.161.dll">
+		    <Visible>false</Visible>
+		    <Pack>true</Pack>
+		    <PackagePath>lib\$(TargetFramework)</PackagePath>
+	    </None>
+	    <None Include="..\RevEng.Core.Abstractions\bin\$(Configuration)\netstandard2.0\RevEng.Core.Abstractions.dll">
+		    <Visible>false</Visible>
+		    <Pack>true</Pack>
+		    <PackagePath>lib\$(TargetFramework)</PackagePath>
+	    </None>
+    </ItemGroup>
+
+</Project>
diff --git a/src/GUI/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac/Key.snk b/src/GUI/ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac/Key.snk
new file mode 100644
index 0000000000000000000000000000000000000000..aea5ce234247329f4bf4ae87eb3c3c9edc522b17
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096uel%FzsCZJk{Sm6HDM*05bj-F5P3aUJ
zi9ZyBy>=lY!)wJonx#^Zh)ylP@XvCmf7cjQ&q+l}F)9wYPI@_ZAiqQ&1{*KS@p^P~
z0;D$bei}MvJ0I~xBJVb99AoA15uZRe3LW5hhV0gZlD-4wvvSIgdBP};=RC)mM|ZRj
zElMgHvN>*+FCmsD;8@7x3pS1(rb?*r1S&YRXcq@uMH?R?O#P*$D`~@Ic>D?7&8{Pj
z^fRb9GSYGEsiNmu><@9prlyD{(y6ZIYI8E%qYl+81Hfag7-Qh3Wai5sPFaO+0<T6M
z<Aw2D>kUehIrAF9L97&DGGwBC!E(n7DjHHzZe}4lHwWLL1{n>EEh&p|lhsM%EroL>
z;kg8bg^^;(LwV(k4AGq&Ij&Dn>$&*Wa#$3%_tVQ`tD_BRhF#yB6USl<`(|F$&R#_G
zC92f(q9vL(+Nw}~T|6|?f6ieA`|>YhIaI4OMWRCHzIlTL$Ha_oCXr9X+BLHRmx|1d
zKp;GE%`Q^yJv=Od6O!VZlAH<b_{Kw`OepI}6+R8fLLfb>aJi@+_OiLUGfqh0o1Mjq
z8+mcyi;#%1Va8S0{qSHp0d7CAzNw6C{-U^7CnOMLQ_D}-4s8$M77xjJ1%UBB_0!0}
zpbp^%YX1wP3x?<*@J8@wzx<LQ$D0~$Q_WwV9i%Vvx$jNcO-5y?hZ5jZVZnfbYiVHr
if0g{l&DP>ay5I^;CwQXm<joF`vlUYe6|EU4kML%aJr$e)

literal 0
HcmV?d00001

diff --git a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj
index 33deb1503..d213d0cdc 100644
--- a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj
+++ b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj
@@ -49,7 +49,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.7.SqlServer.Dacpac.csproj" />
+		<ProjectReference Include="..\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" />
 	</ItemGroup>