Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update .net #2344

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.306'
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.9</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.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<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.305-cbl-mariner2.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.306-cbl-mariner2.0 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/
Expand All @@ -13,7 +13,7 @@ COPY Promitor.Integrations.LogAnalytics/* Promitor.Integrations.LogAnalytics/
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.8-cbl-mariner2.0-distroless AS runtime-base
FROM mcr.microsoft.com/dotnet/aspnet:7.0.9-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.305 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.306 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/
Expand All @@ -13,7 +13,7 @@ COPY Promitor.Integrations.LogAnalytics/* Promitor.Integrations.LogAnalytics/
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.8 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:7.0.9 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.9</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.305-cbl-mariner2.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.306-cbl-mariner2.0 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Core/* Promitor.Core/
Expand All @@ -17,7 +17,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.8-cbl-mariner2.0-distroless AS runtime-base
FROM mcr.microsoft.com/dotnet/aspnet:7.0.9-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.305 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0.306 AS build
WORKDIR /src
ARG VERSION="UNSET-VERSION"
COPY Promitor.Core/* Promitor.Core/
Expand All @@ -17,7 +17,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.8 as runtime
FROM mcr.microsoft.com/dotnet/aspnet:7.0.9 as runtime
WORKDIR /app
ENV PROMITOR_CONFIG_FOLDER="c:/config/"

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.9</RuntimeFrameworkVersion>
<!--<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>-->
</PropertyGroup>

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.9</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.9</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.9</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.9</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.9</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.9</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.9</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.9</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.9</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.9</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.9</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.9</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.9</RuntimeFrameworkVersion>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

Expand Down
Loading