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

fix(nuget): adjust docker images #484

Merged
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
4 changes: 2 additions & 2 deletions docker/Dockerfile-maintenance-service
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ COPY src/framework/Framework.Models/ src/framework/Framework.Models/
COPY src/framework/Framework.Logging/ src/framework/Framework.Logging/
COPY src/framework/Framework.Seeding/ src/framework/Framework.Seeding/
COPY src/framework/Framework.ErrorHandling/ src/framework/Framework.ErrorHandling/
COPY src/web/Web.Identity/ src/web/Web.Identity/
COPY /src/framework/Framework.DateTimeProvider /src/framework/Framework.DateTimeProvider
COPY src/framework/Framework.DateTimeProvider/ src/framework/Framework.DateTimeProvider/
COPY src/processes/Processes.ProcessIdentity/ src/processes/Processes.ProcessIdentity/
RUN dotnet restore "src/maintenance/Maintenance.App/Maintenance.App.csproj"
WORKDIR /src/maintenance/Maintenance.App
RUN dotnet publish "Maintenance.App.csproj" -c Release -o /app/publish
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-portal-migrations
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ COPY /src/framework/Framework.Logging /src/framework/Framework.Logging
COPY /src/framework/Framework.Models /src/framework/Framework.Models
COPY /src/framework/Framework.Linq /src/framework/Framework.Linq
COPY /src/framework/Framework.ErrorHandling /src/framework/Framework.ErrorHandling
COPY /src/web/Web.Identity /src/web/Web.Identity/
COPY /src/framework/Framework.Seeding /src/framework/Framework.Seeding
COPY /src/framework/Framework.DateTimeProvider /src/framework/Framework.DateTimeProvider
COPY /src/processes/Processes.ProcessIdentity/ /src/processes/Processes.ProcessIdentity/
WORKDIR /src/portalbackend/PortalBackend.Migrations
RUN dotnet publish "PortalBackend.Migrations.csproj" -c Release -o /migrations/publish

Expand Down
4 changes: 0 additions & 4 deletions src/framework/Framework.Async/Framework.Async.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,4 @@
<None Include="../../../DEPENDENCIES" Pack="true" PackagePath="" />
<None Include="../../../CONTRIBUTING.md" Pack="true" PackagePath="" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/framework/Framework.Cors/Framework.Cors.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,4 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/framework/Framework.DBAccess/Framework.DBAccess.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,4 @@
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,4 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,4 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,83 +1,78 @@
<!--
- Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
-
- See the NOTICE file(s) distributed with this work for additional
- information regarding copyright ownership.
-
- This program and the accompanying materials are made available under the
- terms of the Apache License, Version 2.0 which is available at
- https://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- SPDX-License-Identifier: Apache-2.0
-->

<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</AssemblyName>
<RootNamespace>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</RootNamespace>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
</PropertyGroup>

<!-- nuget specific config-->
<PropertyGroup>
<PackageId>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</PackageId>
<Title>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</Title>
<Authors>Eclipse Tractus-X</Authors>
<Copyright>All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs.</Copyright>
<Description>
The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks.
This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding.
</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/eclipse-tractusx/portal-backend</PackageProjectUrl>
<RepositoryUrl>https://github.com/eclipse-tractusx/portal-backend</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>

<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup>
<None Include="./README.md" Pack="true" PackagePath="" />
<None Include="../../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../../NOTICE.md" Pack="true" PackagePath="" />
<None Include="../../../DEPENDENCIES" Pack="true" PackagePath="" />
<None Include="../../../CONTRIBUTING.md" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
<PackageReference Include="Serilog" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Framework.ErrorHandling\Framework.ErrorHandling.csproj" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

</Project>
<!--
- Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
-
- See the NOTICE file(s) distributed with this work for additional
- information regarding copyright ownership.
-
- This program and the accompanying materials are made available under the
- terms of the Apache License, Version 2.0 which is available at
- https://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- SPDX-License-Identifier: Apache-2.0
-->

<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</AssemblyName>
<RootNamespace>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</RootNamespace>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
</PropertyGroup>

<!-- nuget specific config-->
<PropertyGroup>
<PackageId>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</PackageId>
<Title>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web</Title>
<Authors>Eclipse Tractus-X</Authors>
<Copyright>All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs.</Copyright>
<Description>
The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks.
This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding.
</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/eclipse-tractusx/portal-backend</PackageProjectUrl>
<RepositoryUrl>https://github.com/eclipse-tractusx/portal-backend</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>

<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup>
<None Include="./README.md" Pack="true" PackagePath="" />
<None Include="../../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../../NOTICE.md" Pack="true" PackagePath="" />
<None Include="../../../DEPENDENCIES" Pack="true" PackagePath="" />
<None Include="../../../CONTRIBUTING.md" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Framework.ErrorHandling\Framework.ErrorHandling.csproj" />
</ItemGroup>

</Project>
142 changes: 69 additions & 73 deletions src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj
Original file line number Diff line number Diff line change
@@ -1,73 +1,69 @@
<!--
- Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
-
- See the NOTICE file(s) distributed with this work for additional
- information regarding copyright ownership.
-
- This program and the accompanying materials are made available under the
- terms of the Apache License, Version 2.0 which is available at
- https://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- SPDX-License-Identifier: Apache-2.0
-->

<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</AssemblyName>
<RootNamespace>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</RootNamespace>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>true</IsPackable>
</PropertyGroup>

<!-- nuget specific config-->
<PropertyGroup>
<PackageId>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</PackageId>
<Title>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</Title>
<Authors>Eclipse Tractus-X</Authors>
<Copyright>All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs.</Copyright>
<Description>
The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks.
This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding.
</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/eclipse-tractusx/portal-backend</PackageProjectUrl>
<RepositoryUrl>https://github.com/eclipse-tractusx/portal-backend</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>

<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup>
<None Include="./README.md" Pack="true" PackagePath="" />
<None Include="../../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../../NOTICE.md" Pack="true" PackagePath="" />
<None Include="../../../DEPENDENCIES" Pack="true" PackagePath="" />
<None Include="../../../CONTRIBUTING.md" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

</Project>
<!--
- Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
-
- See the NOTICE file(s) distributed with this work for additional
- information regarding copyright ownership.
-
- This program and the accompanying materials are made available under the
- terms of the Apache License, Version 2.0 which is available at
- https://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- SPDX-License-Identifier: Apache-2.0
-->

<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</AssemblyName>
<RootNamespace>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</RootNamespace>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>true</IsPackable>
</PropertyGroup>

<!-- nuget specific config-->
<PropertyGroup>
<PackageId>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</PackageId>
<Title>Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling</Title>
<Authors>Eclipse Tractus-X</Authors>
<Copyright>All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs.</Copyright>
<Description>
The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks.
This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding.
</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/eclipse-tractusx/portal-backend</PackageProjectUrl>
<RepositoryUrl>https://github.com/eclipse-tractusx/portal-backend</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>

<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<ItemGroup>
<None Include="./README.md" Pack="true" PackagePath="" />
<None Include="../../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../../NOTICE.md" Pack="true" PackagePath="" />
<None Include="../../../DEPENDENCIES" Pack="true" PackagePath="" />
<None Include="../../../CONTRIBUTING.md" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Framework.ErrorHandling\Framework.ErrorHandling.csproj" />
</ItemGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

</Project>
Loading
Loading