diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/WinModule.cs b/Demos/XVideoRental/XVideoRental.Module.Win/WinModule.cs
index 32adcf82de..74ebed5f42 100644
--- a/Demos/XVideoRental/XVideoRental.Module.Win/WinModule.cs
+++ b/Demos/XVideoRental/XVideoRental.Module.Win/WinModule.cs
@@ -18,7 +18,6 @@
using Xpand.ExpressApp.MasterDetail.Win;
using Xpand.ExpressApp.PivotGrid.Win;
using Xpand.ExpressApp.ReportsV2.Win;
-using Xpand.ExpressApp.Scheduler.Win;
using Xpand.ExpressApp.Security.Win;
using Xpand.ExpressApp.SystemModule;
using Xpand.ExpressApp.Win.SystemModule;
@@ -47,7 +46,7 @@ public XVideoRentalWindowsFormsModule() {
RequiredModuleTypes.Add(typeof(XpandPivotGridWinModule));
RequiredModuleTypes.Add(typeof(XpandChartWinModule));
RequiredModuleTypes.Add(typeof(MasterDetailWindowsModule));
- RequiredModuleTypes.Add(typeof(XpandSchedulerWindowsFormsModule));
+
RequiredModuleTypes.Add(typeof(XpandSecurityWinModule));
RequiredModuleTypes.Add(typeof(ReportsV2WinModule));
RequiredModuleTypes.Add(typeof(DashboardWindowsFormsModule));
diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj b/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj
index e1dd143fb8..322248b17f 100644
--- a/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj
+++ b/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj
@@ -25,7 +25,7 @@
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Chart.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Chart.Win.dll
False
@@ -37,35 +37,31 @@
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.MasterDetail.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.MasterDetail.Win.dll
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.PivotGrid.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.PivotGrid.Win.dll
False
..\..\..\Xpand.DLL\Xpand.ExpressApp.ReportsV2.Win.dll
False
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Scheduler.Win.dll
- False
-
..\..\..\Xpand.DLL\Xpand.ExpressApp.Security.dll
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Security.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Security.Win.dll
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Win.dll
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.XtraDashboard.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.XtraDashboard.Win.dll
False
diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/paket.references b/Demos/XVideoRental/XVideoRental.Module.Win/paket.references
index 11a8b15074..abf632d411 100644
--- a/Demos/XVideoRental/XVideoRental.Module.Win/paket.references
+++ b/Demos/XVideoRental/XVideoRental.Module.Win/paket.references
@@ -11,4 +11,3 @@ DevExpress.ExpressApp.Security.Xpo
DevExpress.Persistent.BaseImpl.Xpo
DevExpress.Win.Reporting
Xpand.XAF.Modules.CloneModelView
-DevExpress.ExpressApp.CodeAnalysis
\ No newline at end of file
diff --git a/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj b/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj
index 5067171c76..ad1253568a 100644
--- a/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj
+++ b/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj
@@ -26,7 +26,7 @@
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Chart.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Chart.Win.dll
False
@@ -42,7 +42,7 @@
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.MasterDetail.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.MasterDetail.Win.dll
False
@@ -50,11 +50,7 @@
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.PivotGrid.Win.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Scheduler.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.PivotGrid.Win.dll
False
@@ -62,7 +58,7 @@
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Security.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Security.Win.dll
False
@@ -70,11 +66,11 @@
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Win.dll
False
- ..\..\..\Xpand.DLL\net6.0-windows7.0\Xpand.ExpressApp.XtraDashboard.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.XtraDashboard.Win.dll
False
diff --git a/Support/Build/Build.ps1 b/Support/Build/Build.ps1
index e7f7204607..73ccae201b 100644
--- a/Support/Build/Build.ps1
+++ b/Support/Build/Build.ps1
@@ -118,8 +118,8 @@ Task CompileModules{
Write-HostFormatted "Compiling helper projects..." -Section
$helperProjects=($group.HelperProjects|GetProjects)
- Write-HostFormatted "helperProjects=$helperProjects" -ForegroundColor Magenta
- BuildProjects $helperProjects "Helper"
+ # Write-HostFormatted "helperProjects=$helperProjects" -ForegroundColor Magenta
+ # BuildProjects $helperProjects "Helper"
$vsAddons=($group.VSAddons|GetProjects)
Write-HostFormatted "vsAddons=$vsAddons" -ForegroundColor Magenta
Push-Location "$root\Xpand.Plugins"
diff --git a/Support/Build/CreateXpandNugets.ps1 b/Support/Build/CreateXpandNugets.ps1
index 9e768f1c0c..efaea3c996 100644
--- a/Support/Build/CreateXpandNugets.ps1
+++ b/Support/Build/CreateXpandNugets.ps1
@@ -1,6 +1,6 @@
Param (
[string]$root = (Get-Item "$PSScriptRoot\..\..").FullName,
- [string]$version = "21.1.501.2",
+ [string]$version = "22.2.300.1",
[bool]$ResolveNugetDependecies,
[bool]$Release
)
@@ -66,10 +66,7 @@ function AddAllDependency($file, $nuspecpaths) {
$metadata.dependencies.RemoveAll()
}
$metadata.version = $version
- $net461Nuspecs=@($nuspecpaths|where-Object{
- $p=Get-XmlContent $_.FullName
- $p.package.files.file.target -match "net461"
- })
+
$netStandardNuspecs=@($nuspecpaths|where-Object{
$p=Get-XmlContent $_.FullName
$p.package.files.file.target -match "netstandard"
@@ -86,10 +83,7 @@ function AddAllDependency($file, $nuspecpaths) {
[xml]$package = Get-Content $_.Fullname
Add-NuspecDependency $package.package.metaData.Id $Version $nuspecpath "netstandard2.0"
}
- ($net461Nuspecs+$netStandardNuspecs) | ForEach-Object {
- [xml]$package = Get-Content $_.Fullname
- Add-NuspecDependency $package.package.metaData.Id $Version $nuspecpath "net461"
- }
+
($net6Nuspecs+$netStandardNuspecs) | ForEach-Object {
[xml]$package = Get-Content $_.Fullname
Add-NuspecDependency $package.package.metaData.Id $Version $nuspecpath "net6.0"
@@ -142,9 +136,7 @@ $nuspecs| Invoke-Parallel -VariablesToImport "nuspecs","projects" -Script {
$xpandMoleReference | ForEach-Object {
$hintPath=$_.hintpath
$multiTarget=$hintPath -match "TargetFramework"
- if($multiTarget ){
- $hintPath=$hintPath.Replace('$(TargetFramework)','net461')
- }
+
$assemblyPath = Get-Item (Resolve-Path $hintPath)
$version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($assemblyPath.FullName).FileVersion
$id = ($nuspecs | Where-Object { $_.Content.package.files.file | Where-Object { $_.src -match $assemblyPath.Name } }).Content.package.metaData.id
@@ -201,7 +193,7 @@ $libNuspec.Save($libNuspecPath)
$nuspecpathFile = "$nuspecpathsPath\All_Agnostic.nuspec"
AddAllDependency $nuspecpathFile (Get-ChildItem "$nuspecpathsPath" -Exclude "*Win*", "*Web*", "*All*")
-"Win", "Web" | ForEach-Object {
+"Win"| ForEach-Object {
$nuspecpaths = (Get-ChildItem "$nuspecpathsPath" "*$_*" | Where-Object { $_.BaseName -notmatch "All" })
$nuspecpathFile = "$nuspecpathsPath\All_$_.nuspec"
AddAllDependency $nuspecpathFile $nuspecpaths
@@ -228,12 +220,12 @@ else {
$modules
-Write-HostFormatted "packing nuspecs"
+Write-HostFormatted "packing nuspecs" -Section
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/Build/Xpand.projects b/Support/Build/Xpand.projects
index a85e557e2e..0d09e28585 100644
--- a/Support/Build/Xpand.projects
+++ b/Support/Build/Xpand.projects
@@ -4,8 +4,8 @@
-
-
+
+
diff --git a/Support/Nuspec/AdditionalViewControlsProvider.Web.nuspec b/Support/Nuspec/AdditionalViewControlsProvider.Web.nuspec
deleted file mode 100644
index f98b191044..0000000000
--- a/Support/Nuspec/AdditionalViewControlsProvider.Web.nuspec
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- eXpandAdditionalViewControlsProviderWeb
- 19.2.402.4
- DevExpress eXpandFramework AdditionalViewControlsProvider Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- AdditionalViewControlsProvider Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- AdditionalViewControlsProvider Module (Web) / eXpandFramework
- eXpandFramework.com
- http://www.expandframework.com/#AVC
- DevExpress, eXpand, XAF, eXpressApp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/AdditionalViewControlsProvider.Win.nuspec b/Support/Nuspec/AdditionalViewControlsProvider.Win.nuspec
index fa5d4677a0..397a200e8a 100644
--- a/Support/Nuspec/AdditionalViewControlsProvider.Win.nuspec
+++ b/Support/Nuspec/AdditionalViewControlsProvider.Win.nuspec
@@ -14,18 +14,16 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#AVC
-
-
-
-
+
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/AdditionalViewControlsProvider.nuspec b/Support/Nuspec/AdditionalViewControlsProvider.nuspec
index cacc8bd95d..742186e73f 100644
--- a/Support/Nuspec/AdditionalViewControlsProvider.nuspec
+++ b/Support/Nuspec/AdditionalViewControlsProvider.nuspec
@@ -14,12 +14,12 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#AVC
-
-
-
+
+
+
-
-
+
+
diff --git a/Support/Nuspec/All_Agnostic.nuspec b/Support/Nuspec/All_Agnostic.nuspec
index 98cf80e485..94acd0752b 100644
--- a/Support/Nuspec/All_Agnostic.nuspec
+++ b/Support/Nuspec/All_Agnostic.nuspec
@@ -2,7 +2,7 @@
eXpandAgnostic
- 22.1.602.0
+ 22.2.300.0
DevExpress eXpandFramework All Platform Agnostic Modules
eXpandFramework
eXpandFramework
@@ -15,87 +15,49 @@
http://www.expandframework.com/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Support/Nuspec/All_Web.nuspec b/Support/Nuspec/All_Web.nuspec
deleted file mode 100644
index 046067bbed..0000000000
--- a/Support/Nuspec/All_Web.nuspec
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- eXpandWeb
- 22.1.602.0
- DevExpress eXpandFramework All Web Platform Modules
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- All Web Platform Modules / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- All Web Platform Modules / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/All_Win.nuspec b/Support/Nuspec/All_Win.nuspec
index 45a6315a22..79c678e2ee 100644
--- a/Support/Nuspec/All_Win.nuspec
+++ b/Support/Nuspec/All_Win.nuspec
@@ -2,7 +2,7 @@
eXpandWin
- 22.1.602.0
+ 22.2.300.0
DevExpress eXpandFramework All Win Platform Modules
eXpandFramework
eXpandFramework
@@ -14,42 +14,23 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Support/Nuspec/AuditTrail.nuspec b/Support/Nuspec/AuditTrail.nuspec
index a21af549a4..75b13344c5 100644
--- a/Support/Nuspec/AuditTrail.nuspec
+++ b/Support/Nuspec/AuditTrail.nuspec
@@ -14,12 +14,12 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#AuditTrail
-
-
-
+
+
+
-
-
+
+
diff --git a/Support/Nuspec/Chart.Win.nuspec b/Support/Nuspec/Chart.Win.nuspec
index 5bbc8cfb24..dea5f29bff 100644
--- a/Support/Nuspec/Chart.Win.nuspec
+++ b/Support/Nuspec/Chart.Win.nuspec
@@ -14,16 +14,14 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#Chart
-
-
-
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/Dashboard.nuspec b/Support/Nuspec/Dashboard.nuspec
index 81ea14f2a9..150dac6f82 100644
--- a/Support/Nuspec/Dashboard.nuspec
+++ b/Support/Nuspec/Dashboard.nuspec
@@ -14,16 +14,14 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#Dashboard
-
-
-
-
-
+
+
+
+
+
-
-
diff --git a/Support/Nuspec/Email.nuspec b/Support/Nuspec/Email.nuspec
deleted file mode 100644
index caaace10ed..0000000000
--- a/Support/Nuspec/Email.nuspec
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- eXpandEmail
- 19.2.402.4
- DevExpress eXpandFramework Email Module
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- Email Module / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Email Module / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#Email
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/ExcelImporter.Web.nuspec b/Support/Nuspec/ExcelImporter.Web.nuspec
deleted file mode 100644
index f1bae26fa5..0000000000
--- a/Support/Nuspec/ExcelImporter.Web.nuspec
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- eXpandExcelImporter.Web
- 19.2.402.4
- DevExpress eXpandFramework ExcelImporter Module
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- ExcelImporter Module / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- ModelArtifactState Module / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#ExcelImporter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/ExcelImporter.Win.nuspec b/Support/Nuspec/ExcelImporter.Win.nuspec
index 6bae937f69..0fc4d10631 100644
--- a/Support/Nuspec/ExcelImporter.Win.nuspec
+++ b/Support/Nuspec/ExcelImporter.Win.nuspec
@@ -15,20 +15,18 @@
http://www.expandframework.com/#ExcelImporter
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/ExcelImporter.nuspec b/Support/Nuspec/ExcelImporter.nuspec
index 12dedc29cc..bc221bad24 100644
--- a/Support/Nuspec/ExcelImporter.nuspec
+++ b/Support/Nuspec/ExcelImporter.nuspec
@@ -15,20 +15,20 @@
http://www.expandframework.com/#ExcelImporter
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/Support/Nuspec/FileAttachment.Web.nuspec b/Support/Nuspec/FileAttachment.Web.nuspec
deleted file mode 100644
index 0f76c71182..0000000000
--- a/Support/Nuspec/FileAttachment.Web.nuspec
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- eXpandFileAttachmentWeb
- 19.2.402.4
- DevExpress eXpandFramework FileAttachment Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- FileAttachment Web Module / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- FileAttachment Web Module / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#FileAttachment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/FileAttachment.nuspec b/Support/Nuspec/FileAttachment.nuspec
index 5447163d96..0dba595cc5 100644
--- a/Support/Nuspec/FileAttachment.nuspec
+++ b/Support/Nuspec/FileAttachment.nuspec
@@ -14,7 +14,7 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#FileAttachment
-
+
diff --git a/Support/Nuspec/HtmlPropertyEditor.Web.nuspec b/Support/Nuspec/HtmlPropertyEditor.Web.nuspec
deleted file mode 100644
index 975d345f5a..0000000000
--- a/Support/Nuspec/HtmlPropertyEditor.Web.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- eXpandHtmlPropertyEditor
- 19.2.402.4
- DevExpress eXpandFramework HtmlPropertyEditor Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- HtmlPropertyEditor Web Module / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- HtmlPropertyEditor Web Module / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#HtmlPropertyEditor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/IO.Web.nuspec b/Support/Nuspec/IO.Web.nuspec
deleted file mode 100644
index 05d6330dd1..0000000000
--- a/Support/Nuspec/IO.Web.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- eXpandIOWeb
- 19.2.402.4
- DevExpress eXpandFramework IO Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- IO Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- IO Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#IO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/IO.Win.nuspec b/Support/Nuspec/IO.Win.nuspec
index 3e51ea71f1..ff316a2f08 100644
--- a/Support/Nuspec/IO.Win.nuspec
+++ b/Support/Nuspec/IO.Win.nuspec
@@ -15,17 +15,15 @@
http://www.expandframework.com/#IO
-
-
-
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/IO.nuspec b/Support/Nuspec/IO.nuspec
index 092f44ab50..caa4d93662 100644
--- a/Support/Nuspec/IO.nuspec
+++ b/Support/Nuspec/IO.nuspec
@@ -15,12 +15,12 @@
http://www.expandframework.com/#IO
-
-
+
+
-
+
diff --git a/Support/Nuspec/ImportWizard.Win.nuspec b/Support/Nuspec/ImportWizard.Win.nuspec
index 4c4c5c77a1..53a3d46224 100644
--- a/Support/Nuspec/ImportWizard.Win.nuspec
+++ b/Support/Nuspec/ImportWizard.Win.nuspec
@@ -15,17 +15,15 @@
http://www.expandframework.com/#ImportWizard
-
-
+
+
-
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/ImportWizard.nuspec b/Support/Nuspec/ImportWizard.nuspec
index ee2748afd1..91fbf38bd1 100644
--- a/Support/Nuspec/ImportWizard.nuspec
+++ b/Support/Nuspec/ImportWizard.nuspec
@@ -15,18 +15,16 @@
http://www.expandframework.com/#ImportWizard
-
+
-
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/Lib.nuspec b/Support/Nuspec/Lib.nuspec
index dc4732fce8..4222bf59b7 100644
--- a/Support/Nuspec/Lib.nuspec
+++ b/Support/Nuspec/Lib.nuspec
@@ -20,21 +20,21 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Support/Nuspec/Logic.nuspec b/Support/Nuspec/Logic.nuspec
index 1aeacbfd34..335801677f 100644
--- a/Support/Nuspec/Logic.nuspec
+++ b/Support/Nuspec/Logic.nuspec
@@ -14,14 +14,14 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#logic
-
-
+
+
-
-
-
+
+
+
diff --git a/Support/Nuspec/MapView.Web.nuspec b/Support/Nuspec/MapView.Web.nuspec
deleted file mode 100644
index 4c43c83906..0000000000
--- a/Support/Nuspec/MapView.Web.nuspec
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- 19.2.402.4
- eXpandFramework
- eXpandFramework
- http://www.expandframework.com/#mapview
- http://sign.expandframework.com
- eXpandMapViewWeb
- DevExpress eXpandFramework MapView Module
- false
- Google Maps integration. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Google Maps
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/MapView.nuspec b/Support/Nuspec/MapView.nuspec
deleted file mode 100644
index 29233b72ba..0000000000
--- a/Support/Nuspec/MapView.nuspec
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- 19.2.402.4
- eXpandFramework
- eXpandFramework
- http://www.expandframework.com/#mapview
- http://sign.expandframework.com
- eXpandMapView
- DevExpress eXpandFramework MapView Module
- false
- Google Maps integration. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Google Maps
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/MasterDetail.Win.nuspec b/Support/Nuspec/MasterDetail.Win.nuspec
index 9ff1b1ab02..c6e04b3ffe 100644
--- a/Support/Nuspec/MasterDetail.Win.nuspec
+++ b/Support/Nuspec/MasterDetail.Win.nuspec
@@ -14,18 +14,16 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#masterdetail
-
-
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/Support/Nuspec/MasterDetail.nuspec b/Support/Nuspec/MasterDetail.nuspec
index 3ea8689299..1acd7416c0 100644
--- a/Support/Nuspec/MasterDetail.nuspec
+++ b/Support/Nuspec/MasterDetail.nuspec
@@ -14,11 +14,11 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#masterdetail
-
-
-
+
+
+
-
+
diff --git a/Support/Nuspec/ModelArtifactState.nuspec b/Support/Nuspec/ModelArtifactState.nuspec
index ded1d629ba..4fa5d239df 100644
--- a/Support/Nuspec/ModelArtifactState.nuspec
+++ b/Support/Nuspec/ModelArtifactState.nuspec
@@ -14,12 +14,12 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#modelartifact
-
-
-
-
+
+
+
+
-
+
diff --git a/Support/Nuspec/ModelDifference.Web.nuspec b/Support/Nuspec/ModelDifference.Web.nuspec
deleted file mode 100644
index 5c307d209f..0000000000
--- a/Support/Nuspec/ModelDifference.Web.nuspec
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
- 19.2.402.4
- eXpandFramework
- eXpandFramework
- http://www.expandframework.com/#modeldifference
- http://sign.expandframework.com
- eXpandModelDifferenceWeb
- DevExpress eXpandFramework ModelDifference Module (Web)
- false
- Extends XAF by adding great new features for example;
-
-◦the ability to generate runtime members for your objects,
-◦creating Application/Role/User models in the database,
-◦storing your web cookies in the database,
-◦handling of external application models,
-◦combine end user modifications with application model,
-◦support for multiple models at design time,
-Blogs:
-http://apobekiaris.blogspot.com/search/label/ModelDifference. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Model managment
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/ModelDifference.Win.nuspec b/Support/Nuspec/ModelDifference.Win.nuspec
index 99dd07ce89..302771393a 100644
--- a/Support/Nuspec/ModelDifference.Win.nuspec
+++ b/Support/Nuspec/ModelDifference.Win.nuspec
@@ -23,19 +23,17 @@ http://apobekiaris.blogspot.com/search/label/ModelDifference.. To debug in VS en
eXpandFramework.com
DevExpress, eXpand, XAF, eXpressApp
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/ModelDifference.nuspec b/Support/Nuspec/ModelDifference.nuspec
index 17dda19f74..4fd89f8a80 100644
--- a/Support/Nuspec/ModelDifference.nuspec
+++ b/Support/Nuspec/ModelDifference.nuspec
@@ -23,12 +23,12 @@ http://apobekiaris.blogspot.com/search/label/ModelDifference. To debug in VS ena
eXpandFramework.com
DevExpress, eXpand, XAF, eXpressApp
-
-
-
+
+
+
-
-
+
+
diff --git a/Support/Nuspec/NCarousel.Web.nuspec b/Support/Nuspec/NCarousel.Web.nuspec
deleted file mode 100644
index d473523521..0000000000
--- a/Support/Nuspec/NCarousel.Web.nuspec
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- eXpandNCarouselWeb
- 19.2.402.4
- DevExpress eXpandFramework NCarousel Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- NCarousel Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- NCarousel Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#NCarousel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/NCarousel.nuspec b/Support/Nuspec/NCarousel.nuspec
deleted file mode 100644
index 9d4c046103..0000000000
--- a/Support/Nuspec/NCarousel.nuspec
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
- eXpandNCarousel
- 19.2.402.4
- DevExpress eXpandFramework NCarousel Module
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- NCarousel Module / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- NCarousel Module / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#NCarousel
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/PivotChart.Web.nuspec b/Support/Nuspec/PivotChart.Web.nuspec
deleted file mode 100644
index 130e4e90a1..0000000000
--- a/Support/Nuspec/PivotChart.Web.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- eXpandPivotChartWeb
- 19.2.402.4
- DevExpress eXpandFramework PivotChart Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- PivotChart Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- PivotChart Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#pivotchart
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/PivotChart.Win.nuspec b/Support/Nuspec/PivotChart.Win.nuspec
index 0c601347ad..499cacc1f0 100644
--- a/Support/Nuspec/PivotChart.Win.nuspec
+++ b/Support/Nuspec/PivotChart.Win.nuspec
@@ -14,17 +14,15 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#pivotchart
-
-
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/PivotChart.nuspec b/Support/Nuspec/PivotChart.nuspec
index 0128fbb92b..43320774e9 100644
--- a/Support/Nuspec/PivotChart.nuspec
+++ b/Support/Nuspec/PivotChart.nuspec
@@ -14,13 +14,13 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#pivotchart
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/Support/Nuspec/PivotGrid.Win.nuspec b/Support/Nuspec/PivotGrid.Win.nuspec
index 22caf33a9f..5b0c2d33b8 100644
--- a/Support/Nuspec/PivotGrid.Win.nuspec
+++ b/Support/Nuspec/PivotGrid.Win.nuspec
@@ -14,18 +14,16 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#PivotGrid
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/Reports.nuspec b/Support/Nuspec/Reports.nuspec
index 64ce8a9ecb..63a7d8895c 100644
--- a/Support/Nuspec/Reports.nuspec
+++ b/Support/Nuspec/Reports.nuspec
@@ -14,8 +14,8 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#Reports
-
-
+
+
diff --git a/Support/Nuspec/ReportsV2.Win.nuspec b/Support/Nuspec/ReportsV2.Win.nuspec
index 939edcec7a..b379f20883 100644
--- a/Support/Nuspec/ReportsV2.Win.nuspec
+++ b/Support/Nuspec/ReportsV2.Win.nuspec
@@ -14,14 +14,12 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#Reports
-
-
+
+
-
-
diff --git a/Support/Nuspec/Scheduler.Web.nuspec b/Support/Nuspec/Scheduler.Web.nuspec
deleted file mode 100644
index 9a83ab6de1..0000000000
--- a/Support/Nuspec/Scheduler.Web.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- eXpandSchedulerWeb
- 19.2.402.4
- DevExpress eXpandFramework Scheduler Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- Scheduler Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Scheduler Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#Scheduler
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/Scheduler.Win.nuspec b/Support/Nuspec/Scheduler.Win.nuspec
deleted file mode 100644
index f6464d0b22..0000000000
--- a/Support/Nuspec/Scheduler.Win.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- eXpandSchedulerWin
- 19.2.402.4
- DevExpress eXpandFramework Scheduler Module (Win)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- Scheduler Module (Win) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Scheduler Module (Win) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#Scheduler
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/Scheduler.nuspec b/Support/Nuspec/Scheduler.nuspec
deleted file mode 100644
index 99988c85eb..0000000000
--- a/Support/Nuspec/Scheduler.nuspec
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- eXpandScheduler
- 19.2.402.4
- DevExpress eXpandFramework Scheduler Module
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- Scheduler Module / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Scheduler Module / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#Scheduler
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/Security.Web.nuspec b/Support/Nuspec/Security.Web.nuspec
deleted file mode 100644
index 45dc71ef44..0000000000
--- a/Support/Nuspec/Security.Web.nuspec
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- eXpandSecurityWeb
- 19.2.402.4
- DevExpress eXpandFramework Security Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- Security Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Security Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#Security
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/Security.Win.nuspec b/Support/Nuspec/Security.Win.nuspec
index fbbde6edf4..1183069dd1 100644
--- a/Support/Nuspec/Security.Win.nuspec
+++ b/Support/Nuspec/Security.Win.nuspec
@@ -14,17 +14,15 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#Security
-
-
+
+
-
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/Security.nuspec b/Support/Nuspec/Security.nuspec
index 6ed753f1f9..c4187c4899 100644
--- a/Support/Nuspec/Security.nuspec
+++ b/Support/Nuspec/Security.nuspec
@@ -14,11 +14,11 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#Security
-
+
-
-
-
+
+
+
diff --git a/Support/Nuspec/StateMachine.nuspec b/Support/Nuspec/StateMachine.nuspec
index 4d7763e785..05e70b39d8 100644
--- a/Support/Nuspec/StateMachine.nuspec
+++ b/Support/Nuspec/StateMachine.nuspec
@@ -14,8 +14,8 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#StateMachine
-
-
+
+
diff --git a/Support/Nuspec/System.Web.nuspec b/Support/Nuspec/System.Web.nuspec
deleted file mode 100644
index 66d5bc4d47..0000000000
--- a/Support/Nuspec/System.Web.nuspec
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- 19.2.402.4
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- eXpandSystemWeb
- DevExpress eXpandFramework System Module (Web)
- false
- System module
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#core
- DevExpress eXpandFramework System Module (Web). To debug in VS enable Source Server support under Tools/Options/Debugging.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/System.Win.nuspec b/Support/Nuspec/System.Win.nuspec
index 72e015e368..81db6c4f47 100644
--- a/Support/Nuspec/System.Win.nuspec
+++ b/Support/Nuspec/System.Win.nuspec
@@ -15,17 +15,16 @@
http://www.expandframework.com/#core
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/System.nuspec b/Support/Nuspec/System.nuspec
index e87808b4e3..c6c4a5b0f2 100644
--- a/Support/Nuspec/System.nuspec
+++ b/Support/Nuspec/System.nuspec
@@ -14,18 +14,18 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#core
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Support/Nuspec/TreeListEditors.Web.nuspec b/Support/Nuspec/TreeListEditors.Web.nuspec
deleted file mode 100644
index 3a584f64e7..0000000000
--- a/Support/Nuspec/TreeListEditors.Web.nuspec
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- eXpandTreelistViewWeb
- 19.2.402.4
- DevExpress eXpandFramework TreelistView Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- TreelistView Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- TreelistView Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#treelist
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/TreeListEditors.Win.nuspec b/Support/Nuspec/TreeListEditors.Win.nuspec
index 6f6634eb5e..72c8dcf93e 100644
--- a/Support/Nuspec/TreeListEditors.Win.nuspec
+++ b/Support/Nuspec/TreeListEditors.Win.nuspec
@@ -14,18 +14,16 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#treelist
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/TreeListEditors.nuspec b/Support/Nuspec/TreeListEditors.nuspec
index 739db62aea..4b039652aa 100644
--- a/Support/Nuspec/TreeListEditors.nuspec
+++ b/Support/Nuspec/TreeListEditors.nuspec
@@ -14,7 +14,7 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#treelist
-
+
diff --git a/Support/Nuspec/Validation.Web.nuspec b/Support/Nuspec/Validation.Web.nuspec
deleted file mode 100644
index fde0a2f250..0000000000
--- a/Support/Nuspec/Validation.Web.nuspec
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- eXpandValidationWeb
- 19.2.402.4
- DevExpress eXpandFramework Validation Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- Validation Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- Validation Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#validation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/Validation.Win.nuspec b/Support/Nuspec/Validation.Win.nuspec
index 34a4a2c9b6..a7154a4bbc 100644
--- a/Support/Nuspec/Validation.Win.nuspec
+++ b/Support/Nuspec/Validation.Win.nuspec
@@ -14,17 +14,15 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#validation
-
-
-
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/Validation.nuspec b/Support/Nuspec/Validation.nuspec
index cccfeebd2f..e042dcd6fc 100644
--- a/Support/Nuspec/Validation.nuspec
+++ b/Support/Nuspec/Validation.nuspec
@@ -14,7 +14,7 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#validation
-
+
diff --git a/Support/Nuspec/ViewVariants.nuspec b/Support/Nuspec/ViewVariants.nuspec
index 8c98072d7b..6d5957f58c 100644
--- a/Support/Nuspec/ViewVariants.nuspec
+++ b/Support/Nuspec/ViewVariants.nuspec
@@ -14,7 +14,7 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#viewvariants
-
+
diff --git a/Support/Nuspec/WizardUI.Win.nuspec b/Support/Nuspec/WizardUI.Win.nuspec
index 32ae0be545..acc0a77fd7 100644
--- a/Support/Nuspec/WizardUI.Win.nuspec
+++ b/Support/Nuspec/WizardUI.Win.nuspec
@@ -14,16 +14,14 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#wizard
-
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/WorkFlow.nuspec b/Support/Nuspec/WorkFlow.nuspec
deleted file mode 100644
index 8bea3c06d7..0000000000
--- a/Support/Nuspec/WorkFlow.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- eXpandWorkFlow
- 19.2.402.4
- DevExpress eXpandFramework WorkFlow Module
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- WorkFlow Module/ eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- WorkFlow Module / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#Workflow
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/WorldCreator.DbMapper.nuspec b/Support/Nuspec/WorldCreator.DbMapper.nuspec
index 2fa5b6437c..94f923fc21 100644
--- a/Support/Nuspec/WorldCreator.DbMapper.nuspec
+++ b/Support/Nuspec/WorldCreator.DbMapper.nuspec
@@ -14,10 +14,10 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#DBMapper
-
-
-
-
+
+
+
+
diff --git a/Support/Nuspec/WorldCreator.Web.nuspec b/Support/Nuspec/WorldCreator.Web.nuspec
deleted file mode 100644
index 39ec25d12a..0000000000
--- a/Support/Nuspec/WorldCreator.Web.nuspec
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- 19.2.402.4
- eXpandFramework
- eXpandFramework
- http://www.expandframework.com/#worldcreator
- http://sign.expandframework.com
- eXpandWorldCreatorWeb
- DevExpress eXpandFramework WorldCreator Module (Web)
- false
- Creates dynamic persistent assemblies. The XAF user interface allows us to create an assembly without writing a single line of code. Advanced users can even use c# scripting and create new code generation templates. To debug in VS enable Source Server support under Tools/Options/Debugging.
-Blogs:
-http://apobekiaris.blogspot.com/search/label/WorldCreator
- Design runtime assemblies
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/WorldCreator.Win.nuspec b/Support/Nuspec/WorldCreator.Win.nuspec
index 026f37f49e..046efb6de1 100644
--- a/Support/Nuspec/WorldCreator.Win.nuspec
+++ b/Support/Nuspec/WorldCreator.Win.nuspec
@@ -16,18 +16,16 @@ http://apobekiaris.blogspot.com/search/label/WorldCreator
eXpandFramework.com
DevExpress, eXpand, XAF, eXpressApp
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
diff --git a/Support/Nuspec/WorldCreator.nuspec b/Support/Nuspec/WorldCreator.nuspec
index 484125d5f0..94832c6545 100644
--- a/Support/Nuspec/WorldCreator.nuspec
+++ b/Support/Nuspec/WorldCreator.nuspec
@@ -16,12 +16,12 @@ http://apobekiaris.blogspot.com/search/label/WorldCreator
eXpandFramework.com
DevExpress, eXpand, XAF, eXpressApp
-
-
+
+
-
-
-
+
+
+
diff --git a/Support/Nuspec/XtraDashboard.Web.nuspec b/Support/Nuspec/XtraDashboard.Web.nuspec
deleted file mode 100644
index fb39271f59..0000000000
--- a/Support/Nuspec/XtraDashboard.Web.nuspec
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
- eXpandXtraDashboardWeb
- 19.2.402.4
- DevExpress eXpandFramework XtraDashboard Module (Web)
- eXpandFramework
- eXpandFramework
- http://sign.expandframework.com
- false
- XtraDashboard Module (Web) / eXpandFramework. To debug in VS enable Source Server support under Tools/Options/Debugging.
- XtraDashboard Module (Web) / eXpandFramework
- eXpandFramework.com
- DevExpress, eXpand, XAF, eXpressApp
- http://www.expandframework.com/#Dashboard
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Support/Nuspec/XtraDashboard.Win.nuspec b/Support/Nuspec/XtraDashboard.Win.nuspec
index 074c1dbf72..6cf630c36e 100644
--- a/Support/Nuspec/XtraDashboard.Win.nuspec
+++ b/Support/Nuspec/XtraDashboard.Win.nuspec
@@ -14,19 +14,17 @@
DevExpress, eXpand, XAF, eXpressApp
http://www.expandframework.com/#Dashboard
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
diff --git a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.deps.json b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.deps.json
index 972c0fce6d..1118f69ffc 100644
--- a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.deps.json
+++ b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.deps.json
@@ -8,728 +8,787 @@
".NETCoreApp,Version=v6.0": {
"Xpand.XAF.ModelEditor.WinDesktop/1.0.0": {
"dependencies": {
- "DevExpress.ExpressApp": "22.1.6",
- "DevExpress.ExpressApp.Win": "22.1.6",
- "DevExpress.ExpressApp.Xpo": "22.1.6",
- "DevExpress.Persistent.Base": "22.1.6",
- "DevExpress.Persistent.BaseImpl.Xpo": "22.1.6",
+ "DevExpress.ExpressApp": "22.2.3",
+ "DevExpress.ExpressApp.Win": "22.2.3",
+ "DevExpress.ExpressApp.Xpo": "22.2.3",
+ "DevExpress.Persistent.Base": "22.2.3",
+ "DevExpress.Persistent.BaseImpl.Xpo": "22.2.3",
"Microsoft.Extensions.DependencyModel": "6.0.0"
},
"runtime": {
"Xpand.XAF.ModelEditor.WinDesktop.dll": {}
}
},
- "DevExpress.CodeParser/22.1.6": {
+ "DevExpress.CodeParser/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
+ "DevExpress.Data": "22.2.3",
"NETStandard.Library": "2.0.3",
"System.CodeDom": "4.4.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.CodeParser.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.CodeParser.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Data/22.1.6": {
+ "DevExpress.Data/22.2.3": {
"dependencies": {
"Microsoft.Win32.Registry": "4.5.0",
"NETStandard.Library": "2.0.3",
"System.ComponentModel.Annotations": "4.4.0",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Reflection.Emit": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0",
- "System.Text.Encoding.CodePages": "4.6.0"
+ "System.Text.Encoding.CodePages": "6.0.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Data.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Data.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Data.Desktop/22.1.6": {
+ "DevExpress.Data.Desktop/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.Data.Desktop.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.Data.Desktop.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.DataAccess/22.1.6": {
+ "DevExpress.DataAccess/22.2.3": {
"dependencies": {
- "DevExpress.CodeParser": "22.1.6",
- "DevExpress.Data": "22.1.6",
- "DevExpress.Office.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.RichEdit.Core": "22.1.6",
- "DevExpress.Xpo": "22.1.6",
+ "DevExpress.CodeParser": "22.2.3",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Office.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.RichEdit.Core": "22.2.3",
+ "DevExpress.Xpo": "22.2.3",
"NETStandard.Library": "2.0.3",
"System.Configuration.ConfigurationManager": "4.5.0",
"System.Data.SqlClient": "4.6.0",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Reflection.Emit": "4.3.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.DataAccess.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.DataAccess.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.DataAccess.UI/22.1.6": {
- "dependencies": {
- "DevExpress.CodeParser": "22.1.6",
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.DataAccess": "22.1.6",
- "DevExpress.Diagram.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.RichEdit.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Utils.UI": "22.1.6",
- "DevExpress.Win.Diagram": "22.1.6",
- "DevExpress.Win.Grid": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6",
- "DevExpress.Win.RichEdit": "22.1.6",
- "DevExpress.Win.TreeList": "22.1.6",
- "DevExpress.Xpo": "22.1.6",
+ "DevExpress.DataAccess.UI/22.2.3": {
+ "dependencies": {
+ "DevExpress.CodeParser": "22.2.3",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.DataAccess": "22.2.3",
+ "DevExpress.Diagram.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.RichEdit.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Utils.UI": "22.2.3",
+ "DevExpress.Win.Diagram": "22.2.3",
+ "DevExpress.Win.Grid": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3",
+ "DevExpress.Win.RichEdit": "22.2.3",
+ "DevExpress.Win.TreeList": "22.2.3",
+ "DevExpress.Xpo": "22.2.3",
"System.Data.SqlClient": "4.6.0"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.DataAccess.v22.1.UI.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.DataAccess.v22.2.UI.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Diagram.Core/22.1.6": {
+ "DevExpress.Diagram.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.Diagram.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.Diagram.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Drawing/22.1.6": {
+ "DevExpress.Drawing/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
+ "DevExpress.Data": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3",
+ "System.Reflection.Emit": "4.3.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Drawing.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Drawing.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.ExpressApp/22.1.6": {
+ "DevExpress.ExpressApp/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Images": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "Microsoft.CodeAnalysis.CSharp": "2.8.0",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Images": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "Microsoft.CodeAnalysis.CSharp": "3.3.1",
"Microsoft.Extensions.Configuration.Abstractions": "5.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Win32.Registry": "4.5.0",
"NETStandard.Library": "2.0.3",
"System.Configuration.ConfigurationManager": "4.5.0",
"System.Diagnostics.EventLog": "4.5.0",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Reflection.Emit": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0",
"System.Resources.Extensions": "4.6.0",
"System.ServiceModel.Primitives": "4.5.3",
- "System.Text.Encoding.CodePages": "4.6.0"
+ "System.Text.Encoding.CodePages": "6.0.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.ExpressApp.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.ExpressApp.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.ExpressApp.Objects/22.1.6": {
+ "DevExpress.ExpressApp.Objects/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.ExpressApp": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.ExpressApp": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.ExpressApp.Objects.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.ExpressApp.Objects.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.ExpressApp.Security/22.1.6": {
+ "DevExpress.ExpressApp.Security/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.ExpressApp": "22.1.6",
- "DevExpress.Persistent.Base": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.ExpressApp": "22.2.3",
+ "DevExpress.Persistent.Base": "22.2.3",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Microsoft.Extensions.Options": "3.1.5",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Security.Permissions": "4.5.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.ExpressApp.Security.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.ExpressApp.Security.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.ExpressApp.Win/22.1.6": {
- "dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.DataAccess.UI": "22.1.6",
- "DevExpress.ExpressApp": "22.1.6",
- "DevExpress.ExpressApp.Security": "22.1.6",
- "DevExpress.Office.Core": "22.1.6",
- "DevExpress.Persistent.Base": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.RichEdit.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win": "22.1.6",
- "DevExpress.Win.BonusSkins": "22.1.6",
- "DevExpress.Win.Grid": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6",
- "DevExpress.Win.RichEdit": "22.1.6",
- "DevExpress.Win.TreeList": "22.1.6",
- "DevExpress.Win.VerticalGrid": "22.1.6",
+ "DevExpress.ExpressApp.Win/22.2.3": {
+ "dependencies": {
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.DataAccess.UI": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.ExpressApp": "22.2.3",
+ "DevExpress.ExpressApp.Security": "22.2.3",
+ "DevExpress.Office.Core": "22.2.3",
+ "DevExpress.Persistent.Base": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.RichEdit.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win": "22.2.3",
+ "DevExpress.Win.BonusSkins": "22.2.3",
+ "DevExpress.Win.Grid": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3",
+ "DevExpress.Win.RichEdit": "22.2.3",
+ "DevExpress.Win.TreeList": "22.2.3",
+ "DevExpress.Win.VerticalGrid": "22.2.3",
"Microsoft.Extensions.DependencyInjection": "6.0.0"
},
"runtime": {
- "lib/net6.0-windows/DevExpress.ExpressApp.Win.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.ExpressApp.Win.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.ExpressApp.Xpo/22.1.6": {
+ "DevExpress.ExpressApp.Xpo/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.ExpressApp": "22.1.6",
- "DevExpress.Xpo": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.ExpressApp": "22.2.3",
+ "DevExpress.Xpo": "22.2.3",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Security.Permissions": "4.5.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.ExpressApp.Xpo.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.ExpressApp.Xpo.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Images/22.1.6": {
+ "DevExpress.Images/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Images.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Images.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Office.Core/22.1.6": {
+ "DevExpress.Office.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Pdf.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Pdf.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Security.Cryptography.Xml": "4.5.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Office.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Office.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Pdf.Core/22.1.6": {
+ "DevExpress.Pdf.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0",
- "System.Reflection.Emit": "4.3.0",
+ "System.Drawing.Common": "5.0.3",
"System.Security.Cryptography.Pkcs": "4.5.2"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Pdf.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Pdf.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Pdf.Drawing/22.1.6": {
+ "DevExpress.Pdf.Drawing/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Pdf.Core": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Pdf.Core": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Pdf.v22.1.Drawing.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Pdf.v22.2.Drawing.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Persistent.Base/22.1.6": {
+ "DevExpress.Persistent.Base/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.DataAccess": "22.1.6",
- "DevExpress.ExpressApp": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.DataAccess": "22.2.3",
+ "DevExpress.ExpressApp": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Persistent.Base.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Persistent.Base.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Persistent.BaseImpl.Xpo/22.1.6": {
+ "DevExpress.Persistent.BaseImpl.Xpo/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.ExpressApp": "22.1.6",
- "DevExpress.ExpressApp.Objects": "22.1.6",
- "DevExpress.ExpressApp.Xpo": "22.1.6",
- "DevExpress.Persistent.Base": "22.1.6",
- "DevExpress.Scheduler.Core": "22.1.6",
- "DevExpress.Xpo": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.ExpressApp": "22.2.3",
+ "DevExpress.ExpressApp.Objects": "22.2.3",
+ "DevExpress.ExpressApp.Xpo": "22.2.3",
+ "DevExpress.Persistent.Base": "22.2.3",
+ "DevExpress.Scheduler.Core": "22.2.3",
+ "DevExpress.Xpo": "22.2.3",
+ "Microsoft.Extensions.Options": "3.1.5",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Persistent.BaseImpl.Xpo.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Persistent.BaseImpl.Xpo.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.PivotGrid.Core/22.1.6": {
+ "DevExpress.PivotGrid.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Reflection.Emit": "4.3.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.PivotGrid.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.PivotGrid.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Printing.Core/22.1.6": {
+ "DevExpress.Printing.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Pdf.Core": "22.1.6",
- "DevExpress.Pdf.Drawing": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Pdf.Core": "22.2.3",
+ "DevExpress.Pdf.Drawing": "22.2.3",
"NETStandard.Library": "2.0.3",
"System.ComponentModel.Annotations": "4.4.0",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.Security.Cryptography.Pkcs": "4.5.2",
"System.ServiceModel.Http": "4.5.3",
- "System.Text.Encoding.CodePages": "4.6.0"
+ "System.Text.Encoding.CodePages": "6.0.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Printing.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Printing.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.RichEdit.Core/22.1.6": {
+ "DevExpress.RichEdit.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Office.Core": "22.1.6",
- "DevExpress.Pdf.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Office.Core": "22.2.3",
+ "DevExpress.Pdf.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.RichEdit.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.RichEdit.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.RichEdit.Export/22.1.6": {
+ "DevExpress.RichEdit.Export/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Office.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.RichEdit.Core": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Office.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.RichEdit.Core": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.RichEdit.v22.1.Export.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.RichEdit.v22.2.Export.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Scheduler.Core/22.1.6": {
+ "DevExpress.Scheduler.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
+ "DevExpress.Data": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.XtraScheduler.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.XtraScheduler.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Sparkline.Core/22.1.6": {
+ "DevExpress.Sparkline.Core/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
"NETStandard.Library": "2.0.3",
- "System.Drawing.Common": "4.5.0"
+ "System.Drawing.Common": "5.0.3"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Sparkline.v22.1.Core.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Sparkline.v22.2.Core.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Utils/22.1.6": {
+ "DevExpress.Utils/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.Utils.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.Utils.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Utils.UI/22.1.6": {
- "dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.DataAccess": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6",
- "DevExpress.Win.RichEdit": "22.1.6",
- "DevExpress.Win.TreeList": "22.1.6",
- "DevExpress.Win.VerticalGrid": "22.1.6"
+ "DevExpress.Utils.UI/22.2.3": {
+ "dependencies": {
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.DataAccess": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.RichEdit.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3",
+ "DevExpress.Win.RichEdit": "22.2.3",
+ "DevExpress.Win.TreeList": "22.2.3",
+ "DevExpress.Win.VerticalGrid": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.Utils.v22.1.UI.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.Utils.v22.2.UI.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win/22.1.6": {
+ "DevExpress.Win/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.RichEdit.Export": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Grid": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.PivotGrid": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6",
- "DevExpress.Win.TreeList": "22.1.6",
- "DevExpress.Win.VerticalGrid": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.RichEdit.Export": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Grid": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.PivotGrid": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3",
+ "DevExpress.Win.TreeList": "22.2.3",
+ "DevExpress.Win.VerticalGrid": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraNavBar.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraNavBar.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
},
- "lib/netcoreapp3.0/DevExpress.XtraWizard.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraWizard.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.BonusSkins/22.1.6": {
+ "DevExpress.Win.BonusSkins/22.2.3": {
"dependencies": {
- "DevExpress.Utils": "22.1.6"
+ "DevExpress.Utils": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.BonusSkins.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.BonusSkins.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.Diagram/22.1.6": {
+ "DevExpress.Win.Diagram/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Diagram.Core": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Pdf.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6",
- "DevExpress.Win.VerticalGrid": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Diagram.Core": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Pdf.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3",
+ "DevExpress.Win.VerticalGrid": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraDiagram.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraDiagram.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.Grid/22.1.6": {
+ "DevExpress.Win.Grid/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraGrid.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraGrid.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.Navigation/22.1.6": {
+ "DevExpress.Win.Navigation/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.Sparkline.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.Sparkline.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraBars.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraBars.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
},
- "lib/netcoreapp3.0/DevExpress.XtraEditors.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraEditors.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
},
- "lib/netcoreapp3.0/DevExpress.XtraLayout.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraLayout.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.PivotGrid/22.1.6": {
+ "DevExpress.Win.PivotGrid/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.PivotGrid.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.PivotGrid.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraPivotGrid.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraPivotGrid.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.Printing/22.1.6": {
+ "DevExpress.Win.Printing/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.RichEdit.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.TreeList": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.RichEdit.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.TreeList": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraPrinting.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraPrinting.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.RichEdit/22.1.6": {
- "dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Images": "22.1.6",
- "DevExpress.Office.Core": "22.1.6",
- "DevExpress.Pdf.Core": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.RichEdit.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Grid": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6"
+ "DevExpress.Win.RichEdit/22.2.3": {
+ "dependencies": {
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Images": "22.2.3",
+ "DevExpress.Office.Core": "22.2.3",
+ "DevExpress.Pdf.Core": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.RichEdit.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Grid": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraRichEdit.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraRichEdit.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.TreeList/22.1.6": {
+ "DevExpress.Win.TreeList/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraTreeList.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraTreeList.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Win.VerticalGrid/22.1.6": {
+ "DevExpress.Win.VerticalGrid/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
- "DevExpress.Data.Desktop": "22.1.6",
- "DevExpress.Drawing": "22.1.6",
- "DevExpress.Printing.Core": "22.1.6",
- "DevExpress.Utils": "22.1.6",
- "DevExpress.Win.Navigation": "22.1.6",
- "DevExpress.Win.Printing": "22.1.6"
+ "DevExpress.Data": "22.2.3",
+ "DevExpress.Data.Desktop": "22.2.3",
+ "DevExpress.Drawing": "22.2.3",
+ "DevExpress.Printing.Core": "22.2.3",
+ "DevExpress.Utils": "22.2.3",
+ "DevExpress.Win.Navigation": "22.2.3",
+ "DevExpress.Win.Printing": "22.2.3"
},
"runtime": {
- "lib/netcoreapp3.0/DevExpress.XtraVerticalGrid.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/net6.0-windows/DevExpress.XtraVerticalGrid.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "DevExpress.Xpo/22.1.6": {
+ "DevExpress.Xpo/22.2.3": {
"dependencies": {
- "DevExpress.Data": "22.1.6",
+ "DevExpress.Data": "22.2.3",
"Microsoft.Extensions.DependencyInjection": "6.0.0",
"Microsoft.Win32.Registry": "4.5.0",
"NETStandard.Library": "2.0.3",
"System.Data.SqlClient": "4.6.0",
- "System.Drawing.Common": "4.5.0",
+ "System.Drawing.Common": "5.0.3",
"System.ServiceModel.Http": "4.5.3",
"System.ServiceModel.NetTcp": "4.4.4",
"System.ServiceModel.Security": "4.4.4",
"System.Text.Json": "6.0.0"
},
"runtime": {
- "lib/netstandard2.0/DevExpress.Xpo.v22.1.dll": {
- "assemblyVersion": "22.1.6.0",
- "fileVersion": "22.1.6.0"
+ "lib/netstandard2.0/DevExpress.Xpo.v22.2.dll": {
+ "assemblyVersion": "22.2.3.0",
+ "fileVersion": "22.2.3.0"
}
}
},
- "Microsoft.CodeAnalysis.Analyzers/1.1.0": {},
- "Microsoft.CodeAnalysis.Common/2.8.0": {
- "dependencies": {
- "Microsoft.CodeAnalysis.Analyzers": "1.1.0",
- "System.AppContext": "4.3.0",
- "System.Collections": "4.3.0",
- "System.Collections.Concurrent": "4.3.0",
- "System.Collections.Immutable": "1.3.1",
- "System.Console": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.FileVersionInfo": "4.3.0",
- "System.Diagnostics.StackTrace": "4.3.0",
- "System.Diagnostics.Tools": "4.3.0",
- "System.Dynamic.Runtime": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO.Compression": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Linq.Expressions": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Metadata": "1.4.2",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.X509Certificates": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Text.Encoding.CodePages": "4.6.0",
- "System.Text.Encoding.Extensions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0",
- "System.Threading.Tasks.Parallel": "4.3.0",
- "System.Threading.Thread": "4.3.0",
- "System.ValueTuple": "4.3.0",
- "System.Xml.ReaderWriter": "4.3.0",
- "System.Xml.XDocument": "4.3.0",
- "System.Xml.XPath.XDocument": "4.3.0",
- "System.Xml.XmlDocument": "4.3.0"
+ "Microsoft.CodeAnalysis.Analyzers/2.9.4": {},
+ "Microsoft.CodeAnalysis.Common/3.3.1": {
+ "dependencies": {
+ "Microsoft.CodeAnalysis.Analyzers": "2.9.4",
+ "System.Collections.Immutable": "1.5.0",
+ "System.Memory": "4.5.4",
+ "System.Reflection.Metadata": "1.6.0",
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0",
+ "System.Text.Encoding.CodePages": "6.0.0",
+ "System.Threading.Tasks.Extensions": "4.5.3"
},
"runtime": {
- "lib/netstandard1.3/Microsoft.CodeAnalysis.dll": {
- "assemblyVersion": "2.8.0.0",
- "fileVersion": "2.8.0.62830"
+ "lib/netstandard2.0/Microsoft.CodeAnalysis.dll": {
+ "assemblyVersion": "3.3.0.0",
+ "fileVersion": "3.300.119.46211"
+ }
+ },
+ "resources": {
+ "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "cs"
+ },
+ "lib/netstandard2.0/de/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "de"
+ },
+ "lib/netstandard2.0/es/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "es"
+ },
+ "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "fr"
+ },
+ "lib/netstandard2.0/it/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "it"
+ },
+ "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "ja"
+ },
+ "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "ko"
+ },
+ "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "pl"
+ },
+ "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "pt-BR"
+ },
+ "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "ru"
+ },
+ "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "tr"
+ },
+ "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "zh-Hans"
+ },
+ "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": {
+ "locale": "zh-Hant"
}
}
},
- "Microsoft.CodeAnalysis.CSharp/2.8.0": {
+ "Microsoft.CodeAnalysis.CSharp/3.3.1": {
"dependencies": {
- "Microsoft.CodeAnalysis.Common": "2.8.0"
+ "Microsoft.CodeAnalysis.Common": "3.3.1"
},
"runtime": {
- "lib/netstandard1.3/Microsoft.CodeAnalysis.CSharp.dll": {
- "assemblyVersion": "2.8.0.0",
- "fileVersion": "2.8.0.62830"
+ "lib/netstandard2.0/Microsoft.CodeAnalysis.CSharp.dll": {
+ "assemblyVersion": "3.3.0.0",
+ "fileVersion": "3.300.119.46211"
+ }
+ },
+ "resources": {
+ "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "cs"
+ },
+ "lib/netstandard2.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "de"
+ },
+ "lib/netstandard2.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "es"
+ },
+ "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "fr"
+ },
+ "lib/netstandard2.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "it"
+ },
+ "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "ja"
+ },
+ "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "ko"
+ },
+ "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "pl"
+ },
+ "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "pt-BR"
+ },
+ "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "ru"
+ },
+ "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "tr"
+ },
+ "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "zh-Hans"
+ },
+ "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+ "locale": "zh-Hant"
}
}
},
@@ -799,7 +858,7 @@
}
}
},
- "Microsoft.NETCore.Platforms/3.0.0": {},
+ "Microsoft.NETCore.Platforms/5.0.0": {},
"Microsoft.NETCore.Targets/1.1.0": {},
"Microsoft.Win32.Registry/4.5.0": {
"dependencies": {
@@ -807,23 +866,14 @@
"System.Security.Principal.Windows": "4.5.0"
}
},
- "Microsoft.Win32.SystemEvents/4.5.0": {
+ "Microsoft.Win32.SystemEvents/5.0.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0"
+ "Microsoft.NETCore.Platforms": "5.0.0"
}
},
"NETStandard.Library/2.0.3": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0"
- }
- },
- "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.native.System/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0"
+ "Microsoft.NETCore.Platforms": "5.0.0"
}
},
"runtime.native.System.Data.SqlClient.sni/4.5.0": {
@@ -833,45 +883,6 @@
"runtime.win-x86.runtime.native.System.Data.SqlClient.sni": "4.4.0"
}
},
- "runtime.native.System.IO.Compression/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
- "runtime.native.System.Net.Http/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
- "runtime.native.System.Security.Cryptography.Apple/4.3.0": {
- "dependencies": {
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0"
- }
- },
- "runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "dependencies": {
- "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0",
- "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
- "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0": {},
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
- "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {},
"runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0": {
"runtimeTargets": {
"runtimes/win-arm64/native/sni.dll": {
@@ -899,46 +910,9 @@
}
}
},
- "System.AppContext/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
"System.Buffers/4.5.1": {},
"System.CodeDom/4.4.0": {},
- "System.Collections/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Collections.Concurrent/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.Collections.Immutable/1.3.1": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
+ "System.Collections.Immutable/1.5.0": {},
"System.ComponentModel.Annotations/4.4.0": {},
"System.Configuration.ConfigurationManager/4.5.0": {
"dependencies": {
@@ -946,20 +920,11 @@
"System.Security.Permissions": "4.5.0"
}
},
- "System.Console/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.IO": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Text.Encoding": "4.3.0"
- }
- },
"System.Data.SqlClient/4.6.0": {
"dependencies": {
"Microsoft.Win32.Registry": "4.5.0",
"System.Security.Principal.Windows": "4.5.0",
- "System.Text.Encoding.CodePages": "4.6.0",
+ "System.Text.Encoding.CodePages": "6.0.0",
"runtime.native.System.Data.SqlClient.sni": "4.5.0"
},
"runtime": {
@@ -983,184 +948,33 @@
}
}
},
- "System.Diagnostics.Debug/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
"System.Diagnostics.EventLog/4.5.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.Win32.Registry": "4.5.0",
"System.Security.Permissions": "4.5.0",
"System.Security.Principal.Windows": "4.5.0",
"System.Threading.AccessControl": "4.5.0"
}
},
- "System.Diagnostics.FileVersionInfo/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Reflection.Metadata": "1.4.2",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0"
- }
- },
- "System.Diagnostics.StackTrace/4.3.0": {
- "dependencies": {
- "System.IO.FileSystem": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Metadata": "1.4.2",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Diagnostics.Tools/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Diagnostics.Tracing/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Drawing.Common/4.5.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.Win32.SystemEvents": "4.5.0"
- }
- },
- "System.Dynamic.Runtime/4.3.0": {
+ "System.Drawing.Common/5.0.3": {
"dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Linq.Expressions": "4.3.0",
- "System.ObjectModel": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Emit": "4.3.0",
- "System.Reflection.Emit.ILGeneration": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Reflection.TypeExtensions": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
- "System.Globalization/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Globalization.Calendars/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Globalization": "4.3.0",
- "System.Runtime": "4.3.0"
+ "Microsoft.Win32.SystemEvents": "5.0.0"
}
},
"System.IO/4.3.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.IO.Compression/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "System.Buffers": "4.5.1",
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0",
- "runtime.native.System": "4.3.0",
- "runtime.native.System.IO.Compression": "4.3.0"
- }
- },
- "System.IO.FileSystem/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.NETCore.Targets": "1.1.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
"System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Threading.Tasks": "4.3.0"
}
},
- "System.IO.FileSystem.Primitives/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Linq/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0"
- }
- },
- "System.Linq.Expressions/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.Linq": "4.3.0",
- "System.ObjectModel": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Emit": "4.3.0",
- "System.Reflection.Emit.ILGeneration": "4.3.0",
- "System.Reflection.Emit.Lightweight": "4.3.0",
- "System.Reflection.Extensions": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Reflection.TypeExtensions": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
"System.Memory/4.5.4": {},
- "System.ObjectModel/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
"System.Private.ServiceModel/4.5.3": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"System.Reflection.DispatchProxy": "4.5.0",
"System.Security.Principal.Windows": "4.5.0"
},
@@ -1181,7 +995,7 @@
},
"System.Reflection/4.3.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.IO": "4.3.0",
"System.Reflection.Primitives": "4.3.0",
@@ -1213,217 +1027,35 @@
"System.Runtime": "4.3.0"
}
},
- "System.Reflection.Extensions/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Reflection": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Reflection.Metadata/1.4.2": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Collections.Immutable": "1.3.1",
- "System.Diagnostics.Debug": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.Compression": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Extensions": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Text.Encoding.Extensions": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
+ "System.Reflection.Metadata/1.6.0": {},
"System.Reflection.Primitives/4.3.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
- "System.Reflection.TypeExtensions/4.3.0": {
- "dependencies": {
- "System.Reflection": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
"System.Resources.Extensions/4.6.0": {},
- "System.Resources.ResourceManager/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Globalization": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
"System.Runtime/4.3.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.NETCore.Targets": "1.1.0"
}
},
"System.Runtime.CompilerServices.Unsafe/6.0.0": {},
- "System.Runtime.Extensions/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Runtime.Handles/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Runtime.InteropServices/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0"
- }
- },
- "System.Runtime.Numerics/4.3.0": {
- "dependencies": {
- "System.Globalization": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0"
- }
- },
"System.Security.AccessControl/4.5.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"System.Security.Principal.Windows": "4.5.0"
}
},
- "System.Security.Cryptography.Algorithms/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "System.Collections": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.Apple": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
"System.Security.Cryptography.Cng/4.5.0": {},
- "System.Security.Cryptography.Csp/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "System.IO": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
- "System.Security.Cryptography.Encoding/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "System.Collections": "4.3.0",
- "System.Collections.Concurrent": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
- "System.Security.Cryptography.OpenSsl/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
"System.Security.Cryptography.Pkcs/4.5.2": {
"dependencies": {
"System.Security.Cryptography.Cng": "4.5.0"
}
},
- "System.Security.Cryptography.Primitives/4.3.0": {
- "dependencies": {
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
"System.Security.Cryptography.ProtectedData/4.5.0": {},
- "System.Security.Cryptography.X509Certificates/4.3.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Globalization.Calendars": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Cng": "4.5.0",
- "System.Security.Cryptography.Csp": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.OpenSsl": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "runtime.native.System": "4.3.0",
- "runtime.native.System.Net.Http": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
"System.Security.Cryptography.Xml/4.5.0": {
"dependencies": {
"System.Security.Cryptography.Pkcs": "4.5.2",
@@ -1437,7 +1069,7 @@
},
"System.Security.Principal.Windows/4.5.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0"
+ "Microsoft.NETCore.Platforms": "5.0.0"
}
},
"System.ServiceModel.Http/4.5.3": {
@@ -1493,22 +1125,14 @@
},
"System.Text.Encoding/4.3.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
- "System.Text.Encoding.CodePages/4.6.0": {
- "dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0"
- }
- },
- "System.Text.Encoding.Extensions/4.3.0": {
+ "System.Text.Encoding.CodePages/6.0.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0",
- "System.Text.Encoding": "4.3.0"
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Encodings.Web/6.0.0": {
@@ -1522,17 +1146,6 @@
"System.Text.Encodings.Web": "6.0.0"
}
},
- "System.Text.RegularExpressions/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Threading/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
"System.Threading.AccessControl/4.5.0": {
"dependencies": {
"System.Security.AccessControl": "4.5.0",
@@ -1541,117 +1154,12 @@
},
"System.Threading.Tasks/4.3.0": {
"dependencies": {
- "Microsoft.NETCore.Platforms": "3.0.0",
+ "Microsoft.NETCore.Platforms": "5.0.0",
"Microsoft.NETCore.Targets": "1.1.0",
"System.Runtime": "4.3.0"
}
},
- "System.Threading.Tasks.Extensions/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.Threading.Tasks.Parallel/4.3.0": {
- "dependencies": {
- "System.Collections.Concurrent": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.Threading.Thread/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.ValueTuple/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Xml.ReaderWriter/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Text.Encoding.Extensions": "4.3.0",
- "System.Text.RegularExpressions": "4.3.0",
- "System.Threading.Tasks": "4.3.0",
- "System.Threading.Tasks.Extensions": "4.3.0"
- }
- },
- "System.Xml.XDocument/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.Tools": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Xml.ReaderWriter": "4.3.0"
- }
- },
- "System.Xml.XmlDocument/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Xml.ReaderWriter": "4.3.0"
- }
- },
- "System.Xml.XPath/4.3.0": {
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Xml.ReaderWriter": "4.3.0"
- }
- },
- "System.Xml.XPath.XDocument/4.3.0": {
- "dependencies": {
- "System.Diagnostics.Debug": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Xml.ReaderWriter": "4.3.0",
- "System.Xml.XDocument": "4.3.0",
- "System.Xml.XPath": "4.3.0"
- }
- }
+ "System.Threading.Tasks.Extensions/4.5.3": {}
}
},
"libraries": {
@@ -1660,285 +1168,285 @@
"serviceable": false,
"sha512": ""
},
- "DevExpress.CodeParser/22.1.6": {
+ "DevExpress.CodeParser/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-IFcJpXersAGJsY8DkjU3j7w3ozl1DRo6zzGrr1FHTAbjz5Zy+D6M5NIjdh3ibKI6oMitCzHBhSjarZkIIFPo5w==",
- "path": "devexpress.codeparser/22.1.6",
- "hashPath": "devexpress.codeparser.22.1.6.nupkg.sha512"
+ "sha512": "sha512-29LZJ6EH5dd4ALDfOUBij0UKi10ttNs+jcccf+4GNbSq20BgXP/2DpnYSgX4qYHSEDSFPpyBzPWnGr4beQkINg==",
+ "path": "devexpress.codeparser/22.2.3",
+ "hashPath": "devexpress.codeparser.22.2.3.nupkg.sha512"
},
- "DevExpress.Data/22.1.6": {
+ "DevExpress.Data/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-dFJZnShBSRyIXxFdL5JF5PWnjV5H9sFQurWdMrelty7BnnS1w2t/Uib/94eHoL1HG7ThoOlkrBN1O9MUgnyJ9g==",
- "path": "devexpress.data/22.1.6",
- "hashPath": "devexpress.data.22.1.6.nupkg.sha512"
+ "sha512": "sha512-L8cY3YVz96Vkztlpux0srEa503aLaruUsqVocfZLeIb20+5JW1V1NghWiJxfiuy/RZxPAu5Jj0bWinSVw4Qjhg==",
+ "path": "devexpress.data/22.2.3",
+ "hashPath": "devexpress.data.22.2.3.nupkg.sha512"
},
- "DevExpress.Data.Desktop/22.1.6": {
+ "DevExpress.Data.Desktop/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-wp0AJxg3iKBxUB5brVjwQjhqXRCXIuUl4xgDPdGcmRt5P1VOpFzVdHHJ4/sPD+/1XWUgF+AObMqA7oLQpmQw5g==",
- "path": "devexpress.data.desktop/22.1.6",
- "hashPath": "devexpress.data.desktop.22.1.6.nupkg.sha512"
+ "sha512": "sha512-TRnD+dS8j2+/QzP+2hRT1CNR5r54B0/vXoWZEery1zWe9uPtoJ1eiv7379EapWkswe+FxehU0ehHmFBt1RN4GQ==",
+ "path": "devexpress.data.desktop/22.2.3",
+ "hashPath": "devexpress.data.desktop.22.2.3.nupkg.sha512"
},
- "DevExpress.DataAccess/22.1.6": {
+ "DevExpress.DataAccess/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-rFEdmaK6/PigKV3J6Zl0aElpH4lP+LKHOv/OQpDBiDqfKOoTwYsG3auJW9E8MpDYvdFKNNtk2fBNQqw2gpoCJA==",
- "path": "devexpress.dataaccess/22.1.6",
- "hashPath": "devexpress.dataaccess.22.1.6.nupkg.sha512"
+ "sha512": "sha512-DP1OtcRbA4B4pfHbz+U5OAZAOV35oSS/BgZxShvhBOqz1JvjFNHfekoUFY1Kl0lkSSsjx4TVqqril+9CZDGkyQ==",
+ "path": "devexpress.dataaccess/22.2.3",
+ "hashPath": "devexpress.dataaccess.22.2.3.nupkg.sha512"
},
- "DevExpress.DataAccess.UI/22.1.6": {
+ "DevExpress.DataAccess.UI/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-KuWzuMG4C4LHiedEX9TzwLlaJo7Dn9oBI+TabBDocw5iPUhUZncFlKA22oAprE4a+2++xrwfcJ/pHiNpyB10zQ==",
- "path": "devexpress.dataaccess.ui/22.1.6",
- "hashPath": "devexpress.dataaccess.ui.22.1.6.nupkg.sha512"
+ "sha512": "sha512-ft2FkcKCLioo/tfDLkYslgaZv3KmF08+EJ6xFIRrg3aE7zrvWNyX2qb+g1kupdOIrf6MIvc+OJGuMNUGV6MSVA==",
+ "path": "devexpress.dataaccess.ui/22.2.3",
+ "hashPath": "devexpress.dataaccess.ui.22.2.3.nupkg.sha512"
},
- "DevExpress.Diagram.Core/22.1.6": {
+ "DevExpress.Diagram.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-JwalvsiL+nL8NBXLpmqajGXavTSj9GKQhapSx9onj7EgSRzvHg7fb9a8DTFfTtJWdgZ+Tgt6799yhD7TbUmMdA==",
- "path": "devexpress.diagram.core/22.1.6",
- "hashPath": "devexpress.diagram.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-TKrZx13RGZZ8jOPfTiebiZ0PZ3Yq7Ial4QQ1me8sEk3pRfSSBAMYCvWYbvX1ivEPPH6gPPcgKaZ4aWdxmwIklQ==",
+ "path": "devexpress.diagram.core/22.2.3",
+ "hashPath": "devexpress.diagram.core.22.2.3.nupkg.sha512"
},
- "DevExpress.Drawing/22.1.6": {
+ "DevExpress.Drawing/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-vdiehfAMxrSuu2r93xCYEc9GKoV7yy0NsODsGGaMuqwnJGr/s0IVXs3CqUDrj15TvnLskwLB7GYiEuOJSZ3ocQ==",
- "path": "devexpress.drawing/22.1.6",
- "hashPath": "devexpress.drawing.22.1.6.nupkg.sha512"
+ "sha512": "sha512-eks9y2+EsumE+YrrRJwqWXZEkMmr1v0gPxNQnpifSzN5tXtXHEUV1ph8/PzcNPN7zYOcZP7JMrXWKcvQkKkWwA==",
+ "path": "devexpress.drawing/22.2.3",
+ "hashPath": "devexpress.drawing.22.2.3.nupkg.sha512"
},
- "DevExpress.ExpressApp/22.1.6": {
+ "DevExpress.ExpressApp/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-QV6zE+NSf6kN1+8r7Z2btT7xAs8HvQTap+AvvQFkGSPpTooZLiS3B/a2tCWPzAHsSmbujiSO1pBQIZloKqfFag==",
- "path": "devexpress.expressapp/22.1.6",
- "hashPath": "devexpress.expressapp.22.1.6.nupkg.sha512"
+ "sha512": "sha512-GfiZhuqQ5SLb8eQAtx9dnBlyTifHZrTGfSmt+fsHRmYkAeStzzB0oWVP12DkGu48gKxY5CVR79o5qUzuHoifTA==",
+ "path": "devexpress.expressapp/22.2.3",
+ "hashPath": "devexpress.expressapp.22.2.3.nupkg.sha512"
},
- "DevExpress.ExpressApp.Objects/22.1.6": {
+ "DevExpress.ExpressApp.Objects/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-DEtvFLSjZnbH0LWjtkE1cSsn0isispK4H6L4V/+wHni0VabP+Znf5IfE+guTKPe028i6Fb6GWVflIgFmc++4tA==",
- "path": "devexpress.expressapp.objects/22.1.6",
- "hashPath": "devexpress.expressapp.objects.22.1.6.nupkg.sha512"
+ "sha512": "sha512-VnI1gntP8541qmX8fZ/04V4gR63Vsh7PXVag0vkPRIb0gp5raU9/I4HbUuxOGpbZmBhaVYUbvwKwdcogiuoBHw==",
+ "path": "devexpress.expressapp.objects/22.2.3",
+ "hashPath": "devexpress.expressapp.objects.22.2.3.nupkg.sha512"
},
- "DevExpress.ExpressApp.Security/22.1.6": {
+ "DevExpress.ExpressApp.Security/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-RzR8W5jZq/Yf8fNy6d0dDXaGDEp4Ui3vLnUfkvdVBwjVFUo71PY1CH+RuPX7dFsg9vgp5S08naRhMBSz0AKVrw==",
- "path": "devexpress.expressapp.security/22.1.6",
- "hashPath": "devexpress.expressapp.security.22.1.6.nupkg.sha512"
+ "sha512": "sha512-gwITcV/QvE8vWO1GI1FSOZEVPOdUXlOBgAD2SPcc/S+6KTukBSUQUQzmz/8JQlwj+ecUzgyeZQzJhY/NB0Uadw==",
+ "path": "devexpress.expressapp.security/22.2.3",
+ "hashPath": "devexpress.expressapp.security.22.2.3.nupkg.sha512"
},
- "DevExpress.ExpressApp.Win/22.1.6": {
+ "DevExpress.ExpressApp.Win/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-NqQ9gHnGq/NYwd9awwTQzZVkTXV4vGH+YHJA9/ImPDPdju8NpjO+6UGsbB60zV60nuR5RWB1mG2aireRpD1Blg==",
- "path": "devexpress.expressapp.win/22.1.6",
- "hashPath": "devexpress.expressapp.win.22.1.6.nupkg.sha512"
+ "sha512": "sha512-4cKN84tqNKff6yZbvcm5k2pH+591q0e7XJ7+alxYLtau2ezUzXsr+bM+viZDsJU/Ah4qZmw/Ojo1PM/HtkLAcQ==",
+ "path": "devexpress.expressapp.win/22.2.3",
+ "hashPath": "devexpress.expressapp.win.22.2.3.nupkg.sha512"
},
- "DevExpress.ExpressApp.Xpo/22.1.6": {
+ "DevExpress.ExpressApp.Xpo/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-H/nRc7fM6w6daHktGRH6d42wXnjdTMLlrM03LOmQluxg/kDB/EhuBvwqzgk4yvVFegGU9m9FU9VkpD4/SW3khA==",
- "path": "devexpress.expressapp.xpo/22.1.6",
- "hashPath": "devexpress.expressapp.xpo.22.1.6.nupkg.sha512"
+ "sha512": "sha512-U9uDc77sfpR4HOBgEI8dTnqbpwYLGOyhWMCVYhiyJjKuJL9QcaziwUc6EA6Jufnk7GfUS9TFd+vjZ7CyZUKmsQ==",
+ "path": "devexpress.expressapp.xpo/22.2.3",
+ "hashPath": "devexpress.expressapp.xpo.22.2.3.nupkg.sha512"
},
- "DevExpress.Images/22.1.6": {
+ "DevExpress.Images/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-C4Hrxq3aUM2tKn6Rqy4Vq/ddc1vUbHCJJiN1Zwju8nsugYspJvHOM7HmEG0EgiSUNoN644UPZDkEJtFW9DlOUw==",
- "path": "devexpress.images/22.1.6",
- "hashPath": "devexpress.images.22.1.6.nupkg.sha512"
+ "sha512": "sha512-ne4kGAIT8nzwESRyyS/zrt+UvJ9NyRttV+MoLjSxYXQnsjj5HnIqY/yhHaJ7FWoMkFggk52U9DVFAIaDUFyyDQ==",
+ "path": "devexpress.images/22.2.3",
+ "hashPath": "devexpress.images.22.2.3.nupkg.sha512"
},
- "DevExpress.Office.Core/22.1.6": {
+ "DevExpress.Office.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-Y4XMR7ecTKoJ9gknxn4vKOzEqekowKNhE3/2RDiZOSw0z6T1cQZN1Iys53tirrWyUHWeYaYZwTz1QOFgeV1uZA==",
- "path": "devexpress.office.core/22.1.6",
- "hashPath": "devexpress.office.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-HGyDnTS3kd9kKAEfvJF9sc2DCUM6Tc8fg1LaOVMYzygEKYOziPm4ztQqQWPrel813M2XDPBRlpG3f//jtD7W3w==",
+ "path": "devexpress.office.core/22.2.3",
+ "hashPath": "devexpress.office.core.22.2.3.nupkg.sha512"
},
- "DevExpress.Pdf.Core/22.1.6": {
+ "DevExpress.Pdf.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-za08EjQ52f+BpEG+C559a8JITKyR06PFdOi0hmpdFT0HnERIdA5umDHq+lRppj4qD7E329iui5Oxnqb7NtDmwg==",
- "path": "devexpress.pdf.core/22.1.6",
- "hashPath": "devexpress.pdf.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-fdch5sR+2ekOoEiwtbxI+ovxj6NpW9sEuI6YGbo/e47t+QfBhkGvDTgRlY3UJTKFLPqhT+V3lfj/ddLDcMnpkw==",
+ "path": "devexpress.pdf.core/22.2.3",
+ "hashPath": "devexpress.pdf.core.22.2.3.nupkg.sha512"
},
- "DevExpress.Pdf.Drawing/22.1.6": {
+ "DevExpress.Pdf.Drawing/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-FkJCr8dgtGqD60O8/lTia5rFxiHSJHR3V99kkb4KgVenSnuctps8ZmpCsnJht4RKK5TssFEMxJVz7KmS5XeIZA==",
- "path": "devexpress.pdf.drawing/22.1.6",
- "hashPath": "devexpress.pdf.drawing.22.1.6.nupkg.sha512"
+ "sha512": "sha512-BFLLT0FAzzV4wEvO4H/FZgCAow+aJGYT8GCoa6lOD10x6MVTeaYvgVYFQLEGmkl1Tz1kSK91Y/G44WerZ0AMgQ==",
+ "path": "devexpress.pdf.drawing/22.2.3",
+ "hashPath": "devexpress.pdf.drawing.22.2.3.nupkg.sha512"
},
- "DevExpress.Persistent.Base/22.1.6": {
+ "DevExpress.Persistent.Base/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-Bs1cKvPeP/ljT3Rht1TyhX3g8AtHJo/oLJuBSKP/ZyvMwkGn33YoedLrMjoE1NSdxlzx7jaFvWZVxTnuFBhUHQ==",
- "path": "devexpress.persistent.base/22.1.6",
- "hashPath": "devexpress.persistent.base.22.1.6.nupkg.sha512"
+ "sha512": "sha512-x/P85QQ3KzEDAgniwfP1p3FVdOGqD1/Mo78LW/F9shiP06HAnSRTraq2xkTSijcV2yfZ6un81J1fMidhHuBBVg==",
+ "path": "devexpress.persistent.base/22.2.3",
+ "hashPath": "devexpress.persistent.base.22.2.3.nupkg.sha512"
},
- "DevExpress.Persistent.BaseImpl.Xpo/22.1.6": {
+ "DevExpress.Persistent.BaseImpl.Xpo/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-nXOvKADXM11R51kn9jklSZyJgqS1x/8ILixKQ+WKEC1t/j5bgSHclDxtJnzQV97aLtb9QElinCPT0NluTTmUbg==",
- "path": "devexpress.persistent.baseimpl.xpo/22.1.6",
- "hashPath": "devexpress.persistent.baseimpl.xpo.22.1.6.nupkg.sha512"
+ "sha512": "sha512-wGDNqYL+cfsyLIAHsNBp5lI03PhVCOoS5nBPtqqe/zWYyTHsv6kOQSHt3yWjGTAJLaO2RNh1hE5nBvnjHHBL+w==",
+ "path": "devexpress.persistent.baseimpl.xpo/22.2.3",
+ "hashPath": "devexpress.persistent.baseimpl.xpo.22.2.3.nupkg.sha512"
},
- "DevExpress.PivotGrid.Core/22.1.6": {
+ "DevExpress.PivotGrid.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-jw7JbpatdG6cG5jxyuqYoY1yadSAISRGycVXEgRBYOkll3TIvsO3MWaiya7fGBKxcP27LoU3q/cqCiITGvpBVA==",
- "path": "devexpress.pivotgrid.core/22.1.6",
- "hashPath": "devexpress.pivotgrid.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-VQ2tvBVmGYDrBi+oD0u6vrpU2oez9b80uTGF//+KY8r3o3JvPZCs7vwl97XyfafvFkWv1yDNlnZiWD0BXepV6g==",
+ "path": "devexpress.pivotgrid.core/22.2.3",
+ "hashPath": "devexpress.pivotgrid.core.22.2.3.nupkg.sha512"
},
- "DevExpress.Printing.Core/22.1.6": {
+ "DevExpress.Printing.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-YAzMLgaWon8MKVyoFBZwZKSsh8sarPBAcC8T5XPmLtL8e7XunVgJvmOuqUUWR4N5sDQChSA05z2qvQvSF4n6bg==",
- "path": "devexpress.printing.core/22.1.6",
- "hashPath": "devexpress.printing.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-8XJB/ofU3fL8n3DQKAy0DHdMGx29ewKLt10CRoISomNbMCpsPWmYFoSfvaGwcgQA9EC6IWKf6gD5vKWSDF96CA==",
+ "path": "devexpress.printing.core/22.2.3",
+ "hashPath": "devexpress.printing.core.22.2.3.nupkg.sha512"
},
- "DevExpress.RichEdit.Core/22.1.6": {
+ "DevExpress.RichEdit.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-9NTHKTEgJk2bYd37x2pwOsOKBAyY9F1rWSBs++IJ3TlPti5RZEgTOcQ7jndNdtZ3pj3W+uKW5y3+qjOpmurChw==",
- "path": "devexpress.richedit.core/22.1.6",
- "hashPath": "devexpress.richedit.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-P2FYGvPRJEu+aqrvTfXcrKgOAPwoZDj4V8wo7Ub8VhoKstF+q3ACRMyjClA/5d/U2AyniGffVUmXw2GnCBTHtQ==",
+ "path": "devexpress.richedit.core/22.2.3",
+ "hashPath": "devexpress.richedit.core.22.2.3.nupkg.sha512"
},
- "DevExpress.RichEdit.Export/22.1.6": {
+ "DevExpress.RichEdit.Export/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-S3aRFXpZ84UKJy6Lnk9VchuZ6K/MCV04l6/ZuppwlV1Ufshod3nJyNFwpok84M4znGfG4xfRxGPE0QbKqaQWZA==",
- "path": "devexpress.richedit.export/22.1.6",
- "hashPath": "devexpress.richedit.export.22.1.6.nupkg.sha512"
+ "sha512": "sha512-QmFz6s2ubFBQ1vIGYlXgZ8EwWWO7DF2mpJ6KHOef1lf6W4fQmRypW2Ge8x0vScBGiWrQYncvLdzqQLRwQ420uA==",
+ "path": "devexpress.richedit.export/22.2.3",
+ "hashPath": "devexpress.richedit.export.22.2.3.nupkg.sha512"
},
- "DevExpress.Scheduler.Core/22.1.6": {
+ "DevExpress.Scheduler.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-b6ulmEd67vnARpjVfb1Qi66IgSh6WZmIZPKK59Qoj8Qdli1Mh7apo1i7hBShQOGqYq1H1HPS041Gzb3cqQ+61w==",
- "path": "devexpress.scheduler.core/22.1.6",
- "hashPath": "devexpress.scheduler.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-agAvXLI8gT5oIyHd0QSHa9ezxAPOGnEF7pl4KEgpQOtnCP0aZRyUk6GIlR9Ze7u191tkQEfjE9S93SXbJ5ehqw==",
+ "path": "devexpress.scheduler.core/22.2.3",
+ "hashPath": "devexpress.scheduler.core.22.2.3.nupkg.sha512"
},
- "DevExpress.Sparkline.Core/22.1.6": {
+ "DevExpress.Sparkline.Core/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-oJ+03tZ7K1yW3VwP415BeFOuFunPcZhOZ1svvyHo6Ed3tk6yIkmvTBuOdB98MUmWb7tXV5KABb2Gq7V62eAp3w==",
- "path": "devexpress.sparkline.core/22.1.6",
- "hashPath": "devexpress.sparkline.core.22.1.6.nupkg.sha512"
+ "sha512": "sha512-IZXF92QWEvEEzBbC20WNh/tw9On2C7Bbnv7sVUZtxCl6r64hMwq0d2MC2oU216WCFi/So8pi7ciJrCYMKENVtg==",
+ "path": "devexpress.sparkline.core/22.2.3",
+ "hashPath": "devexpress.sparkline.core.22.2.3.nupkg.sha512"
},
- "DevExpress.Utils/22.1.6": {
+ "DevExpress.Utils/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-heLDA+bth/C7K0QOg7YeG7aZ5AsHX+BNvzWO0eEAa8Dq7IyeexUkxt53XV8t3KSkh3pzo42R8R6wxdP9cQubjA==",
- "path": "devexpress.utils/22.1.6",
- "hashPath": "devexpress.utils.22.1.6.nupkg.sha512"
+ "sha512": "sha512-UE6Lyp9R9jztFSmmEmnXlSq0SIFZwGvndod4DPHNzVcamXTkoOwY0KxFTLRRKnhtDso7pqI6+tPzcCfTfufLYQ==",
+ "path": "devexpress.utils/22.2.3",
+ "hashPath": "devexpress.utils.22.2.3.nupkg.sha512"
},
- "DevExpress.Utils.UI/22.1.6": {
+ "DevExpress.Utils.UI/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-8fHMZP2XvZxBp9vjEKzrNX9ox8pXrnh4pwhuK2yFaMHY+skTb+sf4e12uJqQnE/yUKq66aLIar7zEugjBTF8Vw==",
- "path": "devexpress.utils.ui/22.1.6",
- "hashPath": "devexpress.utils.ui.22.1.6.nupkg.sha512"
+ "sha512": "sha512-lJSVZNM9rsM5PcfWzUfkJ+l2cPJCXS0ItaBiY07Uh1rf1qH7e/ctOhdqAOWTunUlBSxY698OLcZk+Q40/r2fnw==",
+ "path": "devexpress.utils.ui/22.2.3",
+ "hashPath": "devexpress.utils.ui.22.2.3.nupkg.sha512"
},
- "DevExpress.Win/22.1.6": {
+ "DevExpress.Win/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-sDnDG4T+ys2YQKUr2WKkTqD5PyxxTW5XK/XUM8q1MtRVw4u43cmyPWbBH+ff4DmkDVMhH2uKv1MqrhltZ5eJLA==",
- "path": "devexpress.win/22.1.6",
- "hashPath": "devexpress.win.22.1.6.nupkg.sha512"
+ "sha512": "sha512-7q3sPak82Q7UIWEbuplBeEXhgVDOdGG3U2ORsvSfR8yZZc5m//cDTt8bsEHHfFNeh0pA2g68b4EdnG4qxCsEIw==",
+ "path": "devexpress.win/22.2.3",
+ "hashPath": "devexpress.win.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.BonusSkins/22.1.6": {
+ "DevExpress.Win.BonusSkins/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-dHgE9gvusVKimthKcft+dKLjAzgeKo2VetFIOOiDcGKXkZTBK5W/dDBDO09RMJ4K7tMHAVD2KcmOTyr4qod4mQ==",
- "path": "devexpress.win.bonusskins/22.1.6",
- "hashPath": "devexpress.win.bonusskins.22.1.6.nupkg.sha512"
+ "sha512": "sha512-LRtjlQxmYcXj80wEbvMzH4KpRFz03YqWsgo5YskIsANbILMOXeAL4/57jwezAlObwTpMx9dQTjKjjIphz9c+Kw==",
+ "path": "devexpress.win.bonusskins/22.2.3",
+ "hashPath": "devexpress.win.bonusskins.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.Diagram/22.1.6": {
+ "DevExpress.Win.Diagram/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-sp5lixq0xdnyjCrYLkEkW2VHuLe95S+Wd2kuw6hN2eqqRPz34X0c5qzy6ljt0bnoZrpgI3Bf95LGK4yoCJ9ZUw==",
- "path": "devexpress.win.diagram/22.1.6",
- "hashPath": "devexpress.win.diagram.22.1.6.nupkg.sha512"
+ "sha512": "sha512-H7h4M7L5HpMsAzytV+k3U13v8TnziA0bQHM5I+dAEegZDtQ8Swv1vwtuzFsncNUgA0ytrg0cRhk1alVOkTodow==",
+ "path": "devexpress.win.diagram/22.2.3",
+ "hashPath": "devexpress.win.diagram.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.Grid/22.1.6": {
+ "DevExpress.Win.Grid/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-oqwDiZYlfB0lfTO2qPtZGoEWufluUDfmPH2EtAGU0o+GqTv8nqz31/G/vnZjOjRjdyMkUzonoN0BvPhmyU2rzQ==",
- "path": "devexpress.win.grid/22.1.6",
- "hashPath": "devexpress.win.grid.22.1.6.nupkg.sha512"
+ "sha512": "sha512-afXt8pPPcsF7U+ks0O1OPUrMcgwkIJ4RGwbmiagUgZXYeK0GhGcGQDQ0Vech6gD35gwbMXJQJdTFpKTrg/6G2Q==",
+ "path": "devexpress.win.grid/22.2.3",
+ "hashPath": "devexpress.win.grid.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.Navigation/22.1.6": {
+ "DevExpress.Win.Navigation/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-CYXs8C65O6nq/Zxl84ktKRTaGxTMawTvcULzBdrllJVZVQAg7LSFAx9tLurAQjkifr7vn8DlhDOAT8WiZGvtMg==",
- "path": "devexpress.win.navigation/22.1.6",
- "hashPath": "devexpress.win.navigation.22.1.6.nupkg.sha512"
+ "sha512": "sha512-sVJfDiBF7g0wwRo9uXqBn4Pp7pXl7ZzTJle6q0mOCeUGcv4Bl8rAiC4NAiu9q9jsIG6Mz1SFTJoXLBKFj+R8Dg==",
+ "path": "devexpress.win.navigation/22.2.3",
+ "hashPath": "devexpress.win.navigation.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.PivotGrid/22.1.6": {
+ "DevExpress.Win.PivotGrid/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-HvkhBLiSFqz9WoZ5zY3VecwLDmDxyIkbr938xABZ+07RFW+/o45SCvaRP/tVGoPz84gnMMQQYcnhMZ6jS/TWFw==",
- "path": "devexpress.win.pivotgrid/22.1.6",
- "hashPath": "devexpress.win.pivotgrid.22.1.6.nupkg.sha512"
+ "sha512": "sha512-nF8TFfzKhFjFaF6Dat0FxW/blt+XQN9yhvM1K3m7SQAIWApuXpEPkE5YYpW2UALw0bliVdgDFfQgBn9fAAR2gw==",
+ "path": "devexpress.win.pivotgrid/22.2.3",
+ "hashPath": "devexpress.win.pivotgrid.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.Printing/22.1.6": {
+ "DevExpress.Win.Printing/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-Um0XYLoIFf4s9F8MNomHdNktmxeqY34Yd5uAiA4oPdAd01cowxpjmC06Do5+JKQd+gwFMQgoERwAF5aO+dSQlg==",
- "path": "devexpress.win.printing/22.1.6",
- "hashPath": "devexpress.win.printing.22.1.6.nupkg.sha512"
+ "sha512": "sha512-ND/Be80fnjMbkw5Y5oa/+lrhI5iRhWen8GkY3CzDGIo0Ln8NMlO4xvgUWNxMngP/EmtjHYAbdfoPz8qw5PaOnA==",
+ "path": "devexpress.win.printing/22.2.3",
+ "hashPath": "devexpress.win.printing.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.RichEdit/22.1.6": {
+ "DevExpress.Win.RichEdit/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-Pk8iVS+zhRBLuVzdBovbu7lZ9avzFs5VBfDxDg66SceUE1BWzMPuHCGoCO+AxYBXB2Fl7jmO1hRtoH8+5uwGyg==",
- "path": "devexpress.win.richedit/22.1.6",
- "hashPath": "devexpress.win.richedit.22.1.6.nupkg.sha512"
+ "sha512": "sha512-aTiuzN/+RO4/LWlfKQjJNl/E7XxfKnP7YQ+AxjZ7HbsfnNlNojS9SBa+Tsse9LJpzm4JucrNjMwJbu2kk0NJTQ==",
+ "path": "devexpress.win.richedit/22.2.3",
+ "hashPath": "devexpress.win.richedit.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.TreeList/22.1.6": {
+ "DevExpress.Win.TreeList/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-o9O5AZUqgWm//AzyzyJxyGH7WibdD+2h+Zzw+WYfpIznOoOfJ22a2rcIU3CeqE8Gohg+vXHiv1ztaiAIMmIpsw==",
- "path": "devexpress.win.treelist/22.1.6",
- "hashPath": "devexpress.win.treelist.22.1.6.nupkg.sha512"
+ "sha512": "sha512-EZMf0OE4N6NrJAPlDnZEtzQvviVjsOFbx8tn/UqIzY0CAJiGiH/IHNCCdoLYWthASJ98G0Lflf9O4DDkkJG5mA==",
+ "path": "devexpress.win.treelist/22.2.3",
+ "hashPath": "devexpress.win.treelist.22.2.3.nupkg.sha512"
},
- "DevExpress.Win.VerticalGrid/22.1.6": {
+ "DevExpress.Win.VerticalGrid/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-gWOlHA1vXzzY2CoumVI09uBQo4rC3AltvEhO6DG8jS5ZZaFx2PbyDRhupUWocV3Sd2lUF9TU8RW1J2K2VuvdGg==",
- "path": "devexpress.win.verticalgrid/22.1.6",
- "hashPath": "devexpress.win.verticalgrid.22.1.6.nupkg.sha512"
+ "sha512": "sha512-2r5NQbhdRR6ofehPuiJrHMEMdjZJqXCJ4AF2uD6VeU5W3JJSlp2bzaQuAjQYra5sUhRRlgex2UJZMm/O1N2IIg==",
+ "path": "devexpress.win.verticalgrid/22.2.3",
+ "hashPath": "devexpress.win.verticalgrid.22.2.3.nupkg.sha512"
},
- "DevExpress.Xpo/22.1.6": {
+ "DevExpress.Xpo/22.2.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-NAx9buXCl936rLNCip+9vT92pGzss7HBrDanft79rafxOrSISwkYkau3/LNU9UofJ77ru7k7sKHaCk+qZcMVLw==",
- "path": "devexpress.xpo/22.1.6",
- "hashPath": "devexpress.xpo.22.1.6.nupkg.sha512"
+ "sha512": "sha512-NEZsDdHVWMklNkchoAbntMaZwuJcvW/pYHo1uuCYNa0t4M/0HmhUei7G2oJfPpZIpWGsoLd4YytQVLz3Nc8Rog==",
+ "path": "devexpress.xpo/22.2.3",
+ "hashPath": "devexpress.xpo.22.2.3.nupkg.sha512"
},
- "Microsoft.CodeAnalysis.Analyzers/1.1.0": {
+ "Microsoft.CodeAnalysis.Analyzers/2.9.4": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-HS3iRWZKcUw/8eZ/08GXKY2Bn7xNzQPzf8gRPHGSowX7u7XXu9i9YEaBeBNKUXWfI7qjvT2zXtLUvbN0hds8vg==",
- "path": "microsoft.codeanalysis.analyzers/1.1.0",
- "hashPath": "microsoft.codeanalysis.analyzers.1.1.0.nupkg.sha512"
+ "sha512": "sha512-alIJhS0VUg/7x5AsHEoovh/wRZ0RfCSS7k5pDSqpRLTyuMTtRgj6OJJPRApRhJHOGYYsLakf1hKeXFoDwKwNkg==",
+ "path": "microsoft.codeanalysis.analyzers/2.9.4",
+ "hashPath": "microsoft.codeanalysis.analyzers.2.9.4.nupkg.sha512"
},
- "Microsoft.CodeAnalysis.Common/2.8.0": {
+ "Microsoft.CodeAnalysis.Common/3.3.1": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-06AzG7oOLKTCN1EnoVYL1bQz+Zwa10LMpUn7Kc+PdpN8CQXRqXTyhfxuKIz6t0qWfoatBNXdHD0OLcEYp5pOvQ==",
- "path": "microsoft.codeanalysis.common/2.8.0",
- "hashPath": "microsoft.codeanalysis.common.2.8.0.nupkg.sha512"
+ "sha512": "sha512-N5yQdGy+M4kimVG7hwCeGTCfgYjK2o5b/Shumkb/rCC+/SAkvP1HUAYK+vxPFS7dLJNtXLRsmPHKj3fnyNWnrw==",
+ "path": "microsoft.codeanalysis.common/3.3.1",
+ "hashPath": "microsoft.codeanalysis.common.3.3.1.nupkg.sha512"
},
- "Microsoft.CodeAnalysis.CSharp/2.8.0": {
+ "Microsoft.CodeAnalysis.CSharp/3.3.1": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-RizcFXuHgGmeuZhxxE1qQdhFA9lGOHlk0MJlCUt6LOnYsevo72gNikPcbANFHY02YK8L/buNrihchY0TroGvXQ==",
- "path": "microsoft.codeanalysis.csharp/2.8.0",
- "hashPath": "microsoft.codeanalysis.csharp.2.8.0.nupkg.sha512"
+ "sha512": "sha512-WDUIhTHem38H6VJ98x2Ssq0fweakJHnHYl7vbG8ARnsAwLoJKCQCy78EeY1oRrCKG42j0v6JVljKkeqSDA28UA==",
+ "path": "microsoft.codeanalysis.csharp/3.3.1",
+ "hashPath": "microsoft.codeanalysis.csharp.3.3.1.nupkg.sha512"
},
"Microsoft.Extensions.Configuration.Abstractions/5.0.0": {
"type": "package",
@@ -1982,12 +1490,12 @@
"path": "microsoft.extensions.primitives/5.0.0",
"hashPath": "microsoft.extensions.primitives.5.0.0.nupkg.sha512"
},
- "Microsoft.NETCore.Platforms/3.0.0": {
+ "Microsoft.NETCore.Platforms/5.0.0": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==",
- "path": "microsoft.netcore.platforms/3.0.0",
- "hashPath": "microsoft.netcore.platforms.3.0.0.nupkg.sha512"
+ "sha512": "sha512-VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==",
+ "path": "microsoft.netcore.platforms/5.0.0",
+ "hashPath": "microsoft.netcore.platforms.5.0.0.nupkg.sha512"
},
"Microsoft.NETCore.Targets/1.1.0": {
"type": "package",
@@ -2003,12 +1511,12 @@
"path": "microsoft.win32.registry/4.5.0",
"hashPath": "microsoft.win32.registry.4.5.0.nupkg.sha512"
},
- "Microsoft.Win32.SystemEvents/4.5.0": {
+ "Microsoft.Win32.SystemEvents/5.0.0": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-LuI1oG+24TUj1ZRQQjM5Ew73BKnZE5NZ/7eAdh1o8ST5dPhUnJvIkiIn2re3MwnkRy6ELRnvEbBxHP8uALKhJw==",
- "path": "microsoft.win32.systemevents/4.5.0",
- "hashPath": "microsoft.win32.systemevents.4.5.0.nupkg.sha512"
+ "sha512": "sha512-Bh6blKG8VAKvXiLe2L+sEsn62nc1Ij34MrNxepD2OCrS5cpCwQa9MeLyhVQPQ/R4Wlzwuy6wMK8hLb11QPDRsQ==",
+ "path": "microsoft.win32.systemevents/5.0.0",
+ "hashPath": "microsoft.win32.systemevents.5.0.0.nupkg.sha512"
},
"NETStandard.Library/2.0.3": {
"type": "package",
@@ -2017,34 +1525,6 @@
"path": "netstandard.library/2.0.3",
"hashPath": "netstandard.library.2.0.3.nupkg.sha512"
},
- "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==",
- "path": "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==",
- "path": "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==",
- "path": "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.native.System/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==",
- "path": "runtime.native.system/4.3.0",
- "hashPath": "runtime.native.system.4.3.0.nupkg.sha512"
- },
"runtime.native.System.Data.SqlClient.sni/4.5.0": {
"type": "package",
"serviceable": true,
@@ -2052,90 +1532,6 @@
"path": "runtime.native.system.data.sqlclient.sni/4.5.0",
"hashPath": "runtime.native.system.data.sqlclient.sni.4.5.0.nupkg.sha512"
},
- "runtime.native.System.IO.Compression/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==",
- "path": "runtime.native.system.io.compression/4.3.0",
- "hashPath": "runtime.native.system.io.compression.4.3.0.nupkg.sha512"
- },
- "runtime.native.System.Net.Http/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==",
- "path": "runtime.native.system.net.http/4.3.0",
- "hashPath": "runtime.native.system.net.http.4.3.0.nupkg.sha512"
- },
- "runtime.native.System.Security.Cryptography.Apple/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==",
- "path": "runtime.native.system.security.cryptography.apple/4.3.0",
- "hashPath": "runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512"
- },
- "runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==",
- "path": "runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==",
- "path": "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==",
- "path": "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==",
- "path": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0",
- "hashPath": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512"
- },
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==",
- "path": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==",
- "path": "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==",
- "path": "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==",
- "path": "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
- "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==",
- "path": "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0",
- "hashPath": "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
"runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0": {
"type": "package",
"serviceable": true,
@@ -2157,13 +1553,6 @@
"path": "runtime.win-x86.runtime.native.system.data.sqlclient.sni/4.4.0",
"hashPath": "runtime.win-x86.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512"
},
- "System.AppContext/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==",
- "path": "system.appcontext/4.3.0",
- "hashPath": "system.appcontext.4.3.0.nupkg.sha512"
- },
"System.Buffers/4.5.1": {
"type": "package",
"serviceable": true,
@@ -2178,26 +1567,12 @@
"path": "system.codedom/4.4.0",
"hashPath": "system.codedom.4.4.0.nupkg.sha512"
},
- "System.Collections/4.3.0": {
+ "System.Collections.Immutable/1.5.0": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
- "path": "system.collections/4.3.0",
- "hashPath": "system.collections.4.3.0.nupkg.sha512"
- },
- "System.Collections.Concurrent/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==",
- "path": "system.collections.concurrent/4.3.0",
- "hashPath": "system.collections.concurrent.4.3.0.nupkg.sha512"
- },
- "System.Collections.Immutable/1.3.1": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-n+AGX7zmiZumW9aggOkXaHzUeAS3EfeTErnkKCusyONUozbTv+kMb8VE36m+ldV6kF9g57G2c641KCdgH9E0pg==",
- "path": "system.collections.immutable/1.3.1",
- "hashPath": "system.collections.immutable.1.3.1.nupkg.sha512"
+ "sha512": "sha512-EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==",
+ "path": "system.collections.immutable/1.5.0",
+ "hashPath": "system.collections.immutable.1.5.0.nupkg.sha512"
},
"System.ComponentModel.Annotations/4.4.0": {
"type": "package",
@@ -2213,13 +1588,6 @@
"path": "system.configuration.configurationmanager/4.5.0",
"hashPath": "system.configuration.configurationmanager.4.5.0.nupkg.sha512"
},
- "System.Console/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==",
- "path": "system.console/4.3.0",
- "hashPath": "system.console.4.3.0.nupkg.sha512"
- },
"System.Data.SqlClient/4.6.0": {
"type": "package",
"serviceable": true,
@@ -2227,13 +1595,6 @@
"path": "system.data.sqlclient/4.6.0",
"hashPath": "system.data.sqlclient.4.6.0.nupkg.sha512"
},
- "System.Diagnostics.Debug/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==",
- "path": "system.diagnostics.debug/4.3.0",
- "hashPath": "system.diagnostics.debug.4.3.0.nupkg.sha512"
- },
"System.Diagnostics.EventLog/4.5.0": {
"type": "package",
"serviceable": true,
@@ -2241,61 +1602,12 @@
"path": "system.diagnostics.eventlog/4.5.0",
"hashPath": "system.diagnostics.eventlog.4.5.0.nupkg.sha512"
},
- "System.Diagnostics.FileVersionInfo/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-omCF64wzQ3Q2CeIqkD6lmmxeMZtGHUmzgFMPjfVaOsyqpR66p/JaZzManMw1s33osoAb5gqpncsjie67+yUPHQ==",
- "path": "system.diagnostics.fileversioninfo/4.3.0",
- "hashPath": "system.diagnostics.fileversioninfo.4.3.0.nupkg.sha512"
- },
- "System.Diagnostics.StackTrace/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-BiHg0vgtd35/DM9jvtaC1eKRpWZxr0gcQd643ABG7GnvSlf5pOkY2uyd42mMOJoOmKvnpNj0F4tuoS1pacTwYw==",
- "path": "system.diagnostics.stacktrace/4.3.0",
- "hashPath": "system.diagnostics.stacktrace.4.3.0.nupkg.sha512"
- },
- "System.Diagnostics.Tools/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==",
- "path": "system.diagnostics.tools/4.3.0",
- "hashPath": "system.diagnostics.tools.4.3.0.nupkg.sha512"
- },
- "System.Diagnostics.Tracing/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==",
- "path": "system.diagnostics.tracing/4.3.0",
- "hashPath": "system.diagnostics.tracing.4.3.0.nupkg.sha512"
- },
- "System.Drawing.Common/4.5.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-AiJFxxVPdeITstiRS5aAu8+8Dpf5NawTMoapZ53Gfirml24p7HIfhjmCRxdXnmmf3IUA3AX3CcW7G73CjWxW/Q==",
- "path": "system.drawing.common/4.5.0",
- "hashPath": "system.drawing.common.4.5.0.nupkg.sha512"
- },
- "System.Dynamic.Runtime/4.3.0": {
+ "System.Drawing.Common/5.0.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==",
- "path": "system.dynamic.runtime/4.3.0",
- "hashPath": "system.dynamic.runtime.4.3.0.nupkg.sha512"
- },
- "System.Globalization/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==",
- "path": "system.globalization/4.3.0",
- "hashPath": "system.globalization.4.3.0.nupkg.sha512"
- },
- "System.Globalization.Calendars/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==",
- "path": "system.globalization.calendars/4.3.0",
- "hashPath": "system.globalization.calendars.4.3.0.nupkg.sha512"
+ "sha512": "sha512-rEQZuslijqdsO0pkJn7LtGBaMc//YVA8de0meGihkg9oLPaN+w+/Pb5d71lgp0YjPoKgBKNMvdq0IPnoW4PEng==",
+ "path": "system.drawing.common/5.0.3",
+ "hashPath": "system.drawing.common.5.0.3.nupkg.sha512"
},
"System.IO/4.3.0": {
"type": "package",
@@ -2304,41 +1616,6 @@
"path": "system.io/4.3.0",
"hashPath": "system.io.4.3.0.nupkg.sha512"
},
- "System.IO.Compression/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==",
- "path": "system.io.compression/4.3.0",
- "hashPath": "system.io.compression.4.3.0.nupkg.sha512"
- },
- "System.IO.FileSystem/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==",
- "path": "system.io.filesystem/4.3.0",
- "hashPath": "system.io.filesystem.4.3.0.nupkg.sha512"
- },
- "System.IO.FileSystem.Primitives/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==",
- "path": "system.io.filesystem.primitives/4.3.0",
- "hashPath": "system.io.filesystem.primitives.4.3.0.nupkg.sha512"
- },
- "System.Linq/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==",
- "path": "system.linq/4.3.0",
- "hashPath": "system.linq.4.3.0.nupkg.sha512"
- },
- "System.Linq.Expressions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==",
- "path": "system.linq.expressions/4.3.0",
- "hashPath": "system.linq.expressions.4.3.0.nupkg.sha512"
- },
"System.Memory/4.5.4": {
"type": "package",
"serviceable": true,
@@ -2346,13 +1623,6 @@
"path": "system.memory/4.5.4",
"hashPath": "system.memory.4.5.4.nupkg.sha512"
},
- "System.ObjectModel/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==",
- "path": "system.objectmodel/4.3.0",
- "hashPath": "system.objectmodel.4.3.0.nupkg.sha512"
- },
"System.Private.ServiceModel/4.5.3": {
"type": "package",
"serviceable": true,
@@ -2395,19 +1665,12 @@
"path": "system.reflection.emit.lightweight/4.3.0",
"hashPath": "system.reflection.emit.lightweight.4.3.0.nupkg.sha512"
},
- "System.Reflection.Extensions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==",
- "path": "system.reflection.extensions/4.3.0",
- "hashPath": "system.reflection.extensions.4.3.0.nupkg.sha512"
- },
- "System.Reflection.Metadata/1.4.2": {
+ "System.Reflection.Metadata/1.6.0": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-KYPNMDrLB2R+G5JJiJ2fjBpihtktKVIjsirmyyv+VDo5rQkIR9BWeCYM1wDSzbQatWNZ/NQfPsQyTB1Ui3qBfQ==",
- "path": "system.reflection.metadata/1.4.2",
- "hashPath": "system.reflection.metadata.1.4.2.nupkg.sha512"
+ "sha512": "sha512-COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==",
+ "path": "system.reflection.metadata/1.6.0",
+ "hashPath": "system.reflection.metadata.1.6.0.nupkg.sha512"
},
"System.Reflection.Primitives/4.3.0": {
"type": "package",
@@ -2416,13 +1679,6 @@
"path": "system.reflection.primitives/4.3.0",
"hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512"
},
- "System.Reflection.TypeExtensions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==",
- "path": "system.reflection.typeextensions/4.3.0",
- "hashPath": "system.reflection.typeextensions.4.3.0.nupkg.sha512"
- },
"System.Resources.Extensions/4.6.0": {
"type": "package",
"serviceable": true,
@@ -2430,13 +1686,6 @@
"path": "system.resources.extensions/4.6.0",
"hashPath": "system.resources.extensions.4.6.0.nupkg.sha512"
},
- "System.Resources.ResourceManager/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==",
- "path": "system.resources.resourcemanager/4.3.0",
- "hashPath": "system.resources.resourcemanager.4.3.0.nupkg.sha512"
- },
"System.Runtime/4.3.0": {
"type": "package",
"serviceable": true,
@@ -2451,34 +1700,6 @@
"path": "system.runtime.compilerservices.unsafe/6.0.0",
"hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512"
},
- "System.Runtime.Extensions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==",
- "path": "system.runtime.extensions/4.3.0",
- "hashPath": "system.runtime.extensions.4.3.0.nupkg.sha512"
- },
- "System.Runtime.Handles/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
- "path": "system.runtime.handles/4.3.0",
- "hashPath": "system.runtime.handles.4.3.0.nupkg.sha512"
- },
- "System.Runtime.InteropServices/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==",
- "path": "system.runtime.interopservices/4.3.0",
- "hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512"
- },
- "System.Runtime.Numerics/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==",
- "path": "system.runtime.numerics/4.3.0",
- "hashPath": "system.runtime.numerics.4.3.0.nupkg.sha512"
- },
"System.Security.AccessControl/4.5.0": {
"type": "package",
"serviceable": true,
@@ -2486,13 +1707,6 @@
"path": "system.security.accesscontrol/4.5.0",
"hashPath": "system.security.accesscontrol.4.5.0.nupkg.sha512"
},
- "System.Security.Cryptography.Algorithms/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==",
- "path": "system.security.cryptography.algorithms/4.3.0",
- "hashPath": "system.security.cryptography.algorithms.4.3.0.nupkg.sha512"
- },
"System.Security.Cryptography.Cng/4.5.0": {
"type": "package",
"serviceable": true,
@@ -2500,27 +1714,6 @@
"path": "system.security.cryptography.cng/4.5.0",
"hashPath": "system.security.cryptography.cng.4.5.0.nupkg.sha512"
},
- "System.Security.Cryptography.Csp/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==",
- "path": "system.security.cryptography.csp/4.3.0",
- "hashPath": "system.security.cryptography.csp.4.3.0.nupkg.sha512"
- },
- "System.Security.Cryptography.Encoding/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==",
- "path": "system.security.cryptography.encoding/4.3.0",
- "hashPath": "system.security.cryptography.encoding.4.3.0.nupkg.sha512"
- },
- "System.Security.Cryptography.OpenSsl/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==",
- "path": "system.security.cryptography.openssl/4.3.0",
- "hashPath": "system.security.cryptography.openssl.4.3.0.nupkg.sha512"
- },
"System.Security.Cryptography.Pkcs/4.5.2": {
"type": "package",
"serviceable": true,
@@ -2528,13 +1721,6 @@
"path": "system.security.cryptography.pkcs/4.5.2",
"hashPath": "system.security.cryptography.pkcs.4.5.2.nupkg.sha512"
},
- "System.Security.Cryptography.Primitives/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==",
- "path": "system.security.cryptography.primitives/4.3.0",
- "hashPath": "system.security.cryptography.primitives.4.3.0.nupkg.sha512"
- },
"System.Security.Cryptography.ProtectedData/4.5.0": {
"type": "package",
"serviceable": true,
@@ -2542,13 +1728,6 @@
"path": "system.security.cryptography.protecteddata/4.5.0",
"hashPath": "system.security.cryptography.protecteddata.4.5.0.nupkg.sha512"
},
- "System.Security.Cryptography.X509Certificates/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==",
- "path": "system.security.cryptography.x509certificates/4.3.0",
- "hashPath": "system.security.cryptography.x509certificates.4.3.0.nupkg.sha512"
- },
"System.Security.Cryptography.Xml/4.5.0": {
"type": "package",
"serviceable": true,
@@ -2605,19 +1784,12 @@
"path": "system.text.encoding/4.3.0",
"hashPath": "system.text.encoding.4.3.0.nupkg.sha512"
},
- "System.Text.Encoding.CodePages/4.6.0": {
+ "System.Text.Encoding.CodePages/6.0.0": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==",
- "path": "system.text.encoding.codepages/4.6.0",
- "hashPath": "system.text.encoding.codepages.4.6.0.nupkg.sha512"
- },
- "System.Text.Encoding.Extensions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==",
- "path": "system.text.encoding.extensions/4.3.0",
- "hashPath": "system.text.encoding.extensions.4.3.0.nupkg.sha512"
+ "sha512": "sha512-ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==",
+ "path": "system.text.encoding.codepages/6.0.0",
+ "hashPath": "system.text.encoding.codepages.6.0.0.nupkg.sha512"
},
"System.Text.Encodings.Web/6.0.0": {
"type": "package",
@@ -2633,20 +1805,6 @@
"path": "system.text.json/6.0.0",
"hashPath": "system.text.json.6.0.0.nupkg.sha512"
},
- "System.Text.RegularExpressions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==",
- "path": "system.text.regularexpressions/4.3.0",
- "hashPath": "system.text.regularexpressions.4.3.0.nupkg.sha512"
- },
- "System.Threading/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==",
- "path": "system.threading/4.3.0",
- "hashPath": "system.threading.4.3.0.nupkg.sha512"
- },
"System.Threading.AccessControl/4.5.0": {
"type": "package",
"serviceable": true,
@@ -2661,68 +1819,12 @@
"path": "system.threading.tasks/4.3.0",
"hashPath": "system.threading.tasks.4.3.0.nupkg.sha512"
},
- "System.Threading.Tasks.Extensions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==",
- "path": "system.threading.tasks.extensions/4.3.0",
- "hashPath": "system.threading.tasks.extensions.4.3.0.nupkg.sha512"
- },
- "System.Threading.Tasks.Parallel/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-cbjBNZHf/vQCfcdhzx7knsiygoCKgxL8mZOeocXZn5gWhCdzHIq6bYNKWX0LAJCWYP7bds4yBK8p06YkP0oa0g==",
- "path": "system.threading.tasks.parallel/4.3.0",
- "hashPath": "system.threading.tasks.parallel.4.3.0.nupkg.sha512"
- },
- "System.Threading.Thread/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==",
- "path": "system.threading.thread/4.3.0",
- "hashPath": "system.threading.thread.4.3.0.nupkg.sha512"
- },
- "System.ValueTuple/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-cNLEvBX3d6MMQRZe3SMFNukVbitDAEpVZO17qa0/2FHxZ7Y7PpFRpr6m2615XYM/tYYYf0B+WyHNujqIw8Luwg==",
- "path": "system.valuetuple/4.3.0",
- "hashPath": "system.valuetuple.4.3.0.nupkg.sha512"
- },
- "System.Xml.ReaderWriter/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==",
- "path": "system.xml.readerwriter/4.3.0",
- "hashPath": "system.xml.readerwriter.4.3.0.nupkg.sha512"
- },
- "System.Xml.XDocument/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==",
- "path": "system.xml.xdocument/4.3.0",
- "hashPath": "system.xml.xdocument.4.3.0.nupkg.sha512"
- },
- "System.Xml.XmlDocument/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==",
- "path": "system.xml.xmldocument/4.3.0",
- "hashPath": "system.xml.xmldocument.4.3.0.nupkg.sha512"
- },
- "System.Xml.XPath/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-v1JQ5SETnQusqmS3RwStF7vwQ3L02imIzl++sewmt23VGygix04pEH+FCj1yWb+z4GDzKiljr1W7Wfvrx0YwgA==",
- "path": "system.xml.xpath/4.3.0",
- "hashPath": "system.xml.xpath.4.3.0.nupkg.sha512"
- },
- "System.Xml.XPath.XDocument/4.3.0": {
+ "System.Threading.Tasks.Extensions/4.5.3": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-jw9oHHEIVW53mHY9PgrQa98Xo2IZ0ZjrpdOTmtvk+Rvg4tq7dydmxdNqUvJ5YwjDqhn75mBXWttWjiKhWP53LQ==",
- "path": "system.xml.xpath.xdocument/4.3.0",
- "hashPath": "system.xml.xpath.xdocument.4.3.0.nupkg.sha512"
+ "sha512": "sha512-+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==",
+ "path": "system.threading.tasks.extensions/4.5.3",
+ "hashPath": "system.threading.tasks.extensions.4.5.3.nupkg.sha512"
}
}
}
\ No newline at end of file
diff --git a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll
index 78c16b96b8..7499259500 100644
Binary files a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll and b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll differ
diff --git a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll.config b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll.config
index 456612be7d..f1fac6a59c 100644
--- a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll.config
+++ b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll.config
@@ -143,12 +143,6 @@
-
-
-
-
-
-
@@ -173,12 +167,6 @@
-
-
-
-
-
-
@@ -191,18 +179,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -227,24 +203,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -269,12 +233,6 @@
-
-
-
-
-
-
@@ -425,12 +383,6 @@
-
-
-
-
-
-
@@ -443,12 +395,6 @@
-
-
-
-
-
-
@@ -595,25 +541,25 @@
-
+
-
+
-
+
-
+
@@ -641,12 +587,6 @@
-
-
-
-
-
-
@@ -659,12 +599,6 @@
-
-
-
-
-
-
@@ -713,18 +647,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -755,12 +677,6 @@
-
-
-
-
-
-
@@ -797,35 +713,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.exe b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.exe
index 57b54e6d12..32e54a8e24 100644
Binary files a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.exe and b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.exe differ
diff --git a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.pdb b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.pdb
index 9228cee8a1..39f51cf27c 100644
Binary files a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.pdb and b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.pdb differ
diff --git a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/Xpand.XAF.ModelEditor.exe b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/Xpand.XAF.ModelEditor.exe
index 1048be737b..024639b5e7 100644
Binary files a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/Xpand.XAF.ModelEditor.exe and b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/Xpand.XAF.ModelEditor.exe differ
diff --git a/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj b/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj
index b993a1eeef..310668aeb4 100644
--- a/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj
+++ b/Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj
@@ -250,8 +250,8 @@
-
- ..\packages\DevExpress.Data\lib\net452\DevExpress.Data.v22.1.dll
+
+ ..\packages\DevExpress.Data\lib\net452\DevExpress.Data.v22.2.dll
True
True
@@ -261,8 +261,8 @@
-
- ..\packages\DevExpress.Data.Desktop\lib\net452\DevExpress.Data.Desktop.v22.1.dll
+
+ ..\packages\DevExpress.Data.Desktop\lib\net452\DevExpress.Data.Desktop.v22.2.dll
True
True
@@ -272,8 +272,8 @@
-
- ..\packages\DevExpress.Drawing\lib\net452\DevExpress.Drawing.v22.1.dll
+
+ ..\packages\DevExpress.Drawing\lib\net452\DevExpress.Drawing.v22.2.dll
True
True
@@ -283,8 +283,8 @@
-
- ..\packages\DevExpress.Office.Core\lib\net452\DevExpress.Office.v22.1.Core.dll
+
+ ..\packages\DevExpress.Office.Core\lib\net452\DevExpress.Office.v22.2.Core.dll
True
True
@@ -294,8 +294,8 @@
-
- ..\packages\DevExpress.Pdf.Core\lib\net452\DevExpress.Pdf.v22.1.Core.dll
+
+ ..\packages\DevExpress.Pdf.Core\lib\net452\DevExpress.Pdf.v22.2.Core.dll
True
True
@@ -305,8 +305,8 @@
-
- ..\packages\DevExpress.Pdf.Drawing\lib\net452\DevExpress.Pdf.v22.1.Drawing.dll
+
+ ..\packages\DevExpress.Pdf.Drawing\lib\net452\DevExpress.Pdf.v22.2.Drawing.dll
True
True
@@ -316,8 +316,8 @@
-
- ..\packages\DevExpress.PivotGrid.Core\lib\net452\DevExpress.PivotGrid.v22.1.Core.dll
+
+ ..\packages\DevExpress.PivotGrid.Core\lib\net452\DevExpress.PivotGrid.v22.2.Core.dll
True
True
@@ -327,8 +327,8 @@
-
- ..\packages\DevExpress.Printing.Core\lib\net452\DevExpress.Printing.v22.1.Core.dll
+
+ ..\packages\DevExpress.Printing.Core\lib\net452\DevExpress.Printing.v22.2.Core.dll
True
True
@@ -338,8 +338,8 @@
-
- ..\packages\DevExpress.RichEdit.Core\lib\net452\DevExpress.RichEdit.v22.1.Core.dll
+
+ ..\packages\DevExpress.RichEdit.Core\lib\net452\DevExpress.RichEdit.v22.2.Core.dll
True
True
@@ -349,8 +349,8 @@
-
- ..\packages\DevExpress.RichEdit.Export\lib\net452\DevExpress.RichEdit.v22.1.Export.dll
+
+ ..\packages\DevExpress.RichEdit.Export\lib\net452\DevExpress.RichEdit.v22.2.Export.dll
True
True
@@ -360,8 +360,8 @@
-
- ..\packages\DevExpress.Sparkline.Core\lib\net452\DevExpress.Sparkline.v22.1.Core.dll
+
+ ..\packages\DevExpress.Sparkline.Core\lib\net452\DevExpress.Sparkline.v22.2.Core.dll
True
True
@@ -371,8 +371,8 @@
-
- ..\packages\DevExpress.Utils\lib\net452\DevExpress.Utils.v22.1.dll
+
+ ..\packages\DevExpress.Utils\lib\net452\DevExpress.Utils.v22.2.dll
True
True
@@ -382,13 +382,23 @@
-
- ..\packages\DevExpress.Win\lib\net452\DevExpress.XtraNavBar.v22.1.dll
+
+ ..\packages\DevExpress.Win\lib\net452\DevExpress.XtraNavBar.v22.2.dll
True
True
-
- ..\packages\DevExpress.Win\lib\net452\DevExpress.XtraWizard.v22.1.dll
+
+ ..\packages\DevExpress.Win\lib\net452\Design\WinForms\Server\DevExpress.XtraNavBar.v22.2.Design.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win\lib\net452\DevExpress.XtraWizard.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win\lib\net452\Design\WinForms\Server\DevExpress.XtraWizard.v22.2.Design.dll
True
True
@@ -398,8 +408,13 @@
-
- ..\packages\DevExpress.Win.Grid\lib\net452\DevExpress.XtraGrid.v22.1.dll
+
+ ..\packages\DevExpress.Win.Grid\lib\net452\DevExpress.XtraGrid.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.Grid\lib\net452\Design\WinForms\Server\DevExpress.XtraGrid.v22.2.Design.dll
True
True
@@ -409,18 +424,33 @@
-
- ..\packages\DevExpress.Win.Navigation\lib\net452\DevExpress.XtraBars.v22.1.dll
+
+ ..\packages\DevExpress.Win.Navigation\lib\net452\DevExpress.XtraBars.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.Navigation\lib\net452\Design\WinForms\Server\DevExpress.XtraBars.v22.2.Design.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.Navigation\lib\net452\DevExpress.XtraEditors.v22.2.dll
True
True
-
- ..\packages\DevExpress.Win.Navigation\lib\net452\DevExpress.XtraEditors.v22.1.dll
+
+ ..\packages\DevExpress.Win.Navigation\lib\net452\Design\WinForms\Server\DevExpress.XtraEditors.v22.2.Design.dll
True
True
-
- ..\packages\DevExpress.Win.Navigation\lib\net452\DevExpress.XtraLayout.v22.1.dll
+
+ ..\packages\DevExpress.Win.Navigation\lib\net452\DevExpress.XtraLayout.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.Navigation\lib\net452\Design\WinForms\Server\DevExpress.XtraLayout.v22.2.Design.dll
True
True
@@ -430,8 +460,13 @@
-
- ..\packages\DevExpress.Win.PivotGrid\lib\net452\DevExpress.XtraPivotGrid.v22.1.dll
+
+ ..\packages\DevExpress.Win.PivotGrid\lib\net452\DevExpress.XtraPivotGrid.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.PivotGrid\lib\net452\Design\WinForms\Server\DevExpress.XtraPivotGrid.v22.2.Design.dll
True
True
@@ -441,8 +476,13 @@
-
- ..\packages\DevExpress.Win.Printing\lib\net452\DevExpress.XtraPrinting.v22.1.dll
+
+ ..\packages\DevExpress.Win.Printing\lib\net452\DevExpress.XtraPrinting.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.Printing\lib\net452\Design\WinForms\Server\DevExpress.XtraPrinting.v22.2.Design.dll
True
True
@@ -452,8 +492,13 @@
-
- ..\packages\DevExpress.Win.TreeList\lib\net452\DevExpress.XtraTreeList.v22.1.dll
+
+ ..\packages\DevExpress.Win.TreeList\lib\net452\DevExpress.XtraTreeList.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.TreeList\lib\net452\Design\WinForms\Server\DevExpress.XtraTreeList.v22.2.Design.dll
True
True
@@ -463,8 +508,13 @@
-
- ..\packages\DevExpress.Win.VerticalGrid\lib\net452\DevExpress.XtraVerticalGrid.v22.1.dll
+
+ ..\packages\DevExpress.Win.VerticalGrid\lib\net452\DevExpress.XtraVerticalGrid.v22.2.dll
+ True
+ True
+
+
+ ..\packages\DevExpress.Win.VerticalGrid\lib\net452\Design\WinForms\Server\DevExpress.XtraVerticalGrid.v22.2.Design.dll
True
True
diff --git a/Xpand.Plugins/paket.dependencies b/Xpand.Plugins/paket.dependencies
index 223cd97b45..a01c9603c4 100644
--- a/Xpand.Plugins/paket.dependencies
+++ b/Xpand.Plugins/paket.dependencies
@@ -1,12 +1,12 @@
storage: packages
framework: auto-detect
-source C:\Program Files (x86)\DevExpress 22.1\Components\System\Components\Packages
+source C:\Program Files (x86)\DevExpress 22.2\Components\System\Components\Packages
source https://api.nuget.org/v3/index.json
source https://xpandnugetserver.azurewebsites.net/nuget
-nuget DevExpress.ExpressApp.Xpo == 22.1.6
-nuget DevExpress.ExpressApp.Win == 22.1.6
+nuget DevExpress.ExpressApp.Xpo == 22.2.3
+nuget DevExpress.ExpressApp.Win == 22.2.3
nuget Fasterflect.Xpand
nuget Fody 4.2.1
nuget Microsoft.CSharp 4.7.0
diff --git a/Xpand.Plugins/paket.lock b/Xpand.Plugins/paket.lock
index 81edc0727e..a2b8fbdde6 100644
--- a/Xpand.Plugins/paket.lock
+++ b/Xpand.Plugins/paket.lock
@@ -1,248 +1,255 @@
STORAGE: PACKAGES
RESTRICTION: == net472
NUGET
- remote: C:\Program Files (x86)\DevExpress 22.1\Components\System\Components\Packages
- DevExpress.Charts (22.1.6)
- DevExpress.Charts.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.DataVisualization.Core (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Charts.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.CodeParser (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.DataAccess (22.1.6)
- DevExpress.CodeParser (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Office.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.Xpo (22.1.6)
- DevExpress.DataAccess.UI (22.1.6)
- DevExpress.CodeParser (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.DataAccess (22.1.6)
- DevExpress.Diagram.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Utils.UI (22.1.6)
- DevExpress.Win.Diagram (22.1.6)
- DevExpress.Win.Grid (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Win.RichEdit (22.1.6)
- DevExpress.Win.TreeList (22.1.6)
- DevExpress.Xpo (22.1.6)
- DevExpress.DataVisualization.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Diagram.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.ExpressApp (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Images (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.ExpressApp.Win (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.DataAccess.UI (22.1.6)
- DevExpress.ExpressApp (22.1.6)
- DevExpress.Office.Core (22.1.6)
- DevExpress.Persistent.Base (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win (22.1.6)
- DevExpress.Win.BonusSkins (22.1.6)
- DevExpress.Win.Grid (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Win.RichEdit (22.1.6)
- DevExpress.Win.TreeList (22.1.6)
- DevExpress.Win.VerticalGrid (22.1.6)
- DevExpress.ExpressApp.Xpo (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.ExpressApp (22.1.6)
- DevExpress.Xpo (22.1.6)
- DevExpress.Gauges.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Images (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Office.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Pdf.Drawing (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Persistent.Base (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.DataAccess (22.1.6)
- DevExpress.ExpressApp (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Reporting.Core (22.1.6)
- DevExpress.PivotGrid.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Pdf.Drawing (22.1.6)
- DevExpress.Reporting.Core (22.1.6)
- DevExpress.Charts (22.1.6)
- DevExpress.Charts.Core (22.1.6)
- DevExpress.CodeParser (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.DataAccess (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Gauges.Core (22.1.6)
- DevExpress.Office.Core (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Pdf.Drawing (22.1.6)
- DevExpress.PivotGrid.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.RichEdit.Export (22.1.6)
- DevExpress.Sparkline.Core (22.1.6)
- DevExpress.Xpo (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Office.Core (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Export (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Office.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.Sparkline.Core (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils.UI (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.DataAccess (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Win.RichEdit (22.1.6)
- DevExpress.Win.TreeList (22.1.6)
- DevExpress.Win.VerticalGrid (22.1.6)
- DevExpress.Win (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.RichEdit.Export (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Grid (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.PivotGrid (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Win.TreeList (22.1.6)
- DevExpress.Win.VerticalGrid (22.1.6)
- DevExpress.Win.BonusSkins (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Diagram (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Diagram.Core (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Win.VerticalGrid (22.1.6)
- DevExpress.Win.Grid (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Sparkline.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.PivotGrid (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.PivotGrid.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.TreeList (22.1.6)
- DevExpress.Win.RichEdit (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Images (22.1.6)
- DevExpress.Office.Core (22.1.6)
- DevExpress.Pdf.Core (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.RichEdit.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Grid (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
- DevExpress.Win.TreeList (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.VerticalGrid (22.1.6)
- DevExpress.Data (22.1.6)
- DevExpress.Data.Desktop (22.1.6)
- DevExpress.Drawing (22.1.6)
- DevExpress.Printing.Core (22.1.6)
- DevExpress.Utils (22.1.6)
- DevExpress.Win.Navigation (22.1.6)
- DevExpress.Win.Printing (22.1.6)
+ remote: C:\Program Files (x86)\DevExpress 22.2\Components\System\Components\Packages
+ DevExpress.Charts (22.2.3)
+ DevExpress.Charts.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.DataVisualization.Core (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Charts.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.CodeParser (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.DataAccess (22.2.3)
+ DevExpress.CodeParser (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Office.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Xpo (22.2.3)
+ DevExpress.DataAccess.UI (22.2.3)
+ DevExpress.CodeParser (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.DataAccess (22.2.3)
+ DevExpress.Diagram.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Utils.UI (22.2.3)
+ DevExpress.Win.Diagram (22.2.3)
+ DevExpress.Win.Grid (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Win.RichEdit (22.2.3)
+ DevExpress.Win.TreeList (22.2.3)
+ DevExpress.Xpo (22.2.3)
+ DevExpress.DataVisualization.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Diagram.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.ExpressApp (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Images (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.ExpressApp.Win (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.DataAccess.UI (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.ExpressApp (22.2.3)
+ DevExpress.Office.Core (22.2.3)
+ DevExpress.Persistent.Base (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win (22.2.3)
+ DevExpress.Win.BonusSkins (22.2.3)
+ DevExpress.Win.Grid (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Win.RichEdit (22.2.3)
+ DevExpress.Win.TreeList (22.2.3)
+ DevExpress.Win.VerticalGrid (22.2.3)
+ DevExpress.ExpressApp.Xpo (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.ExpressApp (22.2.3)
+ DevExpress.Xpo (22.2.3)
+ DevExpress.Gauges.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Images (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Office.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Pdf.Drawing (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Persistent.Base (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.DataAccess (22.2.3)
+ DevExpress.ExpressApp (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Reporting.Core (22.2.3)
+ DevExpress.PivotGrid.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Pdf.Drawing (22.2.3)
+ DevExpress.Reporting.Core (22.2.3)
+ DevExpress.Charts (22.2.3)
+ DevExpress.Charts.Core (22.2.3)
+ DevExpress.CodeParser (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.DataAccess (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Gauges.Core (22.2.3)
+ DevExpress.Office.Core (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Pdf.Drawing (22.2.3)
+ DevExpress.PivotGrid.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.RichEdit.Export (22.2.3)
+ DevExpress.Sparkline.Core (22.2.3)
+ DevExpress.Xpo (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Office.Core (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Export (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Office.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Sparkline.Core (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Utils.UI (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.DataAccess (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Win.RichEdit (22.2.3)
+ DevExpress.Win.TreeList (22.2.3)
+ DevExpress.Win.VerticalGrid (22.2.3)
+ DevExpress.Win (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.RichEdit.Export (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Grid (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.PivotGrid (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Win.TreeList (22.2.3)
+ DevExpress.Win.VerticalGrid (22.2.3)
+ DevExpress.Win.BonusSkins (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Diagram (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Diagram.Core (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Win.VerticalGrid (22.2.3)
+ DevExpress.Win.Grid (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Sparkline.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.PivotGrid (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.PivotGrid.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.TreeList (22.2.3)
+ DevExpress.Win.RichEdit (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Images (22.2.3)
+ DevExpress.Office.Core (22.2.3)
+ DevExpress.Pdf.Core (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.RichEdit.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Grid (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
+ DevExpress.Win.TreeList (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.VerticalGrid (22.2.3)
+ DevExpress.Data (22.2.3)
+ DevExpress.Data.Desktop (22.2.3)
+ DevExpress.Drawing (22.2.3)
+ DevExpress.Printing.Core (22.2.3)
+ DevExpress.Utils (22.2.3)
+ DevExpress.Win.Navigation (22.2.3)
+ DevExpress.Win.Printing (22.2.3)
remote: https://api.nuget.org/v3/index.json
- DevExpress.Data (22.1.6)
- DevExpress.Xpo (22.1.6)
- DevExpress.Data (22.1.6)
+ DevExpress.Data (22.2.3)
+ DevExpress.Xpo (22.2.3)
+ DevExpress.Data (22.2.3)
EnvDTE (16.10.31320.204)
Microsoft.VisualStudio.SDK.EmbedInteropTypes (>= 15.0.34)
stdole (>= 16.10.31320.204)
diff --git a/Xpand/Directory.Build.targets b/Xpand/Directory.Build.targets
index 83dbcf1b24..4a688e829c 100644
--- a/Xpand/Directory.Build.targets
+++ b/Xpand/Directory.Build.targets
@@ -3,6 +3,6 @@
- 1701;1702;XAF0023;XAF0020;XAF0027;XAF0025
+ 1701;1702;XAF0023;XAF0020;XAF0027;XAF0025;CA1416
\ No newline at end of file
diff --git a/Xpand/Xpand.EasyTest/Xpand.EasyTest.sln b/Xpand/Xpand.EasyTest/Xpand.EasyTest.sln
index 3cf4df54ec..b6bbba3968 100644
--- a/Xpand/Xpand.EasyTest/Xpand.EasyTest.sln
+++ b/Xpand/Xpand.EasyTest/Xpand.EasyTest.sln
@@ -1,20 +1,15 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33122.133
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{A1B4674F-86C7-4100-85B6-AC05DAA69682}"
ProjectSection(SolutionItems) = preProject
..\..\paket.dependencies = ..\..\paket.dependencies
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xpand.EasyTest", "Xpand.EasyTest\Xpand.EasyTest.csproj", "{80DC8CB8-C285-4953-871F-E49002FA10E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.EasyTest", "Xpand.EasyTest\Xpand.EasyTest.csproj", "{80DC8CB8-C285-4953-871F-E49002FA10E8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xpand.ExpressApp.EasyTest.WebAdapter", "Xpand.ExpressApp.EasyTest.WebAdapter\Xpand.ExpressApp.EasyTest.WebAdapter.csproj", "{38E16F8A-517C-4CA9-9775-56F598F25534}"
- ProjectSection(ProjectDependencies) = postProject
- {80DC8CB8-C285-4953-871F-E49002FA10E8} = {80DC8CB8-C285-4953-871F-E49002FA10E8}
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xpand.ExpressApp.EasyTest.WinAdapter", "Xpand.ExpressApp.EasyTest.WinAdapter\Xpand.ExpressApp.EasyTest.WinAdapter.csproj", "{3A83F2D3-A5DD-438A-AD03-041883B1D6AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.EasyTest.WinAdapter", "Xpand.ExpressApp.EasyTest.WinAdapter\Xpand.ExpressApp.EasyTest.WinAdapter.csproj", "{3A83F2D3-A5DD-438A-AD03-041883B1D6AD}"
ProjectSection(ProjectDependencies) = postProject
{80DC8CB8-C285-4953-871F-E49002FA10E8} = {80DC8CB8-C285-4953-871F-E49002FA10E8}
EndProjectSection
@@ -29,10 +24,6 @@ Global
{80DC8CB8-C285-4953-871F-E49002FA10E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80DC8CB8-C285-4953-871F-E49002FA10E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80DC8CB8-C285-4953-871F-E49002FA10E8}.Release|Any CPU.Build.0 = Release|Any CPU
- {38E16F8A-517C-4CA9-9775-56F598F25534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {38E16F8A-517C-4CA9-9775-56F598F25534}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {38E16F8A-517C-4CA9-9775-56F598F25534}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {38E16F8A-517C-4CA9-9775-56F598F25534}.Release|Any CPU.Build.0 = Release|Any CPU
{3A83F2D3-A5DD-438A-AD03-041883B1D6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A83F2D3-A5DD-438A-AD03-041883B1D6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A83F2D3-A5DD-438A-AD03-041883B1D6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -41,4 +32,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {707257D5-4C07-4F1A-803D-DF2D339A76AD}
+ EndGlobalSection
EndGlobal
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/HideScrollbarCommand.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/HideScrollbarCommand.cs
deleted file mode 100644
index 69237842d7..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/HideScrollbarCommand.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using DevExpress.EasyTest.Framework;
-using mshtml;
-
-namespace Xpand.ExpressApp.EasyTest.WebAdapter.Commands {
- public class HideScrollBarCommand : Xpand.EasyTest.Commands.HideScrollBarCommand {
- protected override void InternalExecute(ICommandAdapter adapter){
- base.InternalExecute(adapter);
- var webAdapter = ((XpandWebCommandAdapter) adapter).WebBrowser;
- var webBrowser2 = webAdapter.Browser;
- var document = (IHTMLDocument2)webBrowser2.Document;
- document.body.style.setAttribute("-ms-overflow-style", "none");
- }
- }
-}
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/LogonCommand.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/LogonCommand.cs
deleted file mode 100644
index f1e2f82ce7..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/LogonCommand.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using DevExpress.EasyTest.Framework;
-using DevExpress.ExpressApp.EasyTest.WebAdapter;
-
-namespace Xpand.ExpressApp.EasyTest.WebAdapter.Commands {
- public class LogonCommand:Xpand.EasyTest.Commands.LogonCommand {
- protected override void InternalExecute(ICommandAdapter adapter){
- var webCommandAdapter = ((WebCommandAdapter) adapter);
- var waitTimeoutTime = webCommandAdapter.WaitTimeoutTime;
- webCommandAdapter.WaitTimeoutTime = 120000;
- base.InternalExecute(adapter);
- webCommandAdapter.WaitTimeoutTime=waitTimeoutTime;
- }
- }
-}
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/SetWebMaxWaitTimeOutCommand.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/SetWebMaxWaitTimeOutCommand.cs
deleted file mode 100644
index 7eb405a1fd..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/SetWebMaxWaitTimeOutCommand.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using DevExpress.EasyTest.Framework;
-using DevExpress.ExpressApp.EasyTest.WebAdapter.Commands;
-
-namespace Xpand.ExpressApp.EasyTest.WebAdapter.Commands {
- public class SetWebMaxWaitTimeOutCommand : Xpand.EasyTest.Commands.SetWebMaxWaitTimeOutCommand {
- protected override void InternalExecute(ICommandAdapter adapter){
- var webMaxWaitTimeCommand = new SetMaxWaitTimeoutTimeCommand();
- webMaxWaitTimeCommand.Parameters.Add(new Parameter("Timeout",Parameters.MainParameter.Value,true,StartPosition));
- webMaxWaitTimeCommand.Execute(adapter);
- }
- }
-}
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/XpandCheckValidationResultCommand.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/XpandCheckValidationResultCommand.cs
deleted file mode 100644
index 37c2d905d5..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Commands/XpandCheckValidationResultCommand.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using DevExpress.EasyTest.Framework;
-using DevExpress.ExpressApp.EasyTest.WebAdapter.Commands;
-using Xpand.EasyTest;
-
-namespace Xpand.ExpressApp.EasyTest.WebAdapter.Commands {
- public class XpandCheckValidationResultCommand: Xpand.EasyTest.Commands.XpandCheckValidationResultCommand {
- protected override void InternalExecute(ICommandAdapter adapter){
- var webCheckValidationResultCommand = new WebCheckValidationResultCommand();
- webCheckValidationResultCommand.SynchWith(this);
- webCheckValidationResultCommand.Execute(adapter);
- }
- }
-}
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Extensions.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Extensions.cs
deleted file mode 100644
index 33cffc05b0..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Extensions.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Fasterflect;
-
-namespace Xpand.ExpressApp.EasyTest.WebAdapter {
- public static class Extensions {
- public static void CreateBrowser(this XpandTestWebAdapter adapter,string url) {
- adapter.CallMethod("CreateBrowser", url);
- }
- }
-}
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/IISHelper.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/IISHelper.cs
deleted file mode 100644
index 110a598462..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/IISHelper.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading;
-using DevExpress.EasyTest.Framework;
-using Microsoft.Web.Administration;
-using Microsoft.Win32;
-using Xpand.EasyTest;
-
-namespace Xpand.ExpressApp.EasyTest.WebAdapter {
- public class IISHelper {
-
- public static void Configure(TestApplication testApplication) {
- using (var server = new ServerManager()) {
- var applicationName = GetApplicationName(testApplication);
- var applicationPool = server.ApplicationPools.FirstOrDefault(pool => pool.Name == applicationName) ?? server.ApplicationPools.Add(applicationName);
- applicationPool.ProcessModel.IdentityType = ProcessModelIdentityType.SpecificUser;
- applicationPool.ProcessModel.UserName = GetValueFromRegistry("UserName");
- applicationPool.ProcessModel.Password = GetValueFromRegistry("Password");
-
- var webSite = server.Sites.First(site => site.Name == "Default Web Site");
- var url = GetUrl(webSite, applicationName);
- ConfigureTestApplication(testApplication, url);
- ConfigureSiteApplication(testApplication, webSite, applicationPool, applicationName);
- server.CommitChanges();
- if (applicationPool.State == ObjectState.Started)
- applicationPool.Stop();
- while (applicationPool.State != ObjectState.Stopped) {
- Thread.Sleep(300);
- }
- applicationPool.Start();
- while (applicationPool.State != ObjectState.Started) {
- Thread.Sleep(300);
- }
- }
- }
-
- private static string GetValueFromRegistry(string name) {
- var registryKey = Registry.LocalMachine.OpenSubKey(@"Software\Xpand\ProcessAsUser");
- return registryKey?.GetValue(name).ToString().Split(';')[0];
- }
-
- private static void ConfigureSiteApplication(TestApplication testApplication, Site webSite, ApplicationPool applicationPool, string applicationName) {
- var application = webSite.Applications.FirstOrDefault(application1 => application1.Path.EndsWith(applicationName));
- if (application == null) {
- application = webSite.Applications.CreateElement();
- application["path"] = "/" + applicationName;
- var physicalPath = Path.GetFullPath(testApplication.ParameterValue(ApplicationParams.PhysicalPath));
- application.VirtualDirectories.Add("/", physicalPath);
- webSite.Applications.Add(application);
- application.ApplicationPoolName = applicationPool.Name;
- }
- else {
- application.VirtualDirectories.Clear();
- var physicalPath = Path.GetFullPath(testApplication.ParameterValue(ApplicationParams.PhysicalPath));
- application.VirtualDirectories.Add("/", physicalPath);
- }
-
- }
-
- private static string GetApplicationName(TestApplication testApplication) {
- var userName = testApplication.ParameterValue(ApplicationParams.UserName);
- return userName ?? testApplication.Name;
- }
-
- private static string GetUrl(Site webSite, string applicationName) {
- var binding = webSite.Bindings.First();
- var host = binding.Host;
- if (string.IsNullOrEmpty(host))
- host = "localhost";
- var url = binding.Protocol + "://" + host + ":" + binding.EndPoint.Port + "/" + applicationName;
- return url;
- }
-
- private static void ConfigureTestApplication(TestApplication testApplication, string url) {
- testApplication.SetParameterValue(ApplicationParams.DontRunWebDev, "True");
- testApplication.SetParameterValue(ApplicationParams.DontRunIISExpress, "True");
- testApplication.SetParameterValue(ApplicationParams.DontRestartIIS, "True");
- testApplication.SetParameterValue(ApplicationParams.Url, url);
- }
-
- public static void StopAplicationPool(TestApplication testApplication) {
- var applicationName = GetApplicationName(testApplication);
- using (var serverManager = new ServerManager()) {
- var applicationPool = serverManager.ApplicationPools.First(pool => pool.Name == applicationName);
- applicationPool.Stop();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Properties/AssemblyInfo.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Properties/AssemblyInfo.cs
deleted file mode 100644
index 07e6ad374c..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xpand.ExpressApp.EasyTest.WebAdapter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xpand.ExpressApp.EasyTest.WebAdapter")]
-[assembly: AssemblyCopyright("Copyright © 2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("14e87e2c-acc6-45bf-bf56-865662d32223")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion(XpandAssemblyInfo.Version)]
-[assembly: AssemblyFileVersion(XpandAssemblyInfo.FileVersion)]
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/TestDataBase.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/TestDataBase.cs
deleted file mode 100644
index c2b5914d20..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/TestDataBase.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Xpand.EasyTest.TestDataBase.Operations;
-
-namespace Xpand.ExpressApp.EasyTest {
- public class ASADatabaseOperations : ASADatabaseOperation {
- }
-
- public class LocalDBDatabaseOperations : LocalDBDatabaseOperation {
- }
-
- public class SQLiteDatabaseOperations : SQLiteDatabaseOperation {
- }
-
- public class MySQLDatabaseOperations : MySQLDatabaseOperation {
-
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Xpand.ExpressApp.EasyTest.WebAdapter.csproj b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Xpand.ExpressApp.EasyTest.WebAdapter.csproj
deleted file mode 100644
index 3da72a38e9..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/Xpand.ExpressApp.EasyTest.WebAdapter.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
- net461
- ..\..\Xpand.key\xpand.snk
- true
- true
- ..\..\..\Xpand.DLL\
- latest
- true
- true
- false
- false
- pdbonly
-
-
-
-
- ..\..\..\Xpand.DLL\Xpand.EasyTest.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Utils.dll
- False
-
-
-
-
\ No newline at end of file
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/XpandTestWebAdapter.cs b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/XpandTestWebAdapter.cs
deleted file mode 100644
index 55a4fd5df4..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/XpandTestWebAdapter.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using DevExpress.EasyTest.Framework;
-using DevExpress.EasyTest.Framework.Loggers;
-using DevExpress.ExpressApp.EasyTest.WebAdapter;
-using DevExpress.ExpressApp.EasyTest.WebAdapter.Utils;
-using DevExpress.ExpressApp.EasyTest.WebAdapter.WebServerManagers;
-using Fasterflect;
-using mshtml;
-using Xpand.EasyTest;
-using Xpand.EasyTest.Commands;
-using Xpand.ExpressApp.EasyTest.WebAdapter;
-using Xpand.EasyTest.Automation;
-
-[assembly: Adapter(typeof (XpandTestWebAdapter))]
-
-namespace Xpand.ExpressApp.EasyTest.WebAdapter{
- public class XpandTestWebAdapter : DevExpress.ExpressApp.EasyTest.WebAdapter.WebAdapter, IXpandTestAdapter{
- private XpandWebCommandAdapter _webCommandAdapter;
- private IWebServerManager _serverManager;
-
- public override void RunApplication(TestApplication testApplication,string connectionString){
- XafWebBrowser.OperationMillisecondsTimeout = 60000*2;
- testApplication.Assign();
- testApplication.CreateParametersFile();
- testApplication.DeleteUserModel();
- testApplication.DropDatabases();
- testApplication.CopyModel();
- ConfigApplicationModel(testApplication);
- if (testApplication.ParameterValue(ApplicationParams.UseIIS)) {
- IISHelper.Configure(testApplication);
- }
- base.RunApplication(testApplication,connectionString);
-
- WebBrowser.BrowserWindowHandle.MoveWindow(new Rectangle(0,0,1024,768));
- }
-
-
- private void ConfigApplicationModel(TestApplication testApplication){
- var physicalPath = testApplication.ParameterValue(ApplicationParams.PhysicalPath);
- var useModel = testApplication.ParameterValue(ApplicationParams.UseModel);
- if (useModel){
- var logPath = Logger.Instance.GetLogger().LogPath;
- var model = Directory.GetFiles(logPath, "*.xafml").Single();
- File.Copy(Path.Combine(physicalPath, "Model.xafml"), Path.Combine(physicalPath, "restore.xafml"), true);
- File.Copy(model, Path.Combine(physicalPath, "Model.xafml"), true);
- }
- else{
- if (File.Exists(Path.Combine(physicalPath, "restore.xafml"))){
- File.Copy(Path.Combine(physicalPath, "restore.xafml"), Path.Combine(physicalPath, "Model.xafml"), true);
- File.Delete(Path.Combine(physicalPath, "restore.xafml"));
- }
- }
- }
-
-
- public override ICommandAdapter CreateCommandAdapter(){
- _webCommandAdapter = new XpandWebCommandAdapter(WebBrowser,_serverManager);
- Win32Helper.MoveMousePointTo(new Point(0, 0));
- return _webCommandAdapter;
- }
-
- protected override IWebServerManager CreateWebServerManager(Uri url, TestApplication testApplication){
- _serverManager = base.CreateWebServerManager(url, testApplication);
- return _serverManager;
- }
-
- public override void KillApplication(TestApplication testApplication, KillApplicationContext context){
- KillApplicationBase(context);
- testApplication.ClearModel();
- testApplication.DeleteParametersFile();
- ScreenCaptureCommand.Stop(false);
- if (testApplication.ParameterValue(ApplicationParams.UseIIS))
- IISHelper.StopAplicationPool(testApplication);
- }
-
- private void KillApplicationBase(KillApplicationContext context){
- this.CallMethod("CloseWebBrowser");
- _serverManager?.ProcessKillApplication(context);
- }
-
- public override void RegisterCommands(IRegisterCommand registrator){
- base.RegisterCommands(registrator);
- registrator.RegisterCommands(this);
- registrator.RegisterCommand(HideScrollBarCommand.Name, typeof (Commands.HideScrollBarCommand));
- registrator.RegisterCommand(SetWebMaxWaitTimeOutCommand.Name, typeof(Commands.SetWebMaxWaitTimeOutCommand));
- registrator.RegisterCommand(XpandCheckValidationResultCommand.Name, typeof(Commands.XpandCheckValidationResultCommand));
- registrator.RegisterCommand(LogonCommand.Name, typeof(Commands.LogonCommand));
- }
-
- }
-
- public class XpandWebCommandAdapter : WebCommandAdapter,IXpandEasyTestCommandAdapter{
- private readonly IEasyTestWebBrowser _webBrowser;
-
- public XpandWebCommandAdapter(IEasyTestWebBrowser webBrowser, IWebServerManager serverManager) : base(webBrowser,serverManager){
- _webBrowser = webBrowser;
- }
-
- public XpandEasyTestWebBrowser WebBrowser => new XpandEasyTestWebBrowser(_webBrowser);
-
- public IntPtr MainWindowHandle => _webBrowser.BrowserWindowHandle;
-
-
- }
-
- public interface IWebBrowser2 {
- IHTMLDocument2 Document { get; }
- }
- public class XpandEasyTestWebBrowser:IEasyTestWebBrowser{
- private readonly IEasyTestWebBrowser _easyTestWebBrowser;
-
- public XpandEasyTestWebBrowser(IEasyTestWebBrowser easyTestWebBrowser){
- _easyTestWebBrowser = easyTestWebBrowser;
- }
-
- public IWebBrowser2 Browser => (IWebBrowser2) _easyTestWebBrowser.GetPropertyValue("InternetExplorer");
-
- public void Navigate(string url){
- _easyTestWebBrowser.Navigate(url);
- }
-
- public void Refresh(){
- _easyTestWebBrowser.Refresh();
- }
-
- public void GoBack(){
- _easyTestWebBrowser.GoBack();
- }
-
- public void GoForward(){
- _easyTestWebBrowser.GoForward();
- }
-
- public void SetWindowSize(int width, int height){
- _easyTestWebBrowser.SetWindowSize(width, height);
- }
-
- public object ExecuteScript(string script){
- return _easyTestWebBrowser.ExecuteScript(script);
- }
-
- public void Close(){
- _easyTestWebBrowser.Close();
- }
-
- public IntPtr BrowserWindowHandle => _easyTestWebBrowser.BrowserWindowHandle;
-
- public IntPtr DialogWindowHandle => _easyTestWebBrowser.DialogWindowHandle;
- public IEasyTestAlert Alert { get; set; }
- }
-}
diff --git a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/paket.references b/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/paket.references
deleted file mode 100644
index 3b631139f0..0000000000
--- a/Xpand/Xpand.EasyTest/Xpand.ExpressApp.EasyTest.WebAdapter/paket.references
+++ /dev/null
@@ -1,5 +0,0 @@
-DevExpress.ExpressApp.Easytest.WebAdapter
-IIS.Microsoft.Web.Adminstration
-Unofficial.Microsoft.mshtml
-Fasterflect.Xpand
-System.ValueTuple
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/AdditionalViewControlsProviderAspNetModule.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/AdditionalViewControlsProviderAspNetModule.cs
deleted file mode 100644
index 2e69449b47..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/AdditionalViewControlsProviderAspNetModule.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.ComponentModel;
-using System.Drawing;
-using DevExpress.Utils;
-using Xpand.Persistent.Base.General;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web {
- [ToolboxBitmap(typeof(AdditionalViewControlsProviderAspNetModule))]
- [ToolboxItem(true)]
- [ToolboxTabName(XpandAssemblyInfo.TabAspNetModules)]
- public class AdditionalViewControlsProviderAspNetModule : XpandModuleBase {
- public AdditionalViewControlsProviderAspNetModule() {
- RequiredModuleTypes.Add(typeof(AdditionalViewControlsModule));
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/UpdateModelViewController.Designer.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/UpdateModelViewController.Designer.cs
deleted file mode 100644
index 5a01a0139e..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/UpdateModelViewController.Designer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controller
-{
- partial class UpdateModelViewController
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
- }
-
- #endregion
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/UpdateModelViewController.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/UpdateModelViewController.cs
deleted file mode 100644
index 55a5800a1a..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/UpdateModelViewController.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controls;
-using eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Decorators;
-
-namespace eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controller
-{
- public partial class UpdateModelViewController : Controllers.UpdateModelViewController
- {
- public UpdateModelViewController()
- {
- InitializeComponent();
- RegisterActions(components);
- }
-
- protected override Type GetDefaultControlType()
- {
- return typeof(HintPanel);
- }
-
- protected override Type GetDefaultDecoratorType()
- {
- return typeof(WebHintPanelDecorator);
- }
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebControlsController.Designer.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebControlsController.Designer.cs
deleted file mode 100644
index 729360a543..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebControlsController.Designer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controller
-{
- partial class WebControlsController
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebControlsController.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebControlsController.cs
deleted file mode 100644
index d3cc183296..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebControlsController.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using DevExpress.ExpressApp;
-using eXpand.ExpressApp.AdditionalViewControlsProvider.Controllers;
-using eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controls;
-using eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Decorators;
-
-namespace eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controller
-{
- public partial class WebControlsController : ViewController, IAdditionalViewControlsProvider
- {
- protected override void OnActivated()
- {
- base.OnActivated();
- Frame.GetController().Register(this, View, Frame);
- }
- protected override void OnDeactivating()
- {
- Frame.GetController().Unregister(this);
- base.OnDeactivating();
- }
-
- public object CreateControl()
- {
- return new HintPanel();
- }
-
- public AdditionalViewControlsProviderDecorator DecorateControl(object control)
- {
- return new WebHintPanelDecorator(View, (HintPanel) control);
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebShowAdditionalViewControlsController.Designer.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebShowAdditionalViewControlsController.Designer.cs
deleted file mode 100644
index 8530cf4b94..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebShowAdditionalViewControlsController.Designer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controller
-{
- partial class WebShowAdditionalViewControlsController
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebShowAdditionalViewControlsController.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebShowAdditionalViewControlsController.cs
deleted file mode 100644
index e57a148d85..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controller/WebShowAdditionalViewControlsController.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Web.UI;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Templates;
-using eXpand.ExpressApp.AdditionalViewControlsProvider.Controllers;
-using eXpand.ExpressApp.Web.Core;
-
-namespace eXpand.ExpressApp.AdditionalViewControlsProvider.Web.Controller
-{
- public partial class WebShowAdditionalViewControlsController : AdditionalViewControlsProviderController
- {
- private void Window_TemplateChanged(object sender, EventArgs e)
- {
-
- var template = Window.Template as ISupportViewControlAdding;
- if (template != null)
- {
- template.ViewControlAdding += template_ViewControlAdding;
- ((Control)template).Unload += WebShowAdditionalInfoController_Unload;
- }
- else if (Window.Context == TemplateContext.PopupWindow && Window.Template != null)
- Window.View.ControlsCreated +=
- (o, args) => AddControls((Window.View.Control));
- }
-
- public override void Unregister(IAdditionalViewControlsProvider controlProvider){
- base.Unregister(controlProvider);
- }
-
- public override void Register(IAdditionalViewControlsProvider controlProvider, View view, Frame frame){
- if (view is DetailView || !((ListView)view).IsNested(frame))
- base.Register(controlProvider, view, frame);
- }
-
- private void WebShowAdditionalInfoController_Unload(object sender, EventArgs e)
- {
- ClearControls();
- }
- private void template_ViewControlAdding(object sender, EventArgs e)
- {
- AddControls();
- }
- protected override void AddControlOnTemplate(object viewSiteControl, object control,AdditionalViewControlsProviderPosition position)
- {
- ControlCollection collection = ((Control)viewSiteControl).Controls;
- if (position == AdditionalViewControlsProviderPosition.Top)
- collection.AddAt(0, (Control) control);
- else
- collection.Add((Control) control);
- }
- protected override void OnActivated()
- {
- base.OnActivated();
- Window.TemplateChanged += Window_TemplateChanged;
- }
- protected override void OnDeactivating()
- {
- Window.TemplateChanged -= Window_TemplateChanged;
- base.OnDeactivating();
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/HintPanel.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/HintPanel.cs
deleted file mode 100644
index b8aeb6b027..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/HintPanel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Xpand.Persistent.Base.AdditionalViewControls;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Controls {
-
- public class HintPanel : HintPanelBase, IAdditionalViewControl {
- public IAdditionalViewControlsRule Rule {get;set;}
- }
-
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/HintPanelBase.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/HintPanelBase.cs
deleted file mode 100644
index 4bf839c999..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/HintPanelBase.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Drawing;
-using System.Web.UI.WebControls;
-using DevExpress.Web;
-using Xpand.Persistent.Base.AdditionalViewControls;
-using FontStyle = Xpand.Persistent.Base.AdditionalViewControls.FontStyle;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Controls {
- public class HintPanelBase : ASPxPanel, ISupportAppeareance {
- private readonly ASPxLabel _label;
-
- public HintPanelBase() {
- Paddings.PaddingBottom = 8;
- var innerHintPanel = new ASPxPanel();
- Controls.Add(innerHintPanel);
-
- _label = new ASPxLabel { EncodeHtml = false };
- innerHintPanel.Controls.Add(_label);
- }
-
- public ASPxLabel Label => _label;
-
- Color? ISupportAppeareance.BackColor {
- get { return BackColor; }
- set {
- if (value.HasValue)
- BackColor = value.Value;
- }
- }
-
- Color? ISupportAppeareance.ForeColor {
- get { return ForeColor; }
- set {
- if (value.HasValue)
- ForeColor = value.Value;
- }
- }
-
- FontStyle? ISupportAppeareance.FontStyle {
- get {
- if (Font.Italic)
- return FontStyle.Italic;
- if (Font.Bold)
- return FontStyle.Bold;
- if (Font.Strikeout)
- return FontStyle.Strikeout;
- return FontStyle.Regular;
- }
- set {
- if (value.HasValue) {
- Font.Italic = value == FontStyle.Italic;
- Font.Strikeout = value == FontStyle.Strikeout;
- Font.Bold = value == FontStyle.Bold;
- }
- }
- }
-
- int? ISupportAppeareance.Height {
- get {
- if (Height != Unit.Empty)
- return (int?)Height.Value;
- return null;
- }
- set {
- if (value.HasValue)
- Height = Unit.Pixel(value.Value);
- }
- }
-
- int? ISupportAppeareance.FontSize {
- get {
- FontUnit fontUnit = Font.Size;
- return (int?)fontUnit.Unit.Value;
- }
- set {
- if (value.HasValue) {
- Label.Font.Size = FontUnit.Point(value.Value);
- }
- }
- }
-
- string ISupportAppeareance.ImageName
- {
- get; set;
- }
-
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/WarningPanel.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/WarningPanel.cs
deleted file mode 100644
index 0398fa3d43..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Controls/WarningPanel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Xpand.ExpressApp.AdditionalViewControlsProvider.Editors;
-using Xpand.Persistent.Base.AdditionalViewControls;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Controls {
- public class WarningPanel : HintPanelBase, ISupportLayoutManager, IAdditionalViewControl {
- object ISupportLayoutManager.LayoutItem { get; set; }
-
- public IAdditionalViewControlsRule Rule { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Decorators/WebHintPanelDecorator.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Decorators/WebHintPanelDecorator.cs
deleted file mode 100644
index 7f0b1e9764..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Decorators/WebHintPanelDecorator.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Web.UI;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Editors;
-using Xpand.ExpressApp.AdditionalViewControlsProvider.Editors;
-using Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Controls;
-using Xpand.Persistent.Base.AdditionalViewControls;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Decorators {
-
- [TypeDecorator(typeof(WarningPanel), typeof(WarningPanel), true, Position = Position.DetailViewItem)]
- [TypeDecorator(typeof(HintPanel), typeof(HintPanel), true)]
- public class WebHintPanelDecorator : AdditionalViewControlsProviderDecorator {
- HintPanelBase _hintPanelBase;
-
- private void hintPanel_Unload(object sender, EventArgs e) {
- _hintPanelBase = null;
- Dispose();
- }
- private void hintPanel_Disposed(object sender, EventArgs e) {
- _hintPanelBase = null;
- Dispose();
- }
- protected override void SetText(string text) {
- if (_hintPanelBase != null) {
- _hintPanelBase.Label.Text = text;
- var visible = !string.IsNullOrEmpty(_hintPanelBase.Label.Text);
- _hintPanelBase.Visible = visible;
- var supportLayoutManager = _hintPanelBase as ISupportLayoutManager;
- if (supportLayoutManager != null) {
- ((Control)((ViewItem)(supportLayoutManager).LayoutItem).Control).Visible = visible;
- }
- }
- }
- public WebHintPanelDecorator(View view, HintPanelBase hintPanelBase, IAdditionalViewControlsRule controlsRule)
- : base(view, hintPanelBase, controlsRule) {
- _hintPanelBase = hintPanelBase;
- hintPanelBase.Unload += hintPanel_Unload;
- hintPanelBase.Disposed += hintPanel_Disposed;
- UpdateText();
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Editors/AdditionalViewControlsItem.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Editors/AdditionalViewControlsItem.cs
deleted file mode 100644
index b53835c32b..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Editors/AdditionalViewControlsItem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Web.UI.WebControls;
-using DevExpress.ExpressApp.Editors;
-using Xpand.ExpressApp.AdditionalViewControlsProvider.Editors;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Editors {
-
- [ViewItem(typeof(IModelAdditionalViewControlsItem))]
- public class AdditionalViewControlsItem : AdditionalViewControlsProvider.Editors.AdditionalViewControlsItem {
-
- public AdditionalViewControlsItem(Type objectType, string id)
- : base(objectType, id) {
- }
-
- public AdditionalViewControlsItem(IModelAdditionalViewControlsItem model, Type objectType)
- : base(model, objectType) {
- }
-
- protected override object CreateControlCore() {
- return new Panel();
- }
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Logic/AdditionalViewControlsRuleViewController.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Logic/AdditionalViewControlsRuleViewController.cs
deleted file mode 100644
index 1797079658..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Logic/AdditionalViewControlsRuleViewController.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Web.UI;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Web.Layout;
-using DevExpress.Web;
-using Xpand.ExpressApp.Logic;
-using Xpand.Persistent.Base.AdditionalViewControls;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Logic {
- public interface ISupportAdditionalViewControls {
- ASPxCallbackPanel TopPanel { get; }
- ASPxCallbackPanel BottomPanel { get; }
- ASPxGlobalEvents AsPxGlobalEvents { get; }
- }
-
- public class AdditionalViewControlsRuleViewController : AdditionalViewControlsProvider.Logic.AdditionalViewControlsRuleViewController {
- protected override Type GetControlType(){
- return typeof (Control);
- }
-
- protected override void AddControl(object control, object controls, LogicRuleInfo info) {
- base.AddControl(control, controls, info);
- var rule = (IAdditionalViewControlsRule) info.Rule;
- if (rule.Position != Position.DetailViewItem) {
- var supportAdditionalViewControls = Frame.Template as ISupportAdditionalViewControls;
- if (supportAdditionalViewControls != null) {
- var asPxCallbackPanel = supportAdditionalViewControls.TopPanel;
- if (rule.Position == Position.Bottom)
- asPxCallbackPanel = supportAdditionalViewControls.BottomPanel;
- var control1 = ((Control)control);
- control1.Visible = info.Active;
- asPxCallbackPanel.Controls.Add(control1);
- ModifyClientEvent(supportAdditionalViewControls.AsPxGlobalEvents, info);
- }
- }
-
- }
- protected override void OnActivated() {
- base.OnActivated();
- if (HasRules && View is DetailView) {
- ResetInfoToLayoutMap();
- var detailView = ((DetailView)View);
- var winLayoutManager = ((WebLayoutManager)detailView.LayoutManager);
- winLayoutManager.ItemCreated += OnItemCreated;
- }
- }
-
- void OnItemCreated(object sender, ItemCreatedEventArgs itemCreatedEventArgs) {
- FillInfoToLayoutMap(itemCreatedEventArgs.ViewItem, itemCreatedEventArgs.ModelLayoutElement, itemCreatedEventArgs.ViewItem);
- }
-
-
- void ModifyClientEvent(ASPxGlobalEvents asPxGlobalEvents, LogicRuleInfo info) {
- asPxGlobalEvents.ClientSideEvents.EndCallback = info.Active
- ? "function(s, e) { DXUpdateSplitterSize();DXMoveFooter(); if(s != TopCallBackPanel&&s != BottomCallBackPanel) {TopCallBackPanel.PerformCallback();BottomCallBackPanel.PerformCallback();}; }"
- : "function(s, e) { DXUpdateSplitterSize();DXMoveFooter(); }";
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Model.DesignedDiffs.xafml b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Model.DesignedDiffs.xafml
deleted file mode 100644
index 399a207d77..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Model.DesignedDiffs.xafml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/NodeUpdaters/AdditionalViewControlsDefaultContextNodeUpdater.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/NodeUpdaters/AdditionalViewControlsDefaultContextNodeUpdater.cs
deleted file mode 100644
index 5d55a1a365..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/NodeUpdaters/AdditionalViewControlsDefaultContextNodeUpdater.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using DevExpress.ExpressApp.Model.Core;
-using eXpand.ExpressApp.AdditionalViewControlsProvider.Model;
-using eXpand.ExpressApp.Logic;
-using eXpand.ExpressApp.Logic.Model;
-using eXpand.ExpressApp.Logic.NodeUpdaters;
-
-namespace eXpand.ExpressApp.AdditionalViewControlsProvider.Web.NodeUpdaters {
- public class AdditionalViewControlsDefaultContextNodeUpdater : LogicDefaultContextNodeUpdater {
- protected override List GetExecutionContexts() {
- return new List { ExecutionContext.ViewControlAdding };
- }
-
- protected override IModelLogic GetModelLogicNode(ModelNode node) {
- return ((IModelApplicationAdditionalViewControls) node.Application).AdditionalViewControls;
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Properties/AssemblyInfo.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Properties/AssemblyInfo.cs
deleted file mode 100644
index 76ffb62026..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xpand.ExpressApp.AdditionalViewControlsProvider.Web")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("-")]
-[assembly: AssemblyProduct("Xpand.ExpressApp.AdditionalViewControlsProvider.Web")]
-[assembly: AssemblyCopyright("Copyright � - 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyMetadata("Platform","Web")]
-[assembly: AssemblyVersion(XpandAssemblyInfo.Version)]
-[assembly: AssemblyFileVersion(XpandAssemblyInfo.FileVersion)]
-
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/ControlTypeConverter.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/ControlTypeConverter.cs
deleted file mode 100644
index 8e519d32bc..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/ControlTypeConverter.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Web.UI;
-using Xpand.ExpressApp.AdditionalViewControlsProvider.Security;
-using Xpand.Persistent.Base.General.Controllers;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Security {
- public class ControlTypeConverter:XpandReferenceConverter {
- protected override Type GetTypeInfo() {
- return typeof(Control);
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/DecoratorTypeConverter.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/DecoratorTypeConverter.cs
deleted file mode 100644
index 4f5de93864..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/DecoratorTypeConverter.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using Xpand.Persistent.Base.General.Controllers;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Security {
- public class DecoratorTypeConverter:XpandReferenceConverter {
- protected override Type GetTypeInfo() {
- return typeof(AdditionalViewControlsProviderDecorator);
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/UpdateDecoratorTypeTypeConverterController.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/UpdateDecoratorTypeTypeConverterController.cs
deleted file mode 100644
index 3bf861efa8..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Security/UpdateDecoratorTypeTypeConverterController.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Xpand.ExpressApp.AdditionalViewControlsProvider.Security.Improved;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web.Security {
- public class UpdateDecoratorTypeTypeConverterController : UpdateDecoratorTypeTypeConverterController {
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Updater.cs b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Updater.cs
deleted file mode 100644
index be058355d5..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Updater.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Updating;
-
-namespace Xpand.ExpressApp.AdditionalViewControlsProvider.Web {
- public class Updater : ModuleUpdater {
- public Updater(IObjectSpace objectSpace, Version currentDBVersion)
- : base(objectSpace, currentDBVersion) {
- }
-
- public override void UpdateDatabaseAfterUpdateSchema() {
- base.UpdateDatabaseAfterUpdateSchema();
- }
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Xpand.ExpressApp.AdditionalViewControlsProvider.Web.csproj b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Xpand.ExpressApp.AdditionalViewControlsProvider.Web.csproj
deleted file mode 100644
index 60613be7d4..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/Xpand.ExpressApp.AdditionalViewControlsProvider.Web.csproj
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
- net461
- ..\..\Xpand.key\xpand.snk
- true
- ..\..\..\Xpand.DLL\
- latest
- true
- true
- false
- false
- pdbonly
-
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.AdditionalViewControlsProvider.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Logic.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Security.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Web.dll
- False
-
-
-
- ..\..\..\Xpand.DLL\Xpand.Persistent.Base.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Utils.dll
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/paket.references b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/paket.references
deleted file mode 100644
index 671e19564f..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Web/paket.references
+++ /dev/null
@@ -1,8 +0,0 @@
-System.ValueTuple
-DevExpress.ExpressApp.Xpo
-DevExpress.ExpressApp.Objects
-DevExpress.ExpressApp.Validation
-DevExpress.ExpressApp.Web
-DevExpress.Document.Processor
-DevExpress.ExpressApp.CodeAnalysis
-
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/Xpand.ExpressApp.AdditionalViewControlsProvider.Win.csproj b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/Xpand.ExpressApp.AdditionalViewControlsProvider.Win.csproj
index 9d4e6a2c9c..cc2d677abe 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/Xpand.ExpressApp.AdditionalViewControlsProvider.Win.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/Xpand.ExpressApp.AdditionalViewControlsProvider.Win.csproj
@@ -1,7 +1,7 @@
- net461;net6.0-windows7.0
+ net6.0-windows7.0
true
..\..\Xpand.key\xpand.snk
true
@@ -10,7 +10,7 @@
true
true
false
- true
+ false
pdbonly
True
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/paket.references b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/paket.references
index e3e7f23339..235746faf7 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider.Win/paket.references
@@ -1,4 +1,4 @@
System.ValueTuple
DevExpress.ExpressApp.Win
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj
index 55b3978c62..4632b0159d 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/Xpand.ExpressApp.AdditionalViewControlsProvider.csproj
@@ -1,7 +1,7 @@
- netstandard2.0
+ net6.0
..\..\Xpand.key\xpand.snk
true
..\..\..\Xpand.DLL\
diff --git a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/paket.references b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/paket.references
index e4374f0968..1ea755e7ee 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/AdditionalViewControlsProvider/paket.references
@@ -1,5 +1,5 @@
DevExpress.ExpressApp.Security.Xpo
Xpand.XAF.Modules.ModelViewInheritance
Xpand.Extensions.XAF.Xpo
-DevExpress.ExpressApp.CodeAnalysis
+
System.ComponentModel.Annotations
diff --git a/Xpand/Xpand.ExpressApp.Modules/AllModules.sln b/Xpand/Xpand.ExpressApp.Modules/AllModules.sln
index ccdeae3bd8..dc76d4e4cc 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AllModules.sln
+++ b/Xpand/Xpand.ExpressApp.Modules/AllModules.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28917.182
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33122.133
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{EB1D042D-5DDB-456D-AD0F-3D2C3792C311}"
ProjectSection(SolutionItems) = preProject
@@ -17,13 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Additional
{8A0EECEA-F699-40BA-B8F9-D70F79E9130B} = {8A0EECEA-F699-40BA-B8F9-D70F79E9130B}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.AdditionalViewControlsProvider.Web", "AdditionalViewControlsProvider.Web\Xpand.ExpressApp.AdditionalViewControlsProvider.Web.csproj", "{D33DA85F-C92D-4A13-9880-B6A5343B957D}"
- ProjectSection(ProjectDependencies) = postProject
- {B3216F6A-B4C6-4899-9D42-398CDF0CA91E} = {B3216F6A-B4C6-4899-9D42-398CDF0CA91E}
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8} = {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B} = {BAD55FD1-7A64-4A38-894D-5C18895EB76B}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.AdditionalViewControlsProvider.Win", "AdditionalViewControlsProvider.Win\Xpand.ExpressApp.AdditionalViewControlsProvider.Win.csproj", "{9C2D3690-C7EB-46C4-83CC-F1D597E0CD2C}"
ProjectSection(ProjectDependencies) = postProject
{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9} = {50DF1466-D5B2-40FC-B91E-B212E4A7F4A9}
@@ -40,15 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Security",
{3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6} = {3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Security.Web", "Security.Web\Xpand.ExpressApp.Security.Web.csproj", "{BAD55FD1-7A64-4A38-894D-5C18895EB76B}"
- ProjectSection(ProjectDependencies) = postProject
- {B964E541-EBA2-4971-B104-A99ABBD95D36} = {B964E541-EBA2-4971-B104-A99ABBD95D36}
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8} = {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {3FA72CCB-7AA9-4CE6-B3BD-CE6554B2D4D7} = {3FA72CCB-7AA9-4CE6-B3BD-CE6554B2D4D7}
- {3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6} = {3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Security.Win", "Security.Win\Xpand.ExpressApp.Security.Win.csproj", "{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9}"
ProjectSection(ProjectDependencies) = postProject
{B964E541-EBA2-4971-B104-A99ABBD95D36} = {B964E541-EBA2-4971-B104-A99ABBD95D36}
@@ -101,14 +85,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.XtraDashbo
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HtmlPropertyEditor", "HtmlPropertyEditor", "{3F42AFC8-B356-4721-9822-241E1D872393}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.HtmlPropertyEditor.Web", "HtmlPropertyEditor.Web\Xpand.ExpressApp.HtmlPropertyEditor.Web.csproj", "{71319B74-CCF9-4171-B79B-1F9F1C89F4F7}"
- ProjectSection(ProjectDependencies) = postProject
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {D38722E2-F2CD-47D3-9203-1AC8070BBE2E} = {D38722E2-F2CD-47D3-9203-1AC8070BBE2E}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImportWizard", "ImportWizard", "{3A4A541B-39DD-49F4-B0F8-0EA112D063A4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.ImportWizard", "ImportWizard\Xpand.ExpressApp.ImportWizard.csproj", "{C0BAAF0F-9FE6-4D7D-98DC-D163EEC7B87E}"
@@ -130,12 +106,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.IO", "IO\X
{8A0EECEA-F699-40BA-B8F9-D70F79E9130B} = {8A0EECEA-F699-40BA-B8F9-D70F79E9130B}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.IO.Web", "IO.Web\Xpand.ExpressApp.IO.Web.csproj", "{67045B46-0875-497F-BF4E-4E74CEF4FF27}"
- ProjectSection(ProjectDependencies) = postProject
- {32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6} = {32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.IO.Win", "IO.Win\Xpand.ExpressApp.IO.Win.csproj", "{EC481968-1696-43E4-837F-BCF08F393323}"
ProjectSection(ProjectDependencies) = postProject
{32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6} = {32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6}
@@ -153,12 +123,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Validation
{3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6} = {3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Validation.Web", "Validation.Web\Xpand.ExpressApp.Validation.Web.csproj", "{19906D61-635D-4FF3-954E-9158CC848E5E}"
- ProjectSection(ProjectDependencies) = postProject
- {B2BC7237-E245-4619-A041-841CBB395E10} = {B2BC7237-E245-4619-A041-841CBB395E10}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Validation.Win", "Validation.Win\Xpand.ExpressApp.Validation.Win.csproj", "{84F8D818-91BC-48DB-9B6C-7E71A82CA635}"
ProjectSection(ProjectDependencies) = postProject
{B2BC7237-E245-4619-A041-841CBB395E10} = {B2BC7237-E245-4619-A041-841CBB395E10}
@@ -174,14 +138,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.ModelDiffe
{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9} = {50DF1466-D5B2-40FC-B91E-B212E4A7F4A9}
{3D13CAAC-A265-4A02-97CB-6C9121D7514D} = {3D13CAAC-A265-4A02-97CB-6C9121D7514D}
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B} = {BAD55FD1-7A64-4A38-894D-5C18895EB76B}
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.ModelDifference.Web", "ModelDifference.Web\Xpand.ExpressApp.ModelDifference.Web.csproj", "{05E856F4-5329-4DB4-8C7E-8B63F24F6506}"
- ProjectSection(ProjectDependencies) = postProject
- {8D97AC44-202D-4659-8CB0-6D8DCC796156} = {8D97AC44-202D-4659-8CB0-6D8DCC796156}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B} = {BAD55FD1-7A64-4A38-894D-5C18895EB76B}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.ModelDifference.Win", "ModelDifference.Win\Xpand.ExpressApp.ModelDifference.Win.csproj", "{88207755-7F6B-4B53-9358-190364299985}"
@@ -199,7 +155,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.MasterDeta
{B964E541-EBA2-4971-B104-A99ABBD95D36} = {B964E541-EBA2-4971-B104-A99ABBD95D36}
{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9} = {50DF1466-D5B2-40FC-B91E-B212E4A7F4A9}
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B} = {BAD55FD1-7A64-4A38-894D-5C18895EB76B}
{D38722E2-F2CD-47D3-9203-1AC8070BBE2E} = {D38722E2-F2CD-47D3-9203-1AC8070BBE2E}
EndProjectSection
EndProject
@@ -212,19 +167,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.MasterDeta
{D38722E2-F2CD-47D3-9203-1AC8070BBE2E} = {D38722E2-F2CD-47D3-9203-1AC8070BBE2E}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NCarousel", "NCarousel", "{62EF5F5C-756E-4A81-A13F-8579539E8580}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.NCarousel", "NCarousel\Xpand.NCarousel.csproj", "{E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}"
- ProjectSection(ProjectDependencies) = postProject
- {3FA72CCB-7AA9-4CE6-B3BD-CE6554B2D4D7} = {3FA72CCB-7AA9-4CE6-B3BD-CE6554B2D4D7}
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.NCarousel.Web", "NCarousel.Web\Xpand.ExpressApp.NCarousel.Web.csproj", "{5F6908F4-2505-4C37-BD49-EC98A6CB103A}"
- ProjectSection(ProjectDependencies) = postProject
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA} = {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PivotChart", "PivotChart", "{5A865BBD-D6F6-4B01-A867-2D4B0B807EE4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.PivotChart", "PivotChart\Xpand.ExpressApp.PivotChart.csproj", "{2626A753-BFA4-4616-BF32-00D7D7AC4174}"
@@ -236,12 +178,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.PivotChart
{8A0EECEA-F699-40BA-B8F9-D70F79E9130B} = {8A0EECEA-F699-40BA-B8F9-D70F79E9130B}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.PivotChart.Web", "PivotChart.Web\Xpand.ExpressApp.PivotChart.Web.csproj", "{0D81BAF7-CC13-411C-BC50-8788755EBA4F}"
- ProjectSection(ProjectDependencies) = postProject
- {2626A753-BFA4-4616-BF32-00D7D7AC4174} = {2626A753-BFA4-4616-BF32-00D7D7AC4174}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.PivotChart.Win", "PivotChart.Win\Xpand.ExpressApp.PivotChart.Win.csproj", "{C044D0A5-B0E1-48D4-B55B-E992DC062A9B}"
ProjectSection(ProjectDependencies) = postProject
{2626A753-BFA4-4616-BF32-00D7D7AC4174} = {2626A753-BFA4-4616-BF32-00D7D7AC4174}
@@ -265,14 +201,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Reports",
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scheduler", "Scheduler", "{CE441F2B-DA1A-40D9-85D5-2CABBA2DC91C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Scheduler.Win", "Scheduler.Win\Xpand.ExpressApp.Scheduler.Win.csproj", "{E0C71294-D0D1-4633-8EE5-630088DF81DD}"
- ProjectSection(ProjectDependencies) = postProject
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F} = {B7848472-FE27-41FD-941B-9C9EE26D9D5F}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StateMachine", "StateMachine", "{13311CEA-6FC1-443D-8E2B-9EBD0AE83C8F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.StateMachine", "StateMachine\Xpand.ExpressApp.StateMachine.csproj", "{5F9E1E64-7384-475E-99A6-50407FAF329A}"
@@ -288,11 +216,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.TreeListEd
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.TreeListEditors.Web", "TreeListEditors.Web\Xpand.ExpressApp.TreeListEditors.Web.csproj", "{7FC6A30C-7375-4EB2-A6E9-A597B941B45F}"
- ProjectSection(ProjectDependencies) = postProject
- {A4B6B731-8A03-4A91-93DB-B22535F8CD99} = {A4B6B731-8A03-4A91-93DB-B22535F8CD99}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.TreeListEditors.Win", "TreeListEditors.Win\Xpand.ExpressApp.TreeListEditors.Win.csproj", "{4AC47CF2-DA60-48BB-AAD5-CDA3D3C6A934}"
ProjectSection(ProjectDependencies) = postProject
{A4B6B731-8A03-4A91-93DB-B22535F8CD99} = {A4B6B731-8A03-4A91-93DB-B22535F8CD99}
@@ -313,13 +236,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.WizardUI.W
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflow", "Workflow", "{83679FB2-A2E2-4727-BF13-6029E545FF17}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Workflow", "Workflow\Xpand.ExpressApp.Workflow.csproj", "{DA7200E2-BE28-4B34-99F2-FF9490A720DC}"
- ProjectSection(ProjectDependencies) = postProject
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WorldCreator", "WorldCreator", "{108448EF-FEC5-4ECB-BC36-238074A92F39}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.WorldCreator", "WorldCreator\Xpand.ExpressApp.WorldCreator.csproj", "{E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60}"
@@ -334,13 +250,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.WorldCreat
{E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60} = {E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.WorldCreator.Web", "WorldCreator.Web\Xpand.ExpressApp.WorldCreator.Web.csproj", "{D0B11788-3559-45D1-BC21-07953398755B}"
- ProjectSection(ProjectDependencies) = postProject
- {E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60} = {E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60}
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8} = {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.WorldCreator.Win", "WorldCreator.Win\Xpand.ExpressApp.WorldCreator.Win.csproj", "{85D2C1FA-1478-454F-B703-5ACB4B420C28}"
ProjectSection(ProjectDependencies) = postProject
{E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60} = {E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60}
@@ -366,49 +275,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.AuditTrail
{D38722E2-F2CD-47D3-9203-1AC8070BBE2E} = {D38722E2-F2CD-47D3-9203-1AC8070BBE2E}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Scheduler.Web", "Scheduler.Web\Xpand.ExpressApp.Scheduler.Web.csproj", "{C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}"
- ProjectSection(ProjectDependencies) = postProject
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F} = {B7848472-FE27-41FD-941B-9C9EE26D9D5F}
- {56242176-A728-4B97-BC0A-58B7D80FF412} = {56242176-A728-4B97-BC0A-58B7D80FF412}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Scheduler", "Scheduler\Xpand.ExpressApp.Scheduler.csproj", "{B7848472-FE27-41FD-941B-9C9EE26D9D5F}"
- ProjectSection(ProjectDependencies) = postProject
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapView", "MapView", "{0D5DFB81-3B70-4FA9-8F71-B02D25F05BB6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.MapView", "MapView\Xpand.ExpressApp.MapView.csproj", "{A334AC3A-C12B-484D-AE4E-DA24038F443D}"
- ProjectSection(ProjectDependencies) = postProject
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.MapView.Web", "MapView.Web\Xpand.ExpressApp.MapView.Web.csproj", "{B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}"
- ProjectSection(ProjectDependencies) = postProject
- {A334AC3A-C12B-484D-AE4E-DA24038F443D} = {A334AC3A-C12B-484D-AE4E-DA24038F443D}
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8} = {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.XtraDashboard.Web", "XtraDashboard.Web\Xpand.ExpressApp.XtraDashboard.Web.csproj", "{5A5436AD-B334-466C-89C5-2D866450C809}"
- ProjectSection(ProjectDependencies) = postProject
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8} = {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}
- {56242176-A728-4B97-BC0A-58B7D80FF412} = {56242176-A728-4B97-BC0A-58B7D80FF412}
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B} = {BAD55FD1-7A64-4A38-894D-5C18895EB76B}
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Email", "Email", "{3A34ABAF-D18D-49BF-8B6D-EA0C17914EB4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Email", "Email\Xpand.ExpressApp.Email.csproj", "{175DE829-3659-47B5-9D37-54238CB694B7}"
- ProjectSection(ProjectDependencies) = postProject
- {B2BC7237-E245-4619-A041-841CBB395E10} = {B2BC7237-E245-4619-A041-841CBB395E10}
- {B964E541-EBA2-4971-B104-A99ABBD95D36} = {B964E541-EBA2-4971-B104-A99ABBD95D36}
- {D38722E2-F2CD-47D3-9203-1AC8070BBE2E} = {D38722E2-F2CD-47D3-9203-1AC8070BBE2E}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FileAttachment", "FileAttachment", "{1865FFED-4812-44FE-8A5C-0A8CEC4C7751}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.FileAttachment", "FileAttachment\Xpand.ExpressApp.FileAttachment.csproj", "{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}"
@@ -416,12 +282,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.FileAttach
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.FileAttachment.Web", "FileAttachment.Web\Xpand.ExpressApp.FileAttachment.Web.csproj", "{07269BB3-0504-41C6-94D4-089356EB39B1}"
- ProjectSection(ProjectDependencies) = postProject
- {0E40CCB3-7904-4300-BCD6-E34D275E6370} = {0E40CCB3-7904-4300-BCD6-E34D275E6370}
- {BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE} = {BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExcelImporter", "ExcelImporter", "{82749A4C-8A2A-42F8-907F-0400DC83CF24}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.ExcelImporter", "ExcelImporter\Xpand.ExpressApp.ExcelImporter.csproj", "{320CAF62-376D-4864-89E2-27015B4E0D63}"
@@ -437,13 +297,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.ExcelImpor
{C88FF08D-3819-41C0-A1F2-F4FF0CDFE99D} = {C88FF08D-3819-41C0-A1F2-F4FF0CDFE99D}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.ExcelImporter.Web", "ExcelImporter.Web\Xpand.ExpressApp.ExcelImporter.Web.csproj", "{7911EDD6-004E-4BC7-9831-702019D30F65}"
- ProjectSection(ProjectDependencies) = postProject
- {19906D61-635D-4FF3-954E-9158CC848E5E} = {19906D61-635D-4FF3-954E-9158CC848E5E}
- {320CAF62-376D-4864-89E2-27015B4E0D63} = {320CAF62-376D-4864-89E2-27015B4E0D63}
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8} = {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System", "System", "{298A4EC6-4A1F-4C38-B21B-FB32C936F183}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp", "..\Xpand.ExpressApp\Xpand.ExpressApp\Xpand.ExpressApp.csproj", "{A85F685A-F56F-4C9A-A5A3-C2444DB4FB78}"
@@ -456,11 +309,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Win", "..\
{A85F685A-F56F-4C9A-A5A3-C2444DB4FB78} = {A85F685A-F56F-4C9A-A5A3-C2444DB4FB78}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.ExpressApp.Web", "..\Xpand.ExpressApp\Xpand.ExpressApp.Web\Xpand.ExpressApp.Web.csproj", "{81F08473-8A32-4AE1-82D1-576CBC0CA5D8}"
- ProjectSection(ProjectDependencies) = postProject
- {A85F685A-F56F-4C9A-A5A3-C2444DB4FB78} = {A85F685A-F56F-4C9A-A5A3-C2444DB4FB78}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpand.Persistent.Base", "..\Xpand.Persistent\Xpand.Persistent.Base\Xpand.Persistent.Base.csproj", "{0E40CCB3-7904-4300-BCD6-E34D275E6370}"
ProjectSection(ProjectDependencies) = postProject
{3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6} = {3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6}
@@ -501,18 +349,6 @@ Global
{B3216F6A-B4C6-4899-9D42-398CDF0CA91E}.Release|Any CPU.Build.0 = Release|Any CPU
{B3216F6A-B4C6-4899-9D42-398CDF0CA91E}.Test|Any CPU.ActiveCfg = Release|Any CPU
{B3216F6A-B4C6-4899-9D42-398CDF0CA91E}.Test|Any CPU.Build.0 = Release|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.Release|Any CPU.Build.0 = Release|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {D33DA85F-C92D-4A13-9880-B6A5343B957D}.Test|Any CPU.Build.0 = Release|Any CPU
{9C2D3690-C7EB-46C4-83CC-F1D597E0CD2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C2D3690-C7EB-46C4-83CC-F1D597E0CD2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C2D3690-C7EB-46C4-83CC-F1D597E0CD2C}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -537,18 +373,6 @@ Global
{B964E541-EBA2-4971-B104-A99ABBD95D36}.Release|Any CPU.Build.0 = Release|Any CPU
{B964E541-EBA2-4971-B104-A99ABBD95D36}.Test|Any CPU.ActiveCfg = Release|Any CPU
{B964E541-EBA2-4971-B104-A99ABBD95D36}.Test|Any CPU.Build.0 = Release|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.Release|Any CPU.Build.0 = Release|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B}.Test|Any CPU.Build.0 = Release|Any CPU
{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -621,18 +445,6 @@ Global
{3E1BF021-F83E-49C0-9BC0-C1C967DF1269}.Release|Any CPU.Build.0 = Release|Any CPU
{3E1BF021-F83E-49C0-9BC0-C1C967DF1269}.Test|Any CPU.ActiveCfg = Release|Any CPU
{3E1BF021-F83E-49C0-9BC0-C1C967DF1269}.Test|Any CPU.Build.0 = Release|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.Release|Any CPU.Build.0 = Release|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7}.Test|Any CPU.Build.0 = Release|Any CPU
{C0BAAF0F-9FE6-4D7D-98DC-D163EEC7B87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C0BAAF0F-9FE6-4D7D-98DC-D163EEC7B87E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0BAAF0F-9FE6-4D7D-98DC-D163EEC7B87E}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -669,18 +481,6 @@ Global
{32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6}.Release|Any CPU.Build.0 = Release|Any CPU
{32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6}.Test|Any CPU.ActiveCfg = Release|Any CPU
{32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6}.Test|Any CPU.Build.0 = Release|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.Release|Any CPU.Build.0 = Release|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {67045B46-0875-497F-BF4E-4E74CEF4FF27}.Test|Any CPU.Build.0 = Release|Any CPU
{EC481968-1696-43E4-837F-BCF08F393323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC481968-1696-43E4-837F-BCF08F393323}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC481968-1696-43E4-837F-BCF08F393323}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -705,18 +505,6 @@ Global
{B2BC7237-E245-4619-A041-841CBB395E10}.Release|Any CPU.Build.0 = Release|Any CPU
{B2BC7237-E245-4619-A041-841CBB395E10}.Test|Any CPU.ActiveCfg = Release|Any CPU
{B2BC7237-E245-4619-A041-841CBB395E10}.Test|Any CPU.Build.0 = Release|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.Release|Any CPU.Build.0 = Release|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {19906D61-635D-4FF3-954E-9158CC848E5E}.Test|Any CPU.Build.0 = Release|Any CPU
{84F8D818-91BC-48DB-9B6C-7E71A82CA635}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{84F8D818-91BC-48DB-9B6C-7E71A82CA635}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84F8D818-91BC-48DB-9B6C-7E71A82CA635}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -741,18 +529,6 @@ Global
{8D97AC44-202D-4659-8CB0-6D8DCC796156}.Release|Any CPU.Build.0 = Release|Any CPU
{8D97AC44-202D-4659-8CB0-6D8DCC796156}.Test|Any CPU.ActiveCfg = Release|Any CPU
{8D97AC44-202D-4659-8CB0-6D8DCC796156}.Test|Any CPU.Build.0 = Release|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.Release|Any CPU.Build.0 = Release|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506}.Test|Any CPU.Build.0 = Release|Any CPU
{88207755-7F6B-4B53-9358-190364299985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88207755-7F6B-4B53-9358-190364299985}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88207755-7F6B-4B53-9358-190364299985}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -789,30 +565,6 @@ Global
{B329592B-9530-4DA7-88F2-846BBA1C8F93}.Release|Any CPU.Build.0 = Release|Any CPU
{B329592B-9530-4DA7-88F2-846BBA1C8F93}.Test|Any CPU.ActiveCfg = Release|Any CPU
{B329592B-9530-4DA7-88F2-846BBA1C8F93}.Test|Any CPU.Build.0 = Release|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.Release|Any CPU.Build.0 = Release|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA}.Test|Any CPU.Build.0 = Release|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.Release|Any CPU.Build.0 = Release|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A}.Test|Any CPU.Build.0 = Release|Any CPU
{2626A753-BFA4-4616-BF32-00D7D7AC4174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2626A753-BFA4-4616-BF32-00D7D7AC4174}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2626A753-BFA4-4616-BF32-00D7D7AC4174}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -825,18 +577,6 @@ Global
{2626A753-BFA4-4616-BF32-00D7D7AC4174}.Release|Any CPU.Build.0 = Release|Any CPU
{2626A753-BFA4-4616-BF32-00D7D7AC4174}.Test|Any CPU.ActiveCfg = Release|Any CPU
{2626A753-BFA4-4616-BF32-00D7D7AC4174}.Test|Any CPU.Build.0 = Release|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.Release|Any CPU.Build.0 = Release|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F}.Test|Any CPU.Build.0 = Release|Any CPU
{C044D0A5-B0E1-48D4-B55B-E992DC062A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C044D0A5-B0E1-48D4-B55B-E992DC062A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C044D0A5-B0E1-48D4-B55B-E992DC062A9B}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -873,18 +613,6 @@ Global
{D40E2E45-324C-4EFD-867E-79ED59F10892}.Release|Any CPU.Build.0 = Release|Any CPU
{D40E2E45-324C-4EFD-867E-79ED59F10892}.Test|Any CPU.ActiveCfg = Release|Any CPU
{D40E2E45-324C-4EFD-867E-79ED59F10892}.Test|Any CPU.Build.0 = Release|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.Release|Any CPU.Build.0 = Release|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {E0C71294-D0D1-4633-8EE5-630088DF81DD}.Test|Any CPU.Build.0 = Release|Any CPU
{5F9E1E64-7384-475E-99A6-50407FAF329A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F9E1E64-7384-475E-99A6-50407FAF329A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F9E1E64-7384-475E-99A6-50407FAF329A}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -909,18 +637,6 @@ Global
{A4B6B731-8A03-4A91-93DB-B22535F8CD99}.Release|Any CPU.Build.0 = Release|Any CPU
{A4B6B731-8A03-4A91-93DB-B22535F8CD99}.Test|Any CPU.ActiveCfg = Release|Any CPU
{A4B6B731-8A03-4A91-93DB-B22535F8CD99}.Test|Any CPU.Build.0 = Release|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.Release|Any CPU.Build.0 = Release|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F}.Test|Any CPU.Build.0 = Release|Any CPU
{4AC47CF2-DA60-48BB-AAD5-CDA3D3C6A934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AC47CF2-DA60-48BB-AAD5-CDA3D3C6A934}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AC47CF2-DA60-48BB-AAD5-CDA3D3C6A934}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -957,18 +673,6 @@ Global
{54F6126C-8D97-4BB4-816D-01EB602D9EA2}.Release|Any CPU.Build.0 = Release|Any CPU
{54F6126C-8D97-4BB4-816D-01EB602D9EA2}.Test|Any CPU.ActiveCfg = Release|Any CPU
{54F6126C-8D97-4BB4-816D-01EB602D9EA2}.Test|Any CPU.Build.0 = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.EasyTest|Any CPU.ActiveCfg = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.EasyTest|Any CPU.Build.0 = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.Release|Any CPU.Build.0 = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC}.Test|Any CPU.Build.0 = Release|Any CPU
{E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -993,18 +697,6 @@ Global
{F28172DF-6820-45AA-A278-525AE01F8202}.Release|Any CPU.Build.0 = Release|Any CPU
{F28172DF-6820-45AA-A278-525AE01F8202}.Test|Any CPU.ActiveCfg = Release|Any CPU
{F28172DF-6820-45AA-A278-525AE01F8202}.Test|Any CPU.Build.0 = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.EasyTest|Any CPU.ActiveCfg = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.EasyTest|Any CPU.Build.0 = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.Release|Any CPU.Build.0 = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {D0B11788-3559-45D1-BC21-07953398755B}.Test|Any CPU.Build.0 = Release|Any CPU
{85D2C1FA-1478-454F-B703-5ACB4B420C28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85D2C1FA-1478-454F-B703-5ACB4B420C28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85D2C1FA-1478-454F-B703-5ACB4B420C28}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1041,78 +733,6 @@ Global
{007CDBAE-9DBD-431C-BB70-CF3596748B06}.Release|Any CPU.Build.0 = Release|Any CPU
{007CDBAE-9DBD-431C-BB70-CF3596748B06}.Test|Any CPU.ActiveCfg = Release|Any CPU
{007CDBAE-9DBD-431C-BB70-CF3596748B06}.Test|Any CPU.Build.0 = Release|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.Release|Any CPU.Build.0 = Release|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397}.Test|Any CPU.Build.0 = Release|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.Release|Any CPU.Build.0 = Release|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F}.Test|Any CPU.Build.0 = Release|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.Release|Any CPU.Build.0 = Release|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {A334AC3A-C12B-484D-AE4E-DA24038F443D}.Test|Any CPU.Build.0 = Release|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.Release|Any CPU.Build.0 = Release|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC}.Test|Any CPU.Build.0 = Release|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.Release|Any CPU.Build.0 = Release|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {5A5436AD-B334-466C-89C5-2D866450C809}.Test|Any CPU.Build.0 = Release|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.Release|Any CPU.Build.0 = Release|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {175DE829-3659-47B5-9D37-54238CB694B7}.Test|Any CPU.Build.0 = Release|Any CPU
{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1125,18 +745,6 @@ Global
{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}.Release|Any CPU.Build.0 = Release|Any CPU
{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}.Test|Any CPU.ActiveCfg = Release|Any CPU
{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE}.Test|Any CPU.Build.0 = Release|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.Release|Any CPU.Build.0 = Release|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {07269BB3-0504-41C6-94D4-089356EB39B1}.Test|Any CPU.Build.0 = Release|Any CPU
{320CAF62-376D-4864-89E2-27015B4E0D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{320CAF62-376D-4864-89E2-27015B4E0D63}.Debug|Any CPU.Build.0 = Debug|Any CPU
{320CAF62-376D-4864-89E2-27015B4E0D63}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1161,18 +769,6 @@ Global
{E8372A81-67B6-4A92-8456-73C82487F3FF}.Release|Any CPU.Build.0 = Release|Any CPU
{E8372A81-67B6-4A92-8456-73C82487F3FF}.Test|Any CPU.ActiveCfg = Release|Any CPU
{E8372A81-67B6-4A92-8456-73C82487F3FF}.Test|Any CPU.Build.0 = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.EasyTest|Any CPU.ActiveCfg = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.EasyTest|Any CPU.Build.0 = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.Release|Any CPU.Build.0 = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {7911EDD6-004E-4BC7-9831-702019D30F65}.Test|Any CPU.Build.0 = Release|Any CPU
{A85F685A-F56F-4C9A-A5A3-C2444DB4FB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A85F685A-F56F-4C9A-A5A3-C2444DB4FB78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A85F685A-F56F-4C9A-A5A3-C2444DB4FB78}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1197,18 +793,6 @@ Global
{C88FF08D-3819-41C0-A1F2-F4FF0CDFE99D}.Release|Any CPU.Build.0 = Release|Any CPU
{C88FF08D-3819-41C0-A1F2-F4FF0CDFE99D}.Test|Any CPU.ActiveCfg = Release|Any CPU
{C88FF08D-3819-41C0-A1F2-F4FF0CDFE99D}.Test|Any CPU.Build.0 = Release|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.DebugGAC|Any CPU.Build.0 = Debug|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.EasyTest|Any CPU.ActiveCfg = Debug|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.EasyTest|Any CPU.Build.0 = Debug|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.RecompiledDxSources|Any CPU.ActiveCfg = Release|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.RecompiledDxSources|Any CPU.Build.0 = Release|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.Release|Any CPU.Build.0 = Release|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.Test|Any CPU.ActiveCfg = Release|Any CPU
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8}.Test|Any CPU.Build.0 = Release|Any CPU
{0E40CCB3-7904-4300-BCD6-E34D275E6370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E40CCB3-7904-4300-BCD6-E34D275E6370}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E40CCB3-7904-4300-BCD6-E34D275E6370}.DebugGAC|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1263,65 +847,43 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B3216F6A-B4C6-4899-9D42-398CDF0CA91E} = {634CD662-E09E-4E2E-82ED-AEBB41DF4A19}
- {D33DA85F-C92D-4A13-9880-B6A5343B957D} = {634CD662-E09E-4E2E-82ED-AEBB41DF4A19}
{9C2D3690-C7EB-46C4-83CC-F1D597E0CD2C} = {634CD662-E09E-4E2E-82ED-AEBB41DF4A19}
{B964E541-EBA2-4971-B104-A99ABBD95D36} = {9376B701-8686-4610-A4DD-30CF76432ADB}
- {BAD55FD1-7A64-4A38-894D-5C18895EB76B} = {9376B701-8686-4610-A4DD-30CF76432ADB}
{50DF1466-D5B2-40FC-B91E-B212E4A7F4A9} = {9376B701-8686-4610-A4DD-30CF76432ADB}
{8A0EECEA-F699-40BA-B8F9-D70F79E9130B} = {A0C7060E-2474-4475-87FE-058AB2E1EA7C}
{560F01E0-F5F8-4261-93A8-A00082204536} = {E0AA9A19-9349-4358-9600-D35F5EF0D3F0}
{D38722E2-F2CD-47D3-9203-1AC8070BBE2E} = {CF0F5D3C-F0F7-4894-A3A6-B0505EF1B656}
{56242176-A728-4B97-BC0A-58B7D80FF412} = {9EDD4832-9A7C-417B-87F1-7C33289D8126}
{3E1BF021-F83E-49C0-9BC0-C1C967DF1269} = {9EDD4832-9A7C-417B-87F1-7C33289D8126}
- {71319B74-CCF9-4171-B79B-1F9F1C89F4F7} = {3F42AFC8-B356-4721-9822-241E1D872393}
{C0BAAF0F-9FE6-4D7D-98DC-D163EEC7B87E} = {3A4A541B-39DD-49F4-B0F8-0EA112D063A4}
{6CCA3D25-5AFA-4C26-9DE7-31CDE8F239EB} = {3A4A541B-39DD-49F4-B0F8-0EA112D063A4}
{32A12C8A-B9C9-4D7C-AF10-AE2CA89550F6} = {0DD52F6C-3452-4313-87E1-20EC3444DE9F}
- {67045B46-0875-497F-BF4E-4E74CEF4FF27} = {0DD52F6C-3452-4313-87E1-20EC3444DE9F}
{EC481968-1696-43E4-837F-BCF08F393323} = {0DD52F6C-3452-4313-87E1-20EC3444DE9F}
{B2BC7237-E245-4619-A041-841CBB395E10} = {EB8404EC-03D2-4DC7-8511-746E5CEF3D03}
- {19906D61-635D-4FF3-954E-9158CC848E5E} = {EB8404EC-03D2-4DC7-8511-746E5CEF3D03}
{84F8D818-91BC-48DB-9B6C-7E71A82CA635} = {EB8404EC-03D2-4DC7-8511-746E5CEF3D03}
{8D97AC44-202D-4659-8CB0-6D8DCC796156} = {57A6ADDE-C312-44B1-8437-310F0A208746}
- {05E856F4-5329-4DB4-8C7E-8B63F24F6506} = {57A6ADDE-C312-44B1-8437-310F0A208746}
{88207755-7F6B-4B53-9358-190364299985} = {57A6ADDE-C312-44B1-8437-310F0A208746}
{FE3FD1A4-E5B5-44D4-8B9E-3BF29AD4CB96} = {663286E1-11FD-4CD4-9F55-532C1F03662E}
{B329592B-9530-4DA7-88F2-846BBA1C8F93} = {663286E1-11FD-4CD4-9F55-532C1F03662E}
- {E08F0BD5-77CA-4B3A-A035-211A2C5DF5CA} = {62EF5F5C-756E-4A81-A13F-8579539E8580}
- {5F6908F4-2505-4C37-BD49-EC98A6CB103A} = {62EF5F5C-756E-4A81-A13F-8579539E8580}
{2626A753-BFA4-4616-BF32-00D7D7AC4174} = {5A865BBD-D6F6-4B01-A867-2D4B0B807EE4}
- {0D81BAF7-CC13-411C-BC50-8788755EBA4F} = {5A865BBD-D6F6-4B01-A867-2D4B0B807EE4}
{C044D0A5-B0E1-48D4-B55B-E992DC062A9B} = {5A865BBD-D6F6-4B01-A867-2D4B0B807EE4}
{74BE7291-EB8A-4FE3-A495-02545797CF2A} = {5A91B737-6708-4380-B489-EE88670215D7}
{D40E2E45-324C-4EFD-867E-79ED59F10892} = {CF6EE81F-791B-4DED-BD23-978055FD5D52}
- {E0C71294-D0D1-4633-8EE5-630088DF81DD} = {CE441F2B-DA1A-40D9-85D5-2CABBA2DC91C}
{5F9E1E64-7384-475E-99A6-50407FAF329A} = {13311CEA-6FC1-443D-8E2B-9EBD0AE83C8F}
{A4B6B731-8A03-4A91-93DB-B22535F8CD99} = {660BD865-56D0-4B8D-969D-3EF810771E6D}
- {7FC6A30C-7375-4EB2-A6E9-A597B941B45F} = {660BD865-56D0-4B8D-969D-3EF810771E6D}
{4AC47CF2-DA60-48BB-AAD5-CDA3D3C6A934} = {660BD865-56D0-4B8D-969D-3EF810771E6D}
{3D13CAAC-A265-4A02-97CB-6C9121D7514D} = {F0D2F61C-1960-480B-8655-9CF81C98C972}
{54F6126C-8D97-4BB4-816D-01EB602D9EA2} = {1149F2F7-F6C8-4DD8-9D51-82120C98A887}
- {DA7200E2-BE28-4B34-99F2-FF9490A720DC} = {83679FB2-A2E2-4727-BF13-6029E545FF17}
{E3A59B23-05DF-4AB1-BE2B-471EAC7ADD60} = {108448EF-FEC5-4ECB-BC36-238074A92F39}
{F28172DF-6820-45AA-A278-525AE01F8202} = {108448EF-FEC5-4ECB-BC36-238074A92F39}
- {D0B11788-3559-45D1-BC21-07953398755B} = {108448EF-FEC5-4ECB-BC36-238074A92F39}
{85D2C1FA-1478-454F-B703-5ACB4B420C28} = {108448EF-FEC5-4ECB-BC36-238074A92F39}
{107424FA-EE61-41B7-BA89-2FD0BC9BCEDE} = {298A4EC6-4A1F-4C38-B21B-FB32C936F183}
{007CDBAE-9DBD-431C-BB70-CF3596748B06} = {615F7F47-B676-4297-8119-879ECC213907}
- {C1791E7B-A8F2-4FEE-9263-6BE0E3A73397} = {CE441F2B-DA1A-40D9-85D5-2CABBA2DC91C}
- {B7848472-FE27-41FD-941B-9C9EE26D9D5F} = {CE441F2B-DA1A-40D9-85D5-2CABBA2DC91C}
- {A334AC3A-C12B-484D-AE4E-DA24038F443D} = {0D5DFB81-3B70-4FA9-8F71-B02D25F05BB6}
- {B9EF03FF-D05B-4FD4-A8E9-F90D819CB1DC} = {0D5DFB81-3B70-4FA9-8F71-B02D25F05BB6}
- {5A5436AD-B334-466C-89C5-2D866450C809} = {9EDD4832-9A7C-417B-87F1-7C33289D8126}
- {175DE829-3659-47B5-9D37-54238CB694B7} = {3A34ABAF-D18D-49BF-8B6D-EA0C17914EB4}
{BE493AC7-4B27-4EAF-B2A9-8ADD2C7CE4BE} = {1865FFED-4812-44FE-8A5C-0A8CEC4C7751}
- {07269BB3-0504-41C6-94D4-089356EB39B1} = {1865FFED-4812-44FE-8A5C-0A8CEC4C7751}
{320CAF62-376D-4864-89E2-27015B4E0D63} = {82749A4C-8A2A-42F8-907F-0400DC83CF24}
{E8372A81-67B6-4A92-8456-73C82487F3FF} = {82749A4C-8A2A-42F8-907F-0400DC83CF24}
- {7911EDD6-004E-4BC7-9831-702019D30F65} = {82749A4C-8A2A-42F8-907F-0400DC83CF24}
{A85F685A-F56F-4C9A-A5A3-C2444DB4FB78} = {298A4EC6-4A1F-4C38-B21B-FB32C936F183}
{C88FF08D-3819-41C0-A1F2-F4FF0CDFE99D} = {298A4EC6-4A1F-4C38-B21B-FB32C936F183}
- {81F08473-8A32-4AE1-82D1-576CBC0CA5D8} = {298A4EC6-4A1F-4C38-B21B-FB32C936F183}
{0E40CCB3-7904-4300-BCD6-E34D275E6370} = {298A4EC6-4A1F-4C38-B21B-FB32C936F183}
{3A3180CF-2A7B-48FC-AC8A-F39B21E75DB6} = {298A4EC6-4A1F-4C38-B21B-FB32C936F183}
{3FA72CCB-7AA9-4CE6-B3BD-CE6554B2D4D7} = {298A4EC6-4A1F-4C38-B21B-FB32C936F183}
diff --git a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/AuditPendingController.cs b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/AuditPendingController.cs
index 38679982ea..413ca902d1 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/AuditPendingController.cs
+++ b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/AuditPendingController.cs
@@ -99,7 +99,7 @@ private void CustomCommitChanges(object sender, HandledEventArgs handledEventArg
if (_auditPending){
var objectSpace = ((IObjectSpace) sender);
if (!objectSpace.IsNewObject(View.CurrentObject)) {
- AuditTrailService.Instance.SaveAuditData(objectSpace.Session());
+ AuditTrailService.GetService(Site).SaveAuditData(objectSpace.Session());
objectSpace.RollbackSilent();
const string template =
"Your changeds are audited and pending for approval. You will be notified by email if approved or not. The object is reset to its origial state";
diff --git a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Logic/AuditTrailRuleViewController.cs b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Logic/AuditTrailRuleViewController.cs
index a3ec13d389..cf543589b3 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Logic/AuditTrailRuleViewController.cs
+++ b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Logic/AuditTrailRuleViewController.cs
@@ -48,8 +48,9 @@ private void BeginSessionAudit(){
Frame.GetController(
controller => controller.LogicRuleExecutor.Execute(ExecutionContext.None, View,
handledEventArgs));
+
if (handledEventArgs.Handled)
- AuditTrailService.Instance.BeginSessionAudit(ObjectSpace.Session(), AuditTrailStrategy.OnObjectLoaded);
+ AuditTrailService.GetService(Site).BeginSessionAudit(ObjectSpace.Session(), AuditTrailStrategy.OnObjectLoaded);
}
private void ObjectSpaceOnCommitted(object sender, EventArgs eventArgs){
@@ -60,11 +61,11 @@ private void AuditSystemChanges(){
var editModelAction =Frame.Controllers.Cast().SelectMany(controller => controller.Actions).FirstOrDefault(@base => @base.Id == "EditModel");
if (editModelAction != null){
editModelAction.Executing += (sender, args) =>{
- AuditTrailService.Instance.SaveAuditTrailData += InstanceOnSaveAuditTrailData;
+ AuditTrailService.GetService(Site).SaveAuditTrailData += InstanceOnSaveAuditTrailData;
_editingModel = true;
};
editModelAction.ExecuteCompleted += (sender, args) =>{
- AuditTrailService.Instance.SaveAuditTrailData -= InstanceOnSaveAuditTrailData;
+ AuditTrailService.GetService(Site).SaveAuditTrailData -= InstanceOnSaveAuditTrailData;
_editingModel = false;
};
_auditSystemChanges = ((IModelApplicationAudiTrail) Application.Model).AudiTrail.AuditSystemChanges;
@@ -95,7 +96,7 @@ void LogicRuleExecutorOnLogicRuleExecute(object sender, LogicRuleExecuteEventArg
}
void ApplyCustomization(IAuditTrailRule auditTrailRule) {
- var auditTrailService = AuditTrailService.Instance;
+ var auditTrailService = AuditTrailService.GetService(Site);
if (auditTrailRule.AuditingMode.HasValue) {
auditTrailService.ObjectAuditingMode = (DevExpress.Persistent.AuditTrail.ObjectAuditingMode) auditTrailRule.AuditingMode.Value;
}
diff --git a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Module.cs b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Module.cs
index 0e2c245920..9ed5420aa3 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Module.cs
+++ b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Module.cs
@@ -22,7 +22,7 @@ namespace Xpand.ExpressApp.AuditTrail {
[ToolboxTabName(XpandAssemblyInfo.TabWinWebModules)]
public sealed class XpandAuditTrailModule :XpandModuleBase,ISecurityModuleUser {
public XpandAuditTrailModule() {
- AuditTrailService.Instance.CustomCreateObjectAuditProcessorsFactory += OnCustomCreateObjectAuditProcessorsFactory;
+
RequiredModuleTypes.Add(typeof (AuditTrailModule));
LogicInstallerManager.RegisterInstaller(new AuditTrailLogicInstaller(this));
RequiredModuleTypes.Add(typeof(ModelViewInheritanceModule));
@@ -41,8 +41,10 @@ public override void Setup(XafApplication application){
}
private void ApplicationOnSetupComplete(object sender, EventArgs eventArgs){
- AuditTrailService.Instance.SaveAuditTrailData += OnSaveAuditTrailData;
- AuditTrailService.Instance.AuditDataStore = new XpandAuditDataStore();
+ var auditTrailService = AuditTrailService.GetService(Site);
+ auditTrailService.CustomCreateObjectAuditProcessorsFactory += OnCustomCreateObjectAuditProcessorsFactory;
+ auditTrailService.SaveAuditTrailData += OnSaveAuditTrailData;
+ auditTrailService.AuditDataStore = new XpandAuditDataStore();
var auditTrailModule = Application.FindModule();
auditTrailModule.AuditDataItemPersistentType = typeof(XpandAuditDataItemPersistent);
@@ -59,9 +61,10 @@ private void OnSaveAuditTrailData(object sender, SaveAuditTrailDataEventArgs sav
}
protected override void Dispose(bool disposing) {
- if (AuditTrailService.Instance != null) {
- AuditTrailService.Instance.SaveAuditTrailData -= OnSaveAuditTrailData;
- AuditTrailService.Instance.CustomCreateObjectAuditProcessorsFactory -= OnCustomCreateObjectAuditProcessorsFactory;
+ var auditTrailService = AuditTrailService.GetService(Site);
+ if (auditTrailService != null) {
+ auditTrailService.SaveAuditTrailData -= OnSaveAuditTrailData;
+ auditTrailService.CustomCreateObjectAuditProcessorsFactory -= OnCustomCreateObjectAuditProcessorsFactory;
}
RuntimeMemberBuilder.CustomCreateMember -= RuntimeMemberBuilderOnCustomCreateMember;
base.Dispose(disposing);
diff --git a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj
index d6425a6d81..1131e6fe5d 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/Xpand.ExpressApp.AuditTrail.csproj
@@ -3,7 +3,7 @@
..\..\Xpand.key\xpand.snk
true
- netstandard2.0
+ net6.0
..\..\..\Xpand.DLL\
latest
true
diff --git a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/paket.references b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/paket.references
index 01831e1dad..ff7dffa785 100644
--- a/Xpand/Xpand.ExpressApp.Modules/AuditTrail/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/AuditTrail/paket.references
@@ -3,5 +3,5 @@ DevExpress.ExpressApp.ConditionalAppearance
DevExpress.ExpressApp.Security.Xpo
Xpand.XAF.Modules.CloneModelView
Xpand.XAF.Modules.ModelViewInheritance
-DevExpress.ExpressApp.CodeAnalysis
+
System.ComponentModel.Annotations
diff --git a/Xpand/Xpand.ExpressApp.Modules/Chart.Win/Xpand.ExpressApp.Chart.Win.csproj b/Xpand/Xpand.ExpressApp.Modules/Chart.Win/Xpand.ExpressApp.Chart.Win.csproj
index a55cf7ff86..67cb6529f4 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Chart.Win/Xpand.ExpressApp.Chart.Win.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/Chart.Win/Xpand.ExpressApp.Chart.Win.csproj
@@ -3,7 +3,7 @@
..\..\Xpand.key\xpand.snk
true
- net461;net6.0-windows7.0
+ net6.0-windows7.0
true
false
..\..\..\Xpand.DLL\
@@ -11,7 +11,7 @@
true
true
false
- true
+ false
pdbonly
True
diff --git a/Xpand/Xpand.ExpressApp.Modules/Chart.Win/paket.references b/Xpand/Xpand.ExpressApp.Modules/Chart.Win/paket.references
index 8ce5e4fb73..1172632e97 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Chart.Win/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/Chart.Win/paket.references
@@ -2,5 +2,5 @@ Xpand.XAF.Modules.ModelMapper
Xpand.XAF.Modules.Reactive.Logger
DevExpress.ExpressApp.Chart.Win
DevExpress.ExpressApp.PivotGrid.Win
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj b/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj
index 490cabe487..824b286f78 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/Dashboard/Xpand.ExpressApp.Dashboard.csproj
@@ -2,7 +2,7 @@
..\..\Xpand.key\xpand.snk
- net461;net6.0-windows7.0
+ net6.0-windows7.0
true
true
..\..\..\Xpand.DLL\
@@ -10,7 +10,7 @@
true
true
false
- true
+ false
pdbonly
True
diff --git a/Xpand/Xpand.ExpressApp.Modules/Dashboard/paket.references b/Xpand/Xpand.ExpressApp.Modules/Dashboard/paket.references
index 64ea339ca2..97f230d41d 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Dashboard/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/Dashboard/paket.references
@@ -7,5 +7,5 @@ Xpand.XAF.Modules.CloneModelView
Xpand.XAF.Modules.Reactive.Logger
Xpand.XAF.Modules.ViewEditMode
Xpand.Extensions
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/BusinessObjects/EmailTemplate.cs b/Xpand/Xpand.ExpressApp.Modules/Email/BusinessObjects/EmailTemplate.cs
deleted file mode 100644
index 886de887f8..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/BusinessObjects/EmailTemplate.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using DevExpress.ExpressApp.Editors;
-using DevExpress.ExpressApp.Model;
-using DevExpress.Persistent.Base;
-using DevExpress.Persistent.Validation;
-using DevExpress.Xpo;
-using Xpand.Xpo;
-
-namespace Xpand.ExpressApp.Email.BusinessObjects {
- [DefaultClassOptions]
- [ImageName("Action_WindowList")]
- public class EmailTemplate : XpandCustomObject, IEmailTemplate {
- string _body;
- string _name;
- string _subject;
-
- public EmailTemplate(Session session) : base(session) {
- }
- public void Configure(EmailTemplateConfig config, string acivationHost=null) {
- if (config == EmailTemplateConfig.UserActivation){
- Subject = "User activation";
- Body =$"A new user @Model.User.UserName has been created. To activate the account please click the following link {acivationHost + "?ua="}@Model.User.Activation";
- }
- else{
- Subject = "pass forgotten";
- Body = "We created a temporary password (@Model.Password) for the UserName (@Model.User.UserName). Please login to reset it";
- }
- }
-
- [EditorAlias(EditorAliases.HtmlPropertyEditor), RuleRequiredField, Size(-1)]
- [Index(2)]
- public string Body {
- get { return _body; }
- set { SetPropertyValue("Body", ref _body, value); }
- }
-
- [RuleRequiredField, RuleUniqueValue(DefaultContexts.Save)]
- [Index(0)]
- public string Name {
- get { return _name; }
- set { SetPropertyValue("Name", ref _name, value); }
- }
-
- [ImmediatePostData, RuleRequiredField]
- [Index(1)][Size(SizeAttribute.Unlimited)]
- [EditorAlias(EditorAliases.StringPropertyEditor)]
- [ModelDefault("RowCount","1")]
- public string Subject {
- get { return _subject; }
- set {
- SetPropertyValue("Subject", ref _subject, value);
- if ((string.IsNullOrEmpty(Name)) && IsNewObject) {
- Name = value;
- }
- }
- }
- }
-
- public enum EmailTemplateConfig{
- UserActivation,
- PassForgotten
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/BusinessObjects/IEmailTemplate.cs b/Xpand/Xpand.ExpressApp.Modules/Email/BusinessObjects/IEmailTemplate.cs
deleted file mode 100644
index b404a999a4..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/BusinessObjects/IEmailTemplate.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-
-namespace Xpand.ExpressApp.Email.BusinessObjects {
- public interface IEmailTemplate {
- string Name { get; set; }
- string Subject { get; set; }
- string Body { get; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/EmailLogicInstaller.cs b/Xpand/Xpand.ExpressApp.Modules/Email/EmailLogicInstaller.cs
deleted file mode 100644
index 1b61a65878..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/EmailLogicInstaller.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using DevExpress.ExpressApp.Model;
-using Xpand.ExpressApp.Email.Logic;
-using Xpand.ExpressApp.Email.Model;
-using Xpand.ExpressApp.Logic;
-using Xpand.ExpressApp.Logic.NodeUpdaters;
-using Xpand.Persistent.Base.Email;
-using Xpand.Persistent.Base.General;
-using Xpand.Persistent.Base.Logic;
-
-namespace Xpand.ExpressApp.Email {
- public class EmailLogicInstaller : LogicInstaller {
- public EmailLogicInstaller(IXpandModuleBase xpandModuleBase) : base(xpandModuleBase) {
- }
-
- public override List ExecutionContexts {
- get { return new List{ExecutionContext.ObjectSpaceCommited}; }
- }
-
- public override List ValidExecutionContexts{
- get { return new[] { ExecutionContext.ObjectSpaceCommited, ExecutionContext.ObjectSpaceObjectChanged }.ToList(); }
- }
-
- public override LogicRulesNodeUpdater LogicRulesNodeUpdater {
- get { return new EmailRulesNodeUpdater(); }
- }
-
- protected override IModelLogicWrapper GetModelLogicCore(IModelApplication applicationModel) {
- IModelLogicEmail logicContexts = ((IModelApplicationEmail) applicationModel).Email;
- return new ModelLogicWrapper(logicContexts.Rules, logicContexts);
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/EmailModule.cs b/Xpand/Xpand.ExpressApp.Modules/Email/EmailModule.cs
deleted file mode 100644
index b73ff01cf3..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/EmailModule.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Model;
-using DevExpress.Utils;
-using RazorEngine.Configuration;
-using RazorEngine.Templating;
-using Xpand.ExpressApp.Email.Logic;
-using Xpand.ExpressApp.Email.Model;
-using Xpand.ExpressApp.Logic;
-using Xpand.ExpressApp.Validation;
-using Xpand.Persistent.Base.General;
-using Xpand.Persistent.Base.Security;
-using Xpand.XAF.Modules.ModelViewInheritance;
-
-namespace Xpand.ExpressApp.Email {
- [ToolboxTabName(XpandAssemblyInfo.TabWinWebModules), ToolboxBitmap(typeof (EmailModule)), ToolboxItem(true)]
- public sealed class EmailModule : XpandModuleBase,ISecurityModuleUser{
- private IRazorEngineService _razorEngineService;
- public event EventHandler CustomCreateRazorEngine;
- public EmailModule() {
- RequiredModuleTypes.Add(typeof (XpandValidationModule));
- LogicInstallerManager.RegisterInstaller(new EmailLogicInstaller(this));
- RequiredModuleTypes.Add(typeof(ModelViewInheritanceModule));
- }
-
- public IRazorEngineService RazorEngineService => _razorEngineService ?? (_razorEngineService = CreateRazorEngine());
-
- void application_CreateCustomLogonWindowControllers(object sender, CreateCustomLogonWindowControllersEventArgs e) {
- if (((IModelApplicationEmail) Application.Model).Email.CreateControllersOnLogon) {
- e.Controllers.Add(Application.CreateController());
- e.Controllers.Add(Application.CreateController());
- }
- }
-
- public override void ExtendModelInterfaces(ModelInterfaceExtenders extenders) {
- base.ExtendModelInterfaces(extenders);
- extenders.Add();
- }
-
- public override void Setup(ApplicationModulesManager moduleManager){
- base.Setup(moduleManager);
- this.AddSecurityObjectsToAdditionalExportedTypes("Xpand.Persistent.BaseImpl.Email");
- if (Application != null){
- Application.CreateCustomLogonWindowControllers +=application_CreateCustomLogonWindowControllers;
- Application.UserDifferencesLoaded+=ApplicationOnUserDifferencesLoaded;
- }
- }
-
- private void ApplicationOnUserDifferencesLoaded(object sender, EventArgs eventArgs){
- CreateRazorEngine();
- }
-
- private IRazorEngineService CreateRazorEngine(){
- var razorEngineArgs = new RazorEngineArgs();
- OnCustomCreateRazorEngine(razorEngineArgs);
- if (razorEngineArgs.Engine != null){
- return razorEngineArgs.Engine;
- }
- var configuration = new TemplateServiceConfiguration{
- Debug = Debugger.IsAttached,
- DisableTempFileLocking = !Debugger.IsAttached
- };
- return RazorEngine.Templating.RazorEngineService.Create(configuration);
- }
-
- private void OnCustomCreateRazorEngine(RazorEngineArgs e){
- var handler = CustomCreateRazorEngine;
- handler?.Invoke(this, e);
- }
- }
-
- public class RazorEngineArgs : EventArgs{
- public IRazorEngineService Engine { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRule.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRule.cs
deleted file mode 100644
index a62e3ef0cd..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRule.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using DevExpress.ExpressApp.Model;
-using Xpand.Persistent.Base.Email;
-using Xpand.Persistent.Base.Logic;
-
-namespace Xpand.ExpressApp.Email.Logic {
- public class EmailRule : LogicRule, IEmailRule {
- public EmailRule(IContextEmailRule emailRule) : base(emailRule) {
- SmtpClientContext = emailRule.SmtpClientContext;
- TemplateContext = emailRule.TemplateContext;
- CurrentObjectEmailMember=emailRule.CurrentObjectEmailMember;
- EmailReceipientsContext = emailRule.EmailReceipientsContext;
- }
-
- public string EmailReceipientsContext { get; set; }
-
- public string SmtpClientContext { get; set; }
-
- public string TemplateContext { get; set; }
- public IModelMember CurrentObjectEmailMember { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRuleAttribute.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRuleAttribute.cs
deleted file mode 100644
index c16130bb1f..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRuleAttribute.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.ComponentModel;
-using DevExpress.ExpressApp.Model;
-using Xpand.Persistent.Base.Email;
-using Xpand.Persistent.Base.General.TypeConverters;
-using Xpand.Persistent.Base.Logic;
-
-namespace Xpand.ExpressApp.Email.Logic {
- public sealed class EmailRuleAttribute : LogicRuleAttribute, IContextEmailRule {
- public EmailRuleAttribute(string id) : base(id) {
- }
-
- public string SmtpClientContext { get; set; }
-
- public string TemplateContext { get; set; }
- public string EmailReceipientsContext { get; set; }
-
- [TypeConverter(typeof(StringToModelMemberConverter))]
- public string CurrentObjectEmailMember { get; set; }
-
- IModelMember IEmailRule.CurrentObjectEmailMember { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRuleViewController.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRuleViewController.cs
deleted file mode 100644
index 72677fa0ce..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Logic/EmailRuleViewController.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Mail;
-using DevExpress.Data.Filtering;
-using DevExpress.ExpressApp;
-using RazorEngine.Templating;
-using Xpand.ExpressApp.Email.BusinessObjects;
-using Xpand.ExpressApp.Email.Model;
-using Xpand.ExpressApp.Logic;
-using Xpand.Persistent.Base.General;
-using Xpand.Utils.Helpers;
-
-namespace Xpand.ExpressApp.Email.Logic {
- public class EmailRuleViewController : ViewController {
- public const string RuleObjectKeyValue = "RuleObjectKeyValue";
- private IRazorEngineService _razorEngineService;
-
- protected override void OnFrameAssigned() {
- base.OnFrameAssigned();
- Frame.Disposing += FrameOnDisposing;
- Frame.GetController(controller => controller.LogicRuleExecutor.LogicRuleExecute += LogicRuleExecutorOnLogicRuleExecute);
- }
-
- void FrameOnDisposing(object sender, EventArgs eventArgs) {
- Frame.Disposing -= FrameOnDisposing;
- Frame.GetController(controller => controller.LogicRuleExecutor.LogicRuleExecute -= LogicRuleExecutorOnLogicRuleExecute);
- }
-
- void LogicRuleExecutorOnLogicRuleExecute(object sender, LogicRuleExecuteEventArgs logicRuleExecuteEventArgs) {
- var logicRuleInfo = logicRuleExecuteEventArgs.LogicRuleInfo;
- var emailRule = logicRuleInfo.Rule as EmailRule;
- if (emailRule != null && !logicRuleInfo.InvertCustomization&&logicRuleInfo.Active) {
- var modelApplicationEmail = (IModelApplicationEmail) Application.Model;
- var emailTemplateObject = EmailTemplateObject(modelApplicationEmail, emailRule, ObjectSpace);
- var modelSmtpClientContext = modelApplicationEmail.Email.SmtpClientContexts.First(emailTemplate => emailTemplate.GetValue("Id") == emailRule.SmtpClientContext);
- var email = CreateEmail(logicRuleInfo, emailRule, modelSmtpClientContext,emailTemplateObject,modelApplicationEmail);
- if (email!=null){
- var smtpClient = CreateSmtpClient(modelSmtpClientContext);
- smtpClient.Send(email);
- }
- }
- }
-
- public IRazorEngineService RazorEngineService => _razorEngineService ??
- (_razorEngineService = Application.FindModule().RazorEngineService);
-
- protected virtual MailMessage CreateEmail(LogicRuleInfo logicRuleInfo, EmailRule emailRule, IModelSmtpClientContext modelSmtpClientContext, IEmailTemplate emailTemplateObject, IModelApplicationEmail modelApplicationEmail){
- var body = RazorEngineService.RunCompile(emailTemplateObject.Body, Guid.NewGuid().ToString(),null, logicRuleInfo.Object);
- var email = new MailMessage{
- IsBodyHtml = true,
- Subject = RazorEngineService.RunCompile(emailTemplateObject.Subject, Guid.NewGuid().ToString(), null, logicRuleInfo.Object),
- Body = body
- };
- var toEmail = emailRule.CurrentObjectEmailMember?.MemberInfo.GetValue(logicRuleInfo.Object) as string;
- toEmail?.Split(';').Each(s => email.To.Add(s));
- if (!string.IsNullOrEmpty(emailRule.EmailReceipientsContext)) {
- AddReceipients(emailRule, modelApplicationEmail, email,logicRuleInfo.Object);
- }
- email.From = new MailAddress(modelSmtpClientContext.SenderEmail);
- modelSmtpClientContext.ReplyToEmails.Split(';').Each(s => email.ReplyToList.Add(s));
- return email.To.Count == 0 ? null : email;
- }
-
- protected virtual void AddReceipients(EmailRule emailRule, IModelApplicationEmail modelApplicationEmail, MailMessage email, object currentObject) {
- var emailReceipientGroup =modelApplicationEmail.Email.EmailReceipients.First(
- group => group.GetValue("Id") == emailRule.EmailReceipientsContext);
- foreach (var modelEmailReceipient in emailReceipientGroup) {
- var criteriaOperator = GetCriteriaOperator(modelEmailReceipient,currentObject);
- var objects = ObjectSpace.GetObjects(modelEmailReceipient.EmailReceipient.TypeInfo.Type,criteriaOperator);
- var sendToCollection = GetSendToCollection(email, modelEmailReceipient);
- foreach (var obj in objects){
- var item = modelEmailReceipient.EmailMember.MemberInfo.GetValue(obj) as string;
- item?.Split(';').Each(s => sendToCollection.Add(s));
- }
- }
- }
-
- protected virtual CriteriaOperator GetCriteriaOperator(IModelEmailReceipient modelEmailReceipient, object o) {
- var keyValue = ObjectSpace.GetKeyValue(o);
- modelEmailReceipient.Criteria = modelEmailReceipient.Criteria.Replace(RuleObjectKeyValue, keyValue+"");
- var criteriaOperator = CriteriaOperator.Parse(modelEmailReceipient.Criteria);
- return criteriaOperator;
- }
-
- protected virtual MailAddressCollection GetSendToCollection(MailMessage email, IModelEmailReceipient modelEmailReceipient){
- var collection = email.To;
- return modelEmailReceipient.EmailType != EmailType.Normal
- ? (modelEmailReceipient.EmailType == EmailType.BCC ? email.Bcc : email.CC)
- : collection;
- }
-
- private SmtpClient CreateSmtpClient(IModelSmtpClientContext modelSmtpClientContext) {
- var smtpClient = new SmtpClient {
- DeliveryMethod = modelSmtpClientContext.DeliveryMethod,
- };
- if (!string.IsNullOrEmpty(modelSmtpClientContext.PickupDirectoryLocation))
- smtpClient.PickupDirectoryLocation = Path.GetFullPath(Environment.ExpandEnvironmentVariables(modelSmtpClientContext.PickupDirectoryLocation));
- if (smtpClient.DeliveryMethod == SmtpDeliveryMethod.Network){
- smtpClient.Host = modelSmtpClientContext.Host;
- smtpClient.Port = modelSmtpClientContext.Port;
- smtpClient.EnableSsl = modelSmtpClientContext.EnableSsl;
- smtpClient.UseDefaultCredentials = modelSmtpClientContext.UseDefaultCredentials;
- if (!smtpClient.UseDefaultCredentials){
- smtpClient.Credentials = new NetworkCredential(modelSmtpClientContext.UserName,
- modelSmtpClientContext.Password);
- }
- }
- else{
- if (!string.IsNullOrEmpty(smtpClient.PickupDirectoryLocation) &&
- !Directory.Exists(smtpClient.PickupDirectoryLocation)){
- Directory.CreateDirectory(smtpClient.PickupDirectoryLocation);
- }
- }
- return smtpClient;
- }
-
- IEmailTemplate EmailTemplateObject(IModelApplicationEmail modelApplication, EmailRule emailRule,
- IObjectSpace objectSpace){
- var modelEmailTemplate =modelApplication.Email.EmailTemplateContexts.FirstOrDefault(
- emailTemplate => emailTemplate.GetValue("Id") == emailRule.TemplateContext);
- if (modelEmailTemplate != null)
- return (IEmailTemplate)objectSpace.FindObject(modelEmailTemplate.EmailTemplate.TypeInfo.Type,
- CriteriaOperator.Parse(modelEmailTemplate.Criteria));
- throw new NullReferenceException("TemplateContext "+ emailRule.TemplateContext);
- }
- }
-
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Model.DesignedDiffs.xafml b/Xpand/Xpand.ExpressApp.Modules/Email/Model.DesignedDiffs.xafml
deleted file mode 100644
index 01079a80d8..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Model.DesignedDiffs.xafml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Model/EmailRulesNodeUpdater.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Model/EmailRulesNodeUpdater.cs
deleted file mode 100644
index 44da5b4a8e..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Model/EmailRulesNodeUpdater.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Xpand.ExpressApp.Logic.NodeUpdaters;
-using Xpand.Persistent.Base.Email;
-
-namespace Xpand.ExpressApp.Email.Model {
- public class EmailRulesNodeUpdater : LogicRulesNodeUpdater {
- protected override void SetAttribute(IModelEmailRule rule, IEmailRule attribute) {
- rule.Attribute = attribute;
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Model/IModelApplicationEmail.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Model/IModelApplicationEmail.cs
deleted file mode 100644
index aed3a50a66..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Model/IModelApplicationEmail.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using DevExpress.ExpressApp.Model;
-
-namespace Xpand.ExpressApp.Email.Model {
- public interface IModelApplicationEmail : IModelNode {
- IModelLogicEmail Email { get; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Model/IModelLogicEmail.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Model/IModelLogicEmail.cs
deleted file mode 100644
index 2b71af0434..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Model/IModelLogicEmail.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Net.Mail;
-using DevExpress.ExpressApp.DC;
-using DevExpress.ExpressApp.Editors;
-using DevExpress.ExpressApp.Model;
-using DevExpress.ExpressApp.Model.Core;
-using DevExpress.Persistent.Base;
-using DevExpress.Persistent.Validation;
-using Xpand.ExpressApp.Email.BusinessObjects;
-using Xpand.Persistent.Base.Email;
-using Xpand.Persistent.Base.General;
-using Xpand.Persistent.Base.Logic.Model;
-using Xpand.Persistent.Base.Logic.NodeGenerators;
-
-namespace Xpand.ExpressApp.Email.Model {
- public interface IModelLogicEmail : IModelLogicContexts{
- [DefaultValue(true)]
- bool CreateControllersOnLogon { get; set; }
- IModelEmailReceipients EmailReceipients { get; }
- IModelEmailTemplateContexts EmailTemplateContexts { get; }
- IModelEmailLogicRules Rules { get; }
- IModelEmailSmtpClientContexts SmtpClientContexts { get; }
- }
-
- [ModelNodesGenerator(typeof(LogicRulesNodesGenerator))]
- public interface IModelEmailLogicRules : IModelNode, IModelList {
- }
-
- [ModelInterfaceImplementor(typeof(IContextEmailRule), "Attribute")]
- public interface IModelEmailRule : IContextEmailRule, IModelConditionalLogicRule{
- [Browsable(false)]
- IEnumerable SmtpClientContexts { get; }
-
- [Browsable(false)]
- IEnumerable TemplateContexts { get; }
-
- [Browsable(false)]
- IEnumerable EmailReceipientsContexts { get; }
- }
-
- public class ModelEmailRuleValidator : IModelNodeValidator {
- public bool IsValid(IModelEmailRule node, IModelApplication application) {
- return !string.IsNullOrEmpty(node.EmailReceipientsContext)||node.CurrentObjectEmailMember!=null;
- }
- }
-
- [DomainLogic(typeof(IModelEmailRule))]
- public class ModelEmailRuleDomainLogic {
- public static IEnumerable Get_EmailReceipientsContexts(IModelEmailRule emailRule) {
- return (((IModelApplicationEmail) emailRule.Application).Email.EmailReceipients.Select(
- template => template.GetValue("Id")));
- }
- public static IEnumerable Get_SmtpClientContexts(IModelEmailRule emailRule) {
- return (((IModelApplicationEmail) emailRule.Application).Email.SmtpClientContexts.Select(
- template => template.GetValue("Id")));
- }
-
- public static IEnumerable Get_TemplateContexts(IModelEmailRule emailRule) {
- return (((IModelApplicationEmail) emailRule.Application).Email.EmailTemplateContexts.Select(
- template => template.GetValue("Id")));
- }
- }
-
- [ModelNodesGenerator(typeof(ModelEmailSmtpClientContextsNodesGenerator))]
- public interface IModelEmailSmtpClientContexts : IModelList, IModelNode {
- }
-
- public class ModelEmailSmtpClientContextsNodesGenerator:ModelNodesGeneratorBase{
- protected override void GenerateNodesCore(ModelNode node){
-
- }
- }
-
- public interface IModelSmtpClientContext : IModelNode {
- [Category("SmtpClient"), ModelBrowsable(typeof(ModelSmtpClientDeliveryMethodVisibilityCalculator))]
- bool EnableSsl { get; set; }
- [Required(typeof(ModelSmtpClientDeliveryMethodRequiredCalculator)), Category("SmtpClient"),ModelBrowsable(typeof(ModelSmtpClientDeliveryMethodVisibilityCalculator))]
- string Host { get; set; }
- [Required(typeof(ModelSmtpClientDeliveryMethodRequiredCalculator)), Category("Credentials"), ModelBrowsable(typeof(ModelSmtpClientUseDefaultCredentialsVisibilityCalculator))]
- string Password { get; set; }
-
- [DefaultValue(25), Category("SmtpClient"),
- ModelBrowsable(typeof(ModelSmtpClientDeliveryMethodVisibilityCalculator))]
- int Port { get; set; }
- [RuleRegularExpression(null, DefaultContexts.Save, @"^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$"), Required]
- string SenderEmail { get; set; }
- [RuleRegularExpression(null, DefaultContexts.Save, @"^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$"), Required]
- [ModelValueCalculator("SenderEmail")]
- string ReplyToEmails { get; set; }
- [Category("Credentials"), ModelBrowsable(typeof(ModelSmtpClientDeliveryMethodVisibilityCalculator)), DefaultValue(true), RefreshProperties(RefreshProperties.All)]
- bool UseDefaultCredentials { get; set; }
- [Category("Credentials"), ModelBrowsable(typeof(ModelSmtpClientUseDefaultCredentialsVisibilityCalculator)), Required(typeof(ModelSmtpClientDeliveryMethodRequiredCalculator))]
- string UserName { get; set; }
- [Category("SmtpClient"),RefreshProperties(RefreshProperties.All)]
- SmtpDeliveryMethod DeliveryMethod { get; set; }
- [Category("SmtpClient")]
- string PickupDirectoryLocation { get; set; }
- }
-
- public class ModelSmtpClientDeliveryMethodRequiredCalculator:IModelIsRequired{
- public bool IsRequired(IModelNode node, string propertyName){
- return new ModelSmtpClientDeliveryMethodVisibilityCalculator().IsVisible(node, propertyName);
- }
- }
-
- public class ModelSmtpClientDeliveryMethodVisibilityCalculator:IModelIsVisible{
- public bool IsVisible(IModelNode node, string propertyName){
- return ((IModelSmtpClientContext) node).DeliveryMethod == SmtpDeliveryMethod.Network;
- }
- }
-
- public class ModelSmtpClientUseDefaultCredentialsVisibilityCalculator : IModelIsVisible {
- public bool IsVisible(IModelNode node, string propertyName) {
- return !((IModelSmtpClientContext) node).UseDefaultCredentials &&
- new ModelSmtpClientDeliveryMethodVisibilityCalculator().IsVisible(node, propertyName);
- }
- }
-
- [ModelNodesGenerator(typeof(ModelEmailRecepientsNodesGenerator))]
- public interface IModelEmailReceipients : IModelList, IModelNode {
- }
-
- public class ModelEmailRecepientsNodesGenerator:ModelNodesGeneratorBase{
- protected override void GenerateNodesCore(ModelNode node){
-
- }
- }
-
- public interface IModelEmailReceipientGroup : IModelNode, IModelList{
- }
-
- public interface IModelEmailReceipient : IModelNode {
- [Editor("DevExpress.ExpressApp.Win.Core.ModelEditor.CriteriaModelEditorControl, DevExpress.ExpressApp.Win"+AssemblyInfo.VSuffix
- , "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), CriteriaOptions("EmailReceipient.TypeInfo")]
- string Criteria { get; set; }
- [Required, DataSourceProperty("EmailMembers")]
- IModelMember EmailMember { get; set; }
- [Browsable(false)]
- IModelList EmailMembers { get; }
- [DataSourceProperty("Application.BOModel"), Required]
- IModelClass EmailReceipient { get; set; }
- EmailType EmailType { get; set; }
- }
-
- public enum EmailType {
- Normal,
- CC,
- BCC
- }
- [DomainLogic(typeof(IModelEmailReceipient))]
- public class ModelEmailReceipientDomainLogic {
- public static IModelList Get_EmailMembers(IModelEmailReceipient emailReceipient) {
- return ((emailReceipient.EmailReceipient != null) ? new CalculatedModelNodeList(emailReceipient.EmailReceipient.AllMembers) : new CalculatedModelNodeList());
- }
- }
-
- public interface IModelEmailTemplateContexts : IModelList, IModelNode {
- }
-
- public interface IModelEmailTemplate : IModelNode {
- [CriteriaOptions("EmailTemplate.TypeInfo"),
- Editor("DevExpress.ExpressApp.Win.Core.ModelEditor.CriteriaModelEditorControl, DevExpress.ExpressApp.Win"+AssemblyInfo.VSuffix
- , XpandModuleBase.UITypeEditor)]
- string Criteria { get; set; }
- [DataSourceProperty("EmailTemplates"), Required]
- IModelClass EmailTemplate { get; set; }
- [Browsable(false)]
- IModelList EmailTemplates { get; }
- }
-
- [DomainLogic(typeof(IModelEmailTemplate))]
- public class ModelEmailTemplateDomainLogic {
- public static IModelClass Get_EmailTemplate(IModelEmailTemplate modelEmailTemplate) {
- return modelEmailTemplate.Application.BOModel.First(@class => (@class.TypeInfo.Type == typeof(EmailTemplate)));
- }
-
- public static IModelList Get_EmailTemplates(IModelEmailTemplate modelEmailTemplate) {
- return new CalculatedModelNodeList(modelEmailTemplate.Application.BOModel.Where(
- @class => typeof (IEmailTemplate).IsAssignableFrom(@class.TypeInfo.Type)));
- }
- }
-
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Properties/AssemblyInfo.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1142fab10d..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xpand.ExpressApp.Email")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("-")]
-[assembly: AssemblyProduct("Xpand.ExpressApp.Email")]
-[assembly: AssemblyCopyright("Copyright � - 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyMetadata("Platform","Core")]
-[assembly: AssemblyVersion(XpandAssemblyInfo.Version)]
-[assembly: AssemblyFileVersion(XpandAssemblyInfo.FileVersion)]
-
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Security/EmailOperationPermissionData.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Security/EmailOperationPermissionData.cs
deleted file mode 100644
index e0d7b0c688..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Security/EmailOperationPermissionData.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-using DevExpress.ExpressApp.Model;
-using DevExpress.ExpressApp.Security;
-using DevExpress.Persistent.Validation;
-using DevExpress.Xpo;
-using Xpand.ExpressApp.Logic.Security.Improved;
-using Xpand.Persistent.Base.Email;
-
-namespace Xpand.ExpressApp.Email.Security {
- [System.ComponentModel.DisplayName("Email")]
- public class EmailOperationPermissionData : LogicRuleOperationPermissionData, IContextEmailRule, IEmailOperationPermissionData{
- public EmailOperationPermissionData(Session session) : base(session) {
- }
-
- [RuleRequiredField]
- public string SmtpClientContext { get; set; }
-
- [RuleRequiredField]
- public string TemplateContext { get; set; }
-
- public string EmailReceipientsContext { get; set; }
-
- public override IList GetPermissions() {
- return new IOperationPermission[]{new EmailRulePermission(this)};
- }
-
-
- public string CurrentObjectEmailMember { get; set; }
-
- IModelMember IEmailRule.CurrentObjectEmailMember { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Security/EmailRulePermission.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Security/EmailRulePermission.cs
deleted file mode 100644
index ad0f182f0f..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Security/EmailRulePermission.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DevExpress.ExpressApp.Model;
-using DevExpress.ExpressApp.Utils;
-using Fasterflect;
-using Xpand.ExpressApp.Logic.Security.Improved;
-using Xpand.Persistent.Base.Email;
-using Xpand.Persistent.Base.Logic.Model;
-
-namespace Xpand.ExpressApp.Email.Security {
- public class EmailRulePermission : LogicRulePermission, IContextEmailRule{
- public const string OperationName = "Email";
-
- public EmailRulePermission(IContextEmailRule contextLogicRule) : base(OperationName, contextLogicRule) {
- EmailReceipientsContext = contextLogicRule.EmailReceipientsContext;
- TemplateContext = contextLogicRule.TemplateContext;
- SmtpClientContext = contextLogicRule.SmtpClientContext;
- var objectTypeData = (Type)contextLogicRule.GetPropertyValue(nameof(ILogicRuleOperationPermissionData.ObjectTypeData));
- if (objectTypeData != null){
- var propertyValue = (string) contextLogicRule.GetPropertyValue(nameof(IEmailOperationPermissionData.CurrentObjectEmailMember));
- if (!string.IsNullOrWhiteSpace(propertyValue))
- CurrentObjectEmailMember =CaptionHelper.ApplicationModel.BOModel.GetClass(objectTypeData).FindMember(propertyValue);
- }
- }
-
- public string SelectedObjectEmailMember { get; set; }
-
- public string SmtpClientContext { get; set; }
-
- public string TemplateContext { get; set; }
- public string EmailReceipientsContext { get; set; }
-
- public override IList GetSupportedOperations() {
- return new[]{OperationName};
- }
-
- public IModelMember CurrentObjectEmailMember { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Security/PopulateControllers.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Security/PopulateControllers.cs
deleted file mode 100644
index ee4ac1828d..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Security/PopulateControllers.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using DevExpress.ExpressApp.Model;
-using Xpand.ExpressApp.Email.Model;
-using Xpand.Persistent.Base.Email;
-using Xpand.Persistent.Base.General.Controllers;
-using Xpand.Utils.Helpers;
-
-namespace Xpand.ExpressApp.Email.Security {
- public class PopulateSmtpClientContextController:PopulateController {
- protected override string GetPredefinedValues(IModelMember wrapper) {
- var smtpClientContexts = ((IModelApplicationEmail)Application.Model).Email.SmtpClientContexts;
- return string.Join(";", smtpClientContexts.Select(contexts => contexts.GetValue("Id")));
- }
-
- protected override Expression> GetPropertyName() {
- return rule => rule.SmtpClientContext;
- }
- }
-
- public class PopulateTemplateContextContextController : PopulateController {
- protected override string GetPredefinedValues(IModelMember wrapper) {
- var templateContexts = ((IModelApplicationEmail)Application.Model).Email.EmailTemplateContexts;
- return string.Join(";", templateContexts.Select(contexts => contexts.GetValue("Id")));
- }
-
- protected override Expression> GetPropertyName() {
- return rule => rule.TemplateContext;
- }
- }
-
- public class PopulateEmailReceipientsContextContextController : PopulateController {
- protected override string GetPredefinedValues(IModelMember wrapper) {
- var emailReceipients = ((IModelApplicationEmail)Application.Model).Email.EmailReceipients;
- return string.Join(";", emailReceipients.Select(contexts => contexts.GetValue("Id")));
- }
-
- protected override Expression> GetPropertyName() {
- return rule => rule.EmailReceipientsContext;
- }
- }
-
- public class PopulateCurrentObjectEmailMemberController : PopulateController {
- protected override IEnumerable RefreshingProperties() {
- return new[] { ((IContextEmailRule)View.CurrentObject).GetPropertyName(rule => rule.TypeInfo) };
- }
-
- protected override string GetPredefinedValues(IModelMember wrapper) {
- var typeInfo = ((IContextEmailRule) View.CurrentObject).TypeInfo;
- var values=new[]{" "};
- if (typeInfo != null) {
- values = typeInfo.Members.Select(member => member.Name).ToArray();
- }
- return string.Join(";", values);
- }
-
- protected override Expression> GetPropertyName() {
- return rule => rule.CurrentObjectEmailMember;
- }
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Updater.cs b/Xpand/Xpand.ExpressApp.Modules/Email/Updater.cs
deleted file mode 100644
index 892f74daac..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Updater.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Updating;
-
-namespace Xpand.ExpressApp.Email {
- public class Updater : ModuleUpdater {
- public Updater(IObjectSpace objectSpace, Version currentDBVersion)
- : base(objectSpace, currentDBVersion) {
- }
-
- public override void UpdateDatabaseAfterUpdateSchema() {
- base.UpdateDatabaseAfterUpdateSchema();
-
- }
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/Xpand.ExpressApp.Email.csproj b/Xpand/Xpand.ExpressApp.Modules/Email/Xpand.ExpressApp.Email.csproj
deleted file mode 100644
index b3823c666e..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/Xpand.ExpressApp.Email.csproj
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- ..\..\Xpand.key\xpand.snk
- true
- net461
- ..\..\..\Xpand.DLL\
- latest
- true
- true
- false
- false
- pdbonly
-
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Logic.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Security.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Validation.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Persistent.Base.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Utils.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Xpo.dll
- False
-
-
-
-
-
-
-
-
- Designer
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/Email/paket.references b/Xpand/Xpand.ExpressApp.Modules/Email/paket.references
deleted file mode 100644
index e207bf5e0c..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/Email/paket.references
+++ /dev/null
@@ -1,6 +0,0 @@
-RazorEngine
-DevExpress.ExpressApp.ConditionalAppearance
-DevExpress.ExpressApp.Security.Xpo
-Xpand.XAF.Modules.ModelViewInheritance
-DevExpress.ExpressApp.CodeAnalysis
-
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Controllers/ExcelColumnMapMemberTypeValueController.cs b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Controllers/ExcelColumnMapMemberTypeValueController.cs
deleted file mode 100644
index 8a69864003..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Controllers/ExcelColumnMapMemberTypeValueController.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Linq;
-using DevExpress.ExpressApp.Utils;
-using DevExpress.ExpressApp.Web.Editors.ASPx;
-using DevExpress.Web;
-using Xpand.ExpressApp.ExcelImporter.BusinessObjects;
-
-namespace Xpand.ExpressApp.ExcelImporter.Web.Controllers{
- public class ExcelColumnMapMemberTypeValueController:ExcelImporter.Controllers.ExcelColumnMapMemberTypeValueController {
-
-
- protected override void PopulateTypes() {
- base.PopulateTypes();
- var grid = ((ASPxGridListEditor) View.Editor).Grid;
- var dataComboBoxColumn = grid.Columns
- .OfType()
- .First(column => column.FieldName == nameof(ExcelColumnMapMemberTypeValue.Type));
- var comboBox = dataComboBoxColumn.PropertiesComboBox;
- comboBox.AllowNull = false;
- comboBox.DropDownStyle=DropDownStyle.DropDownList;
- comboBox.Items.Clear();
- var types = GetTypes();
- var sources = types
- .Select(type => new ListEditItem(CaptionHelper.GetClassCaption(type.FullName),type)).ToArray();
- comboBox.Items.AddRange(sources);
-
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Controllers/ExcelImportDetailViewController.cs b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Controllers/ExcelImportDetailViewController.cs
deleted file mode 100644
index be9c85f092..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Controllers/ExcelImportDetailViewController.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Editors;
-using DevExpress.ExpressApp.FileAttachments.Web;
-using DevExpress.ExpressApp.SystemModule;
-using DevExpress.ExpressApp.Web;
-using DevExpress.ExpressApp.Web.Editors.ASPx;
-using DevExpress.ExpressApp.Web.Templates;
-using DevExpress.Web;
-using ExcelDataReader;
-using Xpand.ExpressApp.ExcelImporter.BusinessObjects;
-using Xpand.ExpressApp.ExcelImporter.Services;
-
-namespace Xpand.ExpressApp.ExcelImporter.Web.Controllers{
- public class ExcelImportDetailViewController:ExcelImporter.Controllers.ExcelImportDetailViewController,IXafCallbackHandler{
- private ListPropertyEditor _listPropertyEditor;
- private FileDataPropertyEditor _fileDataPropertyEditor;
- private ASPxGridListEditor _asPxGridListEditor;
- private Exception _exception;
-
- protected override void OnActivated(){
- base.OnActivated();
- _fileDataPropertyEditor = View.GetItems().First();
- _fileDataPropertyEditor.ControlCreated += FileDataPropertyEditorOnControlCreated;
- _listPropertyEditor = View.GetItems().First(editor => editor.MemberInfo.Name==nameof(BusinessObjects.ExcelImport.ExcelColumnMaps));
- _listPropertyEditor.ControlCreated+=ListPropertyEditorOnControlCreated;
- }
-
- protected override void OnDeactivated() {
- base.OnDeactivated();
- if (_fileDataPropertyEditor != null)
- _fileDataPropertyEditor.ControlCreated -= FileDataPropertyEditorOnControlCreated;
- if (_listPropertyEditor != null) {
- _listPropertyEditor.ControlCreated -= ListPropertyEditorOnControlCreated;
- }
- }
-
- protected XafCallbackManager CallbackManager => WebWindow.CurrentRequestPage != null ? ((ICallbackManagerHolder)WebWindow.CurrentRequestPage).CallbackManager : null;
-
- protected override void OnViewControlsCreated() {
- base.OnViewControlsCreated();
- CallbackManager.RegisterHandler(GetType().FullName, this);
- }
-
- protected override IObservable Synchronize(T t = default) {
- if (t is Exception exception) {
- _exception = exception;
- }
- return base.Synchronize(t);
- }
-
- protected override void ShowMapConfigView(ShowViewParameters parameters) {
- base.ShowMapConfigView(parameters);
- parameters.Controllers.OfType().First().Disposed +=
- (_, _) => ObjectSpace.Refresh();
- }
-
- private void FileDataPropertyEditorOnControlCreated(object sender, EventArgs eventArgs){
- ((FileDataPropertyEditor) sender).Editor.FileDataLoading+=OnFileDataLoading;
- }
-
- private void ListPropertyEditorOnControlCreated(object sender, EventArgs e) {
- _asPxGridListEditor = ((ASPxGridListEditor) _listPropertyEditor.ListView.Editor);
- _asPxGridListEditor.ControlsCreated+=ASPxGridListEditorOnControlsCreated;
- }
-
- private void ASPxGridListEditorOnControlsCreated(object sender, EventArgs e) {
- PopulatePropertyNames();
- }
-
- private void PopulatePropertyNames(){
- var dataComboBoxColumn = _asPxGridListEditor.Grid.Columns
- .OfType().First(column => column.FieldName == nameof(ExcelColumnMap.PropertyName));
- var comboBox = dataComboBoxColumn.PropertiesComboBox;
- comboBox.DropDownStyle = DropDownStyle.DropDownList;
- var items = comboBox.Items;
- items.Clear();
- items.AddRange(ExcelImport.TypePropertyNames.ToArray());
- }
-
- private void ParseStream(UploadedFile uploadedFile) {
- using var stream = ExcelImport.GetXlsContent(uploadedFile.FileName, uploadedFile.FileBytes);
- var temp = new DirectoryInfo(Path.GetTempPath());
- temp = temp.CreateSubdirectory(Application.Title);
- var path = Path.Combine(temp.FullName,$"{ExcelImport.Oid}{Path.GetExtension(uploadedFile.FileName)}");
- using (var fileStream = File.Create(path)){
- stream.CopyTo(fileStream);
- }
- using (var excelDataReader = ExcelReaderFactory.CreateReader(stream)){
- ExcelImport.SheetNames = excelDataReader.Sheets().ToList();
- }
- }
-
- private void OnFileDataLoading(object sender, FileDataLoadingEventArgs e){
- ParseStream(e.UploadedFile);
- }
-
- public void ProcessAction(string parameter) {
- if (_exception != null) {
- ErrorHandling.Instance.SetPageError(_exception);
- _exception = null;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/ExcelImporterWebModule.cs b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/ExcelImporterWebModule.cs
deleted file mode 100644
index a06fa6d477..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/ExcelImporterWebModule.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.ComponentModel;
-using System.Drawing;
-using DevExpress.ExpressApp.ConditionalAppearance;
-using DevExpress.ExpressApp.FileAttachments.Web;
-using DevExpress.ExpressApp.Validation;
-using DevExpress.ExpressApp.Validation.Web;
-using DevExpress.ExpressApp.Web.SystemModule;
-using DevExpress.Utils;
-using Xpand.ExpressApp.Web.SystemModule;
-using Xpand.Persistent.Base.General;
-
-namespace Xpand.ExpressApp.ExcelImporter.Web {
- [ToolboxBitmap(typeof(ExcelImporterWebModule))]
- [ToolboxItem(true)]
- [ToolboxTabName(XpandAssemblyInfo.TabAspNetModules)]
- public sealed class ExcelImporterWebModule : XpandModuleBase {
- public ExcelImporterWebModule() {
- RequiredModuleTypes.Add(typeof(DevExpress.ExpressApp.SystemModule.SystemModule));
- RequiredModuleTypes.Add(typeof(ConditionalAppearanceModule));
- RequiredModuleTypes.Add(typeof(ValidationModule));
- RequiredModuleTypes.Add(typeof(ValidationAspNetModule));
- RequiredModuleTypes.Add(typeof(FileAttachmentsAspNetModule));
- RequiredModuleTypes.Add(typeof(SystemAspNetModule));
- RequiredModuleTypes.Add(typeof(ExcelImporterModule));
- RequiredModuleTypes.Add(typeof(XpandSystemAspNetModule));
- }
-
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Model.DesignedDiffs.xafml b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Model.DesignedDiffs.xafml
deleted file mode 100644
index d57fc8dd86..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Model.DesignedDiffs.xafml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Properties/AssemblyInfo.cs b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Properties/AssemblyInfo.cs
deleted file mode 100644
index aa22762fc5..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xpand.ExpressApp.ExcelImporter.Web")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xpand.ExpressApp.ExcelImporter.Web")]
-[assembly: AssemblyCopyright("Copyright © 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyMetadata("Platform","Web")]
-[assembly: AssemblyVersion(XpandAssemblyInfo.Version)]
-[assembly: AssemblyFileVersion(XpandAssemblyInfo.FileVersion)]
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/ReadMe.txt b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/ReadMe.txt
deleted file mode 100644
index 676af9c355..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/ReadMe.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Project Description
-
-This project implements a platform-agnostic Module. UI-independent application
-elements can be implemented here (Business Objects, Controllers, etc.). The root
-project folder contains the Module.cs(vb) file with the class that inherits
-ModuleBase. This class can be designed with the Module Designer that allows
-you to view and customize Module components: referenced modules, Controllers
-and business classes. Additionally, the root folder contains Application Model
-difference files (XAFML files) that keep application settings specific for the
-current Module. Differences files can be designed with the Model Editor.
-
-
-Relevant Documentation
-
-Application Solution Components
-https://documentation.devexpress.com/eXpressAppFramework/CustomDocument112569.aspx
-
-ModuleBase Class
-https://documentation.devexpress.com/eXpressAppFramework/clsDevExpressExpressAppModuleBasetopic.aspx
-
-Module Designer
-https://documentation.devexpress.com/eXpressAppFramework/CustomDocument112828.aspx
-
-Application Model
-https://documentation.devexpress.com/eXpressAppFramework/CustomDocument112579.aspx
-
-Model Editor
-https://documentation.devexpress.com/eXpressAppFramework/CustomDocument112582.aspx
-
-
-eXpand Framework - http://www.expandframework.com
-
-This is an open source toolkit built above the eXpressApp Framework extending its capabilities
-and providing 50+ cutting-edge libraries containing tools and reusable modules to target numerous
-business scenarios. The main idea behind eXpand is to offer as many features as possible to
-developers/business users through a declarative approach (configuring files rather than writing code).
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Xpand.ExpressApp.ExcelImporter.Web.csproj b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Xpand.ExpressApp.ExcelImporter.Web.csproj
deleted file mode 100644
index 6bfbf21a88..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/Xpand.ExpressApp.ExcelImporter.Web.csproj
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- net461
- latest
- true
- true
- ..\..\..\Xpand.DLL\
- true
- latest
- true
- ..\..\Xpand.key\xpand.snk
- false
- false
- pdbonly
- true
-
-
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.ExcelImporter.dll
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Validation.Web.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.Web.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Persistent.Base.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Utils.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.Xpo.dll
- False
-
-
- ..\..\..\Xpand.DLL\Xpand.ExpressApp.dll
- False
-
-
-
-
-
- ExcelImporterWebModule.cs
-
-
-
-
- Designer
-
-
- Designer
- ExcelImporterWebModule.cs
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/paket.references b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/paket.references
deleted file mode 100644
index b060909545..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Web/paket.references
+++ /dev/null
@@ -1,10 +0,0 @@
-System.IO.Compression
-ExcelDataReader.DataSet
-System.Reactive
-DevExpress.ExpressApp.ConditionalAppearance
-DevExpress.ExpressApp.FileAttachment.Web
-DevExpress.ExpressApp.Validation.Web
-DevExpress.ExpressApp.Xpo
-Xpand.Extensions.XAF
-DevExpress.ExpressApp.CodeAnalysis
-
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj
index c582a96fa9..2d08ca6127 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/Xpand.ExpressApp.ExcelImporter.Win.csproj
@@ -2,7 +2,7 @@
..\..\Xpand.key\xpand.snk
- net461;net6.0-windows7.0
+ net6.0-windows7.0
true
latest
true
@@ -11,7 +11,7 @@
true
latest
false
- true
+ false
pdbonly
True
@@ -32,11 +32,11 @@
..\..\..\Xpand.DLL\Xpand.ExpressApp.ExcelImporter.dll
- ..\..\..\Xpand.DLL\$(TargetFramework)\Xpand.ExpressApp.Validation.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Validation.Win.dll
False
- ..\..\..\Xpand.DLL\$(TargetFramework)\Xpand.ExpressApp.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.Win.dll
False
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/paket.references b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/paket.references
index 9365bf468b..80cdd1df97 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter.Win/paket.references
@@ -6,5 +6,5 @@ DevExpress.ExpressApp.Validation.Win
DevExpress.ExpressApp.Xpo
Xpand.XAF.Modules.Reactive
Xpand.Extensions
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Controllers/ExcelImportDetailViewController.cs b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Controllers/ExcelImportDetailViewController.cs
index 682418a398..41943b2394 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Controllers/ExcelImportDetailViewController.cs
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Controllers/ExcelImportDetailViewController.cs
@@ -67,7 +67,7 @@ private void ExcelMappingActionOnExecute(object sender, SingleChoiceActionExecut
private void AcceptActionOnExecuted(object sender, ActionBaseEventArgs e) {
((IObjectSpaceLink) ExcelImport).ObjectSpace.ReloadObject(ExcelImport);
- ExcelImport.ValidateForImport();
+ ExcelImport.ValidateForImport(Site);
}
protected virtual void ShowMapConfigView(ShowViewParameters parameters) {
@@ -77,18 +77,18 @@ protected virtual void ShowMapConfigView(ShowViewParameters parameters) {
private void Map() {
ValidateFile();
var excelImport = ExcelImport;
- excelImport.Map();
+ excelImport.Map(Site);
}
private void ImportActionOnExecuting(object sender, CancelEventArgs cancelEventArgs){
ValidateFile();
- ExcelImport.ValidateForImport();
+ ExcelImport.ValidateForImport(Site);
}
public ExcelImport ExcelImport => ((ExcelImport) View.CurrentObject);
protected virtual void ValidateFile(){
if (ExcelImport.File.Content == null){
- var result = Validator.RuleSet.NewRuleSetValidationMessageResult(ObjectSpace, "Invalid file", "Save",
+ var result = Validator.GetService(Site).NewRuleSetValidationMessageResult(ObjectSpace, "Invalid file", "Save",
View.CurrentObject, View.ObjectTypeInfo.Type, new List{nameof(ExcelImport.File)});
throw new ValidationException("", result);
}
@@ -112,7 +112,7 @@ await ObjectSpace.WhenCommiting().FirstAsync()
.SelectMany(Synchronize)
.Do(i => {
if (!string.IsNullOrWhiteSpace(excelImport.ValidationContexts)) {
- Validator.RuleSet.ValidateAll(importObjectSpace, importObjectSpace.ModifiedObjects,excelImport.ValidationContexts);
+ Validator.GetService(Site).ValidateAll(importObjectSpace, importObjectSpace.ModifiedObjects,excelImport.ValidationContexts);
}
}).DefaultIfEmpty();
return (importObjectSpace,failedResultsObjectSpace);
diff --git a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Services/ImportExtension.cs b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Services/ImportExtension.cs
index a539f7fc68..1fb807fee2 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Services/ImportExtension.cs
+++ b/Xpand/Xpand.ExpressApp.Modules/ExcelImporter/Services/ImportExtension.cs
@@ -258,8 +258,8 @@ public static string GetColumnName(this ExcelColumnMap excelColumnMap) {
: excelColumnMap.ExcelColumnName;
}
- public static void Map(this ExcelImport excelImport) {
- Validator.RuleSet.Validate(((IObjectSpaceLink) excelImport).ObjectSpace, excelImport,ExcelImport.MappingContext);
+ public static void Map(this ExcelImport excelImport, ISite site) {
+ Validator.GetService(site).Validate(((IObjectSpaceLink) excelImport).ObjectSpace, excelImport,ExcelImport.MappingContext);
using (var memoryStream = new MemoryStream(excelImport.File.Content)){
using (var excelDataReader = ExcelReaderFactory.CreateReader(memoryStream)) {
foreach (var dataColumn in excelDataReader.Columns(excelImport)) {
@@ -397,8 +397,8 @@ public static DataSet GetDataSet(this ExcelImport excelImport, byte[] bytes = nu
}
}
- public static void ValidateForImport(this ExcelImport excelImport) {
- var ruleSet = Validator.RuleSet;
+ public static void ValidateForImport(this ExcelImport excelImport, ISite site) {
+ var ruleSet = Validator.GetService(site);
var objects = new[] {excelImport}.Cast
- ..\..\..\Xpand.DLL\$(TargetFramework)\Xpand.ExpressApp.TreeListEditors.Win.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.TreeListEditors.Win.dll
False
diff --git a/Xpand/Xpand.ExpressApp.Modules/IO.Win/paket.references b/Xpand/Xpand.ExpressApp.Modules/IO.Win/paket.references
index cc70ff4cf7..72450a4e23 100644
--- a/Xpand/Xpand.ExpressApp.Modules/IO.Win/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/IO.Win/paket.references
@@ -2,5 +2,5 @@ DotNetZip
System.ValueTuple
DevExpress.ExpressApp.FileAttachment.Win
DevExpress.ExpressApp.TreeListEditors.Win
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/IO/Xpand.ExpressApp.IO.csproj b/Xpand/Xpand.ExpressApp.Modules/IO/Xpand.ExpressApp.IO.csproj
index 9939e1831b..4badd07cd9 100644
--- a/Xpand/Xpand.ExpressApp.Modules/IO/Xpand.ExpressApp.IO.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/IO/Xpand.ExpressApp.IO.csproj
@@ -3,7 +3,7 @@
..\..\Xpand.key\xpand.snk
true
- netstandard2.0
+ net6.0
..\..\..\Xpand.DLL\
latest
true
diff --git a/Xpand/Xpand.ExpressApp.Modules/IO/paket.references b/Xpand/Xpand.ExpressApp.Modules/IO/paket.references
index 3d65a1dd2d..b507bc7e1d 100644
--- a/Xpand/Xpand.ExpressApp.Modules/IO/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/IO/paket.references
@@ -5,5 +5,5 @@ DevExpress.ExpressApp.Xpo
Fasterflect.Xpand
Xpand.Extensions
System.Security.Permissions
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/Xpand.ExpressApp.ImportWizard.Win.csproj b/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/Xpand.ExpressApp.ImportWizard.Win.csproj
index 60ef323707..b73d72d6d4 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/Xpand.ExpressApp.ImportWizard.Win.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/Xpand.ExpressApp.ImportWizard.Win.csproj
@@ -3,7 +3,7 @@
..\..\Xpand.key\xpand.snk
true
- net461;net6.0-windows7.0
+ net6.0-windows7.0
true
true
..\..\..\Xpand.DLL\
@@ -11,29 +11,16 @@
true
true
false
- true
+ false
pdbonly
True
-
- 1701;1702;MSB3277
-
-
- 1701;1702;MSB3277
-
-
- 1701;1702;MSB3277
-
-
+
1701;1702;MSB3277
-
-
-
-
- ..\..\..\Xpand.DLL\$(TargetFramework)\Xpand.ExpressApp.ImportWizard.dll
+ ..\..\..\Xpand.DLL\Xpand.ExpressApp.ImportWizard.dll
False
diff --git a/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/paket.references b/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/paket.references
index 50499ec56c..5a4b83bae6 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/ImportWizard.Win/paket.references
@@ -3,4 +3,4 @@ DevExpress.ExpressApp.Win
DevExpress.ExpressApp.Xpo
System.ValueTuple
Xpand.Extensions
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/ImportWizard/Xpand.ExpressApp.ImportWizard.csproj b/Xpand/Xpand.ExpressApp.Modules/ImportWizard/Xpand.ExpressApp.ImportWizard.csproj
index 1a9f6f83d4..fcbde6ad15 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ImportWizard/Xpand.ExpressApp.ImportWizard.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/ImportWizard/Xpand.ExpressApp.ImportWizard.csproj
@@ -3,14 +3,14 @@
..\..\Xpand.key\xpand.snk
true
- net461;net6.0-windows7.0
+ net6.0-windows7.0
true
..\..\..\Xpand.DLL\
latest
true
true
false
- true
+ false
pdbonly
True
diff --git a/Xpand/Xpand.ExpressApp.Modules/ImportWizard/paket.references b/Xpand/Xpand.ExpressApp.Modules/ImportWizard/paket.references
index 0bf7ba1e67..81903883ab 100644
--- a/Xpand/Xpand.ExpressApp.Modules/ImportWizard/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/ImportWizard/paket.references
@@ -4,5 +4,5 @@ System.ValueTuple
Fasterflect.Xpand
System.Collections.Immutable
Xpand.Extensions
-DevExpress.ExpressApp.CodeAnalysis
+
diff --git a/Xpand/Xpand.ExpressApp.Modules/Logic/Xpand.ExpressApp.Logic.csproj b/Xpand/Xpand.ExpressApp.Modules/Logic/Xpand.ExpressApp.Logic.csproj
index 1a35f61aeb..9bdbccb638 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Logic/Xpand.ExpressApp.Logic.csproj
+++ b/Xpand/Xpand.ExpressApp.Modules/Logic/Xpand.ExpressApp.Logic.csproj
@@ -3,7 +3,7 @@
..\..\Xpand.key\xpand.snk
true
- netstandard2.0
+ net6.0
false
..\..\..\Xpand.DLL\
latest
diff --git a/Xpand/Xpand.ExpressApp.Modules/Logic/paket.references b/Xpand/Xpand.ExpressApp.Modules/Logic/paket.references
index 55fe35c671..bc9aca311a 100644
--- a/Xpand/Xpand.ExpressApp.Modules/Logic/paket.references
+++ b/Xpand/Xpand.ExpressApp.Modules/Logic/paket.references
@@ -6,5 +6,5 @@ Fasterflect.Xpand
Xpand.XAF.Modules.Reactive
Xpand.Extensions.XAF.Xpo
Xpand.Extensions
-DevExpress.ExpressApp.CodeAnalysis
+
System.ComponentModel.Annotations
diff --git a/Xpand/Xpand.ExpressApp.Modules/MapView.Web/Controllers/ReadMe.txt b/Xpand/Xpand.ExpressApp.Modules/MapView.Web/Controllers/ReadMe.txt
deleted file mode 100644
index 0c7ded8bb8..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/MapView.Web/Controllers/ReadMe.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Folder Description
-
-The "Controllers" project folder is intended for storing Controller classes
-that can change the default XAF application flow and add new features.
-
-
-Relevant Documentation
-
-Extend Functionality
-http://help.devexpress.com/#Xaf/CustomDocument2623
-
-Controller Class
-http://help.devexpress.com/#Xaf/clsDevExpressExpressAppControllertopic
-
-ViewController Class
-http://help.devexpress.com/#Xaf/clsDevExpressExpressAppViewControllertopic
-
-WindowController Class
-http://help.devexpress.com/#Xaf/clsDevExpressExpressAppWindowControllertopic
diff --git a/Xpand/Xpand.ExpressApp.Modules/MapView.Web/MapControl.cs b/Xpand/Xpand.ExpressApp.Modules/MapView.Web/MapControl.cs
deleted file mode 100644
index 15b794e0fe..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/MapView.Web/MapControl.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Text;
-using System.Web.UI.HtmlControls;
-using DevExpress.Web;
-using DevExpress.Web.Internal;
-using Xpand.ExpressApp.Web.Layout;
-using System.Linq;
-
-namespace Xpand.ExpressApp.MapView.Web
-{
- public class MapControl : ASPxWebControl
- {
- private const int infoWidthDefaultValue = 300;
- private const string callAdjustSizeScript = "if (window.AdjustSize) window.AdjustSize(); else div.style.height = document.getElementById('mainDiv').style['min-height'];";
- private HtmlGenericControl div;
- private int infoWindowWidth = infoWidthDefaultValue;
- public event EventHandler FocusedIndexChanged;
- internal event EventHandler MapViewInfoNeeded;
-
- private void OnMapViewInfoNeeded(MapViewInfoEventArgs e)
- {
- var handler = MapViewInfoNeeded;
- if (handler != null) handler(this, e);
- }
-
-
- internal bool PerformCallbackOnMarker { get; set; }
- protected override string GetStartupScript()
- {
- var sb = new StringBuilder();
-
- sb.AppendLine("var adjustSizeOverride = " + XpandLayoutManager.GetAdjustSizeScript());
- sb.AppendLine("adjustSizeOverride();");
- sb.AppendFormat("var div = document.getElementById('{0}');", div.ClientID);
- sb.AppendLine("window.ElementToResize = div;");
- sb.AppendLine("var initMap = function() { ");
-
- sb.AppendFormat(@"{0}
-
- var parentSplitter = XpandHelper.GetElementParentControl(div);
- if (parentSplitter && parentSplitter.{1} && !parentSplitter.xpandInitialized) {{
- window.setTimeout(initMap, 500);
- return;
- }}
-
- ", XpandLayoutManager.GetXpandHelperScript(), div.ClientID, XpandLayoutManager.IsMasterDetailSplitterPropertyName);
-
- sb.AppendLine("var mapOptions = {");
- sb.AppendLine("zoom: 4,");
- sb.AppendLine("mapTypeId: google.maps.MapTypeId.ROADMAP }");
- sb.AppendFormat(" var map = new google.maps.Map(document.getElementById('{0}'), mapOptions);\r\n",
- div.ClientID);
-
- sb.AppendLine("var geocoder = new google.maps.Geocoder();");
- sb.AppendLine(@"var addMarkerClickEvent = function(marker, objectId) {
- google.maps.event.addListener(marker, 'click', function() {");
- sb.AppendLine(@"if (marker.infoWindow) marker.infoWindow.open(map, marker);");
-
-
- sb.AppendLine(@"var markerCallback = function (s,e) {");
- if (PerformCallbackOnMarker)
- {
- sb.Append(@"
- var up = XpandHelper.GetFirstChildControl(parentSplitter.GetPane(1).GetElement().childNodes[0]);
- if (up && up.GetMainElement()) {{
- up.PerformCallback(objectId);}}");
- }
- sb.AppendLine("};");
-
- sb.AppendLine("var arg = 'd1:' + objectId;");
- sb.AppendLine(RenderUtils.GetCallbackEventReference(Page, this, "arg", "markerCallback", "'" + ClientID + "'",
- GetCallBackErrorHandlerName()) + ";");
-
- sb.AppendLine(" });};");
-
- sb.AppendLine("var bounds = new google.maps.LatLngBounds ();");
- sb.AppendLine("var createMarker = function(location, objectId, fitBounds, infoWindowContent, infoWindowMaxWidth) {");
- sb.AppendLine(@"
-
- var marker = new google.maps.Marker({
- map: map,
- position: location
-
- });
- if (infoWindowContent) {
- marker.infoWindow = new google.maps.InfoWindow({
- content: infoWindowContent,
- maxWidth: infoWindowMaxWidth
- });
- }
-
- addMarkerClickEvent(marker, objectId);
- bounds.extend(location);
- if (fitBounds) map.fitBounds(bounds);
-
- }");
-
- sb.AppendLine(@"
- var geoCodeQueue = new Array();
- var createMarkersWithGeoCode = function() {
- if (geoCodeQueue.length == 0) {");
- sb.AppendLine(callAdjustSizeScript);
- sb.AppendLine(@"
- google.maps.event.trigger(map, 'resize');
- map.fitBounds(bounds);
- return;
- }
-
- var info = geoCodeQueue.pop();
- geocoder.geocode( { 'address': info.address}, function(results, status) {
- if (status == google.maps.GeocoderStatus.OK) {
- info.onSuccess(results);
- }
- else if (status == google.maps.GeocoderStatus.OVER_QUERY_LIMIT) {
- geoCodeQueue.push(info);
- window.setTimeout(function () { createMarkersWithGeoCode(); }, 1000);
- return;
- }
- else {
- console.error('Geocode was not successful for the following reason: ' + status);
- }
- createMarkersWithGeoCode();
- });
-
-
- }");
-
- sb.AppendLine("var createMarkerWithGeocode = function(address, objectId, fitBounds, infoWindowContent, infoWindowMaxWidth) {");
- sb.AppendLine(@"geoCodeQueue.push( {'address': address, 'onSuccess': function(results) {
- console.log('Success ' + address);
- createMarker(results[0].geometry.location, objectId, fitBounds, infoWindowContent, infoWindowMaxWidth);
- }});}");
-
-
- bool useGeoCode = false;
-
- if (DataSource != null)
- {
- var list = DataSource as IList;
- if (list != null)
- {
- sb.AppendLine("var marker, infoWindow;");
- var mapViewInfoEventArgs = new MapViewInfoEventArgs();
- OnMapViewInfoNeeded(mapViewInfoEventArgs);
- int index = 0;
- if (mapViewInfoEventArgs.MapViewInfos != null)
- {
- foreach (var mapViewInfo in mapViewInfoEventArgs.MapViewInfos)
- {
- string infoWindowText = "undefined";
- if (!string.IsNullOrEmpty(mapViewInfo.InfoWindowText))
- {
- infoWindowText = GetInfoWindowText(mapViewInfo);
- }
-
- if (mapViewInfo.Longitude != null && mapViewInfo.Latitude != null)
- {
-
- sb.AppendFormat(CultureInfo.InvariantCulture,
- "createMarker(new google.maps.LatLng({0},{1}), '{2}', {3}, '{4}', {5});\r\n",
- mapViewInfo.Latitude, mapViewInfo.Longitude, index,
- (index == list.Count - 1).ToString(CultureInfo.InvariantCulture).ToLower(),
- infoWindowText, InfoWindowWidth);
- }
- else if (!string.IsNullOrWhiteSpace(mapViewInfo.Address))
- {
- useGeoCode = true;
- sb.AppendFormat(CultureInfo.InvariantCulture,
- "createMarkerWithGeocode('{0}', '{1}', {2}, '{3}', {4});\r\n",
- mapViewInfo.Address, index,
- (index == list.Count - 1).ToString(CultureInfo.InvariantCulture).ToLower(),
- infoWindowText, InfoWindowWidth);
- }
- index++;
- }
-
- }
- }
- }
-
-
- if (useGeoCode)
- {
-
- sb.AppendLine("createMarkersWithGeoCode();");
- }
- else
- {
- sb.AppendLine(callAdjustSizeScript);
- sb.AppendLine("google.maps.event.trigger(map, 'resize');");
- }
-
- sb.AppendLine("};");
- sb.AppendLine("window.setTimeout(initMap, 500);");
- return sb.ToString();
- }
-
- [DefaultValue(false)]
- public bool AllowHtmlInInfoText { get; set; }
-
- private string GetInfoWindowText(MapViewInfo mapViewInfo)
- {
- string html = mapViewInfo.InfoWindowText;
- if (string.IsNullOrEmpty(html)) return string.Empty;
-
-
- if (!AllowHtmlInInfoText) {
- const string lineBreak = "
";
- html = System.Web.HttpUtility.HtmlEncode(mapViewInfo.InfoWindowText)
- .Replace("\r\n", lineBreak)
- .Replace("\n\r", lineBreak)
- .Replace("\n", lineBreak)
- .Replace("\r", lineBreak);
- }
-
- return System.Web.HttpUtility.JavaScriptStringEncode(html);
- }
-
-
- protected override void OnCustomDataCallback(CustomDataCallbackEventArgs e)
- {
- base.OnCustomDataCallback(e);
- int index;
- if (int.TryParse(e.Parameter, NumberStyles.Integer, CultureInfo.InvariantCulture, out index))
- FocusedIndex = index;
- }
-
- public object DataSource { get; set; }
-
- protected override bool HasFunctionalityScripts()
- {
- return true;
- }
-
- protected override void CreateChildControls()
- {
-
- div = new HtmlGenericControl("div") { ID = "MapContent" };
- div.Style.Add("display", "block");
- div.Style.Add("width", "100%");
- div.Style.Add("height", "100%");
- Controls.Add(div);
- }
-
-
- private int focusedIndex = -1;
-
- public int FocusedIndex
- {
- get { return focusedIndex; }
- set
- {
- if (focusedIndex != value)
- {
- focusedIndex = value;
- if (FocusedIndexChanged != null)
- FocusedIndexChanged(this, EventArgs.Empty);
- }
- }
- }
-
- public object FocusedObject
- {
- get
- {
- var list = DataSource as IList;
- return list != null && FocusedIndex >= 0 && FocusedIndex < list.Count ? list[FocusedIndex] : null;
- }
- }
-
- [DefaultValue(infoWidthDefaultValue)]
- public int InfoWindowWidth
- {
- get { return infoWindowWidth; }
- set { infoWindowWidth = value; }
- }
- }
-
- public interface IMapViewInfo
- {
- string Address { get; set; }
- string InfoWindowText { get; set; }
- }
-
- public class MapViewInfo : IMapViewInfo
- {
- public string Address { get; set; }
- public string InfoWindowText { get; set; }
- public decimal? Longitude { get; set; }
- public decimal? Latitude { get; set; }
-
- }
- class MapViewInfoEventArgs : EventArgs
- {
- public IEnumerable MapViewInfos { get; set; }
- }
-}
diff --git a/Xpand/Xpand.ExpressApp.Modules/MapView.Web/MapListEditor.cs b/Xpand/Xpand.ExpressApp.Modules/MapView.Web/MapListEditor.cs
deleted file mode 100644
index a96329ba6f..0000000000
--- a/Xpand/Xpand.ExpressApp.Modules/MapView.Web/MapListEditor.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using DevExpress.ExpressApp;
-using DevExpress.ExpressApp.Editors;
-using DevExpress.ExpressApp.Model;
-using Xpand.ExpressApp.ListEditors;
-
-namespace Xpand.ExpressApp.MapView.Web {
- [ListEditor(typeof(object), false)]
- public class MapListEditor : ListEditor, IXpandListEditor {
- public MapListEditor(IModelListView model)
- : base(model) {
-
- }
-
- public event EventHandler ViewControlsCreated;
-
- protected override void AssignDataSourceToControl(object dataSource) {
- if (Control != null)
- ((MapControl)Control).DataSource = dataSource;
- }
-
- public override DevExpress.ExpressApp.Templates.IContextMenuTemplate ContextMenuTemplate {
- get { return null; }
- }
-
- protected override object CreateControlsCore() {
- var mapControl = new MapControl();
- mapControl.FocusedIndexChanged += (s, e) => OnFocusedObjectChanged();
- mapControl.MapViewInfoNeeded += MapControlOnMapViewInfoNeeded;
- mapControl.PerformCallbackOnMarker = IsMasterDetail;
- mapControl.AllowHtmlInInfoText = ModelMapView.AllowHtmlInInfoWindowText;
- return mapControl;
- }
-
- private bool IsMasterDetail {
- get { return Model.MasterDetailMode == MasterDetailMode.ListViewAndDetailView; }
- }
-
- private IModelMapView ModelMapView {
- get { return ((IModelListViewMapView)Model).MapView; }
- }
-
- private T GetMemberValue(object obj, IModelMember modelMember) {
- if (modelMember == null) return default(T);
- var value = modelMember.MemberInfo.GetValue(obj);
- return value != null ? (T) value : default(T);
- }
-
- private string GetMemberValueToString(object obj, IModelMember modelMember) {
- object value = GetMemberValue