Skip to content

Commit a5cb45b

Browse files
authored
Merge pull request #20 from I-RzR-I/feature/AddExtensionSetObjectMessage
Add extension result with input MessageDataModel, adjsut shell script.
2 parents bb1327b + d42e274 commit a5cb45b

File tree

3 files changed

+55
-10
lines changed

3 files changed

+55
-10
lines changed

build/pack-repo.ps1

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
Param
2+
(
3+
[Parameter(Mandatory = $false)]
4+
[string]$ownVersion,
5+
[Parameter(Mandatory = $false)]
6+
[bool]$runTest
7+
);
8+
19
$assemblyPath = "..\src\shared\GeneralAssemblyInfo.cs";
210
$defaultVersion = "1.0.0.0";
311
$nugetPath = "../nuget";
412
$data = ("..\src\AggregatedGenericResultMessage\AggregatedGenericResultMessage.csproj");
5-
$forceCustomPackVersion = $args[0];
13+
$testExec = $false;
614

715
<#
816
.SYNOPSIS
@@ -188,15 +196,20 @@ function Exec-TestSolution
188196
}
189197
}
190198

191-
Write-Host "Init test solution...`n" -ForegroundColor Green;
192-
$testExec = Exec-TestSolution;
199+
If ($runTest -eq $true)
200+
{
201+
Write-Host "Init test solution...`n" -ForegroundColor Green;
202+
$testExec = Exec-TestSolution;
203+
}
204+
Else { $testExec = $true; }
205+
193206
If ($testExec -eq $true)
194207
{
195208
Write-Host "Path to pack: '$nugetPath'`n" -ForegroundColor Green;
196209

197210
$currentVersion = "";
198-
If ($forceCustomPackVersion -eq $null -or $forceCustomPackVersion -eq "") { $currentVersion = Get-CurrentAssemblyVersion; }
199-
Else { $currentVersion = $forceCustomPackVersion; }
211+
If ($ownVersion -eq $null -or $ownVersion -eq "") { $currentVersion = Get-CurrentAssemblyVersion; }
212+
Else { $currentVersion = $ownVersion; }
200213

201214
$directoryInfo = Get-ChildItem $nugetPath | Where-Object { $_.Name -match '[a-z]*.1.0.0.nupkg$' } | Measure-Object;
202215
If ($defaultVersion -eq $currentVersion -and $directoryInfo.count -eq 0)
@@ -218,12 +231,12 @@ If ($testExec -eq $true)
218231
Else
219232
{
220233
$finalVersion = "";
221-
If ($forceCustomPackVersion -eq $null -or $forceCustomPackVersion -eq "")
234+
If ($ownVersion -eq $null -or $ownVersion -eq "")
222235
{
223236
$versArray = $currentVersion.Split('.');
224237
$finalVersion = $versArray[0].ToString() + "." + $versArray[1].ToString() + "." + (([int]$versArray[2]) + 1).ToString() + "." + (Get-TimeStamp).ToString();
225238
}
226-
Else { $finalVersion = $forceCustomPackVersion; }
239+
Else { $finalVersion = $ownVersion; }
227240

228241
Set-VersionAssembly -packVersion $finalVersion;
229242

src/AggregatedGenericResultMessage/ResultOfT.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,34 +340,66 @@ public static Result<T> Failure()
340340
public static Result<T> Failure(string error)
341341
=> ResultFailureHelper.Failure<T>(error);
342342

343+
/// <inheritdoc cref="ResultFailureHelper.Failure{T}(MessageDataModel)"/>
344+
public static Result<T> Failure(MessageDataModel error)
345+
=> ResultFailureHelper.Failure<T>(error);
346+
343347
/// <inheritdoc cref="ResultFailureHelper.Failure{T}(string, string)"/>
344348
public static Result<T> Failure(string code, string error)
345349
=> ResultFailureHelper.Failure<T>(code, error);
346350

351+
/// <inheritdoc cref="ResultFailureHelper.Failure{T}(string, MessageDataModel)"/>
352+
public static Result<T> Failure(string code, MessageDataModel error)
353+
=> ResultFailureHelper.Failure<T>(code, error);
354+
347355
/// <inheritdoc cref="ResultWarnHelper.Warn{T}(string)"/>
348356
public static Result<T> Warn(string warn)
349357
=> ResultWarnHelper.Warn<T>(warn);
350358

359+
/// <inheritdoc cref="ResultWarnHelper.Warn{T}(MessageDataModel)"/>
360+
public static Result<T> Warn(MessageDataModel warn)
361+
=> ResultWarnHelper.Warn<T>(warn);
362+
351363
/// <inheritdoc cref="ResultWarnHelper.Warn{T}(string, string)"/>
352364
public static Result<T> Warn(string code, string error)
353365
=> ResultWarnHelper.Warn<T>(code, error);
354366

367+
/// <inheritdoc cref="ResultWarnHelper.Warn{T}(string, MessageDataModel)"/>
368+
public static Result<T> Warn(string code, MessageDataModel error)
369+
=> ResultWarnHelper.Warn<T>(code, error);
370+
355371
/// <inheritdoc cref="ResultAccessDeniedHelper.AccessDenied{T}(string)"/>
356372
public static Result<T> AccessDenied(string message)
357373
=> ResultAccessDeniedHelper.AccessDenied<T>(message);
358374

375+
/// <inheritdoc cref="ResultAccessDeniedHelper.AccessDenied{T}(MessageDataModel)"/>
376+
public static Result<T> AccessDenied(MessageDataModel message)
377+
=> ResultAccessDeniedHelper.AccessDenied<T>(message);
378+
359379
/// <inheritdoc cref="ResultAccessDeniedHelper.AccessDenied{T}(string, string)"/>
360380
public static Result<T> AccessDenied(string code, string error)
361381
=> ResultAccessDeniedHelper.AccessDenied<T>(code, error);
362382

383+
/// <inheritdoc cref="ResultAccessDeniedHelper.AccessDenied{T}(string, MessageDataModel)"/>
384+
public static Result<T> AccessDenied(string code, MessageDataModel error)
385+
=> ResultAccessDeniedHelper.AccessDenied<T>(code, error);
386+
363387
/// <inheritdoc cref="ResultNotFoundHelper.NotFound{T}(string)"/>
364388
public static Result<T> NotFound(string message)
365389
=> ResultNotFoundHelper.NotFound<T>(message);
366390

391+
/// <inheritdoc cref="ResultNotFoundHelper.NotFound{T}(MessageDataModel)"/>
392+
public static Result<T> NotFound(MessageDataModel message)
393+
=> ResultNotFoundHelper.NotFound<T>(message);
394+
367395
/// <inheritdoc cref="ResultNotFoundHelper.NotFound{T}(string, string)"/>
368396
public static Result<T> NotFound(string code, string error)
369397
=> ResultNotFoundHelper.NotFound<T>(code, error);
370398

399+
/// <inheritdoc cref="ResultNotFoundHelper.NotFound{T}(string, MessageDataModel)"/>
400+
public static Result<T> NotFound(string code, MessageDataModel error)
401+
=> ResultNotFoundHelper.NotFound<T>(code, error);
402+
371403
#region O P E R A T O R S
372404

373405
/// <summary>

src/shared/GeneralAssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343

4444
[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]
4545

46-
[assembly: AssemblyVersion("1.3.0.0")]
47-
[assembly: AssemblyFileVersion("1.3.0.0")]
48-
[assembly: AssemblyInformationalVersion("1.3.0.0")]
46+
[assembly: AssemblyVersion("1.3.0.5142")]
47+
[assembly: AssemblyFileVersion("1.3.0.5142")]
48+
[assembly: AssemblyInformationalVersion("1.3.0.5142")]

0 commit comments

Comments
 (0)