Fix build (#548)

* fix build

* rename queue to pool

* do not pack tests

* try to switch to VSBuild
This commit is contained in:
Sergey Kanzhelev 2020-03-24 15:40:37 -07:00 committed by GitHub
parent f93df2bbea
commit 5998250c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions

View File

@ -11,7 +11,7 @@ trigger:
# no PR builds
pr: none
queue:
pool:
vmImage: 'windows-latest'
steps:
@ -41,15 +41,14 @@ steps:
- task: PublishTestResults@2
- task: DotNetCoreCLI@2
- task: VSBuild@1
displayName: pack solution with symbols (Release)
inputs:
command: "pack"
projects: OpenTelemetry.proj
configurationToPack: 'Release'
packDirectory: '$(build.artifactStagingDirectory)'
buildProperties: "SymbolPackageFormat=snupkg"
arguments: "-p:OS=$(Agent.OS)"
solution: OpenTelemetry.proj
vsVersion: "latest"
platform: "AnyCPU"
configuration: "Release"
msbuildArgs: "/p:OS=$(Agent.OS) /p:SymbolPackageFormat=snupkg /target:pack /p:OutDir=$(build.artifactStagingDirectory)"
- task: NuGetCommand@2
displayName: 'Publish nugets to MyGet'

View File

@ -4,16 +4,17 @@
<ItemGroup>
<SolutionProjects Include="**\*.csproj" />
<SolutionProjects Remove="**\*.Win.csproj" Condition="'$(OS)' != 'Windows_NT'" />
<PackProjects Include="src\**\*.csproj" />
<PackProjects Remove="**\*.Win.csproj" Condition="'$(OS)' != 'Windows_NT'" />
</ItemGroup>
<!-- The only need for this file is to synchronize the PreReleaseVersion -->
<Target Name="Build">
<MSBuild Projects="@(SolutionProjects)" Targets="Restore;Build" ContinueOnError="ErrorAndStop" Properties="PreReleaseVersion=$(PreReleaseVersion)"/>
<MSBuild Projects="@(SolutionProjects)" Targets="Restore;Build" ContinueOnError="ErrorAndStop" />
</Target>
<Target Name="Pack">
<MSBuild Projects="@(SolutionProjects)" Targets="Pack" ContinueOnError="ErrorAndStop" Properties="PreReleaseVersion=$(PreReleaseVersion)"/>
<MSBuild Projects="@(PackProjects)" Targets="Pack" ContinueOnError="ErrorAndStop" />
</Target>
</Project>