Merge remote-tracking branch 'upstream/master'

runejo · Nov 22, 2022 · e7e27a7 · e7e27a7
2 parents 3c24e19 + d9a75b9
commit e7e27a7
Show file tree

Hide file tree

Showing 61 changed files with 474 additions and 871 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,8 @@
+=== Release of PxWeb 2022 v1 ===
+- Changed Referrer-Policy to same-origin
+- Added security header for Strict Transport and change value on header referrer-policy
+- Added security header for cache-control
+- Added support to restore variable values by selecting --Select classification--
 - Changed to the PcAxis.Serializers nuget package
 - Upgraded the Newtonsoft JSON library dependenvis to 13.0.1 due to a vulnerability issue
 - Fixed marking tips translation in Swedish
@@ -53,3 +58,4 @@
 - Better text for screenreader on buttons on selectionpage.
 - Added aria-live on selection page describing selection status and validation errors.
 - Moved checkbox for search in front of search-field. Better to read (screenreader) checkbox text before searchfield connected to checkbox.
+
diff --git a/PCAxis.Api/PCAxis.Api.csproj b/PCAxis.Api/PCAxis.Api.csproj
@@ -101,7 +101,7 @@
       <HintPath>..\packages\Oracle.ManagedDataAccess.Core.2.19.110\lib\netstandard2.0\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Core.1.1.1\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Core.1.2.2\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Encryption, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\PCAxis.Encryption.1.0.2\lib\netstandard2.0\PCAxis.Encryption.dll</HintPath>
@@ -128,7 +128,7 @@
       <HintPath>..\packages\PcAxis.Sql.1.1.4\lib\netstandard2.0\PCAxis.Sql.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.3\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/PCAxis.Api/packages.config b/PCAxis.Api/packages.config
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClosedXML" version="0.95.4" targetFramework="net461" />
-  <package id="DocumentFormat.OpenXml" version="2.12.2" targetFramework="net461" />
-  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net461" />
-  <package id="log4net" version="2.0.12" targetFramework="net461" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
-  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net461" />
-  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net461" />
-  <package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.5.0" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Logging" version="5.5.0" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Protocols" version="5.5.0" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.5.0" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.5.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
-  <package id="Oracle.ManagedDataAccess.Core" version="2.19.110" targetFramework="net461" />
-  <package id="PcAxis.Core" version="1.1.1" targetFramework="net48" />
-  <package id="PCAxis.Encryption" version="1.0.2" targetFramework="net461" />
-  <package id="PCAxis.Menu" version="1.0.1" targetFramework="net461" />
-  <package id="PCAxis.Menu.ConfigDatamodelMenu" version="1.0.4" targetFramework="net461" />
-  <package id="PCAxis.Menu.MsSqlDatamodelMenu" version="1.0.1" targetFramework="net461" />
-  <package id="PCAxis.Menu.OracleDatamodelMenu" version="1.0.1" targetFramework="net461" />
-  <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net461" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net461" />
-  <package id="PCAxis.Serializers" version="1.0.3" targetFramework="net48" />
-  <package id="PcAxis.Sql" version="1.1.4" targetFramework="net461" />
-  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
-  <package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.5.0" targetFramework="net461" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO.Packaging" version="4.0.0" targetFramework="net461" />
-  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Xml" version="4.7.1" targetFramework="net461" />
-  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
-  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net461" />
+  <package id="ClosedXML" version="0.95.4" targetFramework="net48" />
+  <package id="DocumentFormat.OpenXml" version="2.12.2" targetFramework="net48" />
+  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
+  <package id="log4net" version="2.0.12" targetFramework="net48" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
+  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net48" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net48" />
+  <package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.5.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.5.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Protocols" version="5.5.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.5.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.5.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="Oracle.ManagedDataAccess.Core" version="2.19.110" targetFramework="net48" />
+  <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
+  <package id="PCAxis.Encryption" version="1.0.2" targetFramework="net48" />
+  <package id="PCAxis.Menu" version="1.0.1" targetFramework="net48" />
+  <package id="PCAxis.Menu.ConfigDatamodelMenu" version="1.0.4" targetFramework="net48" />
+  <package id="PCAxis.Menu.MsSqlDatamodelMenu" version="1.0.1" targetFramework="net48" />
+  <package id="PCAxis.Menu.OracleDatamodelMenu" version="1.0.1" targetFramework="net48" />
+  <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Sql" version="1.1.4" targetFramework="net48" />
+  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net48" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.5.0" targetFramework="net48" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
+  <package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />
+  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Xml" version="4.7.1" targetFramework="net48" />
+  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
+  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net48" />
 </packages>
