Skip to content

Commit 8c77544

Browse files
authored
Merge pull request #21 from I-RzR-I/fix/FixCliPackMultiAggregatedGenericResultMessage
Fix multi target framework pack and script execution.
2 parents a5cb45b + 895d6da commit 8c77544

3 files changed

Lines changed: 18 additions & 8 deletions

File tree

build/pack-repo.ps1

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,15 @@ function Set-BuildAndPack
8484
}
8585

8686
Write-Host "Pack in Release '$($_)'!" -ForegroundColor Green;
87-
dotnet pack $($_) -p:PackageVersion=$packVersion --no-build -c Release --output $nugetPath;
88-
87+
$packResult = dotnet pack $($_) -p:PackageVersion=$packVersion --no-build -c Release --output $nugetPath;
88+
if ($LASTEXITCODE -ne 0)
89+
{
90+
Set-VersionAssembly -packVersion $currentVersion;
91+
Write-Host $buildResult;
92+
93+
return $false;
94+
}
95+
8996
return $true;
9097
}
9198
catch
@@ -218,8 +225,10 @@ If ($testExec -eq $true)
218225

219226
$data | ForEach-Object {
220227
$buildResult = Set-BuildAndPack -packVersion $currentVersion;
221-
If ($buildResult -eq $false -or $buildResult -ccontains $false)
228+
If ($buildResult -eq $false -or $buildResult -contains $false)
222229
{
230+
Write-Host "`nBuild/pack failed!!!" -ForegroundColor Red;
231+
223232
exit;
224233
}
225234
}
@@ -242,8 +251,10 @@ If ($testExec -eq $true)
242251

243252
$data | ForEach-Object {
244253
$buildResult = Set-BuildAndPack -packVersion $finalVersion -currentVersion $currentVersion;
245-
If ($buildResult -eq $false -or $buildResult -ccontains $false)
254+
If ($buildResult -eq $false -or $buildResult -contains $false)
246255
{
256+
Write-Host "`nBuild/pack failed!!!" -ForegroundColor Red;
257+
247258
exit;
248259
}
249260
}

src/AggregatedGenericResultMessage/AggregatedGenericResultMessage.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
54
<TargetFrameworks>netstandard2.1;netstandard2.0;net461;net462;net47;net471;net472;net48;net45</TargetFrameworks>
65
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
76
<Authors>RzR</Authors>

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.5142")]
47-
[assembly: AssemblyFileVersion("1.3.0.5142")]
48-
[assembly: AssemblyInformationalVersion("1.3.0.5142")]
46+
[assembly: AssemblyVersion("1.3.1.6141")]
47+
[assembly: AssemblyFileVersion("1.3.1.6141")]
48+
[assembly: AssemblyInformationalVersion("1.3.1.6141")]

0 commit comments

Comments
 (0)