22.1.600.0

eXpandFramework · Oct 23, 2022 · 7b8fa3f · 7b8fa3f
1 parent 3f6ad2a
commit 7b8fa3f
Show file tree

Hide file tree

Showing 12 changed files with 2,184 additions and 2,175 deletions.
diff --git a/...s/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.deps.json b/...s/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.deps.json
diff --git a/...Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll b/...Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.dll
diff --git a/...Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.pdb b/...Plugins/Xpand.VSIX/ToolWindow/ModelEditor/WinDesktop/Xpand.XAF.ModelEditor.WinDesktop.pdb
diff --git a/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/Xpand.XAF.ModelEditor.exe b/Xpand.Plugins/Xpand.VSIX/ToolWindow/ModelEditor/Xpand.XAF.ModelEditor.exe
diff --git 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 https://nuget.devexpress.com/88luCgoeuPFTrDrTDcc6zKg22U2cVcTm3vdKCv88I7PHF9St6i/api
 source https://api.nuget.org/v3/index.json
 source https://xpandnugetserver.azurewebsites.net/nuget
 
 
-nuget DevExpress.ExpressApp.Xpo == 22.1.5
-nuget DevExpress.ExpressApp.Win == 22.1.5
+nuget DevExpress.ExpressApp.Xpo == 22.1.6
+nuget DevExpress.ExpressApp.Win == 22.1.6
 nuget Fasterflect.Xpand
 nuget Fody 4.2.1
 nuget Microsoft.CSharp 4.7.0
@@ -57,3 +57,6 @@ nuget Microsoft.VisualStudio.Threading.Analyzers 15.8.209
 nuget Microsoft.VisualStudio.Utilities 15.9.28307
 nuget Microsoft.VisualStudio.Workspace 15.0.485
 nuget Microsoft.VisualStudio.Workspace.VSIntegration 15.0.485
+
+
+
diff --git a/Xpand.Plugins/paket.lock b/Xpand.Plugins/paket.lock
@@ -1,7 +1,7 @@
 STORAGE: PACKAGES
 RESTRICTION: == net472
 NUGET
-  remote: C:\Program Files (x86)\DevExpress 22.1\Components\System\Components\Packages
+  remote: https://nuget.devexpress.com/88luCgoeuPFTrDrTDcc6zKg22U2cVcTm3vdKCv88I7PHF9St6i/api
     DevExpress.Charts (22.1.5)
       DevExpress.Charts.Core (22.1.5)
       DevExpress.Data (22.1.5)

diff --git a/Xpand/Directory.Build.targets b/Xpand/Directory.Build.targets
@@ -3,6 +3,6 @@
    <Exec Command="powershell.exe –NonInteractive –ExecutionPolicy Unrestricted –command &quot;&amp; { &amp;&apos;$(MSBuildThisFileDirectory)\..\Support\Build\ReplaceNuget.ps1&apos; &apos;$(ProjectPath)&apos; &apos;$(TargetPath)&apos; &apos;$(skipNugetReplace)&apos; } &quot; " LogStandardErrorAsError="True" ContinueOnError="False" />
  </Target>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;XAF0023;XAF0020</NoWarn>
+    <NoWarn>1701;1702;XAF0023;XAF0020;XAF0027;XAF0025</NoWarn>
   </PropertyGroup>
 </Project>
diff --git a/Xpand/Xpand.ExpressApp.Modules/Dashboard/BusinessObjects/TypeWrapper.cs b/Xpand/Xpand.ExpressApp.Modules/Dashboard/BusinessObjects/TypeWrapper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using DevExpress.ExpressApp.DC;
 using DevExpress.ExpressApp.Model.Core;
 using DevExpress.ExpressApp.Utils;
 using DevExpress.Xpo;
@@ -12,7 +13,7 @@ public interface ITypeWrapper {
     }
 
     [DefaultProperty("Caption")]
