From 56b86b062f63e44ea60b5beef626984083a371ce Mon Sep 17 00:00:00 2001
From: Eddy Nakamura <ednakamu@microsoft.com>
Date: Mon, 1 Feb 2021 22:02:30 -0300
Subject: [PATCH] new file version style (#1767)

* Fixing FileVersion tag

* temp removing

* updating ymls passing buildnumber

* checking echo

* run_id

* fixing ymls

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
---
 .github/workflows/publish-myget.yml | 10 +++++-----
 build/Common.prod.props             |  7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish-myget.yml b/.github/workflows/publish-myget.yml
index e25d1da78..7332581ca 100644
--- a/.github/workflows/publish-myget.yml
+++ b/.github/workflows/publish-myget.yml
@@ -29,7 +29,7 @@ jobs:
       run: dotnet restore
 
     - name: dotnet build
-      run: dotnet build --configuration Release --no-restore -p:Deterministic=true
+      run: dotnet build --configuration Release --no-restore -p:Deterministic=true -p:BuildNumber=${{ github.run_number }}
 
     - name: dotnet pack
       run: dotnet pack OpenTelemetry.proj --configuration Release --no-build
@@ -40,7 +40,7 @@ jobs:
         name: ${{ matrix.os }}-packages
         path: '**/bin/**/*.*nupkg'
 
-    - name: Publish MyGet
-      run: |
-        nuget setApiKey ${{ secrets.MYGET_TOKEN }} -Source https://www.myget.org/F/opentelemetry/api/v2/package
-        nuget push **/bin/**/*.nupkg -Source https://www.myget.org/F/opentelemetry/api/v2/package
+#    - name: Publish MyGet
+#      run: |
+#        nuget setApiKey ${{ secrets.MYGET_TOKEN }} -Source https://www.myget.org/F/opentelemetry/api/v2/package
+#        nuget push **/bin/**/*.nupkg -Source https://www.myget.org/F/opentelemetry/api/v2/package
diff --git a/build/Common.prod.props b/build/Common.prod.props
index 8b57caeca..2d77e1a18 100644
--- a/build/Common.prod.props
+++ b/build/Common.prod.props
@@ -19,12 +19,9 @@
     <!--<MinVerVerbosity>detailed</MinVerVerbosity>-->
   </PropertyGroup>
 
-  <Target Name="AssemblyVersionTarget" AfterTargets="MinVer" Condition="'$(MinVerVersion)'!=''">
+  <Target Name="AssemblyVersionTarget" AfterTargets="MinVer" Condition="'$(MinVerVersion)'!='' AND '$(BuildNumber)' != ''">
     <PropertyGroup>
-      <RevisionNumber>0</RevisionNumber>
-      <RevisionNumber Condition="$(MinVerVersion.Split(`.`).Length) == 4">$(MinVerVersion.Split(`.`)[3])</RevisionNumber>
-      <Version>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(RevisionNumber)</Version>
-      <FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(RevisionNumber)</FileVersion>
+      <FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(BuildNumber)</FileVersion>
     </PropertyGroup>
   </Target>