Merge pull request #53 from FastReports/sync_branch_636808190992289091

* sync 2019.1
FastReports · Dec 19, 2018 · aae024d · aae024d
2 parents dcc86e6 + a774641
commit aae024d
Show file tree

Hide file tree

Showing 31 changed files with 228 additions and 317 deletions.
diff --git a/Demos/Core/FastReportCore.MVC/FastReportCore.MVC.csproj b/Demos/Core/FastReportCore.MVC/FastReportCore.MVC.csproj
@@ -32,14 +32,9 @@
           <ProjectReference Include="$(SolutionDir)FastReport.OpenSource\FastReport.OpenSource.csproj" />
         </ItemGroup>
       </When>  
-      <When Condition="'$(SolutionFileName)' == 'FastReport.Core.sln'">
-        <ItemGroup>
-          <ProjectReference Include="$(SolutionDir)FastReport.Core\FastReport.Core.csproj" />
-        </ItemGroup>
-      </When>  
       <Otherwise>
         <ItemGroup>
-          <PackageReference Include="FastReport.Core" Version="2017.4.0" />
+          <PackageReference Include="FastReport.Core" Version="2018.4.0" />
         </ItemGroup>
       </Otherwise>  
   </Choose>

diff --git a/Demos/Core/FastReportCore.MVC/FastReportCore.MVC.sln b/Demos/Core/FastReportCore.MVC/FastReportCore.MVC.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastReportCore.MVC", "FastReportCore.MVC.csproj", "{D52ADB4D-0003-4035-8DFD-C01F2B14DDCD}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{4C501371-339F-4270-8F3F-22F0D3DED115}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{D52ADB4D-0003-4035-8DFD-C01F2B14DDCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D52ADB4D-0003-4035-8DFD-C01F2B14DDCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D52ADB4D-0003-4035-8DFD-C01F2B14DDCD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C501371-339F-4270-8F3F-22F0D3DED115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C501371-339F-4270-8F3F-22F0D3DED115}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C501371-339F-4270-8F3F-22F0D3DED115}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C501371-339F-4270-8F3F-22F0D3DED115}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Demos/Core/FastReportWebCore.MVC/FastReportWebCore.MVC/FastReportWebCore.MVC.csproj b/Demos/Core/FastReportWebCore.MVC/FastReportWebCore.MVC/FastReportWebCore.MVC.csproj
@@ -20,15 +20,10 @@
         <ItemGroup>
           <ProjectReference Include="$(SolutionDir)FastReport.Core.Web\FastReport.Web.csproj" />
         </ItemGroup>
-      </When>  
-      <When Condition="'$(SolutionFileName)' == 'FastReport.Core.sln'">
-        <ItemGroup>
-          <ProjectReference Include="$(SolutionDir)FastReport.Core.Web\FastReport.Web.csproj" />
-        </ItemGroup>
-      </When>  
+      </When>
       <Otherwise>
         <ItemGroup>
-          <PackageReference Include="FastReport.Web" Version="2017.4.0" />
+          <PackageReference Include="FastReport.Web" Version="2018.4.0" />
         </ItemGroup>
       </Otherwise>  
   </Choose>

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
@@ -14,7 +14,7 @@
 		<PackageId>FastReport.Data.Couchbase</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
-		<Version>2018.2.2$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>
@@ -24,46 +24,15 @@
 		<DefineConstants>FRCORE;</DefineConstants>
 	</PropertyGroup>
 
-	<Choose>
-		<When Condition="'$(Configuration)' == 'Debug'">
+
 			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 				<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
 				<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
 			</ItemGroup>
 			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj" />
-				<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" >
-
-				</ProjectReference>
-			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<PackageReference Include="FastReport.Core" Version="2018.2.3-*" />	
-				<PackageReference Include="FastReport.Data.Json" Version="2018.2.3-*" />
-			</ItemGroup>
-			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<Reference Include="FastReport">
-					<SpecificVersion>False</SpecificVersion>
-					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
-				</Reference>
-
-
+				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj"><PrivateAssets>all</PrivateAssets></ProjectReference>
+				<ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
 			</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" />