-    [NonPersistent]
+    [DomainComponent]
     public class TypeWrapper :  ITypeWrapper {
         public TypeWrapper( Type type){
             Type = type;

diff --git a/Xpand/Xpand.Utils/Properties/XpandAssemblyInfo.cs b/Xpand/Xpand.Utils/Properties/XpandAssemblyInfo.cs
@@ -1,5 +1,5 @@
 public class XpandAssemblyInfo {
-    public const string Version = "22.1.504.0";
+    public const string Version = "22.1.600.0";
     public const string FileVersion = Version;
     public const string Token = "c52ffed5d5ff0958";
     public const string TabAspNetModules = "eXpand: Web Modules";

diff --git a/build.ps1 b/build.ps1
@@ -1,6 +1,6 @@
 
 $sources=@("https://api.nuget.org/v3/index.json","https://xpandnugetserver.azurewebsites.net/nuget","C:\Program Files (x86)\DevExpress 22.1\Components\System\Components\packages")   
-& $PSScriptRoot\support\build\go.ps1 -taskList @("Release") -packageSources $sources -msbuildArgs @("/p:Configuration=Release","/WarnAsError","/v:m") -version "22.1.504.0" 
+& $PSScriptRoot\support\build\go.ps1 -taskList @("Release") -packageSources $sources -msbuildArgs @("/p:Configuration=Release","/WarnAsError","/v:m") -version "22.1.600.0" 
 exit $LastExitCode
 
 
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,4 +1,4 @@
-source C:\Program Files (x86)\DevExpress 22.1\Components\System\Components\Packages
+source https://nuget.devexpress.com/88luCgoeuPFTrDrTDcc6zKg22U2cVcTm3vdKCv88I7PHF9St6i/api
 source https://api.nuget.org/v3/index.json
 source https://xpandnugetserver.azurewebsites.net/nuget
 storage: none
@@ -16,12 +16,12 @@ nuget AppDomainToolkit 1.0.4.3
 nuget AutoMapper 10.1.1
 nuget CommandLineParser 1.9.71
 nuget Common.Logging 3.4.1
-nuget DevExpress.ExpressApp.Win.All = 22.1.5 
-nuget DevExpress.ExpressApp.Web.All = 22.1.5 
-nuget DevExpress.ExpressApp.Core.All  = 22.1.5
-nuget DevExpress.ExpressApp.Security.Xpo = 22.1.5
-nuget DevExpress.Document.Processor = 22.1.5 
-nuget DevExpress.ExpressApp.CodeAnalysis = 22.1.5
+nuget DevExpress.ExpressApp.Win.All = 22.1.6 
+nuget DevExpress.ExpressApp.Web.All = 22.1.6 
+nuget DevExpress.ExpressApp.Core.All  = 22.1.6
+nuget DevExpress.ExpressApp.Security.Xpo = 22.1.6
+nuget DevExpress.Document.Processor = 22.1.6 
+nuget DevExpress.ExpressApp.CodeAnalysis = 22.1.6
 nuget DocumentFormat.OpenXml 2.11.3
 nuget DotNetZip 1.16.0
 nuget Enums.NET 4.0.0
@@ -72,15 +72,17 @@ nuget Topshelf 4.2.1
 nuget Microsoft.AspNetCore.WebUtilities 2.2.0
 nuget Unofficial.Microsoft.mshtml 7.0.3300
 nuget WindowsBase 4.6.1055.0
-nuget Xpand.XAF.Win.All 4.221.9.0
-nuget Xpand.XAF.Web.All 4.221.9.0
+nuget Xpand.XAF.Win.All 4.221.9.1
+nuget Xpand.XAF.Web.All 4.221.9.1
 nuget System.Memory = 4.5.4
 nuget System.Collections.Immutable = 6.0.0
 nuget System.ServiceModel.NetTcp = 4.9
 nuget System.ServiceModel.Security = 4.9
 nuget System.ServiceModel.Http = 4.9
 nuget System.ServiceModel.Duplex = 4.9
 nuget Microsoft.Bcl.AsyncInterfaces = 6.0.0
-nuget System.Text.Json = 6.0.5
+nuget System.Text.Json = 6.0.6
 nuget System.Text.Encodings.Web = 6.0.0
 nuget Microsoft.IdentityModel.Protocols.OpenIdConnect 6.15.0
+
+