Merge branch 'master' into beta

Author: korzh

.github/workflows/archive2cdn.yml

@@ -1,10 +1,10 @@
 name: Archive and Upload to FTP
 
-on: workflow_dispatch
-
-#  push:
-#    branches:
-#      - master
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
   archive_and_upload:
@@ -53,6 +53,6 @@ jobs:
           for folder in "${folder_list[@]}"; do
             zip_file_name=$(echo "$folder" | sed 's/\//-/g').zip
             echo $zip_file_name
-            curl -T "$zip_file_name" --ftp-create-dirs -u "$FTP_USERNAME:$FTP_PASSWORD" "ftp://$FTP_HOST/cdn.korzh.com/dot-net-samples/$zip_file_name"
-            echo "ftp://$FTP_HOST/cdn.korzh.com/dot-net-samples/$zip_file_name"
+            curl -T "$zip_file_name" --ftp-create-dirs -u "$FTP_USERNAME:$FTP_PASSWORD" "ftp://$FTP_HOST/dot-net-samples/$zip_file_name"
+            echo "ftp://$FTP_HOST/dot-net-samples/$zip_file_name"
           done

WinForms/EqDemoWinFormsNet4/App.config

@@ -5,7 +5,7 @@
       <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
     </startup>
     <connectionStrings>
       <add name="DefaultConnection" connectionString="Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=EqDemo.AspNet4x.AdvancedSearch;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False" providerName="System.Data.SqlClient"/>
@@ -20,4 +20,3 @@
 		  <add key="DpiAwareness" value="PerMonitorV2"/>
 	  </System.Windows.Forms.ApplicationConfigurationSection>
 </configuration>
-

WinForms/EqDemoWinFormsNet4/EqDemoWinFormsNet4.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>EqDemo</RootNamespace>
     <AssemblyName>EqDemoWinFormsNet4</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -58,6 +58,8 @@
     <Compile Include="Models\NWind\Customer.cs" />
     <PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.5.9" />
     <PackageReference Include="EasyData.Exporters.Default" Version="1.5.9" />
+    <Compile Include="Models\NWind\Employee.cs" />
+    <Compile Include="Models\NWind\Order.cs" />
     <Compile Include="Models\NWind\OrderDetail.cs" />
     <Compile Include="Models\NWind\Product.cs" />
     <Compile Include="Models\NWind\Shipper.cs" />
@@ -123,11 +125,23 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EasyData.Core">
-      <Version>1.5.8</Version>
+      <Version>1.5.9</Version>
     </PackageReference>
     <PackageReference Include="EntityFramework" Version="6.2.0" />
     <PackageReference Include="Microsoft.Data.SqlClient">
-      <Version>2.1.7</Version>
+      <Version>6.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
+      <Version>9.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
+      <Version>9.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Options">
+      <Version>9.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Primitives">
+      <Version>9.0.8</Version>
     </PackageReference>
     <PackageReference Include="System.Data.SqlClient">
       <Version>4.8.6</Version>