diff --git a/...ore/FastReport.Data/FastReport.Data.Couchbase/FastReport.OpenSource.Data.Couchbase.csproj b/...ore/FastReport.Data/FastReport.Data.Couchbase/FastReport.OpenSource.Data.Couchbase.csproj
@@ -15,7 +15,7 @@
 		<PackageId>FastReport.OpenSource.Data.Couchbase</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
-		<Version>2018.4.13$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>
@@ -27,7 +27,7 @@
 		<DefineConstants>FRCORE;</DefineConstants>
 	</PropertyGroup>
 
-    <ItemGroup>
+        <ItemGroup>
 		<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
 		<ProjectReference Include="..\FastReport.Data.Json\FastReport.OpenSource.Data.Json.csproj" />
 	</ItemGroup>

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
@@ -15,7 +15,7 @@
 		<PackageId>FastReport.Data.Json</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, Json, connection, reports</PackageTags>
-		<Version>2018.3.11$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.Json</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>
@@ -29,27 +29,13 @@
 		<PackageReference Include="Newtonsoft.Json" Version="[11.0.2,)" />
 	</ItemGroup>
 
-	<Choose>
-		<When Condition="'$(Configuration)' == 'Debug'">
-			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
-			</ItemGroup>
-			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj" />
-			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<PackageReference Include="FastReport.Core" Version="2018.2.3-*" />
-			</ItemGroup>
-			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<Reference Include="FastReport">
-					<SpecificVersion>False</SpecificVersion>
-					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
-				</Reference>
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
+	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj"><PrivateAssets>all</PrivateAssets></ProjectReference>
+	</ItemGroup>
+
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 		<Compile Remove="JsonConnectionEditor.cs" />

diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Json/JsonCompiler.cs b/Extras/Core/FastReport.Data/FastReport.Data.Json/JsonCompiler.cs
@@ -41,8 +41,19 @@ public static Type Compile(string json)
                 source = sw.ToString();
             }
 
-            string nLocation = Path.GetDirectoryName(Assembly.GetCallingAssembly().Location);
-            string nPath = Path.Combine(nLocation, "Newtonsoft.Json.dll");
+            string nLocation;
+            string nPath;
+
+            try
+            {
+                nLocation = Path.GetDirectoryName(Assembly.GetCallingAssembly().Location);
+                nPath = Path.Combine(nLocation, "Newtonsoft.Json.dll");
+            }
+            catch
+            {
+                nLocation = Environment.CurrentDirectory;
+                nPath = Path.Combine(nLocation, "Newtonsoft.Json.dll");
+            }
 
             Type type = Utils.CompileHelper.GenerateAssemblyInMemory(source, nPath).GetType("__JSON__.__JSON__");
             return type;

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
@@ -15,7 +15,7 @@
 		<PackageId>FastReport.Data.MongoDB</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, MongoDB, connection, reports</PackageTags>
-		<Version>2018.2.2$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.MongoDB</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>
@@ -31,27 +31,13 @@
 		<PackageReference Include="MongoDB.Driver.Core" Version="[2.5.0,)" />
 	</ItemGroup>
 
-	<Choose>
-		<When Condition="'$(Configuration)' == 'Debug'">
 			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 				<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
 			</ItemGroup>
 			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj" />
+				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj"><PrivateAssets>all</PrivateAssets></ProjectReference>
 			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<PackageReference Include="FastReport.Core" Version="2018.2.2-*" />
-			</ItemGroup>
-			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<Reference Include="FastReport">
-					<SpecificVersion>False</SpecificVersion>
-					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
-				</Reference>
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
+
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 		<Compile Remove="MongoDBConnectionEditor.cs" />

