Merge branch 'main' into utpilla/Fix-Namespace-For-Exporters

open-telemetry · Feb 2, 2021 · 54581c1 · 54581c1
2 parents 001a5f8 + 56b86b0
commit 54581c1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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>
 

diff --git a/build/Common.props b/build/Common.props
@@ -40,11 +40,11 @@
     <OpenTracingPkgVer>[0.12.1,0.13)</OpenTracingPkgVer>
     <StackExchangeRedisPkgVer>[2.1.58,3.0)</StackExchangeRedisPkgVer>
     <StyleCopAnalyzersPkgVer>[1.1.118,2.0)</StyleCopAnalyzersPkgVer>
-    <SystemCollectionsImmutablePkgVer>[1.4.0,6.0)</SystemCollectionsImmutablePkgVer>
-    <SystemDiagnosticSourcePkgVer>5.0.0</SystemDiagnosticSourcePkgVer>
-    <SystemReflectionEmitLightweightPkgVer>[4.7.0,6.0)</SystemReflectionEmitLightweightPkgVer>
-    <SystemTextJsonPkgVer>[4.7.0,6.0)</SystemTextJsonPkgVer>
-    <SystemThreadingTasksExtensionsPkgVer>[4.5.3,6.0)</SystemThreadingTasksExtensionsPkgVer>
+    <SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>
+    <SystemDiagnosticSourcePkgVer>5.0.1</SystemDiagnosticSourcePkgVer>
+    <SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>
+    <SystemTextJsonPkgVer>4.7.0</SystemTextJsonPkgVer>
+    <SystemThreadingTasksExtensionsPkgVer>4.5.3</SystemThreadingTasksExtensionsPkgVer>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Relax System.* packages version requirement to remove upper bound.
+* Require System.Diagnostics.DiagnosticSource package 5.0.1.
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29