open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[net7-main] Fixes to get solution building in VS (#3552) 

* Fixes to get solution building in VS with net7 changes.

* More fixes + some code review.

* CONTRIBUTING update.

* Attempting to fix integration tests.

* Attempting to fix integration tests.

* Attempt to fix integration tests.

* Attempt to fix integration tests.
This commit is contained in:
Mikel Blanchard 2022-08-05 10:49:06 -07:00 committed by GitHub
parent 69d11bbfb2
commit 58ee541cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/integration-md.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [net6.0]
version: [net7.0]
steps:
- run: 'echo "No build required"'
@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [net6.0]
version: [net7.0]
steps:
- run: 'echo "No build required"'
@ -34,6 +34,6 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [net6.0]
version: [net7.0]
steps:
- run: 'echo "No build required"'

6
.github/workflows/integration.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net6.0]
version: [net7.0]
steps:
- uses: actions/checkout@v3
@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net6.0]
version: [net7.0]
steps:
- uses: actions/checkout@v3
@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net6.0]
version: [net7.0]
steps:
- uses: actions/checkout@v3

2
CONTRIBUTING.md
View File

@ -44,7 +44,7 @@ You can contribute to this project from a Windows, macOS or Linux machine.
On all platforms, the minimum requirements are:
* Git client and command line tools.
* .NET 6.0+
* .NET 7.0+
### Linux or MacOS

12
OpenTelemetry.sln
View File

@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.dockerignore = .dockerignore
.editorconfig = .editorconfig
CONTRIBUTING.md = CONTRIBUTING.md
global.json = global.json
LICENSE = LICENSE
NuGet.config = NuGet.config
OpenTelemetry.proj = OpenTelemetry.proj
@ -26,7 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E
build\Common.props = build\Common.props
build\debug.snk = build\debug.snk
build\docfx.cmd = build\docfx.cmd
build\docker-compose.net6.0.yml = build\docker-compose.net6.0.yml
build\docker-compose.net7.0.yml = build\docker-compose.net7.0.yml
build\docker-compose.netcoreapp3.1.yml = build\docker-compose.netcoreapp3.1.yml
build\finalize-publicapi.ps1 = build\finalize-publicapi.ps1
build\GlobalAttrExclusions.txt = build\GlobalAttrExclusions.txt
@ -241,7 +242,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Prom
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Prometheus.HttpListener.Tests", "test\OpenTelemetry.Exporter.Prometheus.HttpListener.Tests\OpenTelemetry.Exporter.Prometheus.HttpListener.Tests.csproj", "{4EF4364F-6E64-43CE-BED1-E6FE01024899}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Tests.Stress.Traces", "test\OpenTelemetry.Tests.Stress.Traces\OpenTelemetry.Tests.Stress.Traces.csproj", "{5697662B-5F14-4E32-BB11-1D8942782AB6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Tests.Stress.Traces", "test\OpenTelemetry.Tests.Stress.Traces\OpenTelemetry.Tests.Stress.Traces.csproj", "{5697662B-5F14-4E32-BB11-1D8942782AB6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore.7.0", "test\TestApp.AspNetCore.7.0\TestApp.AspNetCore.7.0.csproj", "{6BCAEBBA-C805-454B-8E13-F9C161910E4A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -505,6 +508,10 @@ Global
{5697662B-5F14-4E32-BB11-1D8942782AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5697662B-5F14-4E32-BB11-1D8942782AB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5697662B-5F14-4E32-BB11-1D8942782AB6}.Release|Any CPU.Build.0 = Release|Any CPU
{6BCAEBBA-C805-454B-8E13-F9C161910E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BCAEBBA-C805-454B-8E13-F9C161910E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BCAEBBA-C805-454B-8E13-F9C161910E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BCAEBBA-C805-454B-8E13-F9C161910E4A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -542,6 +549,7 @@ Global
{6C7A1595-36D6-4229-BBB5-5A6B5791791D} = {3862190B-E2C5-418E-AFDC-DB281FB5C705}
{9A07D215-90AC-4BAF-BCDB-73D74FD3A5C5} = {3862190B-E2C5-418E-AFDC-DB281FB5C705}
{F5EFF065-7AF5-4D7D-8038-CC419ABD8777} = {E359BB2B-9AEC-497D-B321-7DF2450C3B8E}
{6BCAEBBA-C805-454B-8E13-F9C161910E4A} = {77C7929A-2EED-4AA6-8705-B5C443C8AA0F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {55639B5C-0770-4A22-AB56-859604650521}

8
build/docker-compose.net6.0.yml
View File

@ -1,8 +0,0 @@
version: '3.7'
services:
tests:
build:
args:
PUBLISH_FRAMEWORK: net6.0
SDK_VERSION: 6.0

8
build/docker-compose.net7.0.yml Normal file
View File

@ -0,0 +1,8 @@
version: '3.7'
services:
tests:
build:
args:
PUBLISH_FRAMEWORK: net7.0
SDK_VERSION: 7.0

10
examples/MicroserviceExample/WebApi/Dockerfile
View File

@ -1,10 +1,12 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
ARG SDK_VERSION=7.0
FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net7.0
WORKDIR /app
COPY . ./
RUN dotnet publish ./examples/MicroserviceExample/WebApi -c Release -o /out -p:IntegrationBuild=true
RUN dotnet publish ./examples/MicroserviceExample/WebApi -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /out -p:IntegrationBuild=true
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:${SDK_VERSION} AS runtime
WORKDIR /app
COPY --from=build /out ./
ENTRYPOINT ["dotnet", "WebApi.dll"]

10
examples/MicroserviceExample/WorkerService/Dockerfile
View File

@ -1,10 +1,12 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
ARG SDK_VERSION=7.0
FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net7.0
WORKDIR /app
COPY . ./
RUN dotnet publish ./examples/MicroserviceExample/WorkerService -c Release -o /out -p:IntegrationBuild=true
RUN dotnet publish ./examples/MicroserviceExample/WorkerService -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /out -p:IntegrationBuild=true
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:${SDK_VERSION} AS runtime
WORKDIR /app
COPY --from=build /out ./
ENTRYPOINT ["dotnet", "WorkerService.dll"]

3
global.json
View File

@ -1,7 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "6.0.100",
"allowPrerelease": "true"
"version": "7.0.100-preview"
}
}

6
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
View File

@ -2,10 +2,10 @@
# This should be run from the root of the repo:
# docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
ARG SDK_VERSION=6.0
FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build
ARG SDK_VERSION=7.0
FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net6.0
ARG PUBLISH_FRAMEWORK=net7.0
WORKDIR /repo
COPY . ./
WORKDIR "/repo/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests"

6
test/OpenTelemetry.Instrumentation.SqlClient.Tests/Dockerfile
View File

@ -2,10 +2,10 @@
# This should be run from the root of the repo:
# docker build --file test/OpenTelemetry.Instrumentation.SqlClient.Tests/Dockerfile .
ARG SDK_VERSION=6.0
FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build
ARG SDK_VERSION=7.0
FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net6.0
ARG PUBLISH_FRAMEWORK=net7.0
WORKDIR /repo
COPY . ./
RUN ls -la /repo