Merge pull request #206 from FastReports/sync_branch_637342047886474033

sync 8/28/2020 ScriptSecurity
FastReports · Aug 28, 2020 · 0b3a5a3 · 0b3a5a3
2 parents f3415b9 + 978fdc5
commit 0b3a5a3
Show file tree

Hide file tree

Showing 33 changed files with 1,385 additions and 163 deletions.
diff --git a/Demos/OpenSource/WPFOpenSourceViewer/OpenSourceCustomViewer/OpenSourceCustomViewer.csproj b/Demos/OpenSource/WPFOpenSourceViewer/OpenSourceCustomViewer/OpenSourceCustomViewer.csproj
@@ -118,4 +118,4 @@
     <Resource Include="Resources\001.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Demos/OpenSource/WinFormsOpenSourceViewer/WinFormsOpenSource/WinFormsOpenSource.csproj b/Demos/OpenSource/WinFormsOpenSourceViewer/WinFormsOpenSource/WinFormsOpenSource.csproj
@@ -145,4 +145,4 @@
     <Content Include="Reports\nwind.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Demos/Reports/Barcode.frx b/Demos/Reports/Barcode.frx
diff --git a/Demos/Reports/QR-Codes.frx b/Demos/Reports/QR-Codes.frx
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="This report demonstrates different QR-Code and Aztec types developed in FastReport Designer: Text, vCard, URI, GEolocation, E-Mail address, E-Mail message, SMS, Call, Event, Wi-Fi. You can create it with a double-click on BarcodeObject (Barcode Type should be set to &quot;QR Code or Aztec&quot;)." ReportInfo.Created="02/21/2008 20:44:59" ReportInfo.Modified="01/18/2019 15:50:42" ReportInfo.CreatorVersion="2019.1.9.0">
+<Report ScriptLanguage="CSharp" TextQuality="Regular" ReportInfo.Description="This report demonstrates different QR-Code and Aztec types developed in FastReport Designer: Text, vCard, URI, GEolocation, E-Mail address, E-Mail message, SMS, Call, Event, Wi-Fi. You can create it with a double-click on BarcodeObject (Barcode Type should be set to &quot;QR Code or Aztec&quot;)." ReportInfo.Created="02/21/2008 20:44:59" ReportInfo.Modified="08/12/2020 14:04:04" ReportInfo.CreatorVersion="2020.3.11.0">
   <Dictionary/>
-  <ReportPage Name="Page1">
+  <ReportPage Name="Page1" Watermark.Font="Arial, 60pt">
     <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="94.5" CanGrow="true">
       <TextObject Name="Text29" Width="718.2" Height="28.35" Anchor="Top, Left, Right" Fill.Color="WhiteSmoke" CanGrow="true" Text="[Report.ReportInfo.Description]" Padding="4, 4, 4, 4" VertAlign="Center" Font="Tahoma, 8pt"/>
       <TextObject Name="Text30" Top="47.25" Width="718.2" Height="37.8" Text="BarcodeObject - QR Code, Aztec" HorzAlign="Center" VertAlign="Center" Font="Tahoma, 14pt, style=Bold"/>
     </ReportTitleBand>
     <DataBand Name="Data1" Top="98.5" Width="718.2" Height="907.2">
