Skip to content

Commit

Permalink
chore(deps): update .net (#2398)
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 Oct 19, 2023
1 parent 9266ba3 commit 155578b
Show file tree
Hide file tree
Showing 22 changed files with 27 additions and 27 deletions.
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.305'
DotNet.Sdk.Version: '7.0.402'
DotNet.Configuration: 'release'
4 changes: 2 additions & 2 deletions src/Promitor.Agents.Core/Promitor.Agents.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</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.11" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.12" />
<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
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.401-cbl-mariner2.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.402-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.11-cbl-mariner2.0-distroless AS runtime-base
FROM mcr.microsoft.com/dotnet/aspnet:7.0.12-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.401 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.402 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.11 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:7.0.12 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
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DocumentationFile>Docs\Open-Api.xml</DocumentationFile>
<UserSecretsId>159d036b-3697-40d4-bdc4-7d9736521375</UserSecretsId>
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.401-cbl-mariner2.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.402-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.11-cbl-mariner2.0-distroless AS runtime-base
FROM mcr.microsoft.com/dotnet/aspnet:7.0.12-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.401 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.402 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.11 as runtime
FROM mcr.microsoft.com/dotnet/aspnet:7.0.12 as runtime
WORKDIR /app
ENV PROMITOR_CONFIG_FOLDER="c:/config/"

Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<!--<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>-->
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core.Contracts/Promitor.Core.Contracts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core/Promitor.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.7</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Tests.Unit/Promitor.Tests.Unit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<RuntimeFrameworkVersion>7.0.8</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>7.0.12</RuntimeFrameworkVersion>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

Expand Down

0 comments on commit 155578b

Please sign in to comment.