feat(nuget): adjust framework push process

Refs: CPLP-3400
eclipse-tractusx · Jan 25, 2024 · 00b8ab0 · 00b8ab0
1 parent f6c9407
commit 00b8ab0
Show file tree

Hide file tree

Showing 94 changed files with 126 additions and 597 deletions.
diff --git a/.github/workflows/nuget-package-push.yml b/.github/workflows/nuget-package-push.yml
@@ -25,6 +25,7 @@ on:
         - 'src/framework/**'
       branches:
         - 'dev'
+        - 'release/v*.*.*-RC*'
   workflow_dispatch:
 
 jobs:

diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -40,14 +40,15 @@ nuget/nuget/-/Serilog.Extensions.Hosting/7.0.0, Apache-2.0, approved, #10078
 nuget/nuget/-/Serilog.Extensions.Logging/7.0.0, Apache-2.0, approved, #10070
 nuget/nuget/-/Serilog.Formatting.Compact/1.1.0, Apache-2.0, approved, #11115
 nuget/nuget/-/Serilog.Settings.Configuration/7.0.0, Apache-2.0, approved, #10069
+nuget/nuget/-/Serilog.Sinks.Console/4.0.1, Apache-2.0, approved, #12858
 nuget/nuget/-/Serilog.Sinks.Console/4.1.0, Apache-2.0, approved, #8434
 nuget/nuget/-/Serilog.Sinks.Debug/2.0.0, Apache-2.0, approved, clearlydefined
 nuget/nuget/-/Serilog.Sinks.File/5.0.0, Apache-2.0, approved, #11116
+nuget/nuget/-/Serilog/2.12.0, Apache-2.0, approved, #8435
 nuget/nuget/-/Serilog/3.0.1, Apache-2.0, approved, #10063
 nuget/nuget/-/SharpZipLib/1.4.2, MIT AND GFDL-1.3-or-later AND (Apache-2.0 AND MIT) AND WTFPL AND bzip2-1.0.6 AND LicenseRef-Permissive-license-with-conditions AND LicenseRef-Permission-Notice, approved, #10058
 nuget/nuget/-/SshNet.Security.Cryptography/1.3.0, MIT, approved, clearlydefined
 nuget/nuget/-/Stubble.Core/1.10.8, MIT AND BSD-2-Clause, approved, #9297
-nuget/nuget/-/SwashBuckle.AspNetCore/6.5.0, MIT AND Apache-2.0, approved, #7159
 nuget/nuget/-/Swashbuckle.AspNetCore.Swagger/6.5.0, MIT AND Apache-2.0, approved, #7160
 nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerGen/6.5.0, MIT AND Apache-2.0, approved, #7156
 nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerUI/6.5.0, MIT AND Apache-2.0, approved, #7158

diff --git a/scripts/update-nuget-packages.md → docs/nuget/update-nuget-packages.md b/scripts/update-nuget-packages.md → docs/nuget/update-nuget-packages.md
@@ -1,6 +1,6 @@
 # Update nuget packages
 
-Currently each project of the framework directory is build and provided as an nuget package.
+Each project of the framework directory is build and provided as an nuget package.
 
 To be able to build and test changes locally we recommend the following setup:
 