+      <BarcodeObject Name="Barcode47" Left="396.9" Top="604.8" Width="302.4" Height="291.06" AutoSize="false" Text="SPC&#13;&#10;0200&#13;&#10;1&#13;&#10;CH4431999123000889012&#13;&#10;S&#13;&#10;Carl Ltd.&#13;&#10;Luber&#13;&#10;16&#13;&#10;123321&#13;&#10;Berlin&#13;&#10;GE&#13;&#10;&#13;&#10;&#13;&#10;&#13;&#10;&#13;&#10;&#13;&#10;&#13;&#10;&#13;&#10;50050&#13;&#10;EUR&#13;&#10;S&#13;&#10;Sigmunt Shuld&#13;&#10;Lunglen&#13;&#10;23&#13;&#10;123322&#13;&#10;Ferburg&#13;&#10;GE&#13;&#10;NON&#13;&#10;&#13;&#10;&#13;&#10;EPD&#13;&#10;" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="M" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
       <TextObject Name="Text36" Left="510.3" Top="406.35" Width="189" Height="170.1" Text="E-Mail message" Padding="2, 7, 2, 0" HorzAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
       <TextObject Name="Text49" Left="264.6" Top="406.35" Width="189" Height="170.1" Text="Call" Padding="2, 7, 2, 0" HorzAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
       <TextObject Name="Text37" Left="18.9" Top="406.35" Width="189" Height="170.1" Text="SMS" Padding="2, 7, 2, 0" HorzAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
@@ -25,10 +26,11 @@
       <BarcodeObject Name="Barcode46" Left="529.2" Top="66.15" Width="151.2" Height="147.42" AutoSize="false" Text="WIFI:T:WPA;S:Honeypot;P:youarewelcome;H:true;" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
       <BarcodeObject Name="Barcode42" Left="283.5" Top="245.7" Width="151.2" Height="147.42" AutoSize="false" Text="geo:-50.737563,-79.490016,120" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
       <BarcodeObject Name="Barcode39" Left="37.8" Top="66.15" Width="151.2" Height="147.42" AutoSize="false" Text="http://www.fast-report.com/en/product/fast-report-net/" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
-      <TextObject Name="Text32" Left="189" Top="595.35" Width="340.2" Height="311.85" Text="Text" Padding="2, 7, 2, 0" HorzAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
-      <BarcodeObject Name="Barcode19" Left="207.9" Top="614.25" Width="302.4" Height="291.06" AutoSize="false" Text="With FastReport.Net, you can create application-independent .Net reports. In other words, FastReport.Net can be used as a standalone reporting tool." ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="H" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
-      <TextObject Name="Text2" Left="302.4" Top="718.2" Width="122.85" Height="94.5" Fill.Color="White" Text="With &#13;&#10;Error &#13;&#10;Correction" Padding="15, 0, 2, 0" VertAlign="Center" Font="Arial, 14pt"/>
+      <TextObject Name="Text32" Top="595.35" Width="340.2" Height="311.85" Text="With error correction" Padding="2, 7, 2, 0" HorzAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
+      <BarcodeObject Name="Barcode19" Left="18.9" Top="604.8" Width="302.4" Height="291.06" AutoSize="false" Text="With FastReport.Net, you can create application-independent .Net reports. In other words, FastReport.Net can be used as a standalone reporting tool." ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="H" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
       <TextObject Name="Text1" Left="18.9" Width="680.4" Height="37.8" Fill.Color="Orange" Text="QR-Codes" VertAlign="Center" Font="Tahoma, 16pt"/>
+      <PictureObject Name="Picture1" Left="132.3" Top="708.75" Width="75.6" Height="75.6" Image="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"/>
+      <TextObject Name="Text51" Left="378" Top="595.35" Width="340.2" Height="311.85" CanGrow="true" Text="Swiss QR" Padding="2, 7, 2, 0" HorzAlign="Center" Font="Tahoma, 8pt, style=Bold"/>
     </DataBand>
     <PageFooterBand Name="PageFooter1" Top="1009.7" Width="718.2" Height="28.35" Fill.Color="WhiteSmoke">
       <TextObject Name="Text31" Left="9.45" Width="217.35" Height="28.35" Cursor="Hand" Hyperlink.Value="https://www.fast-report.com/en/product/fast-report-net/" Text="Generated by FastReport .NET" VertAlign="Center" Font="Tahoma, 8pt, style=Underline" TextFill.Color="Blue"/>

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
@@ -27,7 +27,7 @@
         </ProjectReference>
         <ProjectReference Include="..\FastReport.Data.Json\FastReport.Data.Json.csproj" />
     </ItemGroup>
