Cross process patching synchronization #380

eXpandFramework · Apr 28, 2019 · fe4a56f · fe4a56f
1 parent d1f408b
commit fe4a56f
Show file tree

Hide file tree

Showing 21 changed files with 195 additions and 180 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 | <img src="http://expandframework.com/images/site/logo.png" width=150 height=68 alt="eXpandFramework logo"/> | Build | Nuget
 |----------|--------|--------
 **Stable**|[![Build Status](https://dev.azure.com/eXpandDevOps/eXpandFramework/_apis/build/status/DevExpress.XAF-Release?branchName=master)](https://dev.azure.com/eXpandDevOps/eXpandFramework/_build/latest?definitionId=25&branchName=master)|`nuget.exe list Xpand.XAF`
-**Lab**|[![Build Status](https://dev.azure.com/eXpandDevOps/eXpandFramework/_apis/build/status/Packages/XAF-Lab?branchName=lab)](https://dev.azure.com/eXpandDevOps/eXpandFramework/_build/latest?definitionId=23?branchName=lab)|`nuget.exe list Xpand.XAF -source http://lab.nugetserver.expandframework.com/nuget`
+**Lab**|[![Build Status](https://dev.azure.com/eXpandDevOps/eXpandFramework/_apis/build/status/Packages/XAF-Lab?branchName=lab)](https://dev.azure.com/eXpandDevOps/eXpandFramework/_build/latest?definitionId=23?branchName=lab)|`nuget.exe list Xpand.XAF -source https://xpandnugetserver.azurewebsites.net/nuget`
 <sub><sup>[How do I set up a package source in Visual Studio?](https://go.microsoft.com/fwlink/?linkid=698608)</sup></sub>
 
 # About

diff --git a/go.ps1 b/go.ps1
@@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop"
     Version ="4.7.4"
 },[PSCustomObject]@{
     Name = "XpandPosh"
-    Version ="1.9.2"
+    Version ="1.9.5"
 })|ForEach-Object{
     & "$PSScriptRoot\tools\build\Install-Module.ps1" $_
 }

diff --git a/src/Modules/Agnostic/AutoCommit/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/AutoCommit/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.0.16.0")]
-[assembly: AssemblyFileVersion("0.0.16.0")]
+[assembly: AssemblyVersion("0.0.17.0")]
+[assembly: AssemblyFileVersion("0.0.17.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/AutoCommit/Readme.md b/src/Modules/Agnostic/AutoCommit/Readme.md
@@ -26,8 +26,8 @@ The module follows the Nuget [Version Basics](https://docs.microsoft.com/en-us/n
 |<!-- -->|<!-- -->
 |----|----
 |**DevExpress.ExpressApp**|**Any**
-|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.16
- |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.15
+|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.17
+ |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.16
  |fasterflect|2.1.3
  |System.ValueTuple|4.5.0
 

diff --git a/src/Modules/Agnostic/CloneMemberValue/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/CloneMemberValue/Properties/AssemblyInfo.cs
@@ -29,7 +29,7 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.15.0")]
-[assembly: AssemblyFileVersion("1.2.15.0")]
+[assembly: AssemblyVersion("1.2.16.0")]
+[assembly: AssemblyFileVersion("1.2.16.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/CloneMemberValue/Readme.md b/src/Modules/Agnostic/CloneMemberValue/Readme.md
@@ -33,8 +33,8 @@ The module follows the Nuget [Version Basics](https://docs.microsoft.com/en-us/n
 |<!-- -->|<!-- -->
 |----|----
 |**DevExpress.ExpressApp**|**Any**
-|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.16
- |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.15
+|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.17
+ |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.16
  |fasterflect|2.1.3
  |System.Reactive|4.1.3
  |System.Runtime.CompilerServices.Unsafe|4.5.2

diff --git a/src/Modules/Agnostic/CloneModelView/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/CloneModelView/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.0.4.0")]
-[assembly: AssemblyFileVersion("0.0.4.0")]
+[assembly: AssemblyVersion("0.0.5.0")]
+[assembly: AssemblyFileVersion("0.0.5.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/CloneModelView/Readme.md b/src/Modules/Agnostic/CloneModelView/Readme.md
@@ -29,23 +29,22 @@ The module follows the Nuget [Version Basics](https://docs.microsoft.com/en-us/n
 |<!-- -->|<!-- -->
 |----|----
 |**DevExpress.ExpressApp**|**Any**
-|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.16
+|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.17
  |System.ValueTuple|4.5.0
 
 ## Issues
 For [Bugs](https://github.com/eXpandFramework/eXpand/issues/new?assignees=apobekiaris&labels=Bug%2C+Standalone_XAF_Modules,+CloneModelView&template=standalone-xaf-modules--bug-report.md&title=), [Questions](https://github.com/eXpandFramework/eXpand/issues/new?assignees=apobekiaris&labels=Question%2C+Standalone_XAF_Modules,+CloneModelView&template=standalone-xaf-modules--question.md&title=) or [Suggestions](https://github.com/eXpandFramework/eXpand/issues/new?assignees=apobekiaris&labels=Enhancement%2C+Standalone_XAF_Modules,+CloneModelView&template=standalone-xaf-modules--feature-request.md&title=) use main project issues.
 ## Details
 Using the `CloneModelViewAttribute` in your Bussiness Objects you can:
 1. Create one or many `DetailViews` or `ListViews` or `LookupListViews`.
-2. Additionaly for the generated view you can configure if it will be default.
-3. If you generate a `ListView` it is possible the related `DetailView`
+2. Additionaly for the cloned view you can configure if it will be the default view for the Bussiness Object.
+3. If you cloned a `ListView` it is possible the configure related `DetailView`
 
 
 
 ### Tests
 The module is tested on Azure for each build with these [tests](https://github.com/eXpandFramework/Packages/tree/master/src/Tests/Modules/CloneModelView)
 
-### Examples
 ### Examples
 The module is integrated with the following eXpandFramework modules: `Dashboard, ExcelImporter, ModelDifference, System`,
 

diff --git a/src/Modules/Agnostic/MasterDetail/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/MasterDetail/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.0.16.0")]
-[assembly: AssemblyFileVersion("0.0.16.0")]
+[assembly: AssemblyVersion("0.0.17.0")]
+[assembly: AssemblyFileVersion("0.0.17.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/MasterDetail/Readme.md b/src/Modules/Agnostic/MasterDetail/Readme.md
@@ -27,8 +27,8 @@ The module follows the Nuget [Version Basics](https://docs.microsoft.com/en-us/n
 |----|----
 |**DevExpress.Data**|**Any**
  |**DevExpress.ExpressApp**|**Any**
-|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.16
- |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.15
+|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.17
+ |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.16
  |fasterflect|2.1.3
  |Ryder|0.8.0
  |System.ValueTuple|4.5.0

diff --git a/src/Modules/Agnostic/ModelViewInheritance/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/ModelViewInheritance/Properties/AssemblyInfo.cs
@@ -29,8 +29,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.1.12.0")]
-[assembly: AssemblyVersion("1.1.12.0")]
-[assembly: AssemblyFileVersion("1.1.12.0")]
+// [assembly: AssemblyVersion("1.1.13.0")]
+[assembly: AssemblyVersion("1.1.13.0")]
+[assembly: AssemblyFileVersion("1.1.13.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/ModelViewInheritance/Readme.md b/src/Modules/Agnostic/ModelViewInheritance/Readme.md
@@ -26,7 +26,7 @@ The module follows the Nuget [Version Basics](https://docs.microsoft.com/en-us/n
 |<!-- -->|<!-- -->
 |----|----
 |**DevExpress.ExpressApp**|**Any**
-|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.16
+|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.17
  |fasterflect|2.1.3
  |System.ValueTuple|4.5.0
 

diff --git a/src/Modules/Agnostic/Reactive/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/Reactive/Properties/AssemblyInfo.cs
@@ -29,7 +29,7 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.15.0")]
-[assembly: AssemblyFileVersion("1.2.15.0")]
+[assembly: AssemblyVersion("1.2.16.0")]
+[assembly: AssemblyFileVersion("1.2.16.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/SuppressConfirmation/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/SuppressConfirmation/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.0.16.0")]
-[assembly: AssemblyFileVersion("0.0.16.0")]
+[assembly: AssemblyVersion("0.0.17.0")]
+[assembly: AssemblyFileVersion("0.0.17.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/SuppressConfirmation/Readme.md b/src/Modules/Agnostic/SuppressConfirmation/Readme.md
@@ -26,8 +26,8 @@ The module follows the Nuget [Version Basics](https://docs.microsoft.com/en-us/n
 |<!-- -->|<!-- -->
 |----|----
 |**DevExpress.ExpressApp**|**Any**
-|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.16
- |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.15
+|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.17
+ |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.16
  |fasterflect|2.1.3
  |System.ValueTuple|4.5.0
 

diff --git a/src/Modules/Agnostic/ViewEditMode/Properties/AssemblyInfo.cs b/src/Modules/Agnostic/ViewEditMode/Properties/AssemblyInfo.cs
@@ -29,7 +29,7 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.15.0")]
-[assembly: AssemblyFileVersion("1.2.15.0")]
+[assembly: AssemblyVersion("1.2.16.0")]
+[assembly: AssemblyFileVersion("1.2.16.0")]
 //[assembly:AllowPartiallyTrustedCallers]
 //[assembly: SecurityTransparent()]
diff --git a/src/Modules/Agnostic/ViewEditMode/Readme.md b/src/Modules/Agnostic/ViewEditMode/Readme.md
@@ -33,8 +33,8 @@ The module follows the Nuget [Version Basics](https://docs.microsoft.com/en-us/n
 |<!-- -->|<!-- -->
 |----|----
 |**DevExpress.ExpressApp**|**Any**
-|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.16
- |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.15
+|[Xpand.VersionConverter](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/tools/Xpand.VersionConverter)|1.0.17
+ |[Xpand.XAF.Modules.Reactive](https://github.com/eXpandFramework/DevExpress.XAF/tree/master/src/Modules/Agnostic/Xpand.XAF.Modules.Reactive)|1.2.16
  |fasterflect|2.1.3
  |System.Reactive|4.1.3
  |System.Runtime.CompilerServices.Unsafe|4.5.2

diff --git a/tools/Build/PublishNugets.ps1 b/tools/Build/PublishNugets.ps1
@@ -1,48 +1,36 @@
 param(
-    $Branch="lab",
-    $sourcesRoot="$PSScriptRoot\..\..",
+    $Branch = "lab",
+    $sourcesRoot = "$PSScriptRoot\..\..",
     $apiKey,
-    $criteria=@("Xpand.XAF*","Xpand.VersionConverter*"),
-    $localPackageSource="$PSScriptRoot\..\..\bin\Nupkg"
+    $criteria = "Xpand.*",
+    $localPackageSource = "$PSScriptRoot\..\..\bin\Nupkg"
 )
-& "$PSScriptRoot\CreateNuspec.ps1"
-
-set-location $sourcesRoot
 $remotePackageSource=Get-PackageFeed -Nuget
 if ($Branch -eq "lab"){
     $remotePackageSource=Get-PackageFeed -Xpand
 }
-
-if ($remotePackageSource -like "*nuget.org*"){
-    $nugetResult=$criteria|ForEach-Object{
-        & (Get-Nugetpath)  list -source $remotePackageSource id:$_
-    }
-}
-else{
-    $nugetResult=$criteria|ForEach-Object{
-        $item=$_
-        & (Get-Nugetpath) list -source $remotePackageSource|Where-Object{$_ -like $item}
-    }
+set-location $sourcesRoot
+$pArgs = @{
+    PackageSource = "Release"
+    Filter=$criteria
 }
-$packages=$nugetResult|ForEach-Object{
-    $strings=$_.Split(' ')
-    [PSCustomObject]@{
-        Name = $strings[0]
-        Version = $strings[1]
-    }
+if ($Branch -eq "lab") {
+    $pArgs.PackageSource="Lab"
 }
+$packages =Find-XpandPackage  @pArgs
+
 Write-Host "packages:" -f blue
 $packages
-Get-ChildItem $localPackageSource *.nupkg -Recurse|ForEach-Object{
-    $localPackageName=[System.IO.Path]::GetFileNameWithoutExtension($_)
-    $r=New-Object System.Text.RegularExpressions.Regex("[\d]{1,2}\.[\d]{1}\.[\d]*(\.[\d]*)?")
-    $localPackageVersion=$r.Match($localPackageName).Value
+Get-ChildItem $localPackageSource *.nupkg -Recurse | ForEach-Object {
+    $localPackageName = [System.IO.Path]::GetFileNameWithoutExtension($_)
+    $r = New-Object System.Text.RegularExpressions.Regex("[\d]{1,2}\.[\d]{1}\.[\d]*(\.[\d]*)?")
+    $localPackageVersion = $r.Match($localPackageName).Value
     "localPackageVersion=$localPackageVersion"
-    $localPackageName=$localPackageName.Replace($localPackageVersion,"").Trim(".")
+    $localPackageName = $localPackageName.Replace($localPackageVersion, "").Trim(".")
     "localPackageName=$localPackageName"
-    $package=$packages|Where-Object{$_.name -eq $localPackageName  }
-    "package=$package"
-    if (!$package -or (([version]$package.Version) -lt ([version]$localPackageVersion))){
+    $package = $packages | Where-Object { $_.Id -eq $localPackageName }
+    "publishedPackage=$package"
+    if (!$package -or (([version]$package.Version) -lt ([version]$localPackageVersion))) {
         "Pushing $($_.FullName)"
         & (Get-Nugetpath) push $_.FullName -source $remotePackageSource -ApiKey $apikey
     }

diff --git a/tools/Build/UpdateReadMe.ps1 b/tools/Build/UpdateReadMe.ps1
@@ -5,7 +5,7 @@ Set-Location $rootLocation
 
 $nuget = Get-NugetPath
 $packagesPath = "$rootLocation\bin\Nupkg\"
-$packages = & $nuget List -Source $packagesPath | ConvertTo-PackageObject | Select-Object -ExpandProperty Name
+$packages = & $nuget List -Source $packagesPath | ConvertTo-PackageObject | Select-Object -ExpandProperty Id
 function UpdateModulesList($rootLocation, $packages) {
     $moduleList = "|PackageName|Version|Downloads`r`n|---|---|---|`r`n"
     $packages | Where-Object { $_ -ne "Xpand.VersionConverter" } | ForEach-Object {

diff --git a/tools/Xpand.VersionConverter/Xpand.VersionConverter.nuspec b/tools/Xpand.VersionConverter/Xpand.VersionConverter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Xpand.VersionConverter</id>
-    <version>1.0.16.0</version>
+    <version>1.0.17.0</version>
     <title>This package overrides the AfterBuild with targets that modify the DevExpress references in all Xpand.XAF.* assemblies to match the target prroject DevExpress version</title>
     <authors>eXpandFramework</authors>
     <owners>eXpandFramework</owners>