Skip to content

Commit

Permalink
chore(deps): update .net to v8 (#2402)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Tom Kerkhove <[email protected]>
  • Loading branch information
renovate[bot] and tomkerkhove authored Feb 27, 2024
1 parent 851a992 commit 4f87d74
Show file tree
Hide file tree
Showing 29 changed files with 68 additions and 68 deletions.
2 changes: 1 addition & 1 deletion build/azure-devops/agents-ci-discovery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ stages:
condition: succeeded()
timeoutInMinutes: 180
pool:
vmImage: windows-2019
vmImage: windows-latest
variables:
OS.Name: 'windows'
steps:
Expand Down
2 changes: 1 addition & 1 deletion build/azure-devops/agents-ci-scraper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ stages:
condition: succeeded()
timeoutInMinutes: 180
pool:
vmImage: windows-2019
vmImage: windows-latest
variables:
OS.Name: 'windows'
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ stages:
dependsOn: Init
displayName: Windows Docker image
pool:
vmImage: windows-2019
vmImage: windows-latest
variables:
- name: OS.Name
value: 'windows'
Expand Down
2 changes: 1 addition & 1 deletion build/azure-devops/agents-scraper-release-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ stages:
- job: BuildWindows
displayName: Build Windows Docker image
pool:
vmImage: windows-2019
vmImage: windows-latest
variables:
OS.Name: 'windows'
steps:
Expand Down
2 changes: 1 addition & 1 deletion build/azure-devops/variables/build.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
variables:
DotNet.Sdk.Version: '7.0.402'
DotNet.Sdk.Version: '8.0.201'
DotNet.Configuration: 'release'
4 changes: 2 additions & 2 deletions changelog/content/experimental/unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ version:

#### Scraper

None.
- {{% tag changed %}} Migrate to .NET 8

#### Resource Discovery

None.
- {{% tag changed %}} Migrate to .NET 8
6 changes: 3 additions & 3 deletions src/Promitor.Agents.Core/Promitor.Agents.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand All @@ -21,7 +21,7 @@
<PackageReference Include="CronScheduler.AspNetCore" Version="3.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.2" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<PackageReference Include="Prometheus.Client" Version="5.2.0" />
<PackageReference Include="Prometheus.Client.AspNetCore" Version="5.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public async Task<IActionResult> Get(string resourceDiscoveryGroup, int pageSize
return NotFound(new {Information = "No resource discovery group was found with specified name"});
}

Response.Headers.Add("X-Paging-Page-Size", pagedDiscoveredResources.PageInformation.PageSize.ToString());
Response.Headers.Add("X-Paging-Current-Page", pagedDiscoveredResources.PageInformation.CurrentPage.ToString());
Response.Headers.Add("X-Paging-Total", pagedDiscoveredResources.PageInformation.TotalRecords.ToString());
Response.Headers.Append("X-Paging-Page-Size", pagedDiscoveredResources.PageInformation.PageSize.ToString());
Response.Headers.Append("X-Paging-Current-Page", pagedDiscoveredResources.PageInformation.CurrentPage.ToString());
Response.Headers.Append("X-Paging-Total", pagedDiscoveredResources.PageInformation.TotalRecords.ToString());

var serializedResources = JsonConvert.SerializeObject(pagedDiscoveredResources.Result, _serializerSettings);