-    <ItemGroup >
+    <ItemGroup>
         <Reference Include="System" />
         <Reference Include="System.Data" />
         <Reference Include="System.Data.Entity.Design" />
@@ -36,15 +36,13 @@
         <Reference Include="System.Windows.Forms" />
         <Reference Include="System.Xml" />
     </ItemGroup>
-    <ItemGroup >
-        <Compile Update="CouchbaseConnectionEditor.cs">
-            <SubType>UserControl</SubType>
-        </Compile>
+    <ItemGroup>
+        <Compile Update="CouchbaseConnectionEditor.cs" />
         <Compile Update="CouchbaseConnectionEditor.Designer.cs">
             <DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
         </Compile>
     </ItemGroup>
-    <ItemGroup >
+    <ItemGroup>
         <EmbeddedResource Update="CouchbaseConnectionEditor.resx">
             <DependentUpon>CouchbaseConnectionEditor.cs</DependentUpon>
             <SubType>Designer</SubType>

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
@@ -38,9 +38,7 @@
         <Reference Include="System.Xml" />
     </ItemGroup>
     <ItemGroup>
-        <Compile Update="JsonConnectionEditor.cs">
-            <SubType>UserControl</SubType>
-        </Compile>
+        <Compile Update="JsonConnectionEditor.cs" />
         <Compile Update="JsonConnectionEditor.Designer.cs">
             <DependentUpon>JsonConnectionEditor.cs</DependentUpon>
         </Compile>

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
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net4.5</TargetFrameworks>
+        <TargetFrameworks>net4.5;net4.5.2</TargetFrameworks>
         <SignAssembly>false</SignAssembly>
         <AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -20,36 +20,41 @@
         <RootNamespace>FastReport.Data</RootNamespace>
         <PackageReleaseNotes>fixed a bug with wrong database name</PackageReleaseNotes>
     </PropertyGroup>
-    <ItemGroup >
+    <ItemGroup>
         <ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj">
             <PrivateAssets>all</PrivateAssets>
         </ProjectReference>
     </ItemGroup>
-    <ItemGroup >
+    <ItemGroup>
         <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 >
+    <ItemGroup>
         <Compile Update="MongoDBConnectionEditor.cs">
             <SubType>UserControl</SubType>
         </Compile>
         <Compile Update="MongoDBConnectionEditor.Designer.cs">
             <DependentUpon>MongoDBConnectionEditor.cs</DependentUpon>
         </Compile>
     </ItemGroup>
-    <ItemGroup >
+    <ItemGroup>
         <EmbeddedResource Update="MongoDBConnectionEditor.resx">
             <DependentUpon>MongoDBConnectionEditor.cs</DependentUpon>
             <SubType>Designer</SubType>
         </EmbeddedResource>
     </ItemGroup>
-    <ItemGroup >
-        <PackageReference Include="MongoDB.Bson" Version="[2.3.0,)" />
-        <PackageReference Include="MongoDB.Driver" Version="[2.3.0,)" />
-        <PackageReference Include="MongoDB.Driver.Core" Version="[2.3.0,)" />
+    <ItemGroup Condition="'$(TargetFramework)'=='net4.5'">
+        <PackageReference Include="MongoDB.Bson" Version="2.7.3" />
+        <PackageReference Include="MongoDB.Driver" Version="2.7.3" />
+        <PackageReference Include="MongoDB.Driver.Core" Version="2.7.3" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'=='net4.5.2'">
+        <PackageReference Include="MongoDB.Bson" Version="[2.11.0,)" />
+        <PackageReference Include="MongoDB.Driver" Version="[2.11.0,)" />
+        <PackageReference Include="MongoDB.Driver.Core" Version="[2.11.0,)" />
     </ItemGroup>
 </Project>