diff --git a/.ci/ci.csproj b/.ci/ci.csproj deleted file mode 100644 index 0da2792d6..000000000 --- a/.ci/ci.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - false - false - true - false - false - $(ProjectDir) - - diff --git a/.ci/linux/deploy.sh b/.ci/deploy.sh old mode 100755 new mode 100644 similarity index 100% rename from .ci/linux/deploy.sh rename to .ci/deploy.sh diff --git a/.ci/docker/iis/Dockerfile b/.ci/docker/iis/Dockerfile deleted file mode 100644 index 7a16a993d..000000000 --- a/.ci/docker/iis/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM mcr.microsoft.com/dotnet/framework/aspnet - -RUN powershell -NoProfile -Command Remove-Item -Recurse C:\\inetpub\wwwroot\* - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN New-Item -Path "c:\\" -Name "tools" -ItemType "directory" - -WORKDIR /tools - -RUN "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12" - -# Install chocolatey -RUN iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - -# Install .NET (Core) SDKs -RUN Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1 -UseBasicParsing -RUN & ./dotnet-install.ps1 -Channel LTS -InstallDir ./dotnet -Version 5.0.100 - -# Install NuGet Tool -RUN Invoke-WebRequest "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile dotnet\\nuget.exe -UseBasicParsing - -# Install 2019 build tools -RUN Invoke-WebRequest -UseBasicParsing "https://download.visualstudio.microsoft.com/download/pr/cb1d5164-e767-4886-8955-2df3a7c816a8/b9ff67da6d68d6a653a612fd401283cc213b4ec4bae349dd3d9199659a7d9354/vs_BuildTools.exe" -OutFile "C:\tools\vs_BuildTools.exe"; \ - Start-Process vs_BuildTools.exe -ArgumentList "--add", "Microsoft.VisualStudio.Component.NuGet", \ - "--add", "'Microsoft.VisualStudio.Workload.NetCoreBuildTools;includeRecommended;includeOptional'", \ - "--add", "Microsoft.VisualStudio.Workload.MSBuildTools", \ - "--add", "'Microsoft.VisualStudio.Workload.WebBuildTools;includeRecommended;includeOptional'", \ - "--quiet", "--norestart", "--nocache" -NoNewWindow -Wait; - -ENV PATH="C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0;C:\\Windows\\System32\\OpenSSH;C:\\Users\\ContainerAdministrator\\AppData\\Local\\Microsoft\\WindowsApps;c:\\tools;c:\\tools\\dotnet;C:\\ProgramData\\chocolatey\\bin" - - diff --git a/.ci/docker/iis/README.md b/.ci/docker/iis/README.md deleted file mode 100644 index ae50c6b4e..000000000 --- a/.ci/docker/iis/README.md +++ /dev/null @@ -1,17 +0,0 @@ -This is a Docker container with VisualStudio 2017, MSBuild tools, -dotnet SDK and an IIS installed. -This container could be used to build and run the IIS test. -The following commands would build the image and run the tests. - ----- - -**IMPORTANT**: This uses a Windows container, so can only be run with Docker on Windows, switched to use Windows containers - ----- - -``` -docker build -t iis .ci\docker\iis -docker run --name iis -v "${PWD}:C:\inetpub\wwwroot" -w C:\inetpub\wwwroot\ iis -docker exec iis cmd /C .ci\windows\msbuild.bat -docker exec iis cmd /C .ci\windows\test-iis.bat -``` \ No newline at end of file diff --git a/.ci/docker/iis/content/index.html b/.ci/docker/iis/content/index.html deleted file mode 100644 index 5960eee56..000000000 --- a/.ci/docker/iis/content/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - Hello Docker Windows - - \ No newline at end of file diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh deleted file mode 100755 index f57471210..000000000 --- a/.ci/packer_cache.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# shellcheck disable=SC1091 -source /usr/local/bin/bash_standard_lib.sh - -ARCH=$(uname -m| tr '[:upper:]' '[:lower:]') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef1f70410..b3d4b7548 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: run: ./build.sh pack - name: Release to Nuget - run: .ci/linux/deploy.sh ${{ secrets.NUGET_API_KEY }} ${{ secrets.NUGET_API_URL }} + run: .ci/deploy.sh ${{ secrets.NUGET_API_KEY }} ${{ secrets.NUGET_API_URL }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 diff --git a/ElasticApmAgent.sln b/ElasticApmAgent.sln index 56ed373a1..a0f8b6997 100644 --- a/ElasticApmAgent.sln +++ b/ElasticApmAgent.sln @@ -45,8 +45,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.AspNetFullFrame EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Tests.MockApmServer", "test\Elastic.Apm.Tests.MockApmServer\Elastic.Apm.Tests.MockApmServer.csproj", "{AFFB238B-10C0-4229-9527-184EFCF0F5AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ci", ".ci\ci.csproj", "{9AAC1E7A-5887-46BC-96DA-DDFFF0F7CDC2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.EntityFrameworkCore.Tests", "test\instrumentations\Elastic.Apm.EntityFrameworkCore.Tests\Elastic.Apm.EntityFrameworkCore.Tests.csproj", "{79BEA612-E2C8-47FD-84DC-A1B17AAD5038}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.SqlClient.Tests", "test\instrumentations\Elastic.Apm.SqlClient.Tests\Elastic.Apm.SqlClient.Tests.csproj", "{968E1E85-E996-42DE-9845-D20DAE16165A}" @@ -300,8 +298,6 @@ Global {AFFB238B-10C0-4229-9527-184EFCF0F5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {AFFB238B-10C0-4229-9527-184EFCF0F5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {AFFB238B-10C0-4229-9527-184EFCF0F5AC}.Release|Any CPU.Build.0 = Release|Any CPU - {9AAC1E7A-5887-46BC-96DA-DDFFF0F7CDC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AAC1E7A-5887-46BC-96DA-DDFFF0F7CDC2}.Release|Any CPU.ActiveCfg = Release|Any CPU {79BEA612-E2C8-47FD-84DC-A1B17AAD5038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {79BEA612-E2C8-47FD-84DC-A1B17AAD5038}.Debug|Any CPU.Build.0 = Debug|Any CPU {79BEA612-E2C8-47FD-84DC-A1B17AAD5038}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/global.json b/global.json index 789bff3bd..42f2b9487 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.404", "rollForward": "latestFeature", "allowPrerelease": false }