Expand Down
4 changes: 2 additions & 2 deletions src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0.402-cbl-mariner2.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0.201-cbl-mariner2.0 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/
Expand All @@ -14,7 +14,7 @@ COPY Promitor.Integrations.Sinks.Core/* Promitor.Integrations.Sinks.Core/
COPY Promitor.Integrations.Sinks.Prometheus/* Promitor.Integrations.Sinks.Prometheus/
RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app /p:Version=$VERSION

FROM mcr.microsoft.com/dotnet/aspnet:7.0.12-cbl-mariner2.0-distroless AS runtime-base
FROM mcr.microsoft.com/dotnet/aspnet:8.0.2-cbl-mariner2.0-distroless AS runtime-base

FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer

Expand Down
4 changes: 2 additions & 2 deletions src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0.402 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-ltsc2022 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/
Expand All @@ -14,7 +14,7 @@ COPY Promitor.Integrations.Sinks.Core/* Promitor.Integrations.Sinks.Core/
COPY Promitor.Integrations.Sinks.Prometheus/* Promitor.Integrations.Sinks.Prometheus/
RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app /p:Version=%VERSION%

FROM mcr.microsoft.com/dotnet/aspnet:7.0.12 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022 AS runtime
WORKDIR /app
ENV PROMITOR_CONFIG_FOLDER="c:/config/"
COPY --from=build /app .
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DocumentationFile>Docs\Open-Api.xml</DocumentationFile>
<UserSecretsId>159d036b-3697-40d4-bdc4-7d9736521375</UserSecretsId>
Expand Down Expand Up @@ -36,15 +36,15 @@
<PackageReference Include="Guard.NET" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ResourceGraph" Version="2.1.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<PackageReference Include="Polly" Version="8.3.0" />

<!-- Explicitly pin dependencies on container project to mitigate security vulnerabilities -->
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Promitor.Agents.Scraper/Dockerfile.linux
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0.402-cbl-mariner2.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0.201-cbl-mariner2.0 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Core/* Promitor.Core/
Expand All @@ -18,7 +18,7 @@ COPY Promitor.Integrations.Sinks.Statsd/* Promitor.Integrations.Sinks.Statsd/
COPY Promitor.Agents.Scraper/* Promitor.Agents.Scraper/
RUN dotnet publish Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj --configuration release --output app /p:Version=$VERSION

FROM mcr.microsoft.com/dotnet/aspnet:7.0.12-cbl-mariner2.0-distroless AS runtime-base
FROM mcr.microsoft.com/dotnet/aspnet:8.0.2-cbl-mariner2.0-distroless AS runtime-base

FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer

Expand Down
4 changes: 2 additions & 2 deletions src/Promitor.Agents.Scraper/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0.402 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-ltsc2022 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Core/* Promitor.Core/
Expand All @@ -18,7 +18,7 @@ COPY Promitor.Integrations.Sinks.Statsd/* Promitor.Integrations.Sinks.Statsd/
COPY Promitor.Agents.Scraper/* Promitor.Agents.Scraper/
RUN dotnet publish Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj --configuration release --output app /p:Version=%VERSION%

FROM mcr.microsoft.com/dotnet/aspnet:7.0.12 as runtime
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022 as runtime
WORKDIR /app
ENV PROMITOR_CONFIG_FOLDER="c:/config/"

Expand Down
8 changes: 4 additions & 4 deletions src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
<!--<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>-->
</PropertyGroup>

Expand Down Expand Up @@ -44,8 +44,8 @@

<!-- Explicitly pin dependencies on container project to mitigate security vulnerabilities -->
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Promitor.Core.Contracts/Promitor.Core.Contracts.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
4 changes: 2 additions & 2 deletions src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
<LangVersion>8</LangVersion>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.4</RuntimeFrameworkVersion>
</PropertyGroup>

Expand All @@ -15,8 +15,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Promitor.Core/Promitor.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand All @@ -19,8 +19,8 @@
<PackageReference Include="Humanizer" Version="2.14.1" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageReference Include="Microsoft.Azure.Management.Monitor.Fluent" Version="1.38.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="YamlDotNet" Version="13.4.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand All @@ -17,8 +17,8 @@
<PackageReference Include="Guard.NET" Version="3.0.0" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.38.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Guard.Net" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Storage.Queue" Version="11.2.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -11,7 +11,7 @@
<PackageReference Include="Guard.Net" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="1.38.1" />
<PackageReference Include="Microsoft.Azure.Storage.Queue" Version="11.2.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand All @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="Flurl" Version="3.0.7" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.2</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Loading

0 comments on commit 4f87d74

Please sign in to comment.