chore: update packages

Refs: CPLP-3400

.github/workflows/nuget-package.yml

@@ -62,3 +62,5 @@ jobs:
       if: success()
       run: |
         bash ./scripts/pack_and_push_packages.sh nuget secrets.NUGET_API_KEY
+
+    # Create tag for nuget version update

scripts/pack_and_push_packages.sh

@@ -61,10 +61,7 @@ case "$nugetSource" in
     ;;
   nuget)
     for packageFile in "$folderPath"/*.nupkg; do
-      dotnet nuget push "$packageFile" --api-key $NUGET_API_KEY --source https://api.nuget.org/v3/index.json
-    done
-    for packageFile in "$folderPath"/*.snupkg; do
-      dotnet nuget push "$packageFile" --api-key $NUGET_API_KEY --source https://api.nuget.org/v3/index.json
+      dotnet nuget push "$packageFile" --api-key $NUGET_API_KEY --source https://api.nuget.org/v3/index.json --skip-duplicate
     done
     ;;
   *)

scripts/update_all_framework_versions.sh

@@ -1,3 +1,22 @@
+###############################################################
+# Copyright (c) 2021, 2023 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
+###############################################################
+
 #!/bin/bash
 
 # Check if the correct number of arguments are provided
@@ -9,9 +28,6 @@ fi
 # Assign the arguments to variables
 version="$1"
 
-# Initialize a global arrays to store data
-already_updated_projects=()
-
 # Define the version update functions
 update_major() {
   local version="$1"
@@ -94,8 +110,7 @@ update_version(){
 iterate_directories() {
   for dir in ./src/framework/*/; do
     if [ -d "$dir" ]; then
-        update_version "$dir"
-        already_updated_projects+=("$(basename "$dir")")
+      update_version "$dir"
     fi
   done
 }

scripts/update_framework_version.sh

@@ -1,3 +1,24 @@
+###############################################################
+# Copyright (c) 2021, 2023 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
+###############################################################
+
+#!/bin/bash
+
 # Check if the correct number of arguments are provided
 if [ "$#" -ne 2 ]; then
   echo "Usage: $0 <location> <version>"
