From 889c42e4455e3259e67289ecee4749c6fc3b4c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Leiva=20Obando?= Date: Mon, 7 Oct 2024 18:16:08 -0600 Subject: [PATCH 1/2] [DI-1388] Fix package name format for package promotion in azure 'on-release.yml Update substring index. Update nuget version to fix vulnerabilities --- .../DataImport.Common.Tests.csproj | 12 +++--- DataImport.Common/DataImport.Common.csproj | 14 +++---- .../DataImport.EdFi.UnitTests.csproj | 8 ++-- .../DataImport.Models.Tests.csproj | 8 ++-- DataImport.Models/DataImport.Models.csproj | 13 +++--- ...taImport.Server.TransformLoad.Tests.csproj | 10 ++--- .../DataImport.Server.TransformLoad.csproj | 24 +++++------ .../DataImport.Web.Tests.csproj | 12 +++--- DataImport.Web/DataImport.Web.csproj | 40 +++++++++++-------- eng/promote-packages.psm1 | 2 +- 10 files changed, 76 insertions(+), 67 deletions(-) diff --git a/DataImport.Common.Tests/DataImport.Common.Tests.csproj b/DataImport.Common.Tests/DataImport.Common.Tests.csproj index fb01972c..b99a8018 100644 --- a/DataImport.Common.Tests/DataImport.Common.Tests.csproj +++ b/DataImport.Common.Tests/DataImport.Common.Tests.csproj @@ -12,18 +12,18 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DataImport.Common/DataImport.Common.csproj b/DataImport.Common/DataImport.Common.csproj index 7bcbbee8..c307e8d0 100644 --- a/DataImport.Common/DataImport.Common.csproj +++ b/DataImport.Common/DataImport.Common.csproj @@ -20,16 +20,16 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -37,11 +37,11 @@ - - + + - - + + diff --git a/DataImport.EdFi.UnitTests/DataImport.EdFi.UnitTests.csproj b/DataImport.EdFi.UnitTests/DataImport.EdFi.UnitTests.csproj index 4875aa69..4f1070c9 100644 --- a/DataImport.EdFi.UnitTests/DataImport.EdFi.UnitTests.csproj +++ b/DataImport.EdFi.UnitTests/DataImport.EdFi.UnitTests.csproj @@ -8,11 +8,11 @@ - + - - - + + + \ No newline at end of file diff --git a/DataImport.Models.Tests/DataImport.Models.Tests.csproj b/DataImport.Models.Tests/DataImport.Models.Tests.csproj index 0c13d3f2..5faf1585 100644 --- a/DataImport.Models.Tests/DataImport.Models.Tests.csproj +++ b/DataImport.Models.Tests/DataImport.Models.Tests.csproj @@ -9,12 +9,12 @@ - - - + + + - + diff --git a/DataImport.Models/DataImport.Models.csproj b/DataImport.Models/DataImport.Models.csproj index 780f7eea..beb60e6d 100644 --- a/DataImport.Models/DataImport.Models.csproj +++ b/DataImport.Models/DataImport.Models.csproj @@ -115,15 +115,18 @@ - - + + - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + \ No newline at end of file diff --git a/DataImport.Server.TransformLoad.Tests/DataImport.Server.TransformLoad.Tests.csproj b/DataImport.Server.TransformLoad.Tests/DataImport.Server.TransformLoad.Tests.csproj index 535c0313..c454b0e0 100644 --- a/DataImport.Server.TransformLoad.Tests/DataImport.Server.TransformLoad.Tests.csproj +++ b/DataImport.Server.TransformLoad.Tests/DataImport.Server.TransformLoad.Tests.csproj @@ -37,12 +37,12 @@ - + - - - - + + + + \ No newline at end of file diff --git a/DataImport.Server.TransformLoad/DataImport.Server.TransformLoad.csproj b/DataImport.Server.TransformLoad/DataImport.Server.TransformLoad.csproj index b22b7cfa..14c4b1fe 100644 --- a/DataImport.Server.TransformLoad/DataImport.Server.TransformLoad.csproj +++ b/DataImport.Server.TransformLoad/DataImport.Server.TransformLoad.csproj @@ -49,19 +49,19 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/DataImport.Web.Tests/DataImport.Web.Tests.csproj b/DataImport.Web.Tests/DataImport.Web.Tests.csproj index 9ad2ab77..25e8818d 100644 --- a/DataImport.Web.Tests/DataImport.Web.Tests.csproj +++ b/DataImport.Web.Tests/DataImport.Web.Tests.csproj @@ -12,13 +12,13 @@ - + - - - - - + + + + + diff --git a/DataImport.Web/DataImport.Web.csproj b/DataImport.Web/DataImport.Web.csproj index 312514ed..f09b2cf8 100644 --- a/DataImport.Web/DataImport.Web.csproj +++ b/DataImport.Web/DataImport.Web.csproj @@ -25,31 +25,37 @@ - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/eng/promote-packages.psm1 b/eng/promote-packages.psm1 index 07bdf4fb..472998f4 100644 --- a/eng/promote-packages.psm1 +++ b/eng/promote-packages.psm1 @@ -37,7 +37,7 @@ function Invoke-Promote { ) $package = "DataImport.Web" - $version = $ReleaseRef.substring(1) + $version = $ReleaseRef.substring(0) $body = ' { From fbfb94920baccbaff3bdd7e9bb8bff97078f3ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Leiva=20Obando?= Date: Tue, 8 Oct 2024 08:42:34 -0600 Subject: [PATCH 2/2] Update promote-packages.psm1 Update version --- eng/promote-packages.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/promote-packages.psm1 b/eng/promote-packages.psm1 index 472998f4..3e865b8b 100644 --- a/eng/promote-packages.psm1 +++ b/eng/promote-packages.psm1 @@ -37,7 +37,7 @@ function Invoke-Promote { ) $package = "DataImport.Web" - $version = $ReleaseRef.substring(0) + $version = ($ReleaseRef -split "-v")[1] $body = ' {