diff --git a/...as/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.OpenSource.Data.MongoDB.csproj b/...as/Core/FastReport.Data/FastReport.Data.MongoDB/FastReport.OpenSource.Data.MongoDB.csproj
@@ -14,7 +14,7 @@
 		<PackageId>FastReport.OpenSource.Data.MongoDB</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, MongoDB, connection, reports</PackageTags>
-		<Version>2018.4.13$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.MongoDB</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>

diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MsSql/FastReport.Data.MsSql.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MsSql/FastReport.Data.MsSql.csproj
@@ -14,7 +14,7 @@
 		<PackageId>FastReport.Data.MsSql</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, mssql, connection, reports, core</PackageTags>
-		<Version>2018.2.3$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.MsSql</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>
@@ -25,17 +25,8 @@
 		<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
 	</ItemGroup>
 
-	<Choose>
-		<When Condition="'$(Configuration)' == 'Debug'">
 			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 				<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
 			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<PackageReference Include="FastReport.Core" Version="[2018.2.2-ci-*,)" />
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
 
 </Project>
diff --git a/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.Data.MySql.csproj b/Extras/Core/FastReport.Data/FastReport.Data.MySql/FastReport.Data.MySql.csproj
@@ -14,7 +14,7 @@
 		<PackageId>FastReport.Data.MySql</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, mysql, connection, reports</PackageTags>
-		<Version>2018.2.2$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.MySql</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>
@@ -25,27 +25,12 @@
 		<PackageReference Include="MySql.Data" Version="[6.10.6,)" />
 	</ItemGroup>
 
-	<Choose>
-		<When Condition="'$(Configuration)' == 'Debug'">
-			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
-			</ItemGroup>
-			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj" />
-			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<PackageReference Include="FastReport.Core" Version="[2018.2.2-*,)" />
-			</ItemGroup>
-			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<Reference Include="FastReport">
-					<SpecificVersion>False</SpecificVersion>
-					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
-				</Reference>
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
+	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj"><PrivateAssets>all</PrivateAssets></ProjectReference>
+	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 		<Compile Remove="MySqlConnectionEditor.cs" />

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
@@ -14,7 +14,7 @@
 		<PackageId>FastReport.Data.OracleODPCore</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, oracle, core, connection, reports</PackageTags>
-		<Version>2018.3.29$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.OracleODPCore</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>
@@ -25,33 +25,12 @@
 		<DefineConstants>FRCORE;</DefineConstants>
 	</PropertyGroup>
 
-	<Choose>
-		<When Condition="'$(Configuration)' == 'Debug'">
-			<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 Condition="'$(TargetFramework)'=='netstandard2.0'">
-				<PackageReference Include="FastReport.Core" Version="[2018.2.2-*,)" />
-			</ItemGroup>
-			<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
-				<Reference Include="FastReport">
-					<SpecificVersion>False</SpecificVersion>
-					<HintPath>..\..\..\..\FastReport\bin\$(Configuration)\FastReport.dll</HintPath>
-				</Reference>
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
+	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+		<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
+				<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj"><PrivateAssets>all</PrivateAssets></ProjectReference>
+	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
 		<Reference Include="System" />

diff --git a/...Report.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj b/...Report.Data/FastReport.Data.OracleODPCore/FastReport.OpenSource.Data.OracleODPCore.csproj
@@ -15,7 +15,7 @@
 		<PackageId>FastReport.OpenSource.Data.OracleODPCore</PackageId>
 		<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
 		<PackageTags>reporting, oracle, core, connection, reports</PackageTags>
-		<Version>2018.4.13$(VersionSuffix)</Version>
+		<Version>1.0.0</Version>
 		<Configurations>Debug;Release;</Configurations>
 		<AssemblyName>FastReport.Data.OracleODPCore</AssemblyName>
 		<RootNamespace>FastReport.Data</RootNamespace>