Merge pull request #42 from FastReports/detrav_branch

* sync repo 11/26/2018 close #18
FastReports · Nov 26, 2018 · 3bd2d77 · 3bd2d77
2 parents 664c4e9 + e680b50
commit 3bd2d77
Show file tree

Hide file tree

Showing 21 changed files with 671 additions and 113 deletions.
diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.Data.Couchbase.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Couchbase/FastReport.Data.Couchbase.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net4.5</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
 		<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>		
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<Copyright>Fast Reports Inc.</Copyright>
@@ -34,7 +34,9 @@
 			</ItemGroup>
 			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
 				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj" />
-				<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
+				<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" >
+
+				</ProjectReference>
 			</ItemGroup>
 		</When>
 		<Otherwise>
@@ -48,13 +50,26 @@
 				</ProjectReference>
 				<Reference Include="FastReport">
 					<SpecificVersion>False</SpecificVersion>
-					<HintPath>..\..\..\..\FastReport\bin\Release\FastReport.dll</HintPath>
+					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
 				</Reference>
-				<PackageReference Include="FastReport.Data.Json" Version="2018.2.3-*" />
+
+
 			</ItemGroup>
+	<ItemGroup Condition="'$(Configuration)'=='Community'">
+		<Reference Include="FastReport.Data.Json">
+		<SpecificVersion>False</SpecificVersion>
+		<HintPath>..\FastReport.Data.Json\bin\Community\net47\FastReport.Data.Json.dll</HintPath>
+        	</Reference>
+        </ItemGroup>
+<ItemGroup Condition="'$(Configuration)'!='Community'">
+				<PackageReference Include="FastReport.Data.Json" Version="2018.2.3-*" />
+        </ItemGroup>
 		</Otherwise>
 	</Choose>
 
+
+
+
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 		<Compile Remove="CouchbaseConnectionEditor.cs" />
 		<Compile Remove="CouchbaseConnectionEditor.Designer.cs" />

diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.Data.Json.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Json/FastReport.Data.Json.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 <PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net4;net4.5</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net4;net45;net47</TargetFrameworks>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.Data.MongoDB.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.Data.MongoDB.csproj
@@ -52,7 +52,7 @@
 				</ProjectReference>
 				<Reference Include="FastReport">
 					<SpecificVersion>False</SpecificVersion>
-					<HintPath>..\..\..\..\FastReport\bin\Release\FastReport.dll</HintPath>
+					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
 				</Reference>
 			</ItemGroup>
 		</Otherwise>

diff --git a/...s/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.Data.OracleODPCore.csproj b/...s/Core/FastReport.Data/FastReport.Data.OracleODPCore/FastReport.Data.OracleODPCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -23,21 +23,80 @@
 		<PackageReleaseNotes></PackageReleaseNotes>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<DefineConstants>FRCORE;</DefineConstants>
+	</PropertyGroup>
+
 	<Choose>
 		<When Condition="'$(Configuration)' == 'Debug'">
-			<ItemGroup>
+			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 				<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
 			</ItemGroup>
+			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj">
+					<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+				</ProjectReference>
+				<Reference Include="FastReport">
+					<SpecificVersion>False</SpecificVersion>
+					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
+				</Reference>
+			</ItemGroup>
 		</When>
 		<Otherwise>
-			<ItemGroup>
-				<PackageReference Include="FastReport.Core" Version="[2018.2.3-*,)" />
+			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+				<PackageReference Include="FastReport.Core" Version="[2018.2.2-*,)" />
+			</ItemGroup>
+			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj">
+					<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+				</ProjectReference>
+				<Reference Include="FastReport">
+					<SpecificVersion>False</SpecificVersion>
+					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
+				</Reference>
 			</ItemGroup>
 		</Otherwise>
 	</Choose>
+
+	<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+		<Reference Include="System" />
+		<Reference Include="System.Data" />
+		<Reference Include="System.Design" />
+		<Reference Include="System.Drawing" />
+		<Reference Include="System.Windows.Forms" />
+		<Reference Include="System.Xml" />
+	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="	Oracle.ManagedDataAccess.Core" Version="[2.12.0-*,)" />
+		<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="[2.12.0-*,)" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<Compile Remove="OracleConnectionEditor.cs" />
+		<Compile Remove="OracleConnectionEditor.Designer.cs" />
+		<Compile Remove="OracleConnectionEditor.resx" />
+		<Compile Remove="OracleConnectionEditor.DesignExt.cs" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<EmbeddedResource Remove="OracleConnectionEditor.resx" />
+	</ItemGroup>
+
+
+	<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+		<Compile Update="OracleConnectionEditor.Designer.cs">
+			<DependentUpon>OracleConnectionEditor.cs</DependentUpon>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+		<EmbeddedResource Update="OracleConnectionEditor.resx">
+			<DependentUpon>OracleConnectionEditor.cs</DependentUpon>
+			<SubType>Designer</SubType>
+		</EmbeddedResource>
+	</ItemGroup>
+	<ItemGroup>
+	  <Compile Update="OracleConnectionEditor.cs">
+	    <SubType>UserControl</SubType>
+	  </Compile>
 	</ItemGroup>
 
 </Project>
diff --git a/...Report.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj b/...Report.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -25,11 +25,25 @@
         <RepositoryUrl>https://github.com/FastReports/FastReport</RepositoryUrl>
 	</PropertyGroup>
 
+	<PropertyGroup>
+		<DefineConstants>FRCORE;</DefineConstants>
+	</PropertyGroup>
+
     <ItemGroup>
 		<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="	Oracle.ManagedDataAccess.Core" Version="[2.12.0-*,)" />
+		<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="[2.12.0-*,)" />
+	</ItemGroup>
+
+	<ItemGroup >
+		<Compile Remove="OracleConnectionEditor.cs" />
+		<Compile Remove="OracleConnectionEditor.Designer.cs" />
+		<Compile Remove="OracleConnectionEditor.resx" />
+		<Compile Remove="OracleConnectionEditor.DesignExt.cs" />
+	</ItemGroup>
+	<ItemGroup >
+		<EmbeddedResource Remove="OracleConnectionEditor.resx" />
 	</ItemGroup>
 </Project>
diff --git a/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/OracleConnectionEditor.Designer.cs b/Extras/Core/FastReport.Data/FastReport.Data.OracleODPCore/OracleConnectionEditor.Designer.cs