From f34a1a83d2d69e36322f6158165a71f11e361e4e Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Thu, 6 Feb 2020 17:55:33 +0100 Subject: [PATCH 1/2] feat(csharp): upgrade to netcoreapp3.1 From `netcoreap3.0`, in order to reflect the current recommended framework version for .NET 3.x. --- .../Amazon.JSII.Analyzers.UnitTests.csproj | 2 +- .../Amazon.JSII.JsonModel.UnitTests.csproj | 2 +- .../src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj | 2 +- .../Amazon.JSII.Runtime.IntegrationTests.csproj | 2 +- .../Amazon.JSII.Runtime.UnitTests.csproj | 2 +- .../src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj | 2 +- packages/jsii-pacmak/lib/targets/dotnet.ts | 2 +- ...on.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj | 2 +- .../Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj | 2 +- .../Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj | 2 +- .../Amazon.JSII.Tests.CalculatorPackageId.csproj | 2 +- superchain/Dockerfile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj index 426f45e3eb..0d06ffbb13 100644 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false Amazon.JSII.Analyzers.UnitTests diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj index b01cc9e83f..bfa55bf1d6 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false Amazon.JSII.JsonModel.UnitTests Amazon.JSII.JsonModel.UnitTests diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj index 6917bcc4ab..8e82179c1a 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0 + netcoreapp3.1 Amazon.JSII.JsonModel .NET JsonModel for JSII icon.png diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj index f8b12a9de4..294666587f 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj index ffdfbae95c..2763dc88b9 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj index 0cfd79c8fe..32dff55d07 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0 + netcoreapp3.1 Amazon.JSII.Runtime .NET Runtime for JSII icon.png diff --git a/packages/jsii-pacmak/lib/targets/dotnet.ts b/packages/jsii-pacmak/lib/targets/dotnet.ts index 1b500ab4ad..c6b76a35e4 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet.ts @@ -9,7 +9,7 @@ import { DotNetGenerator } from './dotnet/dotnetgenerator'; import { TargetBuilder, BuildOptions } from '../builder'; import { JsiiModule } from '../packaging'; -export const TARGET_FRAMEWORK = 'netcoreapp3.0'; +export const TARGET_FRAMEWORK = 'netcoreapp3.1'; /** * Build .NET packages all together, by generating an aggregate solution file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj index 781642ad3a..144663134d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj @@ -18,7 +18,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj index 7de6624cda..eea70df8a7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj @@ -18,7 +18,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj index 3086ff0b2e..9c056740dd 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj @@ -18,7 +18,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj index ac198651ac..d5ec1a761e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj @@ -20,7 +20,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 diff --git a/superchain/Dockerfile b/superchain/Dockerfile index 5f6a951e97..f67da5d210 100644 --- a/superchain/Dockerfile +++ b/superchain/Dockerfile @@ -14,7 +14,7 @@ RUN rpm --import "https://packages.microsoft.com/keys/microsoft.asc" && rpm --import /tmp/mono.asc && rm -f /tmp/mono.asc \ && curl -sSL "https://download.mono-project.com/repo/centos7-stable.repo" \ | tee /etc/yum.repos.d/mono-centos7-stable.repo \ - && yum -y install dotnet-sdk-3.0 mono-devel powershell \ + && yum -y install dotnet-sdk-3.1 mono-devel powershell \ && yum clean all && rm -rf /var/cache/yum \ && dotnet help From 10de6fc1a2cfb688b7e99b574772117aebe517cd Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Fri, 7 Feb 2020 17:00:23 +0100 Subject: [PATCH 2/2] fixup test expectation --- .../Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs index 17a7f10121..1109d2f3b5 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs @@ -924,7 +924,7 @@ public void OptionalAndVariadicArgumentsTest() [Fact(DisplayName = Prefix + nameof(JsiiAgent))] public void JsiiAgent() { - Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v3.0/1.0.0.0", JsiiAgent_.JsiiAgent); + Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v3.1/1.0.0.0", JsiiAgent_.JsiiAgent); } [Fact(DisplayName = Prefix + nameof(ReceiveInstanceOfPrivateClass))]