24.2.3

eXpandFramework · Dec 23, 2024 · e7d4335 · e7d4335
1 parent d8ce2ff
commit e7d4335
Show file tree

Hide file tree

Showing 398 changed files with 3,034 additions and 32,700 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "8.0.0",
+      "version": "9.0.2",
       "commands": [
         "paket"
       ]

diff --git a/.github/Azure-pipeline.ps1 b/.github/Azure-pipeline.ps1
@@ -4,7 +4,7 @@ param(
    $NuGetApiKey,
    $artifactstagingdirectory
 )
-dotnet tool restore
+
 $WorkingDirectory="$PSScriptRoot\.."
 if ($repository -like "*/eXpand.lab"){
    "Finding Version.."
@@ -23,12 +23,25 @@ else{
 }
 $version
 & "$WorkingDirectory\support\build\go.ps1" -installmodules 
+Invoke-Script {
+
+   Set-Location $WorkingDirectory
+   try {
+       dotnet nuget add source "https://api.nuget.org/v3/index.json" --name "nuget.org"
+       dotnet nuget add source "$DXApiFeed" --name "DX"
+   }
+   catch { }
+   $LASTEXITCODE=0
+   dotnet nuget list source
+   Write-HostFormatted "Installing paket" -Section
+   dotnet tool restore
+}
 Set-VsoVariable build.updatebuildnumber $version
 Set-Location $WorkingDirectory
 Move-PaketSource 0 $DXApiFeed
-Push-Location $WorkingDirectory\Xpand.Plugins
-Move-PaketSource 0 $DXApiFeed
-Pop-Location
+# Push-Location $WorkingDirectory\Xpand.Plugins
+# Move-PaketSource 0 $DXApiFeed
+# Pop-Location
 
 
 Set-location $WorkingDirectory
@@ -72,8 +85,8 @@ $env:DxFeed=$DXApiFeed
 $DXVersion=Get-DevExpressVersion (Get-DevExpressVersion)
 Set-Location $WorkingDirectory
 Move-PaketSource 0 "C:\Program Files (x86)\DevExpress $DXVersion\Components\System\Components\Packages"
-Push-Location $WorkingDirectory\Xpand.Plugins
-Move-PaketSource 0 "C:\Program Files (x86)\DevExpress $DXVersion\Components\System\Components\Packages"
-Pop-Location
+# Push-Location $WorkingDirectory\Xpand.Plugins
+# Move-PaketSource 0 "C:\Program Files (x86)\DevExpress $DXVersion\Components\System\Components\Packages"
+# Pop-Location
 Write-HostFormatted "Exit"
 exit 
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/WinModule.cs b/Demos/XVideoRental/XVideoRental.Module.Win/WinModule.cs
@@ -8,7 +8,6 @@
 using DevExpress.ExpressApp.PivotGrid.Win;
 using DevExpress.ExpressApp.ReportsV2;
 using DevExpress.ExpressApp.Scheduler.Win;
-using DevExpress.ExpressApp.ScriptRecorder.Win;
 using DevExpress.ExpressApp.TreeListEditors;
 using DevExpress.ExpressApp.TreeListEditors.Win;
 using DevExpress.ExpressApp.Updating;
@@ -33,7 +32,6 @@ public sealed class XVideoRentalWindowsFormsModule : ModuleBase {
         public XVideoRentalWindowsFormsModule() {
 
             RequiredModuleTypes.Add(typeof(SystemWindowsFormsModule));
-            RequiredModuleTypes.Add(typeof(ScriptRecorderWindowsFormsModule));
             RequiredModuleTypes.Add(typeof(PivotChartWindowsFormsModule));
             RequiredModuleTypes.Add(typeof(PivotGridWindowsFormsModule));
             RequiredModuleTypes.Add(typeof(ChartWindowsFormsModule));

diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj b/Demos/XVideoRental/XVideoRental.Module.Win/XVideoRental.Module.Win.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/Demos/XVideoRental/XVideoRental.Module.Win/paket.references b/Demos/XVideoRental/XVideoRental.Module.Win/paket.references
@@ -4,12 +4,17 @@ DevExpress.ExpressApp.PivotChart.Win
 DevExpress.ExpressApp.PivotGrid.Win
 DevExpress.ExpressApp.ReportsV2
 DevExpress.ExpressApp.Scheduler.Win
-DevExpress.ExpressApp.ScriptRecorder.Win
 DevExpress.ExpressApp.TreeListEditors.Win
 DevExpress.ExpressApp.ViewVariantsModule
 DevExpress.ExpressApp.Security.Xpo
 DevExpress.Persistent.BaseImpl.Xpo
-DevExpress.Win.Reporting
+DevExpress.Persistent.Base
 Xpand.XAF.Modules.CloneModelView
 System.Threading.Tasks.Dataflow
 System.Text.Json
+Microsoft.Extensions.Configuration
+Microsoft.Extensions.DependencyInjection.Abstractions
+Microsoft.CodeAnalysis
+Microsoft.Extensions.Configuration.Abstractions
+System.ServiceModel.Http
+System.ServiceModel.NetTcp
diff --git a/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj b/Demos/XVideoRental/XVideoRental.Win/XVideoRental.Win.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <ApplicationIcon>ExpressApp.ico</ApplicationIcon>
-    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -12,7 +12,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <PlatformTarget>x86</PlatformTarget>
-    <Prefer32Bit>true</Prefer32Bit>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
     <NoWarn>1701;1702;CA1416</NoWarn>

diff --git a/Demos/XVideoRental/XVideoRental.Win/paket.references b/Demos/XVideoRental/XVideoRental.Win/paket.references
@@ -1,4 +1,4 @@
-DevExpress.Win.Dashboard
+
 DevExpress.ExpressApp.Chart.Win
 DevExpress.ExpressApp.ConditionalAppearance
 DevExpress.ExpressApp.PivotChart.Win

diff --git a/Support/Build/Build.ps1 b/Support/Build/Build.ps1
@@ -77,7 +77,7 @@ Task PackNuget{
 
 Task VSIX{
     InvokeScript{
-        & "$PSScriptRoot\buildVSIX.ps1" "$root" $msbuild $version ($packageSources -join ";") $Release
+        # & "$PSScriptRoot\buildVSIX.ps1" "$root" $msbuild $version ($packageSources -join ";") $Release
     }  
 }
 
@@ -116,17 +116,17 @@ Task CompileModules{
             throw
         }
 
-        Write-HostFormatted "Compiling helper projects..." -Section
-        $helperProjects=($group.HelperProjects|GetProjects)
-        # Write-HostFormatted "helperProjects=$helperProjects" -ForegroundColor Magenta
-        # BuildProjects $helperProjects "Helper"
-        $vsAddons=($group.VSAddons|GetProjects)
-        Write-HostFormatted "vsAddons=$vsAddons" -ForegroundColor Magenta
-        Push-Location "$root\Xpand.Plugins"
-        Get-Content ".\paket.dependencies" -Raw
-        Invoke-PaketRestore -Install -Strict
-        # BuildProjects $vsAddons "VSIX"
-        Pop-Location
+        # Write-HostFormatted "Compiling helper projects..." -Section
+        # $helperProjects=($group.HelperProjects|GetProjects)
+        # # Write-HostFormatted "helperProjects=$helperProjects" -ForegroundColor Magenta
+        # # BuildProjects $helperProjects "Helper"
+        # $vsAddons=($group.VSAddons|GetProjects)
+        # Write-HostFormatted "vsAddons=$vsAddons" -ForegroundColor Magenta
+        # Push-Location "$root\Xpand.Plugins"
+        # Get-Content ".\paket.dependencies" -Raw
+        # Invoke-PaketRestore -Install -Strict
+        # # BuildProjects $vsAddons "VSIX"
+        # Pop-Location
 
         # Write-HostFormatted "Compiling Agnostic EasyTest projects..." -Section
         # $agnosticEasytest=(($group.EasyTestProjects|GetProjects)|Where-Object{!("$_".Contains("Win"))  -and !("$_".Contains("Web"))}) 

diff --git a/Support/Build/CreateXpandNugets.ps1 b/Support/Build/CreateXpandNugets.ps1
@@ -1,6 +1,6 @@
 Param (
     [string]$root = (Get-Item "$PSScriptRoot\..\..").FullName,
-    [string]$version = "22.2.300.1",
+    [string]$version = "24.2.300.0",
     [bool]$ResolveNugetDependecies,
     [bool]$Release 
 )
@@ -77,7 +77,7 @@ function AddAllDependency($file, $nuspecpaths) {
     })
     $net6Nuspecs=@($nuspecpaths|where-Object{
         $p=Get-XmlContent $_.FullName
-        $p.package.files.file.target -match "net6"
+        $p.package.files.file.target -match "net9"
     })
     ($netStandardNuspecs) | ForEach-Object {
         [xml]$package = Get-Content $_.Fullname
@@ -223,9 +223,9 @@ $modules
 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/Installer.ps1 b/Support/Build/Installer.ps1
@@ -36,8 +36,8 @@ $packageFolder ="$XpandFolder\Build\_Package\$DXVersion\"
 New-Item -ItemType Directory $packageFolder -Force
 
 
-Copy-Item "$XpandFolder\Xpand.DLL\Plugins\Xpand.VSIX.vsix" "$packageFolder\Xpand.VSIX-$DXVersion.vsix"
-Copy-Item "$XpandFolder\Xpand.DLL\Plugins\Xpand.VSIX.vsix" "$installerfolder\Xpand.VSIX-$DXVersion.vsix"
+# Copy-Item "$XpandFolder\Xpand.DLL\Plugins\Xpand.VSIX.vsix" "$packageFolder\Xpand.VSIX-$DXVersion.vsix"
+# Copy-Item "$XpandFolder\Xpand.DLL\Plugins\Xpand.VSIX.vsix" "$installerfolder\Xpand.VSIX-$DXVersion.vsix"
 
 
 

diff --git a/Support/Build/go.ps1 b/Support/Build/go.ps1
@@ -7,7 +7,7 @@ param(
     [string[]]$taskList = @("Release"),
     [string]$nugetApiKey = $null,
     [string]$Repository = "eXpand",
-    [string]$XpandPwshVersion = "1.221.0.20",
+    [string]$XpandPwshVersion = "1.221.0.22",
     [bool]$ResolveNugetDependecies
 )
 

diff --git a/Support/GacInstaller/GacInstaller.csproj b/Support/GacInstaller/GacInstaller.csproj
diff --git a/Support/GacInstaller/GacInstaller.sln b/Support/GacInstaller/GacInstaller.sln
diff --git a/Support/GacInstaller/Options.cs b/Support/GacInstaller/Options.cs
diff --git a/Support/GacInstaller/Program.cs b/Support/GacInstaller/Program.cs