@@ -80,4 +80,4 @@ To update the version of a specific package:
 ./scripts/pack_and_push_packages.sh <NUGET_API_KEY>
 ```
 
-NUGET_API_KEY is the key generated on nuget.org. The last command should only be executed within the github action
+NUGET_API_KEY is the key generated on nuget.org. The last command should only be executed within the github action [nuget-package-push](/.github/workflows/nuget-package-push.yml)
diff --git a/scripts/pack_and_push_packages.sh b/scripts/pack_and_push_packages.sh
@@ -35,7 +35,7 @@ iterate_directories() {
     if [ -d "$dir" ]; then
       proj="$(basename "$dir")"
       echo "Pack project: $proj"
-      dotnet pack --no-build --no-restore src/framework/$proj/$proj.csproj -c Release -o "$folderPath"
+      dotnet pack src/framework/$proj/$proj.csproj -c Release -o "$folderPath"
     fi
   done
 }

diff --git a/scripts/pack_and_push_packages_local.sh b/scripts/pack_and_push_packages_local.sh
@@ -27,7 +27,7 @@ iterate_directories() {
     if [ -d "$dir" ]; then
       proj="$(basename "$dir")"
       echo "Pack project: $proj"
-      dotnet pack --no-build --no-restore src/framework/$proj/$proj.csproj -c Release -o "$folderPath"
+      dotnet pack src/framework/$proj/$proj.csproj -c Release -o "$folderPath"
     fi
   done
 }

diff --git a/src/administration/Administration.Service/Administration.Service.csproj b/src/administration/Administration.Service/Administration.Service.csproj
@@ -39,11 +39,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider" Version="1.0.0-beta.6" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Models" Version="1.0.0-beta.7" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.7" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Async" Version="1.0.0-beta.6" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.7" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider" Version="1.0.0-beta.8" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Models" Version="1.0.0-beta.9" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.9" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Async" Version="1.0.0-beta.8" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.9" />
     <PackageReference Include="PasswordGenerator" Version="2.1.0" />
   </ItemGroup>
 

diff --git a/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs b/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs
@@ -18,8 +18,8 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration;
 using System.Text;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;

diff --git a/src/administration/Administration.Service/Controllers/CompanyDataController.cs b/src/administration/Administration.Service/Controllers/CompanyDataController.cs
@@ -26,6 +26,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 using System.Net;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;

diff --git a/src/administration/Administration.Service/Controllers/ConnectorsController.cs b/src/administration/Administration.Service/Controllers/ConnectorsController.cs
@@ -27,6 +27,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Models;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;

diff --git a/src/administration/Administration.Service/Controllers/DocumentsController.cs b/src/administration/Administration.Service/Controllers/DocumentsController.cs
@@ -22,9 +22,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;

diff --git a/src/administration/Administration.Service/Controllers/IdentityProviderController.cs b/src/administration/Administration.Service/Controllers/IdentityProviderController.cs
@@ -23,9 +23,9 @@
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Enums;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 

diff --git a/src/administration/Administration.Service/Controllers/InvitationController.cs b/src/administration/Administration.Service/Controllers/InvitationController.cs
@@ -23,7 +23,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 

diff --git a/src/administration/Administration.Service/Controllers/NetworkController.cs b/src/administration/Administration.Service/Controllers/NetworkController.cs
@@ -22,8 +22,8 @@
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 

diff --git a/src/administration/Administration.Service/Controllers/RegistrationController.cs b/src/administration/Administration.Service/Controllers/RegistrationController.cs
@@ -28,6 +28,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Models;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 

diff --git a/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs b/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs
@@ -22,8 +22,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 

diff --git a/src/administration/Administration.Service/Controllers/ServiceAccountController.cs b/src/administration/Administration.Service/Controllers/ServiceAccountController.cs
@@ -26,6 +26,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 

diff --git a/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs b/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs
@@ -22,9 +22,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;

diff --git a/src/administration/Administration.Service/Controllers/UserController.cs b/src/administration/Administration.Service/Controllers/UserController.cs
@@ -25,6 +25,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models;
+using Org.Eclipse.TractusX.Portal.Backend.Web.Identity;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers;
 

diff --git a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj
@@ -35,7 +35,7 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.7" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.9" />
     </ItemGroup>
 
 </Project>
diff --git a/src/externalsystems/Custodian.Library/Custodian.Library.csproj b/src/externalsystems/Custodian.Library/Custodian.Library.csproj
@@ -34,8 +34,8 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.7" />
-      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.7" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.9" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.9" />
     </ItemGroup>
 
 </Project>
diff --git a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj
@@ -29,7 +29,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.7" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.9" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...xternalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj b/...xternalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.7" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.9" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj
@@ -29,7 +29,7 @@
     </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.7" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.9" />
   </ItemGroup>
 
     <ItemGroup>

diff --git a/src/framework/Framework.Async/Directory.Build.props b/src/framework/Framework.Async/Directory.Build.props
@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.6</VersionSuffix>
+    <VersionSuffix>beta.8</VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/framework/Framework.Async/README.md b/src/framework/Framework.Async/README.md
@@ -10,39 +10,16 @@ This content is produced and maintained by the Eclipse Tractus-X project.
 
 dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Async
 
-## 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.
-
 ## Contributing
 
 We welcome contributions! Please read our [contributing guidelines](./CONTRIBUTING.md) for more details.
 
-## License
-
-Distributed under the Apache 2.0 License.
-See [LICENSE](./LICENSE) for more information.
-
 ## Source Code
 
 The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx:
 
 - https://github.com/eclipse-tractusx/portal-backend
 
-## Third-party Content
-
-This project uses the following image content:
-
-* Image: Catena-X Logo
-* Source URL: https://catena-x.net
-
-## Cryptography
+## License
 
-Content may contain encryption software. The country in which you are currently
-may have restrictions on the import, possession, and use, and/or re-export to
-another country, of encryption software. BEFORE using any encryption software,
-please check the country's laws, regulations and policies concerning the import,
-possession, or use, and re-export of encryption software, to see if this is
-permitted.
+Distributed under the Apache 2.0 License.
diff --git a/src/framework/Framework.Authorization/Directory.Build.props b/src/framework/Framework.Authorization/Directory.Build.props
diff --git a/src/framework/Framework.Authorization/README.md b/src/framework/Framework.Authorization/README.md
diff --git a/src/framework/Framework.Cors/Directory.Build.props b/src/framework/Framework.Cors/Directory.Build.props
@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.6</VersionSuffix>
+    <VersionSuffix>beta.8</VersionSuffix>
   </PropertyGroup>
 </Project>