From 5998250c0f2004a3469e20f680b0a98b8d777d64 Mon Sep 17 00:00:00 2001
From: Sergey Kanzhelev <S.Kanzhelev@live.com>
Date: Tue, 24 Mar 2020 15:40:37 -0700
Subject: [PATCH] Fix build (#548)

* fix build

* rename queue to pool

* do not pack tests

* try to switch to VSBuild
---
 .vsts/ci-myget-update.yml | 15 +++++++--------
 OpenTelemetry.proj        |  9 +++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.vsts/ci-myget-update.yml b/.vsts/ci-myget-update.yml
index 281b86ee7..f78c912f6 100644
--- a/.vsts/ci-myget-update.yml
+++ b/.vsts/ci-myget-update.yml
@@ -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'
diff --git a/OpenTelemetry.proj b/OpenTelemetry.proj
index cd5b374b0..6fb0b7cc3 100644
--- a/OpenTelemetry.proj
+++ b/OpenTelemetry.proj
@@ -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>
\ No newline at end of file