21.2.3

eXpandFramework · Jul 5, 2022 · 7db8305 · 7db8305
1 parent 9146c83
commit 7db8305
Show file tree

Hide file tree

Showing 140 changed files with 4,902 additions and 4,726 deletions.
diff --git a/.github/Azure-pipeline.yml b/.github/Azure-pipeline.yml
@@ -13,7 +13,7 @@ trigger:
     include:
       - master
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 steps:
 - checkout: self
   clean: true

diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/DatabaseUpdate/Updater.cs b/Demos/XVideoRental/XVideoRental.Module.Win/DatabaseUpdate/Updater.cs
@@ -89,7 +89,7 @@ private static string GetDashboardLayout(string dashboardName) {
         }
 
         void SetPermissions(IPermissionPolicyRole employersRole) {
-            employersRole.SetTypePermission<ReportData>(SecurityOperations.ReadOnlyAccess, SecurityPermissionState.Allow);
+            // employersRole.SetTypePermission<ReportData>(SecurityOperations.ReadOnlyAccess, SecurityPermissionState.Allow);
             ((ISecurityRole) employersRole).CreatePermissionBehaviour(PermissionBehavior.ReadOnlyAccess, (role, info) =>
                 ((IPermissionPolicyRole) role).SetTypePermission(info.Type, SecurityOperations.ReadOnlyAccess, SecurityPermissionState.Allow));
         }

diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj b/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
@@ -14,20 +14,18 @@
     <OutputPath>bin\Debug\</OutputPath>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
+    <NoWarn>1701;1702;CA1416</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;CA1416</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System.configuration">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Xpand.ExpressApp">
       <HintPath>..\..\..\Xpand.DLL\Xpand.ExpressApp.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Chart.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.Chart.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Chart.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Dashboard">
@@ -39,11 +37,11 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.MasterDetail.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.MasterDetail.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.MasterDetail.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.PivotGrid.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.PivotGrid.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.PivotGrid.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.ReportsV2.Win">
@@ -59,15 +57,15 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Security.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.Security.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Security.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.XtraDashboard.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.XtraDashboard.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.XtraDashboard.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.Persistent.Base">

diff --git a/Demos/XVideoRental/XVideoRental.Win/Program.cs b/Demos/XVideoRental/XVideoRental.Win/Program.cs
@@ -24,7 +24,7 @@ static void Main() {
 
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            EditModelPermission.AlwaysGranted = System.Diagnostics.Debugger.IsAttached;
+            // EditModelPermission.AlwaysGranted = System.Diagnostics.Debugger.IsAttached;
             var winApplication = new XVideoRentalWindowsFormsApplication();
 
 #if EASYTEST

diff --git a/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj b/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>WinExe</OutputType>
     <ApplicationIcon>ExpressApp.ico</ApplicationIcon>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -15,20 +15,18 @@
     <Prefer32Bit>true</Prefer32Bit>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
+    <NoWarn>1701;1702;CA1416</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;CA1416</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System.configuration">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Xpand.ExpressApp">
       <HintPath>..\..\..\Xpand.DLL\Xpand.ExpressApp.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Chart.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.Chart.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Chart.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Dashboard">
@@ -44,15 +42,15 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.MasterDetail.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.MasterDetail.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.MasterDetail.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.ModelArtifactState">
       <HintPath>..\..\..\Xpand.DLL\Xpand.ExpressApp.ModelArtifactState.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.PivotGrid.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.PivotGrid.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.PivotGrid.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Scheduler.Win">
@@ -64,19 +62,19 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Security.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.Security.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Security.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Validation">
       <HintPath>..\..\..\Xpand.DLL\Xpand.ExpressApp.Validation.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.ExpressApp.XtraDashboard.Win">
-      <HintPath>..\..\..\Xpand.DLL\net461\Xpand.ExpressApp.XtraDashboard.Win.dll</HintPath>
+      <HintPath>..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.XtraDashboard.Win.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Xpand.Persistent.Base">

diff --git a/Support/Build/Build.ps1 b/Support/Build/Build.ps1
@@ -128,20 +128,20 @@ Task CompileModules{
         # BuildProjects $vsAddons "VSIX"
         Pop-Location
 
-        Write-HostFormatted "Compiling Agnostic EasyTest projects..." -Section
-        $agnosticEasytest=(($group.EasyTestProjects|GetProjects)|Where-Object{!("$_".Contains("Win"))  -and !("$_".Contains("Web"))}) 
-        "agnosticEasytest=$agnosticEasytest"
-        BuildProjects $agnosticEasytest "EasyTest"
+        # Write-HostFormatted "Compiling Agnostic EasyTest projects..." -Section
+        # $agnosticEasytest=(($group.EasyTestProjects|GetProjects)|Where-Object{!("$_".Contains("Win"))  -and !("$_".Contains("Web"))}) 
+        # "agnosticEasytest=$agnosticEasytest"
+        # BuildProjects $agnosticEasytest "EasyTest"
 
-        Write-HostFormatted "Compiling Win EasyTest projects..." -Section
-        $winEasyTest=(($group.EasyTestProjects|GetProjects)|Where-Object{"$_".Contains("Win")}) 
-        "winEasyTest=$winEasyTest"
-        BuildProjects $winEasyTest "EasyTest"
+        # Write-HostFormatted "Compiling Win EasyTest projects..." -Section
+        # $winEasyTest=(($group.EasyTestProjects|GetProjects)|Where-Object{"$_".Contains("Win")}) 
+        # "winEasyTest=$winEasyTest"
+        # BuildProjects $winEasyTest "EasyTest"
 
-        Write-HostFormatted "Compiling Web EasyTest projects..." -Section
-        $webEasyTest=(($group.EasyTestProjects|GetProjects)|Where-Object{"$_".Contains("Web")}) 
-        "webEasyTest=$webEasyTest"
-        BuildProjects $webEasyTest "EasyTest"
+        # Write-HostFormatted "Compiling Web EasyTest projects..." -Section
+        # $webEasyTest=(($group.EasyTestProjects|GetProjects)|Where-Object{"$_".Contains("Web")}) 
+        # "webEasyTest=$webEasyTest"
+        # BuildProjects $webEasyTest "EasyTest"
     }
 }
 

