Merge pull request PHOENIXCONTACT#68 from PHOENIXCONTACT/feature/snupkg

Use SourceLink to patch pdbs and provide snupkg
mmarkwort · Nov 3, 2020 · 4cd636c · 4cd636c
2 parents 130eb91 + f3c4ba5
commit 4cd636c
Show file tree

Hide file tree

Showing 23 changed files with 18 additions and 61 deletions.
diff --git a/.build/BuildToolkit.ps1 b/.build/BuildToolkit.ps1
@@ -493,7 +493,7 @@ function Invoke-Publish {
         Invoke-ExitCodeCheck 1;
     }
 
-    $packages = Get-ChildItem $NugetPackageArtifacts -Recurse -Include '*.nupkg'
+    $packages = Get-ChildItem $NugetPackageArtifacts -Recurse -Include *.nupkg, *.snupkg
 
     foreach ($package in $packages) {
         & $global:NugetCli push $package $env:MORYX_NUGET_APIKEY -Source $env:MORYX_PACKAGE_TARGET -Verbosity $env:MORYX_NUGET_VERBOSITY

diff --git a/.build/Common.props b/.build/Common.props
@@ -22,8 +22,6 @@
 
     <PackageIcon>moryx-logo.png</PackageIcon>
     <PackageProjectUrl>https://moryx-industry.net/</PackageProjectUrl>
-
-    <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -6,9 +6,6 @@ on:
   push:
     branches: 
       - dev
-    tags:
-      - "v*-beta.*"
-      - "v*-rc.*"
   pull_request:
     branches: 
       - dev

diff --git a/Build.ps1 b/Build.ps1
@@ -50,7 +50,7 @@ if ($GenerateDocs) {
 }
 
 if ($Pack) {
-    Invoke-PackAll -Symbols
+    Invoke-PackAll
 }
 
 if ($Publish) {

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
 
+  <Import Project=".build\Common.props" Condition="'$(CreatePackage)' == 'true'" />
+
+  <!-- Properties for all projects if CreatePackage=true -->
+  <PropertyGroup Condition="'$(CreatePackage)' == 'true'">
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <!-- Package refereces for all projects if CreatePackage=true -->
+  <ItemGroup Condition="'$(CreatePackage)' == 'true'">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
     <!--3rd party dependencies-->

diff --git a/Directory.build.props b/Directory.build.props
@@ -10,5 +10,9 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/PHOENIXCONTACT/MORYX-Platform</RepositoryUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
+
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+
 </Project>
diff --git a/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj b/src/Moryx.Communication.Serial/Moryx.Communication.Serial.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Library for serial port communication.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Container/Moryx.Container.csproj b/src/Moryx.Container/Moryx.Container.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Handling of container structure.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj b/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>InMemory extension to Moryx.Model.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj b/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net45;net461</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>EntityFramework DataModel based on Npgsql.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Model/Moryx.Model.csproj b/src/Moryx.Model/Moryx.Model.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Extended model functionality.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj b/src/Moryx.Runtime.DbUpdate/Moryx.Runtime.DbUpdate.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Runtime RunMode for executing database migrations.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj b/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Main kernel abstraction for the runtime environment</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj b/src/Moryx.Runtime.Maintenance/Moryx.Runtime.Maintenance.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Core module to maintain the application. It provides config and logging support by default.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj b/src/Moryx.Runtime.SmokeTest/Moryx.Runtime.SmokeTest.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Runtime RunMode for executing smoke tests.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj b/src/Moryx.Runtime.Wcf/Moryx.Runtime.Wcf.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Extensions for the Moryx.Runtime for hosting wcf services.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj b/src/Moryx.Runtime.WinService/Moryx.Runtime.WinService.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Provides runtime mode for running as Windows Service.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.Runtime/Moryx.Runtime.csproj b/src/Moryx.Runtime/Moryx.Runtime.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Contains core interfaces for the runtime environment.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj b/src/Moryx.TestTools.SystemTest/Moryx.TestTools.SystemTest.csproj
@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
     <Description>Library with helper classes for SystemTests.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj b/src/Moryx.TestTools.UnitTest/Moryx.TestTools.UnitTest.csproj
@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
     <Description>Library with helper classes for UnitTests.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx.TestTools.UnitTest/app.config b/src/Moryx.TestTools.UnitTest/app.config
diff --git a/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj b/src/Moryx.Tools.Wcf/Moryx.Tools.Wcf.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>net45;net461</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Wcf integation in Platform.</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>

diff --git a/src/Moryx/Moryx.csproj b/src/Moryx/Moryx.csproj
@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\.build\Common.props"></Import>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net461</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
     <Description>Root namespace of the MORYX ecosystem</Description>
     <CreatePackage>true</CreatePackage>
   </PropertyGroup>