From d34ac08f6dfbf98c15c93126873baf35597ab425 Mon Sep 17 00:00:00 2001 From: aws-sdk-dotnet-automation Date: Thu, 3 Nov 2022 20:54:26 +0000 Subject: [PATCH 1/2] build: version bump to 1.7 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 9f2c5d434..4159b582c 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.6", + "version": "1.7", "publicReleaseRefSpec": [ ".*" ], From 6bd59d3004351cd7ee4e3ff0941ad8eb41a5b9fe Mon Sep 17 00:00:00 2001 From: Philippe El Asmar Date: Wed, 9 Nov 2022 12:14:41 -0500 Subject: [PATCH 2/2] chore: update AWS .NET SDK package references --- THIRD_PARTY_LICENSES | 103 +++++++++--------- src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj | 10 +- .../TypeHints/ECRRepositoryCommand.cs | 1 + .../AWS.Deploy.Common.csproj | 38 +++---- .../AWS.Deploy.Orchestration.csproj | 34 +++--- .../DeploymentBundleHandler.cs | 1 + .../AWS.Deploy.ServerMode.Client.csproj | 4 +- .../AWS.Deploy.CLI.IntegrationTests.csproj | 4 +- .../MessageProcessingApp.csproj | 4 +- 9 files changed, 102 insertions(+), 97 deletions(-) diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index b8ac90477..87af4eaed 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -1,28 +1,29 @@ -** AWSSDK.AppRunner; version 3.7.3.11 -- https://www.nuget.org/packages/AWSSDK.AppRunner/ -** AWSSDK.CloudFront; version 3.7.3.10 -- https://www.nuget.org/packages/AWSSDK.CloudFront/ -** AWSSDK.CloudWatchEvents; version 3.7.3.14 -- https://www.nuget.org/packages/AWSSDK.CloudWatchEvents/ -** AWSSDK.DynamoDBv2; version 3.7.0.83 -- https://www.nuget.org/packages/AWSSDK.DynamoDBv2/ -** AWSSDK.EC2; version 3.7.19.1 -- https://www.nuget.org/packages/AWSSDK.EC2/ -** AWSSDK.ElasticLoadBalancingV2; version 3.7.0.48 -- https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancingV2/ -** AWSSDK.S3; version 3.7.1.17 -- https://www.nuget.org/packages/AWSSDK.S3/ -** AWSSDK.SimpleNotificationService; version 3.7.2.53 -- https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/ -** AWSSDK.SQS; version 3.7.2.53 -- https://www.nuget.org/packages/AWSSDK.SQS/ -** AWSSDK.CloudFormation; version 3.7.7.14 -- https://www.nuget.org/packages/AWSSDK.CloudFormation -** AWSSDK.Core; version 3.7.6 -- https://www.nuget.org/packages/AWSSDK.Core ** AWSSDK.EC2; version 3.7.19.1 -- https://www.nuget.org/packages/AWSSDK.EC2 -** AWSSDK.ECR; version 3.7.0.45 -- https://www.nuget.org/packages/AWSSDK.ECR -** AWSSDK.ECS; version 3.7.2.20 -- https://www.nuget.org/packages/AWSSDK.ECS -** AWSSDK.ElasticBeanstalk; version 3.7.0.45 -- https://www.nuget.org/packages/AWSSDK.ElasticBeanstalk -** AWSSDK.Extensions.NETCore.Setup; version 3.7.1 -- https://www.nuget.org/packages/AWSSDK.Extensions.NETCore.Setup -** AWSSDK.IdentityManagement; version 3.7.2.25 -- https://www.nuget.org/packages/AWSSDK.IdentityManagement -** AWSSDK.SecurityToken; version 3.7.1.35 -- https://www.nuget.org/packages/AWSSDK.SecurityToken ** Constructs; version 10.0.0 -- https://www.nuget.org/packages/Constructs -** Amazon.CDK.Lib; version 2.43.1 -- https://www.nuget.org/packages/Amazon.CDK.Lib/ ** Amazon.JSII.Runtime; version 1.54.0 -- https://www.nuget.org/packages/Amazon.JSII.Runtime -** AWSSDK.CloudControlApi; version 3.7.2 -- https://www.nuget.org/packages/AWSSDK.CloudControlApi/ -** AWSSDK.SimpleSystemsManagement; version 3.7.16 -- https://www.nuget.org/packages/AWSSDK.SimpleSystemsManagement/ -** AWSSDK.SSO; version 3.7.0.201 -- https://www.nuget.org/packages/AWSSDK.SSO -** AWSSDK.SSOOIDC; version 3.7.1.4 -- https://www.nuget.org/packages/AWSSDK.SSOOIDC +** AWSSDK.IdentityManagement; version 3.7.100.15 -- https://www.nuget.org/packages/AWSSDK.IdentityManagement +** AWSSDK.CloudFormation; version 3.7.101.9 -- https://www.nuget.org/packages/AWSSDK.CloudFormation +** AWSSDK.SecurityToken; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.SecurityToken +** AWSSDK.SSO; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.SSO +** AWSSDK.SSOOIDC; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.SSOOIDC +** AWSSDK.CloudControlApi; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.CloudControlApi/ +** AWSSDK.CloudWatchEvents; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.CloudWatchEvents/ +** AWSSDK.EC2; version 3.7.105.3 -- https://www.nuget.org/packages/AWSSDK.EC2/ +** AWSSDK.Extensions.NETCore.Setup; version 3.7.2 -- https://www.nuget.org/packages/AWSSDK.Extensions.NETCore.Setup +** AWSSDK.AppRunner; version 3.7.102.7 -- https://www.nuget.org/packages/AWSSDK.AppRunner/ +** AWSSDK.CloudFront; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.CloudFront/ +** AWSSDK.DynamoDBv2; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.DynamoDBv2/ +** AWSSDK.ECR; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.ECR +** AWSSDK.ECS; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.ECS +** AWSSDK.S3; version 3.7.101.14 -- https://www.nuget.org/packages/AWSSDK.S3/ +** AWSSDK.SimpleSystemsManagement; version 3.7.101.4 -- https://www.nuget.org/packages/AWSSDK.SimpleSystemsManagement/ +** AWSSDK.SimpleNotificationService; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/ +** AWSSDK.SQS; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.SQS/ +** AWSSDK.ElasticBeanstalk; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.ElasticBeanstalk +** AWSSDK.ElasticLoadBalancingV2; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancingV2/ +** AWSSDK.Core; version 3.7.100.14 -- https://www.nuget.org/packages/AWSSDK.Core +** AWSSDK.CloudWatchLogs; version 3.7.101.7 -- https://www.nuget.org/packages/AWSSDK.CloudWatchLogs +** Amazon.CDK.Lib; version 2.43.1 -- https://www.nuget.org/packages/Amazon.CDK.Lib/ Apache License Version 2.0, January 2004 @@ -207,58 +208,60 @@ 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. -* For AWSSDK.AppRunner see also this required NOTICE: +* For AWSSDK.EC2 see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.CloudFront see also this required NOTICE: +* For Constructs see also this required NOTICE: + Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. +* For Amazon.JSII.Runtime see also this required NOTICE: + AWS Cloud Development Kit (AWS CDK) + Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +* For AWSSDK.IdentityManagement see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.CloudWatchEvents see also this required NOTICE: +* For AWSSDK.CloudFormation see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.DynamoDBv2 see also this required NOTICE: +* For AWSSDK.SecurityToken see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.EC2 see also this required NOTICE: +* For AWSSDK.SSO see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.ElasticLoadBalancingV2 see also this required NOTICE: +* For AWSSDK.SSOOIDC see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.S3 see also this required NOTICE: +* For AWSSDK.CloudControlApi see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.SimpleNotificationService see also this required NOTICE: +* For AWSSDK.CloudWatchEvents see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.SQS see also this required NOTICE: +* For AWSSDK.EC2 see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.CloudFormation see also this required NOTICE: +* For AWSSDK.Extensions.NETCore.Setup see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.Core see also this required NOTICE: +* For AWSSDK.AppRunner see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.EC2 see also this required NOTICE: +* For AWSSDK.CloudFront see also this required NOTICE: + Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +* For AWSSDK.DynamoDBv2 see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * For AWSSDK.ECR see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * For AWSSDK.ECS see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.ElasticBeanstalk see also this required NOTICE: +* For AWSSDK.S3 see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.Extensions.NETCore.Setup see also this required NOTICE: +* For AWSSDK.SimpleSystemsManagement see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.IdentityManagement see also this required NOTICE: +* For AWSSDK.SimpleNotificationService see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.SecurityToken see also this required NOTICE: +* For AWSSDK.SQS see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For Constructs see also this required NOTICE: - Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For Amazon.CDK.Lib see also this required NOTICE: - AWS Cloud Development Kit (AWS CDK) - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For Amazon.JSII.Runtime see also this required NOTICE: - AWS Cloud Development Kit (AWS CDK) - Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.CloudControlApi see also this required NOTICE: +* For AWSSDK.ElasticBeanstalk see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.SimpleSystemsManagement see also this required NOTICE: +* For AWSSDK.ElasticLoadBalancingV2 see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.SSO see also this required NOTICE: +* For AWSSDK.Core see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -* For AWSSDK.SSOOIDC see also this required NOTICE: +* For AWSSDK.CloudWatchLogs see also this required NOTICE: Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +* For Amazon.CDK.Lib see also this required NOTICE: + AWS Cloud Development Kit (AWS CDK) + Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------ diff --git a/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj b/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj index a806942b6..9c0df0421 100644 --- a/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj +++ b/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj @@ -21,11 +21,11 @@ - - - - - + + + + + diff --git a/src/AWS.Deploy.CLI/Commands/TypeHints/ECRRepositoryCommand.cs b/src/AWS.Deploy.CLI/Commands/TypeHints/ECRRepositoryCommand.cs index d51fefe85..79ecb1c6a 100644 --- a/src/AWS.Deploy.CLI/Commands/TypeHints/ECRRepositoryCommand.cs +++ b/src/AWS.Deploy.CLI/Commands/TypeHints/ECRRepositoryCommand.cs @@ -10,6 +10,7 @@ using AWS.Deploy.Common.Recipes; using AWS.Deploy.Common.TypeHintData; using AWS.Deploy.Orchestration.Data; +using Recommendation = AWS.Deploy.Common.Recommendation; namespace AWS.Deploy.CLI.Commands.TypeHints { diff --git a/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj b/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj index 98148018f..09a87dc3a 100644 --- a/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj +++ b/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -8,25 +8,25 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + diff --git a/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj b/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj index b1ad93f52..e56b0a07b 100644 --- a/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj +++ b/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -12,22 +12,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/AWS.Deploy.Orchestration/DeploymentBundleHandler.cs b/src/AWS.Deploy.Orchestration/DeploymentBundleHandler.cs index d810fbd6f..8871e599a 100644 --- a/src/AWS.Deploy.Orchestration/DeploymentBundleHandler.cs +++ b/src/AWS.Deploy.Orchestration/DeploymentBundleHandler.cs @@ -16,6 +16,7 @@ using AWS.Deploy.Constants; using AWS.Deploy.Orchestration.Data; using AWS.Deploy.Orchestration.Utilities; +using Recommendation = AWS.Deploy.Common.Recommendation; namespace AWS.Deploy.Orchestration { diff --git a/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj b/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj index 6e0d0ddea..c37f13364 100644 --- a/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj +++ b/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -14,7 +14,7 @@ - + diff --git a/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj b/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj index 387f3c3d7..ab9534778 100644 --- a/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj +++ b/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -7,7 +7,7 @@ - + diff --git a/testapps/MessageProcessingApp/MessageProcessingApp.csproj b/testapps/MessageProcessingApp/MessageProcessingApp.csproj index 8acef6d2b..154529b87 100644 --- a/testapps/MessageProcessingApp/MessageProcessingApp.csproj +++ b/testapps/MessageProcessingApp/MessageProcessingApp.csproj @@ -1,4 +1,4 @@ - + Exe @@ -6,7 +6,7 @@ - +