You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by fo...@apache.org on 2020/02/10 12:38:39 UTC
[avro] branch master updated: AVRO-2693: Upgrade to netcoreapp3.1
(#798)
This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new 343c92e AVRO-2693: Upgrade to netcoreapp3.1 (#798)
343c92e is described below
commit 343c92e736d8fa7fce5974314b79bc2f01b00800
Author: Zoltan Csizmadia <zc...@gmail.com>
AuthorDate: Mon Feb 10 06:38:27 2020 -0600
AVRO-2693: Upgrade to netcoreapp3.1 (#798)
---
.travis/before_install.sh | 2 +-
lang/csharp/build.sh | 4 ++--
lang/csharp/src/apache/codegen/Avro.codegen.csproj | 2 +-
lang/csharp/src/apache/perf/Avro.perf.csproj | 4 ++--
lang/csharp/src/apache/test/Avro.test.csproj | 18 +++++++-----------
lang/csharp/src/apache/test/CodGen/CodeGenTest.cs | 2 +-
lang/csharp/src/apache/test/Specific/SpecificTests.cs | 2 +-
share/docker/Dockerfile | 2 +-
8 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 87982e2..b5bd8ed 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -32,7 +32,7 @@ case "$TRAVIS_OS_NAME" in
rm /tmp/apache-yetus-0.10.0/lib/precommit/robots.d/travisci.sh
;;
"windows")
- choco install dotnetcore-sdk --version 2.2.300
+ choco install dotnetcore-sdk --version 3.1.101
;;
*)
echo "Invalid PLATFORM"
diff --git a/lang/csharp/build.sh b/lang/csharp/build.sh
index 37063be..cba03c3 100755
--- a/lang/csharp/build.sh
+++ b/lang/csharp/build.sh
@@ -42,7 +42,7 @@ do
perf)
pushd ./src/apache/perf/
- dotnet run --configuration Release --framework netcoreapp2.2
+ dotnet run --configuration Release --framework netcoreapp3.1
;;
dist)
@@ -70,7 +70,7 @@ do
;;
interop-data-generate)
- dotnet run --project src/apache/test/Avro.test.csproj --framework netcoreapp2.2 ../../share/test/schemas/interop.avsc ../../build/interop/data
+ dotnet run --project src/apache/test/Avro.test.csproj --framework netcoreapp3.1 ../../share/test/schemas/interop.avsc ../../build/interop/data
;;
interop-data-test)
diff --git a/lang/csharp/src/apache/codegen/Avro.codegen.csproj b/lang/csharp/src/apache/codegen/Avro.codegen.csproj
index 80329cc..b94fcff 100644
--- a/lang/csharp/src/apache/codegen/Avro.codegen.csproj
+++ b/lang/csharp/src/apache/codegen/Avro.codegen.csproj
@@ -20,7 +20,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>avrogen</AssemblyName>
<RootNamespace>Avro.codegen</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/lang/csharp/src/apache/perf/Avro.perf.csproj b/lang/csharp/src/apache/perf/Avro.perf.csproj
index 725fa6f..fa6e1ec 100644
--- a/lang/csharp/src/apache/perf/Avro.perf.csproj
+++ b/lang/csharp/src/apache/perf/Avro.perf.csproj
@@ -18,8 +18,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFrameworks Condition="'$(OS)'!='Windows_NT'">netcoreapp2.2</TargetFrameworks>
- <TargetFrameworks Condition="'$(OS)'=='Windows_NT'">net461;netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks Condition="'$(OS)'!='Windows_NT'">netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks Condition="'$(OS)'=='Windows_NT'">net461;netcoreapp3.1</TargetFrameworks>
<AssemblyName>Avro.perf</AssemblyName>
<RootNamespace>Avro.perf</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/lang/csharp/src/apache/test/Avro.test.csproj b/lang/csharp/src/apache/test/Avro.test.csproj
index a5bd04c..15054ac 100644
--- a/lang/csharp/src/apache/test/Avro.test.csproj
+++ b/lang/csharp/src/apache/test/Avro.test.csproj
@@ -17,8 +17,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks Condition="'$(OS)'!='Windows_NT'">netcoreapp2.2</TargetFrameworks>
- <TargetFrameworks Condition="'$(OS)'=='Windows_NT'">net461;netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks Condition="'$(OS)'!='Windows_NT'">netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks Condition="'$(OS)'=='Windows_NT'">net461;netcoreapp3.1</TargetFrameworks>
<RootNamespace>Avro.test</RootNamespace>
<AssemblyName>Avro.test</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -32,22 +32,18 @@
<ItemGroup>
<PackageReference Include="nunit">
- <Version>3.10.1</Version>
+ <Version>3.12.0</Version>
</PackageReference>
<PackageReference Include="nunit3testadapter">
- <Version>3.10.0</Version>
+ <Version>3.16.1</Version>
</PackageReference>
<PackageReference Include="NUnit.ConsoleRunner">
- <Version>3.9.0</Version>
+ <Version>3.10.0</Version>
</PackageReference>
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.2'">
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.2'">
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+ <ItemGroup>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
</ItemGroup>
<ItemGroup>
diff --git a/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs b/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
index 7e1a96d..ee59107 100644
--- a/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
+++ b/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
@@ -30,7 +30,7 @@ namespace Avro.Test
class CodeGenTest
{
-#if !NETCOREAPP2_2 // System.CodeDom compilation not supported in .NET Core: https://github.com/dotnet/corefx/issues/12180
+#if !NETCOREAPP // System.CodeDom compilation not supported in .NET Core: https://github.com/dotnet/corefx/issues/12180
[TestCase(@"{
""type"" : ""record"",
""name"" : ""ClassKeywords"",
diff --git a/lang/csharp/src/apache/test/Specific/SpecificTests.cs b/lang/csharp/src/apache/test/Specific/SpecificTests.cs
index 96d412b..2602f6c 100644
--- a/lang/csharp/src/apache/test/Specific/SpecificTests.cs
+++ b/lang/csharp/src/apache/test/Specific/SpecificTests.cs
@@ -33,7 +33,7 @@ namespace Avro.Test
[TestFixture]
class SpecificTests
{
-#if !NETCOREAPP2_2 // System.CodeDom compilation not supported in .NET Core: https://github.com/dotnet/corefx/issues/12180
+#if !NETCOREAPP // System.CodeDom compilation not supported in .NET Core: https://github.com/dotnet/corefx/issues/12180
// The dynamically created assembly used in the test below can only be created
// once otherwise repeated tests will fail as the same type name will exist in
// multiple assemblies and so the type in the test and the type found by ObjectCreator
diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 124a6af..6325b14 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -136,7 +136,7 @@ RUN curl -sSLO https://packages.microsoft.com/config/ubuntu/16.04/packages-micro
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
&& apt-get -qqy update \
- && apt-get -qqy install --no-install-recommends dotnet-sdk-2.2 \
+ && apt-get -qqy install --no-install-recommends dotnet-sdk-3.1 \
&& apt-get -qqy clean \
&& rm -rf /var/lib/apt/lists