Merge pull request #420 from reactiveui/build-script

update build scripts

Author: Oren Novotny

.vsts-ci.yml

@@ -13,26 +13,21 @@ steps:
     modifyEnvironment: true
   displayName: Setup Environment Variables
 
-- task: NuGetToolInstaller@0
-  displayName: Use NuGet 4.6.2
+- task: DotNetCoreCLI@2  
   inputs:
-    versionSpec: 4.6.2
+    command: custom
+    custom: tool
+    arguments: install --tool-path . nbgv
+  displayName: Install NBGV tool
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
 
-- task: DotNetCoreCLI@2
-  inputs:
-    command: build
-    projects: script/setversion.csproj
-    arguments: -c Release 
+- script: nbgv cloud
   displayName: Set Version
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
 
-- powershell: |
-    nuget install SignClient -Version 0.9.1 -SolutionDir $(Build.SourcesDirectory) -Verbosity quiet -ExcludeVersion
-    .\build.cmd
+- script: build.cmd
   displayName: Build 
   env:
-    SIGNCLIENT_SECRET: $(SignClientSecret)
-    SIGNCLIENT_USER: $(SignClientUser)
     VSTS_ACCESS_TOKEN: $(System.AccessToken)
     COVERALLS_TOKEN: $(COVERALLS_TOKEN)
 
@@ -41,26 +36,36 @@ steps:
     Contents: 'artifacts/*.nupkg'
     TargetFolder: '$(build.artifactstagingdirectory)\packages'
     flattenFolders: true
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+
+- task: PowerShell@2
+  displayName: Authenticode Sign artifacts
+  inputs:
+    filePath: script/Sign-Packages.ps1
+  env:
+    SignClientUser: $(SignClientUser)
+    SignClientSecret: $(SignClientSecret)
+    ArtifactDirectory: $(Build.ArtifactStagingDirectory)\Packages
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false), not(eq(variables['SignClientSecret'], '')))
 
 - task: PublishBuildArtifacts@1
   displayName: Publish Package Artifacts
   inputs:
     pathToPublish: '$(build.artifactstagingdirectory)\packages'
     artifactType: container
     artifactName: Packages
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
 
 - task: CopyFiles@2
   inputs:
     Contents: '**\bin\**'
     TargetFolder: '$(build.artifactstagingdirectory)\binaries'
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
 
 - task: PublishBuildArtifacts@1
   displayName: Publish Binaries
   inputs:
     pathToPublish: '$(build.artifactstagingdirectory)\binaries'
     artifactType: container
     artifactName: Binaries
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))

NuGet.Config

@@ -1,4 +1,4 @@
-## Akavache: An Asynchronous Key-Value Store for Native Applications [![Build status](https://ci.appveyor.com/api/projects/status/4kret7d2wqtd47dk/branch/master?svg=true)](https://ci.appveyor.com/project/ghuntley/akavache/branch/master)
+## Akavache: An Asynchronous Key-Value Store for Native Applications [![Build Status](https://dotnetfoundation.visualstudio.com/ReactiveUI/_apis/build/status/Akavache-CI)](https://dotnetfoundation.visualstudio.com/ReactiveUI/_build/latest?definitionId=25)
 
 
 Akavache is an *asynchronous*, *persistent* (i.e. writes to disk) key-value

README.md

@@ -16,7 +16,7 @@
 #tool "nuget:?package=OpenCover&version=4.6.519"
 #tool "nuget:?package=ReportGenerator&version=3.1.2"
 #tool "nuget:?package=vswhere&version=2.4.1"
-#tool "nuget:?package=xunit.runner.console&version=2.4.0-beta.2.build3984"
+#tool "nuget:?package=xunit.runner.console&version=2.4.0"
 
 
 //////////////////////////////////////////////////////////////////////

build.cake

@@ -1,23 +1,23 @@
 $currentDirectory = split-path $MyInvocation.MyCommand.Definition
 
 # See if we have the ClientSecret available
-if([string]::IsNullOrWhitespace($env:SIGNCLIENT_SECRET)){
+if([string]::IsNullOrWhitespace($env:SignClientSecret)){
     Write-Error "Client Secret not found, not signing packages";
     [System.Environment]::Exit(1);  
 }
 
+dotnet tool install --tool-path . SignClient
+
 # Setup Variables we need to pass into the sign client tool
 
 $appSettings = "$currentDirectory\SignPackages.json"
 
-$appPath = "$currentDirectory\packages\SignClient\tools\netcoreapp2.0\SignClient.dll"
-
-$nupgks = ls $currentDirectory\artifacts\*.nupkg | Select -ExpandProperty FullName
+$nupgks = gci $Env:ArtifactDirectory\*.nupkg | Select -ExpandProperty FullName
 
 foreach ($nupkg in $nupgks){
     Write-Host "Submitting $nupkg for signing"
 
-    dotnet $appPath 'sign' -c $appSettings -i $nupkg -r $env:SIGNCLIENT_USER -s $env:SIGNCLIENT_SECRET -n 'ReactiveUI' -d 'ReactiveUI' -u 'https://reactiveui.net' 
+    .\SignClient 'sign' -c $appSettings -i $nupkg -r $env:SignClientUser -s $env:SignClientSecret -n 'ReactiveUI' -d 'ReactiveUI' -u 'https://reactiveui.net' 
 
     Write-Host "Finished signing $nupkg"
 }

SignPackages.ps1 script/Sign-Packages.ps1SignPackages.ps1 renamed to script/Sign-Packages.ps1

@@ -7,14 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="Microsoft.Reactive.Testing" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="xunit" Version="2.4.0-beta.2.build3984" />
-		<PackageReference Include="xunit.runner.console" Version="2.4.0-beta.2.build3984" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.2.build3984" />
+		<PackageReference Include="xunit" Version="2.4.0" />
+		<PackageReference Include="xunit.runner.console" Version="2.4.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 		<PackageReference Include="Xunit.StaFact" Version="0.2.9" />
     <PackageReference Include="reactiveui" Version="8.5.1" />
     <PackageReference Include="ReactiveUI.Testing" Version="8.5.1" />
@@ -29,7 +29,4 @@
     <ProjectReference Include="..\Akavache.Sqlite3\Akavache.Sqlite3.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup> 
 </Project>

SignPackages.json script/SignPackages.jsonSignPackages.json renamed to script/SignPackages.json

@@ -8,23 +8,22 @@
     <Owners>paulcbetts</Owners>
     <PackageTags>Akavache;Cache;Xamarin;Sqlite3;Magic</PackageTags>
     <PackageReleaseNotes>https://github.com/akavache/Akavache/releases</PackageReleaseNotes>
-
     <NoWarn>$(NoWarn);1591</NoWarn>
-    <RepositoryUrl>https://github.com/reactiveui/Akavache</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
 
     <Platform>AnyCPU</Platform>
-    <DebugType>full</DebugType>
     <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
+		<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.3" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'">
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" /> 
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
 	</ItemGroup>
 
   <PropertyGroup>