From 899086180516dd5e0fc5341baa603bcc6e56e551 Mon Sep 17 00:00:00 2001 From: Malhar Khimsaria <96malhar@gmail.com> Date: Fri, 17 Nov 2023 17:12:00 -0800 Subject: [PATCH 1/6] chore: update .snk file for strong naming --- public.snk | Bin 596 -> 596 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public.snk b/public.snk index be0ad9c5930ece51dbbbe0747b6ef61162b261b0..709adb3d6ac9f5fd24010a99a3550ff07e26bc91 100644 GIT binary patch delta 587 zcmV-R0<`_q1k?nO6o1=aS@4+Ba(2gqICZ8bIy}cpv3seh-wRT%+vg=GMcZ<8)h8d< zoF54GXzcoqspojbs&PVCUSi61M9FU3(o&CEB#1wB(q9%Twg znP?ClfBFG4^-4)==RJ>spg`dl>MGa#*em5~QP0IF&MBa}%pfyi#Occg;Xa_Eljk85c=tJM;py$M1PhfPOL;=5wuMV_UzW1MqZOw zWLE`+pDTxtAk*{au6){R8C3ulxoldm1Wkeg`o5Q18M3kt+}Wrd&Q?k8XsR!o*haX9)QOIv_Y08Wb+Bh{H>a$O*?!2T^IspIjJ~;}`MW;) z6oNsmv_#%Q6Y1|a=<~82x8z7Ayl18dx=EeQwRpEQrxy7@uJ822s Zq264rAXoYhzMW#0P>3f?tB8nGYYTXWCsF_a delta 587 zcmV-R0<`_q1k?nO6n{}{s$&t`mK?Bm0@gTo#kkAXVO4z5i{78PX1g$?L@K){q@}E- zuNBFAck}r6gXLw^M;DO3x35$(Ol-{CFb3^)1b41R^6 zML~s(q-(NR5Se%ZA?|=db1QNb?3-LjKJh#qw$=D*as0p(+<&h(eI_9tbhMxmF6L`V ze;(0Wb_^uJ4IyYQ$|443<=Y2#k%xBCmjE6b)%NKdazC+Mwd7C3kx2V4bjIHHf&A9D zW>t9bDP2S1AZ?<9ZY^&ZwRon-c^ix#{~83~F|_M&CDe6a$5SQ!^PqD7u|hn2R**VfQnC1#Q7}9iQpIkVo=GhmmG33^d5Ib$>I}F zB)mt0FnL)bW@f^Ed_sP5BJ&ST>pUAzoA5`pTVq#MC|7zs4%YcuvY!vwiKX`)5cu;* zs)$P>=%ZkiR^?Hin?9ioxZT7=Z2Y#1m5I`3yYzcRB!50Df3oLPyLwDW8=dyi>f|Pb zia1CEcD1MmNu*q|{CD-dNwwBlYFm?Att4kmj9FbM(U7c=+6g$(?aFXr>2s9{p#iGu zJRo0I%b$picNvFPA2|^x#H36G)@M;(_`W%^M#0$(`IY4*>51XheYTMxMnB)C?O)a_ z$e?YNzeEda>v`$*mO;QxvYe)|$cU}40bw~Qkb#u9i+3K^yJ{K29#+iylAfRfv0U8e Z8Ne0IOB{c2$hv^B#Vs&Z+svt-<6$U)Bd7oX From fa3049d8b91f37e61eeaaa57171581e3111d772b Mon Sep 17 00:00:00 2001 From: aws-sdk-dotnet-automation Date: Fri, 17 Nov 2023 18:33:05 +0000 Subject: [PATCH 2/6] build: version bump to 1.18 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index cffe4327d..bc664608f 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.17", + "version": "1.18", "publicReleaseRefSpec": [ ".*" ], From 8a57505b8588cd0318bdfe44e3f482ec9043e3a9 Mon Sep 17 00:00:00 2001 From: Alex Shovlin Date: Wed, 20 Dec 2023 14:08:44 -0500 Subject: [PATCH 3/6] Adjust role used by GitHub actions that builds docs, and upgrade configure-aws-credentials --- .github/workflows/DetectDocGeneratorChanges.yml | 4 ++-- .github/workflows/codebuild-ci.yml | 4 ++-- .github/workflows/doc-builder.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/DetectDocGeneratorChanges.yml b/.github/workflows/DetectDocGeneratorChanges.yml index eb8ebba50..bb2560371 100644 --- a/.github/workflows/DetectDocGeneratorChanges.yml +++ b/.github/workflows/DetectDocGeneratorChanges.yml @@ -12,9 +12,9 @@ jobs: steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 #v4 with: - role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} + role-to-assume: ${{ secrets.CI_MAIN_TESTING_ACCOUNT_ROLE_ARN }} role-duration-seconds: 7200 aws-region: us-west-2 - uses: actions/checkout@v3 diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index c5d7fcd66..62e113d0f 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 #v4 with: role-to-assume: ${{ secrets.CI_MAIN_TESTING_ACCOUNT_ROLE_ARN }} role-duration-seconds: 7200 @@ -40,7 +40,7 @@ jobs: "roleArn=$($roleArn -replace '"', '')" >> $env:GITHUB_OUTPUT - name: Configure Test Runner Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 #v4 with: role-to-assume: ${{ steps.lambda.outputs.roleArn }} role-duration-seconds: 7200 diff --git a/.github/workflows/doc-builder.yml b/.github/workflows/doc-builder.yml index b1d57d849..f643f8826 100644 --- a/.github/workflows/doc-builder.yml +++ b/.github/workflows/doc-builder.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 #v4 with: - role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} + role-to-assume: ${{ secrets.CI_MAIN_TESTING_ACCOUNT_ROLE_ARN }} aws-region: us-west-2 - uses: actions/checkout@v3 with: From c34bcd8d0c31193603dbde293516785c4e3fe1a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:44:52 +0000 Subject: [PATCH 4/6] build(deps): bump tj-actions/verify-changed-files in /.github/workflows Bumps [tj-actions/verify-changed-files](https://github.com/tj-actions/verify-changed-files) from 9.1 to 17. - [Release notes](https://github.com/tj-actions/verify-changed-files/releases) - [Changelog](https://github.com/tj-actions/verify-changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/verify-changed-files/compare/v9.1...v17) --- updated-dependencies: - dependency-name: tj-actions/verify-changed-files dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/DetectRestAPIClientChanges.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/DetectRestAPIClientChanges.yml b/.github/workflows/DetectRestAPIClientChanges.yml index 733f139f8..636d1c690 100644 --- a/.github/workflows/DetectRestAPIClientChanges.yml +++ b/.github/workflows/DetectRestAPIClientChanges.yml @@ -24,7 +24,7 @@ jobs: cd ./src/AWS.Deploy.ServerMode.ClientGenerator dotnet run --project ./AWS.Deploy.ServerMode.ClientGenerator.csproj - name: Verify Changed files - uses: tj-actions/verify-changed-files@v9.1 + uses: tj-actions/verify-changed-files@v17 id: verify-changed-files with: files: | From ed3c74873febeb21526ab3938e818fb553e249dd Mon Sep 17 00:00:00 2001 From: Alex Shovlin Date: Tue, 5 Dec 2023 17:03:14 -0500 Subject: [PATCH 5/6] fix: Enable selecting the '.NET 6 on AL2023' platform when deploying to Elastic Beanstalk on Linux --- src/AWS.Deploy.Constants/ElasticBeanstalk.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AWS.Deploy.Constants/ElasticBeanstalk.cs b/src/AWS.Deploy.Constants/ElasticBeanstalk.cs index 7b4a0a5ab..a9bc57dc6 100644 --- a/src/AWS.Deploy.Constants/ElasticBeanstalk.cs +++ b/src/AWS.Deploy.Constants/ElasticBeanstalk.cs @@ -22,7 +22,7 @@ internal static class ElasticBeanstalk public const string HealthCheckURLOptionNameSpace = "aws:elasticbeanstalk:application"; public const string HealthCheckURLOptionName = "Application Healthcheck URL"; - public const string LinuxPlatformType = ".NET Core"; + public const string LinuxPlatformType = ".NET"; public const string WindowsPlatformType = "Windows Server"; public const string IISAppPathOptionId = "IISAppPath"; From 6447501df8e92bc4bc79b18ddbadd8a2e769473e Mon Sep 17 00:00:00 2001 From: Alex Shovlin Date: Tue, 19 Dec 2023 23:32:57 -0500 Subject: [PATCH 6/6] Add padding to search for ".NET " instead of ".NET" --- src/AWS.Deploy.Constants/ElasticBeanstalk.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AWS.Deploy.Constants/ElasticBeanstalk.cs b/src/AWS.Deploy.Constants/ElasticBeanstalk.cs index a9bc57dc6..fde11439b 100644 --- a/src/AWS.Deploy.Constants/ElasticBeanstalk.cs +++ b/src/AWS.Deploy.Constants/ElasticBeanstalk.cs @@ -22,7 +22,7 @@ internal static class ElasticBeanstalk public const string HealthCheckURLOptionNameSpace = "aws:elasticbeanstalk:application"; public const string HealthCheckURLOptionName = "Application Healthcheck URL"; - public const string LinuxPlatformType = ".NET"; + public const string LinuxPlatformType = ".NET "; public const string WindowsPlatformType = "Windows Server"; public const string IISAppPathOptionId = "IISAppPath";