Merge pull request #425 from MarcoRossignoli/nightly

Setup nightly build
coverlet-coverage · May 26, 2019 · 02708bb · 02708bb
2 parents 8dc1d27 + 0b0cb15
commit 02708bb
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 16 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)build\$(Configuration)\</PackageOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.3.38" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/build.proj b/build.proj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
     <OutputPath>$(MSBuildThisFileDirectory)build\$(Configuration)</OutputPath>
+    <PublicRelease Condition="$(PublicRelease) == ''">true</PublicRelease>
   </PropertyGroup>
 
   <Target Name="BuildAllProjects">
@@ -30,9 +31,9 @@
   </Target>
 
   <Target Name="CreateNuGetPackage" AfterTargets="RunTests" Condition="$(Configuration) == 'Release'">
-    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.msbuild.tasks\coverlet.msbuild.tasks.csproj&quot; -c $(Configuration) -o $(OutputPath)" />
-    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.console\coverlet.console.csproj&quot; -c $(Configuration) -o $(OutputPath)" />
-    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.collector\coverlet.collector.csproj&quot; -c $(Configuration) -p:NuspecFile=&quot;$(MSBuildThisFileDirectory)src\coverlet.collector\coverlet.collector.nuspec&quot; -o $(OutputPath)" />
+    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.msbuild.tasks\coverlet.msbuild.tasks.csproj&quot; -c $(Configuration) -o $(OutputPath) /p:PublicRelease=$(PublicRelease)"  />
+    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.console\coverlet.console.csproj&quot; -c $(Configuration) -o $(OutputPath) /p:PublicRelease=$(PublicRelease)" />
+    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.collector\coverlet.collector.csproj&quot; -c $(Configuration) -o $(OutputPath) /p:PublicRelease=$(PublicRelease)" />
   </Target>
 
 </Project>
diff --git a/eng/azure-pipelines-nightly.yml b/eng/azure-pipelines-nightly.yml
@@ -0,0 +1,12 @@
+pool:
+  vmImage: 'windows-2019'
+steps:
+- task: DotNetCoreInstaller@0
+  inputs:
+    version: '2.2.300'
+- powershell:
+    .\eng\nightly.ps1 -apiKey $env:APIKEY -source $env:SOURCE
+  ignoreLASTEXITCODE: "true"
+  env:
+    APIKEY: $(apikey)
+    SOURCE: $(source)
diff --git a/eng/nightly.ps1 b/eng/nightly.ps1
@@ -0,0 +1,19 @@
+param (
+    [string]$apiKey,
+    [string]$source
+ )
+
+if (!$apiKey -or !$source)
+{
+     Write-Host -ForegroundColor Red Specify apiKey and source
+     exit
+}
+
+Write-Host -ForegroundColor Blue Publish with .NET CLI
+& dotnet --info
+
+Write-Host -ForegroundColor Green Create Packages
+& dotnet msbuild "$PSScriptRoot\..\build.proj" /t:CreateNuGetPackage /p:Configuration=Release /p:PublicRelease=false # amend build.proj path if changes
+
+Write-Host -ForegroundColor Green Upload Packages
+& dotnet nuget push "$PSScriptRoot\..\build\Release\*.nupkg" -k $apiKey -s $source
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "2.2.300"
+    }
+} 
diff --git a/src/coverlet.collector/coverlet.collector.csproj b/src/coverlet.collector/coverlet.collector.csproj
@@ -1,12 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk" >
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyTitle>coverlet.collector</AssemblyTitle>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
-
     <PackageId>coverlet.collector</PackageId>
-    <PackageVersion>$(AssemblyVersion)</PackageVersion>
     <Title>coverlet.collector</Title>
     <Authors>tonerdo</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -19,6 +15,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/tonerdo/coverlet</RepositoryUrl>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <NuspecFile>coverlet.collector.nuspec</NuspecFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -65,4 +62,11 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\coverlet.core\coverlet.core.csproj" PrivateAssets="All" />
   </ItemGroup>
 
+  <Target Name="SetNuspecPackageVersion" DependsOnTargets="GetBuildVersion" BeforeTargets="GenerateNuspec">
+    <PropertyGroup>
+      <NuspecProperties>$(NuspecProperties);version=$(NuGetPackageVersion);configuration=$(Configuration)
+    </NuspecProperties>
+  </PropertyGroup>
+  </Target>
+
 </Project>
diff --git a/src/coverlet.collector/coverlet.collector.nuspec b/src/coverlet.collector/coverlet.collector.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>coverlet.collector</id>
-    <version>1.0.0</version>
+    <version>$version$</version>
     <title>coverlet.collector</title>
     <authors>tonerdo</authors>
     <owners>tonerdo</owners>
@@ -14,8 +14,8 @@
     <tags>coverage testing unit-test lcov opencover quality</tags>
   </metadata>
   <files>
-    <file src="bin\Release\netcoreapp2.0\*.dll" target="build\netcoreapp2.0\" />
-    <file src="bin\Release\netcoreapp2.0\coverlet.collector.deps.json" target="build\netcoreapp2.0\" />
+    <file src="bin\$configuration$\netcoreapp2.0\*.dll" target="build\netcoreapp2.0\" />
+    <file src="bin\$configuration$\netcoreapp2.0\coverlet.collector.deps.json" target="build\netcoreapp2.0\" />
     <file src="coverlet.collector.targets" target="build\netcoreapp2.0\" />
   </files>
 </package>
diff --git a/src/coverlet.collector/version.json b/src/coverlet.collector/version.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "1.0.0",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$"
+  ]
+}
diff --git a/src/coverlet.console/coverlet.console.csproj b/src/coverlet.console/coverlet.console.csproj
@@ -6,10 +6,8 @@
     <ToolCommandName>coverlet</ToolCommandName>
     <PackAsTool>true</PackAsTool>
     <AssemblyTitle>coverlet.console</AssemblyTitle>
-    <AssemblyVersion>1.5.1</AssemblyVersion>
     <Authors>tonerdo</Authors>
     <PackageId>$(AssemblyTitle)</PackageId>
-    <Title>$(AssemblyTitle)</Title>
     <Description>Coverlet is a cross platform code coverage tool for .NET, with support for line, branch and method coverage.</Description>
     <PackageVersion>$(AssemblyVersion)</PackageVersion>
     <PackageTags>coverage;testing;unit-test;lcov;opencover;quality</PackageTags>

diff --git a/src/coverlet.console/version.json b/src/coverlet.console/version.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "1.5.1",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$"
+  ]
+}
diff --git a/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj b/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj
@@ -4,10 +4,7 @@
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyTitle>coverlet.msbuild.tasks</AssemblyTitle>
-    <AssemblyVersion>2.6.1</AssemblyVersion>
-
     <PackageId>coverlet.msbuild</PackageId>
-    <PackageVersion>$(AssemblyVersion)</PackageVersion>
     <Title>coverlet.msbuild</Title>
     <Authors>tonerdo</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/coverlet.msbuild.tasks/version.json b/src/coverlet.msbuild.tasks/version.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "2.6.1",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$"
+  ]
+}