diff --git a/Support/Build/CreateXpandNugets.ps1 b/Support/Build/CreateXpandNugets.ps1
@@ -78,9 +78,9 @@ function AddAllDependency($file, $nuspecpaths) {
         $p=Get-XmlContent $_.FullName
         $p.package.files.file.target -match "netstandard"
     })
-    $net5Nuspecs=@($nuspecpaths|where-Object{
+    $net6Nuspecs=@($nuspecpaths|where-Object{
         $p=Get-XmlContent $_.FullName
-        $p.package.files.file.target -match "net5"
+        $p.package.files.file.target -match "net6"
     })
     ($netStandardNuspecs) | ForEach-Object {
         [xml]$package = Get-Content $_.Fullname
@@ -90,9 +90,9 @@ function AddAllDependency($file, $nuspecpaths) {
         [xml]$package = Get-Content $_.Fullname
         Add-NuspecDependency $package.package.metaData.Id $Version $nuspecpath "net461"  
     }
-    ($net5Nuspecs+$netStandardNuspecs) | ForEach-Object {
+    ($net6Nuspecs+$netStandardNuspecs) | ForEach-Object {
         [xml]$package = Get-Content $_.Fullname
-        Add-NuspecDependency $package.package.metaData.Id $Version $nuspecpath "net5.0"  
+        Add-NuspecDependency $package.package.metaData.Id $Version $nuspecpath "net6.0"  
     }
     $nuspecpath.Save($file)
     Format-Xml -path $file
@@ -231,9 +231,9 @@ $modules
 Write-HostFormatted "packing nuspecs"
 Get-ChildItem "$root\build\Nuget" -ErrorAction SilentlyContinue | Remove-Item -Force -Recurse
 
-Get-ChildItem "$root\Support\Nuspec" *.nuspec | Invoke-Parallel -RetryOnError 3 -VariablesToImport @("modules","Nuget","version","root") -Script {    
-# $nuspecs = Get-ChildItem "$root\Support\Nuspec" *.nuspec
-# $nuspecs | foreach {    
+# Get-ChildItem "$root\Support\Nuspec" *.nuspec | Invoke-Parallel -RetryOnError 3 -VariablesToImport @("modules","Nuget","version","root") -Script {    
+$nuspecs = Get-ChildItem "$root\Support\Nuspec" *.nuspec
+$nuspecs | foreach {    
     if (!$Version) {
         throw
     }

diff --git a/Support/Nuspec/AdditionalViewControlsProvider.Web.nuspec b/Support/Nuspec/AdditionalViewControlsProvider.Web.nuspec
@@ -14,12 +14,12 @@
     <projectUrl>http://www.expandframework.com/#AVC</projectUrl>
     <tags>DevExpress, eXpand, XAF, eXpressApp</tags>
     <dependencies>
-      <dependency id="eXpandAdditionalViewControlsProvider" version="21.2.801.0" />
-      <dependency id="eXpandLib" version="21.2.801.0" />
-      <dependency id="eXpandLogic" version="21.2.801.0" />
-      <dependency id="eXpandSecurity" version="21.2.801.0" />
-      <dependency id="eXpandSystem" version="21.2.801.0" />
-      <dependency id="eXpandSystemWeb" version="21.2.801.0" />
+      <dependency id="eXpandAdditionalViewControlsProvider" version="22.1.300.0" />
+      <dependency id="eXpandLib" version="22.1.300.0" />
+      <dependency id="eXpandLogic" version="22.1.300.0" />
+      <dependency id="eXpandSecurity" version="22.1.300.0" />
+      <dependency id="eXpandSystem" version="22.1.300.0" />
+      <dependency id="eXpandSystemWeb" version="22.1.300.0" />
       <dependency id="System.ValueTuple" version="4.5" />
     </dependencies>
   </metadata>

diff --git a/Support/Nuspec/AdditionalViewControlsProvider.Win.nuspec b/Support/Nuspec/AdditionalViewControlsProvider.Win.nuspec
@@ -14,18 +14,18 @@
     <tags>DevExpress, eXpand, XAF, eXpressApp</tags>
     <projectUrl>http://www.expandframework.com/#AVC</projectUrl>
     <dependencies>
-      <dependency id="eXpandAdditionalViewControlsProvider" version="21.2.801.0" />
-      <dependency id="eXpandLib" version="21.2.801.0" />
-      <dependency id="eXpandLogic" version="21.2.801.0" />
-      <dependency id="eXpandSecurity" version="21.2.801.0" />
+      <dependency id="eXpandAdditionalViewControlsProvider" version="22.1.300.0" />
+      <dependency id="eXpandLib" version="22.1.300.0" />
+      <dependency id="eXpandLogic" version="22.1.300.0" />
+      <dependency id="eXpandSecurity" version="22.1.300.0" />
       <dependency id="System.ValueTuple" version="4.5" />
     </dependencies>
   </metadata>
   <files>
     <file src=".\net461\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.dll" target="lib\net461\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.dll" />
     <file src=".\net461\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.pdb" target="lib\net461\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.pdb" />
-    <file src=".\net5.0-windows7.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.dll" target="lib\net5.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.dll" />
-    <file src=".\net5.0-windows7.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.pdb" target="lib\net5.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.pdb" />
+    <file src=".\net6.0-windows7.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.dll" target="lib\net6.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.dll" />
+    <file src=".\net6.0-windows7.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.pdb" target="lib\net6.0\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.pdb" />
     <file src="..\Support\build\CopySymbols.targets" target="build\eXpandAdditionalViewControlsProviderWin.targets">
     </file>
     <file src="..\Support\build\CopySymbols.ps1" target="build\CopySymbols.ps1">

diff --git a/Support/Nuspec/AdditionalViewControlsProvider.nuspec b/Support/Nuspec/AdditionalViewControlsProvider.nuspec
@@ -14,11 +14,12 @@
     <tags>DevExpress, eXpand, XAF, eXpressApp</tags>
     <projectUrl>http://www.expandframework.com/#AVC</projectUrl>
     <dependencies>
-      <dependency id="eXpandLib" version="21.2.801.0" />
-      <dependency id="eXpandLogic" version="21.2.801.0" />
-      <dependency id="eXpandSecurity" version="21.2.801.0" />
-      <dependency id="Xpand.Extensions.XAF.Xpo" version="4.212.10" />
-      <dependency id="Xpand.XAF.Modules.ModelViewInheritance" version="4.212.10" />
+      <dependency id="eXpandLib" version="22.1.300.0" />
+      <dependency id="eXpandLogic" version="22.1.300.0" />
+      <dependency id="eXpandSecurity" version="22.1.300.0" />
+      <dependency id="System.ComponentModel.Annotations" version="5.0" />
+      <dependency id="Xpand.Extensions.XAF.Xpo" version="4.212.10.1" />
+      <dependency id="Xpand.XAF.Modules.ModelViewInheritance" version="4.212.10.1" />
     </dependencies>
   </metadata>
   <files>