diff --git a/.build/BuildToolkit.ps1 b/.build/BuildToolkit.ps1 index 8b5c9e36e..3148a2aba 100644 --- a/.build/BuildToolkit.ps1 +++ b/.build/BuildToolkit.ps1 @@ -100,6 +100,10 @@ function Invoke-Initialize([string]$Version = "1.0.0", [bool]$Cleanup = $False) $env:MORYX_PACKAGE_TARGET = ""; } + if (-not $env:MORYX_PACKAGE_TARGET_V3) { + $env:MORYX_PACKAGE_TARGET_V3 = ""; + } + if (-not $env:MORYX_ASSEMBLY_VERSION) { $env:MORYX_ASSEMBLY_VERSION = $Version; } @@ -140,6 +144,7 @@ function Invoke-Initialize([string]$Version = "1.0.0", [bool]$Cleanup = $False) Write-Variable "MORYX_TEST_VERBOSITY" $env:MORYX_TEST_VERBOSITY; Write-Variable "MORYX_NUGET_VERBOSITY" $env:MORYX_NUGET_VERBOSITY; Write-Variable "MORYX_PACKAGE_TARGET" $env:MORYX_PACKAGE_TARGET; + Write-Variable "MORYX_PACKAGE_TARGET_V3" $env:MORYX_PACKAGE_TARGET_V3; Write-Variable "MORYX_ASSEMBLY_VERSION" $env:MORYX_ASSEMBLY_VERSION; Write-Variable "MORYX_FILE_VERSION" $env:MORYX_FILE_VERSION; @@ -488,17 +493,29 @@ function Invoke-PackAll([switch]$Symbols = $False) { function Invoke-Publish { Write-Host "Pushing packages from $NugetPackageArtifacts to $env:MORYX_PACKAGE_TARGET" - if ([string]::IsNullOrEmpty($env:MORYX_PACKAGE_TARGET)) { + $packages = Get-ChildItem $NugetPackageArtifacts -Recurse -Include *.nupkg + if ($packages.Length -gt 0 -and [string]::IsNullOrEmpty($env:MORYX_PACKAGE_TARGET)) { Write-Host-Error "There is no package target given. Set the environment varialble MORYX_PACKAGE_TARGET to publish packages."; Invoke-ExitCodeCheck 1; } - $packages = Get-ChildItem $NugetPackageArtifacts -Recurse -Include *.nupkg, *.snupkg - foreach ($package in $packages) { + Write-Host "Pushing package $package" & $global:NugetCli push $package $env:MORYX_NUGET_APIKEY -Source $env:MORYX_PACKAGE_TARGET -Verbosity $env:MORYX_NUGET_VERBOSITY Invoke-ExitCodeCheck $LastExitCode; } + + $symbolPackages = Get-ChildItem $NugetPackageArtifacts -Recurse -Include *.snupkg + if ($symbolPackages.Length -gt 0 -and [string]::IsNullOrEmpty($env:MORYX_PACKAGE_TARGET_V3)) { + Write-Host-Error "There is no package (v3) target given. Set the environment varialble MORYX_PACKAGE_TARGET_V3 to publish snupkg symbol packages."; + Invoke-ExitCodeCheck 1; + } + + foreach ($symbolPackage in $symbolPackages) { + Write-Host "Pushing symbol (snupkg) $symbolPackage" + & $global:NugetCli push $symbolPackage $env:MORYX_NUGET_APIKEY -Source $env:MORYX_PACKAGE_TARGET_V3 -Verbosity $env:MORYX_NUGET_VERBOSITY + Invoke-ExitCodeCheck $LastExitCode; + } } function Set-Version ([string]$MajorMinorPatch) { diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fba567ecd..55c60b719 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -16,6 +16,7 @@ env: MORYX_BUILDNUMBER: ${{github.run_number}} MORYX_NUGET_APIKEY: ${{secrets.MYGET_TOKEN}} MORYX_PACKAGE_TARGET: "https://www.myget.org/F/moryx/api/v2/package" + MORYX_PACKAGE_TARGET_V3: "https://www.myget.org/F/moryx/api/v3/index.json" jobs: Build: diff --git a/Directory.Build.targets b/Directory.Build.targets index 8a8bdb516..016d3b79d 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,11 +3,6 @@ - - - true - - diff --git a/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj b/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj index 40c78efcd..bcb81d1d6 100644 --- a/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj +++ b/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj @@ -2,6 +2,7 @@ netstandard2.0;net45 + true Library for serial port communication. true diff --git a/src/Moryx.Container/Moryx.Container.csproj b/src/Moryx.Container/Moryx.Container.csproj index 8def7c8a7..db6d21d34 100644 --- a/src/Moryx.Container/Moryx.Container.csproj +++ b/src/Moryx.Container/Moryx.Container.csproj @@ -2,6 +2,7 @@ netstandard2.0;net45 + true Handling of container structure. true diff --git a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj b/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj index 38ca9fad6..973051d21 100644 --- a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj +++ b/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj @@ -2,6 +2,7 @@ netstandard2.1;net45 + true InMemory extension to Moryx.Model. true diff --git a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj b/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj index 04af7c41e..7fae98810 100644 --- a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj +++ b/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj @@ -2,6 +2,7 @@ netstandard2.1;net45;net461 + true EntityFramework DataModel based on Npgsql. true diff --git a/src/Moryx.Model/Moryx.Model.csproj b/src/Moryx.Model/Moryx.Model.csproj index 3a6b4d1e8..90fc46edf 100644 --- a/src/Moryx.Model/Moryx.Model.csproj +++ b/src/Moryx.Model/Moryx.Model.csproj @@ -2,6 +2,7 @@ netstandard2.1;net45 + true Extended model functionality. true diff --git a/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj b/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj index c30ef1bc5..b4c8a82a9 100644 --- a/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj +++ b/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj @@ -1,7 +1,8 @@  - netstandard2.0;net45 + netstandard2.1;net45 + true Runtime RunMode for executing database migrations. true diff --git a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj b/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj index 3c2d4711d..8072b0068 100644 --- a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj +++ b/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj @@ -2,6 +2,7 @@ netstandard2.0;net45 + true Main kernel abstraction for the runtime environment true diff --git a/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj b/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj index 094b68c40..8df9b2093 100644 --- a/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj +++ b/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj @@ -2,6 +2,7 @@ net45 + true Core module to maintain the application. It provides config and logging support by default. true diff --git a/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj b/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj index bc4bd6335..0c1f06b2a 100644 --- a/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj +++ b/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj @@ -2,6 +2,7 @@ netstandard2.1;net45 + true Runtime RunMode for executing smoke tests. true diff --git a/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj b/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj index b937c1e1b..c161ec2e0 100644 --- a/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj +++ b/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj @@ -2,6 +2,7 @@ net45 + true Extensions for the Moryx.Runtime for hosting wcf services. true diff --git a/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj b/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj index f1c6eca3d..919552357 100644 --- a/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj +++ b/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj @@ -2,6 +2,7 @@ net45 + true Provides runtime mode for running as Windows Service. true diff --git a/src/Moryx.Runtime/Moryx.Runtime.csproj b/src/Moryx.Runtime/Moryx.Runtime.csproj index fa517d26d..13038a9c4 100644 --- a/src/Moryx.Runtime/Moryx.Runtime.csproj +++ b/src/Moryx.Runtime/Moryx.Runtime.csproj @@ -2,6 +2,7 @@ netstandard2.0;net45 + true Contains core interfaces for the runtime environment. true diff --git a/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj b/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj index 45e59f4a9..a3dc71556 100644 --- a/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj +++ b/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj @@ -2,6 +2,7 @@ net45 + true Library with helper classes for SystemTests. true diff --git a/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj b/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj index 9996910e9..eb9363ce9 100644 --- a/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj +++ b/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj @@ -2,6 +2,7 @@ netstandard2.0;net45 + true Library with helper classes for UnitTests. true diff --git a/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj b/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj index d7a35be1b..47696b52a 100644 --- a/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj +++ b/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj @@ -2,6 +2,7 @@ net45;net461 + true Wcf integation in Platform. true diff --git a/src/Moryx/Moryx.csproj b/src/Moryx/Moryx.csproj index 185cd895f..fdf571de0 100644 --- a/src/Moryx/Moryx.csproj +++ b/src/Moryx/Moryx.csproj @@ -2,6 +2,7 @@ netstandard2.0;net45;net461 + true true Root namespace of the MORYX ecosystem true