diff --git a/PCAxis.Charting/PxChart/PCAxis.Charting.csproj b/PCAxis.Charting/PxChart/PCAxis.Charting.csproj
@@ -67,7 +67,7 @@
       <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\PcAxis.Core.1.1.1\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
+      <HintPath>..\..\packages\PcAxis.Core.1.2.2\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Menu, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\PCAxis.Menu.1.0.1\lib\netstandard2.0\PCAxis.Menu.dll</HintPath>
@@ -126,7 +126,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>

diff --git a/PCAxis.Charting/PxChart/packages.config b/PCAxis.Charting/PxChart/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.12" targetFramework="net461" />
-  <package id="PcAxis.Core" version="1.1.1" targetFramework="net48" />
-  <package id="PCAxis.Menu" version="1.0.1" targetFramework="net461" />
-  <package id="PCAxis.PxExtend" version="1.0.4" targetFramework="net461" />
-  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
-  <package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net461" />
-  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
-  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net461" />
+  <package id="log4net" version="2.0.12" targetFramework="net48" />
+  <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
+  <package id="PCAxis.Menu" version="1.0.1" targetFramework="net48" />
+  <package id="PCAxis.PxExtend" version="1.0.4" targetFramework="net48" />
+  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
+  <package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net48" />
+  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
+  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net48" />
 </packages>
diff --git a/PCAxis.Charts/ChartHelper.cs b/PCAxis.Charts/ChartHelper.cs
@@ -148,6 +148,11 @@ public static PxWebChart GetChart(ChartSettings settings, PXModel model)
             Color backgroundColor = ColorTranslator.FromHtml(settings.BackgroundColor);
             chart.BackColor = Color.FromArgb(settings.BackgroundAlpha, backgroundColor);
 
+            if (chart.Legends.Count > 0)
+            {
+                chart.Legends[0].BackColor = Color.FromArgb(settings.BackgroundAlpha, backgroundColor);
+            }
+
             if (settings.BackgroundAlpha != 255)
             {
                 chart.AntiAliasing = AntiAliasingStyles.Graphics;

diff --git a/PCAxis.Charts/PCAxis.Chart.csproj b/PCAxis.Charts/PCAxis.Chart.csproj
@@ -62,7 +62,7 @@
       <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Core.1.1.1\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Core.1.2.2\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/PCAxis.Charts/packages.config b/PCAxis.Charts/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.12" targetFramework="net461" />
-  <package id="PcAxis.Core" version="1.1.1" targetFramework="net48" />
-  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
-  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net461" />
+  <package id="log4net" version="2.0.12" targetFramework="net48" />
+  <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
+  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
+  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net48" />
 </packages>
diff --git a/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj b/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj
@@ -75,7 +75,7 @@
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Core.1.1.1\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Core.1.2.2\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Metadata, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
@@ -84,7 +84,7 @@
       <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.3\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/PCAxis.Excel.Web.Controls/packages.config b/PCAxis.Excel.Web.Controls/packages.config
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClosedXML" version="0.95.4" targetFramework="net461" />
-  <package id="DocumentFormat.OpenXml" version="2.12.2" targetFramework="net461" />
-  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net461" />
-  <package id="log4net" version="2.0.12" targetFramework="net461" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
-  <package id="PcAxis.Core" version="1.1.1" targetFramework="net48" />
-  <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net461" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net461" />
-  <package id="PCAxis.Serializers" version="1.0.3" targetFramework="net48" />
-  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO.Packaging" version="4.0.0" targetFramework="net461" />
-  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
-  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net461" />
+  <package id="ClosedXML" version="0.95.4" targetFramework="net48" />
+  <package id="DocumentFormat.OpenXml" version="2.12.2" targetFramework="net48" />
+  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
+  <package id="log4net" version="2.0.12" targetFramework="net48" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
+  <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
+  <package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />
+  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Permissions" version="5.0.0" targetFramework="net48" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
+  <package id="Ude.NetStandard" version="1.2.0" targetFramework="net48" />
 </packages>
diff --git a/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj b/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj
@@ -39,7 +39,8 @@
       <HintPath>..\packages\DocumentFormat.OpenXml.2.12.2\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
     <Reference Include="ExcelNumberFormat, Version=1.0.10.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll</HintPath>
+      <HintPath>..\packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
@@ -48,7 +49,7 @@
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Core.1.1.1\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Core.1.2.2\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Metadata, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
@@ -57,7 +58,7 @@
       <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.3\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />