Add VSTS CI build yaml

vcsjones · Jul 15, 2018 · fc4ebcd · fc4ebcd
1 parent 15980a0
commit fc4ebcd
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 22 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -0,0 +1,44 @@
+queue: Hosted VS2017
+variables: 
+  BuildConfiguration: Release
+
+steps:
+- task: DotNetCoreCLI@2  
+  inputs:
+    command: custom
+    custom: tool
+    arguments: install --tool-path . nbgv
+  displayName: Install NBGV tool
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+
+- script: nbgv cloud
+  displayName: Set Version
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+
+- task: DotNetCoreInstaller@0
+  inputs:
+    version: '2.1.400-preview-009063'
+
+- task: DotNetCoreCLI@2
+  inputs:
+    command: pack
+    packagesToPack: '**/*.csproj'
+    configuration: $(BuildConfiguration)
+    packDirectory: $(Build.ArtifactStagingDirectory)\Artifacts    
+    verbosityPack: Minimal
+  displayName: Pack
+
+- task: DotNetCoreCLI@2
+  inputs:
+    command: test
+    projects: '**/*.Tests.csproj'
+    arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)CodeCoverage.runsettings
+  displayName: Run Tests
+
+- task: PublishBuildArtifacts@1
+  displayName: Publish Build Artifacts
+  inputs:
+    pathToPublish: $(Build.ArtifactStagingDirectory)\Artifacts
+    artifactType: container
+    artifactName: Artifacts
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
diff --git a/CodeCoverage.runsettings b/CodeCoverage.runsettings
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- File name extension must be .runsettings -->
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        <Configuration>
+          <CodeCoverage>
+
+            <!--  
+About include/exclude lists:  
+Empty "Include" clauses imply all; empty "Exclude" clauses imply none.  
+Each element in the list is a regular expression (ECMAScript syntax). See http://msdn.microsoft.com/library/2k3te2cs.aspx.  
+An item must first match at least one entry in the include list to be included.  
+Included items must then not match any entries in the exclude list to remain included.  
+-->
+
+            <!-- Match assembly file paths: -->
+            <ModulePaths>
+              <Include>
+                <ModulePath>.*OpenVsixSignTool.*</ModulePath>
+              </Include>
+              <Exclude>
+                <ModulePath>.*Tests.*</ModulePath>
+              </Exclude>
+            </ModulePaths>
+
+          </CodeCoverage>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/Directory.Build.Props b/Directory.Build.Props
@@ -4,9 +4,9 @@
     <PackageProjectUrl>https://github.com/vcsjones/OpenOpcSignTool</PackageProjectUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/vcsjones/OpenOpcSignTool/master/LICENSE</PackageLicenseUrl>
 
-    <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/OpenVsixSignTool.sln b/OpenVsixSignTool.sln
@@ -3,13 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenVsixSignTool.Core", "src\OpenVsixSignTool.Core\OpenVsixSignTool.Core.csproj", "{351BD833-DE64-4042-9ADE-343825443A36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenVsixSignTool.Core", "src\OpenVsixSignTool.Core\OpenVsixSignTool.Core.csproj", "{351BD833-DE64-4042-9ADE-343825443A36}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenVsixSignTool.Core.Tests", "tests\OpenVsixSignTool.Core.Tests\OpenVsixSignTool.Core.Tests.csproj", "{F2E16674-87EA-4460-9456-50F6C5F10302}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenVsixSignTool.Core.Tests", "tests\OpenVsixSignTool.Core.Tests\OpenVsixSignTool.Core.Tests.csproj", "{F2E16674-87EA-4460-9456-50F6C5F10302}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenVsixSignTool", "src\OpenVsixSignTool\OpenVsixSignTool.csproj", "{E2F61A10-A5A3-478D-BE78-2059154D0930}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenVsixSignTool", "src\OpenVsixSignTool\OpenVsixSignTool.csproj", "{E2F61A10-A5A3-478D-BE78-2059154D0930}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenVsixSignTool.Tests", "tests\OpenVsixSignTool.Tests\OpenVsixSignTool.Tests.csproj", "{79191EB5-FDF2-42D4-B416-E5A2D4B75E4D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenVsixSignTool.Tests", "tests\OpenVsixSignTool.Tests\OpenVsixSignTool.Tests.csproj", "{79191EB5-FDF2-42D4-B416-E5A2D4B75E4D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49F130E1-BD5B-43AD-98C6-4CDE1AA10B2A}"
+	ProjectSection(SolutionItems) = preProject
+		.vsts-ci.yml = .vsts-ci.yml
+		Directory.Build.Props = Directory.Build.Props
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,4 +43,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2BE6A280-E6B4-425E-9369-66A19D5DC47C}
+	EndGlobalSection
 EndGlobal
diff --git a/tests/OpenVsixSignTool.Core.Tests/OpenVsixSignTool.Core.Tests.csproj b/tests/OpenVsixSignTool.Core.Tests/OpenVsixSignTool.Core.Tests.csproj
@@ -14,18 +14,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0-rc.2.build4045" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-rc.2.build4045" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
 
     <ProjectReference Include="..\..\src\OpenVsixSignTool.Core\OpenVsixSignTool.Core.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
+
   <ItemGroup>
     <None Update="certs\*.pfx;certs\*.cer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/tests/OpenVsixSignTool.Tests/OpenVsixSignTool.Tests.csproj b/tests/OpenVsixSignTool.Tests/OpenVsixSignTool.Tests.csproj
@@ -11,22 +11,17 @@
 
   </PropertyGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
-
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0-rc.2.build4045" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-rc.2.build4045" />
 
     <ProjectReference Include="..\..\src\OpenVsixSignTool\OpenVsixSignTool.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net462'">
     <Reference Include="System.Security" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
+
   <ItemGroup>
     <None Update="certs\*.pfx;certs\*.cer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>