More work on the tests; logging

msawczyn · Jan 14, 2020 · 56c4cc1 · 56c4cc1
1 parent 5cabddc
commit 56c4cc1
Show file tree

Hide file tree

Showing 30 changed files with 1,070 additions and 42 deletions.
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -0,0 +1,15 @@
+<Project>
+  <Target Name="PublishProjectIfFrameworkSet"
+          DependsOnTargets="Publish"
+          Condition=" '$(TargetFramework)' != '' " />
+
+  <Target Name="PublishProjectForAllFrameworksIfFrameworkUnset" Condition=" '$(TargetFramework)' == '' ">
+    <ItemGroup>
+      <_PublishFramework Include="$(TargetFrameworks)" />
+    </ItemGroup>
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Publish" Properties="TargetFramework=%(_PublishFramework.Identity)" />
+  </Target>
+
+  <Target Name="PublishAll"
+          DependsOnTargets="PublishProjectIfFrameworkSet;PublishProjectForAllFrameworksIfFrameworkUnset" />
+</Project>
diff --git a/src/DslPackage/DslPackage.csproj b/src/DslPackage/DslPackage.csproj
@@ -445,8 +445,7 @@
 </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>exit 1
-dotnet tool install -g dotnet-warp
+    <PreBuildEvent>dotnet tool install -g dotnet-warp
 del /S /Q "$(ProjectDir)Parsers\*.*"
 
 set EFVER=EF6

diff --git a/src/DslPackage/Parsers/EF6/net472/placeholder.txt b/src/DslPackage/Parsers/EF6/net472/placeholder.txt
diff --git a/src/DslPackage/Parsers/EF6/netcoreapp3.1/placeholder.txt b/src/DslPackage/Parsers/EF6/netcoreapp3.1/placeholder.txt
diff --git a/src/DslPackage/Parsers/EFCore2/net472/placeholder.txt b/src/DslPackage/Parsers/EFCore2/net472/placeholder.txt
diff --git a/src/DslPackage/Parsers/EFCore2/netcoreapp2.1/placeholder.txt b/src/DslPackage/Parsers/EFCore2/netcoreapp2.1/placeholder.txt
diff --git a/src/DslPackage/Parsers/EFCore2/netcoreapp3.1/placeholder.txt b/src/DslPackage/Parsers/EFCore2/netcoreapp3.1/placeholder.txt
diff --git a/src/DslPackage/Parsers/EFCore3/net472/placeholder.txt b/src/DslPackage/Parsers/EFCore3/net472/placeholder.txt
diff --git a/src/DslPackage/Parsers/EFCore3/netcoreapp2.1/placeholder.txt b/src/DslPackage/Parsers/EFCore3/netcoreapp2.1/placeholder.txt
diff --git a/src/DslPackage/Parsers/EFCore3/netcoreapp3.1/placeholder.txt b/src/DslPackage/Parsers/EFCore3/netcoreapp3.1/placeholder.txt
diff --git a/src/Utilities/EF6Parser/EF6Parser.csproj b/src/Utilities/EF6Parser/EF6Parser.csproj
@@ -13,6 +13,10 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="log4net.config" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.4.0" />
     <PackageReference Include="log4net" Version="2.0.8" />
@@ -31,4 +35,25 @@
     <ProjectReference Include="..\ParsingModels\ParsingModels.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Resource Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Utilities/EF6Parser/Parser.cs b/src/Utilities/EF6Parser/Parser.cs
@@ -234,7 +234,8 @@ private static EntitySet GetTable(Type type, DbContext context)
                                                  ?.SingleOrDefault(s => s.EntitySet == entitySet);
 
                // Find the storage entity set (table) that the entity is mapped
-               table = mapping?.EntityTypeMappings.SingleOrDefault()?.Fragments?.SingleOrDefault()?.StoreEntitySet;
+               table = mapping?.EntityTypeMappings?.SelectMany(m => m.Fragments.Select(f => f.StoreEntitySet))?.Distinct().FirstOrDefault();
+               //table = mapping?.EntityTypeMappings.SingleOrDefault()?.Fragments?.SingleOrDefault()?.StoreEntitySet;
             }
          }
 

diff --git a/src/Utilities/EF6Parser/Program.cs b/src/Utilities/EF6Parser/Program.cs
@@ -35,9 +35,9 @@ private static int Main(string[] args)
 
             GlobalContext.Properties["LogPath"] = Path.ChangeExtension(outputPath, "");
             ILoggerRepository logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
-            XmlConfigurator.Configure(logRepository, new FileInfo("log4net.config"));
+            XmlConfigurator.Configure(logRepository, GetLogStream());
 
-            log.Debug($"Starting {typeof(Program).Assembly.GetName().Name}");
+            log.Info($"Starting {Assembly.GetEntryAssembly().Location}");
             log.Info($"Log file at {GlobalContext.Properties["LogPath"]}.log");
 
             string contextClassName = args.Length == 3 ? args[2] : null;
@@ -107,5 +107,15 @@ private static void Exit(int returnCode, Exception ex = null)
          log.Error($"Exiting with return code {returnCode}");
          Environment.Exit(returnCode);
       }
+
+      private static Stream GetLogStream()
+      {
+         MemoryStream stream = new MemoryStream();
+         StreamWriter writer = new StreamWriter(stream);
+         writer.Write(Resources.Log4netConfig);
+         writer.Flush();
+         stream.Position = 0;
+         return stream;
+      }
    }
 }
diff --git a/src/Utilities/EF6Parser/Properties/PublishProfiles/FolderProfile.pubxml b/src/Utilities/EF6Parser/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <TargetFramework>net472</TargetFramework>
+    <PublishDir>bin\Release\net472\publish\</PublishDir>
+    <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
+  </PropertyGroup>
+</Project>
diff --git a/src/Utilities/EF6Parser/Properties/launchSettings.json b/src/Utilities/EF6Parser/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "EF6Parser": {
+      "commandName": "Project",
+      "commandLineArgs": "C:\\Code\\EFDesigner\\src\\Testing\\EF6\\EF6NetCore3\\bin\\Debug\\netcoreapp3.1\\EF6NetCore3.dll c:\\temp\\test.txt"
+    }
+  }
+}
diff --git a/src/Utilities/EF6Parser/Resources.Designer.cs b/src/Utilities/EF6Parser/Resources.Designer.cs
diff --git a/src/Utilities/EF6Parser/Resources.resx b/src/Utilities/EF6Parser/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Log4netConfig" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>log4net.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+</root>