@@ -61,9 +82,6 @@ update_csproj_files_recursive() {
           project=$(basename "$dir")
           if [[ ! " ${already_updated_projects[*]} " == *"$project"* ]]; then
             update_version "$dir" "$project"
-            if [[ ! " ${already_updated_projects[*]} " == *"$project"* ]]; then
-              already_updated_projects+=("$project")
-            fi
           fi
         fi
       done
@@ -113,15 +131,13 @@ update_version(){
         ;;
     esac
 
-    # if [[ ! " ${already_updated_projects[*]} " == *"$project_name"* ]]; then
-      # Update the VersionPrefix and VersionSuffix in the file
-      awk -v new_version="$updated_version" -v new_suffix="$updated_suffix" '/<VersionPrefix>/{gsub(/<VersionPrefix>[^<]+<\/VersionPrefix>/, "<VersionPrefix>" new_version "</VersionPrefix>")}/<VersionSuffix>/{gsub(/<VersionSuffix>[^<]+<\/VersionSuffix>/, "<VersionSuffix>" new_suffix "</VersionSuffix>")}1' "$props_file" > temp && mv temp "$props_file"
-      echo "Updated version in $props_file to $updated_version $updated_suffix"
+    # Update the VersionPrefix and VersionSuffix in the file
+    awk -v new_version="$updated_version" -v new_suffix="$updated_suffix" '/<VersionPrefix>/{gsub(/<VersionPrefix>[^<]+<\/VersionPrefix>/, "<VersionPrefix>" new_version "</VersionPrefix>")}/<VersionSuffix>/{gsub(/<VersionSuffix>[^<]+<\/VersionSuffix>/, "<VersionSuffix>" new_suffix "</VersionSuffix>")}1' "$props_file" > temp && mv temp "$props_file"
+    echo "Updated version in $props_file to $updated_version $updated_suffix"
 
-      already_updated_projects+=($directory)
-      # Update the depending solutions
-      update_csproj_files_recursive "$updated_name"
-    # fi
+    already_updated_projects+=($directory)
+    # Update the depending solutions
+    update_csproj_files_recursive "$updated_name"
   else
     echo "Directory.Builds.props file not found in $directory$updated_name"
   fi
@@ -134,12 +150,9 @@ iterate_directories() {
   for dir in ./src/framework/*/; do
     if [ -d "$dir" ]; then
       if [[ $dir == "./src/framework/$updated_name/" ]]; then
-        update_version "$dir" "$updated_name"
-        if [[ ! " ${projects_to_update[*]} " == *"$updated_name"* ]]; then
-          projects_to_update+=("$updated_name")
-        fi
         if [[ ! " ${already_updated_projects[*]} " == *"$updated_name"* ]]; then
-          already_updated_projects+=("$updated_name")
+          update_version "$dir" "$updated_name"
+          projects_to_update+=("$updated_name")
         fi
       fi
     fi

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.3" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Models" Version="1.0.0-beta.3" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.3" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Async" Version="1.0.0-beta.3" />
-    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.3" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider" Version="1.0.0-beta.4" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Models" Version="1.0.0-beta.5" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.5" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Async" Version="1.0.0-beta.4" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.5" />
     <PackageReference Include="PasswordGenerator" Version="2.1.0" />
   </ItemGroup>
 

src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs

@@ -19,7 +19,6 @@
 
 using Microsoft.Extensions.Options;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.IO;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq;

src/administration/Administration.Service/BusinessLogic/RegistrationBusinessLogic.cs

@@ -24,7 +24,6 @@
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.BusinessLogic;
 using Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.Models;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail;

src/administration/Administration.Service/BusinessLogic/UserRolesBusinessLogic.cs

@@ -22,7 +22,6 @@
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Async;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Models;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;

src/administration/Administration.Service/BusinessLogic/UserUploadBusinessLogic.cs

@@ -19,7 +19,6 @@
 
 using Microsoft.Extensions.Options;
 using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
-using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.IO;
 using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq;

src/administration/Administration.Service/Models/IdentityProviderUpdateStats.cs

@@ -17,7 +17,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 

src/administration/Administration.Service/Models/PartnerRegistrationData.cs

@@ -21,7 +21,6 @@
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 using Org.Eclipse.TractusX.Portal.Backend.Registration.Common;
 using System.Text.Json.Serialization;
-using RegistrationData = Org.Eclipse.TractusX.Portal.Backend.Registration.Common.RegistrationData;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 

src/administration/Administration.Service/Models/UserCreationStats.cs

@@ -17,7 +17,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 

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.3" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.5" />
     </ItemGroup>
 
 </Project>

src/externalsystems/Custodian.Library/Custodian.Library.csproj

@@ -35,8 +35,8 @@
 
     <ItemGroup>
       <PackageReference Include="System.Net.Requests" Version="4.3.0" />
-      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.3" />
-      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.3" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.IO" Version="1.0.0-beta.5" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.5" />
     </ItemGroup>
 
 </Project>

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.3" />
+      <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.5" />
     </ItemGroup>
 
     <ItemGroup>

src/externalsystems/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.3" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.5" />
   </ItemGroup>
 
   <ItemGroup>

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.3" />
+    <PackageReference Include="Org.Eclipse.TractusX.Portal.Backend.Framework.Token" Version="1.0.0-beta.5" />
   </ItemGroup>
 
     <ItemGroup>

src/framework/Framework.Async/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.4</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.Authorization/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.5</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.Authorization/Framework.Authorization.csproj

@@ -62,7 +62,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
     <PackageReference Include="System.Json" Version="4.7.1" />
   </ItemGroup>
 

src/framework/Framework.Cors/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.4</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.DBAccess/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.5</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.DBAccess/Framework.DBAccess.csproj

@@ -61,7 +61,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

src/framework/Framework.DateTimeProvider/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.4</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.DependencyInjection/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.4</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.ErrorHandling.Library/DetailException.cs

@@ -17,10 +17,9 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 using System.Text.RegularExpressions;
 
-namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 
 [Serializable]
 public abstract class DetailException : Exception

src/framework/Framework.ErrorHandling.Library/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.5</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.ErrorHandling.Library/ErrorDetails.cs

@@ -17,7 +17,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling;
+namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library;
 
 public record ErrorDetails(
     string ErrorCode,

src/framework/Framework.ErrorHandling.Web/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.5</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.HttpClientExtensions/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.5</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.IO/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.5</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.Linq/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.5</VersionSuffix>
   </PropertyGroup>
 </Project>

src/framework/Framework.Linq/Framework.Linq.csproj

@@ -61,7 +61,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 

src/framework/Framework.Logging/Directory.Build.props

@@ -21,6 +21,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta.3</VersionSuffix>
+    <VersionSuffix>beta.4</VersionSuffix>
   </PropertyGroup>
 </Project>