Revert "Merge branch 'net7.0' into main" (#3531)

This reverts commit e64015c, reversing changes made to 5653454.
open-telemetry · Aug 3, 2022 · 25df7e8 · 25df7e8
1 parent e64015c
commit 25df7e8
Show file tree

Hide file tree

Showing 66 changed files with 108 additions and 323 deletions.
diff --git a/.github/workflows/apicompatibility.yml b/.github/workflows/apicompatibility.yml
@@ -2,7 +2,7 @@ name: API Compatibility
 
 on:
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
 
@@ -11,15 +11,10 @@ jobs:
     runs-on: windows-latest
     env:
       CheckAPICompatibility: true
-      # https://github.com/actions/setup-dotnet/issues/122
-      DOTNET_MULTILEVEL_LOOKUP: 1
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-dotnet@v1
       with:
         fetch-depth: 0 # fetching all
-        dotnet-version: '7.0.x'
-        include-prerelease: true
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -2,11 +2,11 @@ name: Code Coverage
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
 
@@ -20,17 +20,11 @@ jobs:
         os: [windows-latest]
     env:
       OS: ${{ matrix.os }}
-      # https://github.com/actions/setup-dotnet/issues/122
-      DOTNET_MULTILEVEL_LOOKUP: 1
 
     steps:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0 # fetching all
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -2,9 +2,9 @@ name: docfx
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/dotnet-format-md.yml b/.github/workflows/dotnet-format-md.yml
@@ -9,7 +9,7 @@ name: dotnet format
 
 on:
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.md'
 

diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
@@ -2,12 +2,12 @@ name: dotnet format
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.cs'
     - '.editorconfig'
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.cs'
     - '.editorconfig'
@@ -25,12 +25,6 @@ jobs:
       with:
         dotnet-version: 6.0.x
 
-    - name: Setup .NET Core 7.0
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true
-
     - name: Install format tool
       run: dotnet tool install -g dotnet-format
 

diff --git a/.github/workflows/integration-md.yml b/.github/workflows/integration-md.yml
@@ -9,7 +9,7 @@ name: Integration Tests
 
 on:
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.md'
 
@@ -18,22 +18,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [net6.0]
+        version: [netcoreapp3.1,net6.0]
     steps:
       - run: 'echo "No build required"'
 
   w3c-trace-context-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [net6.0]
+        version: [netcoreapp3.1,net6.0]
     steps:
       - run: 'echo "No build required"'
 
   otlp-exporter-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [net6.0]
+        version: [netcoreapp3.1,net6.0]
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -2,11 +2,11 @@ name: Integration Tests
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
 
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net6.0]
+        version: [netcoreapp3.1,net6.0]
     steps:
       - uses: actions/checkout@v3
 
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net6.0]
+        version: [netcoreapp3.1,net6.0]
     steps:
       - uses: actions/checkout@v3
 
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net6.0]
+        version: [netcoreapp3.1,net6.0]
     steps:
       - uses: actions/checkout@v3
 

diff --git a/.github/workflows/linux-ci-md.yml b/.github/workflows/linux-ci-md.yml
@@ -9,7 +9,7 @@ name: Linux
 
 on:
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.md'
 
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        version: [net6.0]
+        version: [netcoreapp3.1,net6.0]
 
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
@@ -2,11 +2,11 @@ name: Linux
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
 
@@ -16,23 +16,13 @@ jobs:
 
     strategy:
       matrix:
-        version: [net6.0, net7.0]
+        version: [netcoreapp3.1,net6.0]
 
     steps:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0 # fetching all
 
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
-
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true
-
-
     - name: Install dependencies
       run: dotnet restore
 

diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml
@@ -2,11 +2,11 @@ name: markdownlint
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.md'
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.md'
 

diff --git a/.github/workflows/sanitycheck.yml b/.github/workflows/sanitycheck.yml
@@ -2,9 +2,9 @@ name: sanitycheck
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
 
 jobs:
   misspell:

diff --git a/.github/workflows/windows-ci-md.yml b/.github/workflows/windows-ci-md.yml
@@ -9,7 +9,7 @@ name: Windows
 
 on:
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths:
     - '**.md'
 
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        version: [net462,net6.0]
+        version: [net462,netcoreapp3.1,net6.0]
 
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -2,35 +2,27 @@ name: Windows
 
 on:
   push:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main, net7.0 ]
+    branches: [ main ]
     paths-ignore:
     - '**.md'
 
 jobs:
   build-test:
     runs-on: windows-latest
-    env:
-      # https://github.com/actions/setup-dotnet/issues/122
-      DOTNET_MULTILEVEL_LOOKUP: 1
 
     strategy:
       matrix:
-        version: [net462,net6.0,net7.0]
+        version: [net462,netcoreapp3.1,net6.0]
 
     steps:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0 # fetching all
 
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true
-
     - name: Install dependencies
       run: dotnet restore
 

diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln
@@ -51,6 +51,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testdata", "testdata", "{77C7929A-2EED-4AA6-8705-B5C443C8AA0F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore.3.1", "test\TestApp.AspNetCore.3.1\TestApp.AspNetCore.3.1.csproj", "{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{E359BB2B-9AEC-497D-B321-7DF2450C3B8E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Jaeger", "src\OpenTelemetry.Exporter.Jaeger\OpenTelemetry.Exporter.Jaeger.csproj", "{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}"
@@ -271,6 +273,10 @@ Global
 		{2A47F6A8-63E5-4237-8046-94CAF321E797}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A47F6A8-63E5-4237-8046-94CAF321E797}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A47F6A8-63E5-4237-8046-94CAF321E797}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -504,6 +510,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{F2F81E76-6A0E-466B-B673-EBBF1A9ED075} = {77C7929A-2EED-4AA6-8705-B5C443C8AA0F}
 		{A533C800-3DC3-4D04-90A7-0CE7A1E6BDB3} = {F1D0972B-38CF-49C2-9F4B-4C5DE02FB71D}
 		{E69578EB-B456-4062-A645-877CD964528B} = {F1D0972B-38CF-49C2-9F4B-4C5DE02FB71D}
 		{C1542297-8763-4DF4-957C-489ED771C21D} = {7CB2F02E-03FA-4FFF-89A5-C51F107623FD}

diff --git a/build/Common.props b/build/Common.props
@@ -43,7 +43,7 @@
     <SerilogPkgVer>[2.8.0,3.0)</SerilogPkgVer>
     <StyleCopAnalyzersPkgVer>[1.2.0-beta.354,2.0)</StyleCopAnalyzersPkgVer>
     <SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>
-    <SystemDiagnosticSourcePkgVer>7.0.0-preview.4.22229.4</SystemDiagnosticSourcePkgVer>
+    <SystemDiagnosticSourcePkgVer>6.0.0</SystemDiagnosticSourcePkgVer>
     <SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>
     <SystemTextJsonPkgVer>4.7.0</SystemTextJsonPkgVer>
     <SystemThreadingTasksExtensionsPkgVer>4.5.3</SystemThreadingTasksExtensionsPkgVer>

diff --git a/docs/Directory.Build.props b/docs/Directory.Build.props
@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <!-- https://dotnet.microsoft.com/download/dotnet-core -->
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <!-- https://dotnet.microsoft.com/download/dotnet-framework -->
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462;net47;net471;net472;net48</TargetFrameworks>
   </PropertyGroup>

diff --git a/global.json b/global.json
@@ -1,7 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestFeature",
-    "version": "6.0.100",
-    "allowPrerelease": "true"
+    "version": "6.0.100"
   }
 }
diff --git a/...e/.publicApi/net6.0/PublicAPI.Shipped.txt → ...icApi/netcoreapp3.1/PublicAPI.Shipped.txt b/...e/.publicApi/net6.0/PublicAPI.Shipped.txt → ...icApi/netcoreapp3.1/PublicAPI.Shipped.txt
diff --git a/....publicApi/net6.0/PublicAPI.Unshipped.txt → ...Api/netcoreapp3.1/PublicAPI.Unshipped.txt b/....publicApi/net6.0/PublicAPI.Unshipped.txt → ...Api/netcoreapp3.1/PublicAPI.Unshipped.txt
diff --git a/...emetry.Exporter.Prometheus.AspNetCore/OpenTelemetry.Exporter.Prometheus.AspNetCore.csproj b/...emetry.Exporter.Prometheus.AspNetCore/OpenTelemetry.Exporter.Prometheus.AspNetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <Description>ASP.NET Core middleware for hosting OpenTelemetry .NET Prometheus Exporter</Description>
     <PackageTags>$(PackageTags);prometheus;metrics</PackageTags>
     <MinVerTagPrefix>core-</MinVerTagPrefix>

diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/.publicApi/net7.0/PublicAPI.Shipped.txt b/src/OpenTelemetry.Instrumentation.AspNetCore/.publicApi/net7.0/PublicAPI.Shipped.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ name: dotnet format @@
     on:
       pull_request:
-        branches: [ main, net7.0 ]
+        branches: [ main ]
         paths:
         - '**.md'
@@ Expand Down @@