From 4abc6d8f6b1c8241998b1b037c97d60c372376ad Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 21 Jan 2025 13:43:56 +0100 Subject: [PATCH 1/7] Remove unsupported LangVersion from dotnet example --- examples/role-cs/role-cs.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/role-cs/role-cs.csproj b/examples/role-cs/role-cs.csproj index 190809b34d..d475a53fb0 100644 --- a/examples/role-cs/role-cs.csproj +++ b/examples/role-cs/role-cs.csproj @@ -1,7 +1,6 @@  - 11 Exe net6.0 enable From 3eef44364431ed55acaeb76b90b53af2e2d69395 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 21 Jan 2025 13:46:50 +0100 Subject: [PATCH 2/7] Bump examples to dotnet 8 --- examples/role-cs/role-cs.csproj | 2 +- examples/simple-cs/simple-cs.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/role-cs/role-cs.csproj b/examples/role-cs/role-cs.csproj index d475a53fb0..f432dbe7e6 100644 --- a/examples/role-cs/role-cs.csproj +++ b/examples/role-cs/role-cs.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable diff --git a/examples/simple-cs/simple-cs.csproj b/examples/simple-cs/simple-cs.csproj index d475a53fb0..f432dbe7e6 100644 --- a/examples/simple-cs/simple-cs.csproj +++ b/examples/simple-cs/simple-cs.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable From 2af4417c14243741b89a6b01ad09644871383d9c Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 21 Jan 2025 14:13:34 +0100 Subject: [PATCH 3/7] Move back to 6.0.x --- examples/role-cs/role-cs.csproj | 2 +- examples/simple-cs/simple-cs.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/role-cs/role-cs.csproj b/examples/role-cs/role-cs.csproj index f432dbe7e6..d475a53fb0 100644 --- a/examples/role-cs/role-cs.csproj +++ b/examples/role-cs/role-cs.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net6.0 enable diff --git a/examples/simple-cs/simple-cs.csproj b/examples/simple-cs/simple-cs.csproj index f432dbe7e6..d475a53fb0 100644 --- a/examples/simple-cs/simple-cs.csproj +++ b/examples/simple-cs/simple-cs.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net6.0 enable From e3fb2a210dc090ca3d5510da970f99fc6629bfad Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 21 Jan 2025 21:12:23 +0100 Subject: [PATCH 4/7] Try fixing installing the right dotnet version --- .github/workflows/pull-request.yml | 4 +--- examples/role-cs/role-cs.csproj | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 2726c1ecdf..ab4e759ae1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,9 +24,7 @@ env: GOVERSION: 1.21.x NODEVERSION: 20.x PYTHONVERSION: "3.11" - DOTNETVERSION: | - 6.0.x - 3.1.301 + DOTNETVERSION: "6.0.x\n3.1.301" JAVAVERSION: "11" AWS_REGION: us-west-2 PULUMI_API: https://api.pulumi-staging.io diff --git a/examples/role-cs/role-cs.csproj b/examples/role-cs/role-cs.csproj index d475a53fb0..190809b34d 100644 --- a/examples/role-cs/role-cs.csproj +++ b/examples/role-cs/role-cs.csproj @@ -1,6 +1,7 @@  + 11 Exe net6.0 enable From e6968d16b31640b59b88f14b0a110e88ca80eece Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 21 Jan 2025 21:30:14 +0100 Subject: [PATCH 5/7] Remove dotnet 11 language features --- examples/role-cs/MyStack.cs | 20 +++++++++----------- examples/role-cs/role-cs.csproj | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/examples/role-cs/MyStack.cs b/examples/role-cs/MyStack.cs index 5ea37d8e29..2552270b78 100644 --- a/examples/role-cs/MyStack.cs +++ b/examples/role-cs/MyStack.cs @@ -12,19 +12,17 @@ public MyStack() { var testRole = new Role("role-test", new RoleArgs { - AssumeRolePolicyDocument = """ - { - "Version": "2012-10-17", - "Statement": [{ - "Sid": "", - "Effect": "Allow", - "Principal": { - "Service": "ec2.amazonaws.com" + AssumeRolePolicyDocument = @"{ + ""Version"": ""2012-10-17"", + ""Statement"": [{ + ""Sid"": """", + ""Effect"": ""Allow"", + ""Principal"": { + ""Service"": ""ec2.amazonaws.com"" }, - "Action": "sts:AssumeRole" + ""Action"": ""sts:AssumeRole"" }] - } - """, + }", Policies = new[] { new IamInputs.RolePolicyArgs diff --git a/examples/role-cs/role-cs.csproj b/examples/role-cs/role-cs.csproj index 190809b34d..34356e55c2 100644 --- a/examples/role-cs/role-cs.csproj +++ b/examples/role-cs/role-cs.csproj @@ -1,10 +1,10 @@  - 11 Exe net6.0 enable + 11.0 From f3a4876a3d9a908860f54b00e68c5e3a7edce510 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 21 Jan 2025 21:30:47 +0100 Subject: [PATCH 6/7] Remove unrelated changes --- .github/workflows/pull-request.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ab4e759ae1..2726c1ecdf 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,7 +24,9 @@ env: GOVERSION: 1.21.x NODEVERSION: 20.x PYTHONVERSION: "3.11" - DOTNETVERSION: "6.0.x\n3.1.301" + DOTNETVERSION: | + 6.0.x + 3.1.301 JAVAVERSION: "11" AWS_REGION: us-west-2 PULUMI_API: https://api.pulumi-staging.io From dc798026a0ff43f8d76aa903085ef024e1b1a373 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Tue, 21 Jan 2025 22:27:09 +0100 Subject: [PATCH 7/7] remove language version --- examples/role-cs/role-cs.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/role-cs/role-cs.csproj b/examples/role-cs/role-cs.csproj index 34356e55c2..d475a53fb0 100644 --- a/examples/role-cs/role-cs.csproj +++ b/examples/role-cs/role-cs.csproj @@ -4,7 +4,6 @@ Exe net6.0 enable - 11.0