This is an automated email from the ASF dual-hosted git repository.
blachniet pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/branch-1.9 by this push:
new 4c4f606 AVRO-2422: Build NuGet packages on Linux (#553)
4c4f606 is described below
commit 4c4f6061d02d876d2d1865571d8acf31cf9344b6
Author: Brian Lachniet <[email protected]>
AuthorDate: Mon Jun 17 21:39:58 2019 -0400
AVRO-2422: Build NuGet packages on Linux (#553)
- Primarily target .NET Standard and .NET Core
- Still test against net40 & netcore when building/testing on Windows
- Package Avrogen as a dotnet tool
- Upgrade to .NET Core 2.2 (previously 2.0)
(cherry picked commit from 4988b9b701a99561f49a0e5147f08d2dbec0ab3d)
---
BUILD.md | 2 +-
lang/csharp/Avro.sln | 29 --------
lang/csharp/README.md | 39 +++-------
lang/csharp/build.ps1 | 82 ----------------------
lang/csharp/build.sh | 17 ++---
lang/csharp/src/apache/codegen/Avro.codegen.csproj | 20 +++++-
lang/csharp/src/apache/main/Avro.main.csproj | 14 ++--
lang/csharp/src/apache/msbuild/Avro.msbuild.csproj | 5 +-
lang/csharp/src/apache/perf/Avro.perf.csproj | 3 +-
lang/csharp/src/apache/test/Avro.test.csproj | 9 +--
lang/csharp/src/apache/test/CodGen/CodeGenTest.cs | 4 +-
.../src/apache/test/Specific/SpecificTests.cs | 4 +-
12 files changed, 55 insertions(+), 173 deletions(-)
diff --git a/BUILD.md b/BUILD.md
index a70c9c5..837a82e 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -10,7 +10,7 @@ The following packages must be installed before Avro can be
built:
- Python 3: 3.5 or greater
- C: gcc, cmake, asciidoc, source-highlight
- C++: cmake 3.7.2 or greater, g++, flex, bison, libboost-dev
- - C#: mono-devel mono-gmcs nunit
+ - C#: .NET Core 2.2 SDK
- JavaScript: Node 6.x+, nodejs, npm
- Ruby: Ruby 2.3.3 or greater, ruby-dev, gem, rake, echoe, yajl-ruby
- Perl: Perl 5.24.1 or greater, gmake, Module::Install,
diff --git a/lang/csharp/Avro.sln b/lang/csharp/Avro.sln
index 4f95c2f..c484f6e 100644
--- a/lang/csharp/Avro.sln
+++ b/lang/csharp/Avro.sln
@@ -9,17 +9,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"Avro.test", "src\apache\tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avro.codegen",
"src\apache\codegen\Avro.codegen.csproj",
"{BF0D313C-1AA3-4900-B277-B0F5F9DDCDA8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avro.ipc",
"src\apache\ipc\Avro.ipc.csproj", "{3B05043A-DC6C-49B6-85BF-9AB055D0B414}"
- ProjectSection(ProjectDependencies) = postProject
- {AEB22F94-4ECF-4008-B159-389B3F05D54B} =
{AEB22F94-4ECF-4008-B159-389B3F05D54B}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avro.msbuild",
"src\apache\msbuild\Avro.msbuild.csproj",
"{AEB22F94-4ECF-4008-B159-389B3F05D54B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avro.perf",
"src\apache\perf\Avro.perf.csproj", "{AC4E1909-2594-4D01-9B2B-B832C07BAFE5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avro.ipc.test",
"src\apache\ipc.test\Avro.ipc.test.csproj",
"{A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items",
"Solution Items", "{8A671DF3-BC71-4E1A-BB06-0A225799A274}"
ProjectSection(SolutionItems) = preProject
..\..\.editorconfig = ..\..\.editorconfig
@@ -72,16 +65,6 @@ Global
{BF0D313C-1AA3-4900-B277-B0F5F9DDCDA8}.Release|Mixed
Platforms.Build.0 = Release|Any CPU
{BF0D313C-1AA3-4900-B277-B0F5F9DDCDA8}.Release|x86.ActiveCfg =
Release|Any CPU
{BF0D313C-1AA3-4900-B277-B0F5F9DDCDA8}.Release|x86.Build.0 =
Release|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Debug|Any CPU.Build.0 =
Debug|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Debug|Mixed
Platforms.ActiveCfg = Debug|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Debug|Mixed
Platforms.Build.0 = Debug|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Debug|x86.ActiveCfg =
Debug|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Release|Any CPU.Build.0
= Release|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Release|Mixed
Platforms.ActiveCfg = Release|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Release|Mixed
Platforms.Build.0 = Release|Any CPU
- {3B05043A-DC6C-49B6-85BF-9AB055D0B414}.Release|x86.ActiveCfg =
Release|Any CPU
{AEB22F94-4ECF-4008-B159-389B3F05D54B}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
{AEB22F94-4ECF-4008-B159-389B3F05D54B}.Debug|Any CPU.Build.0 =
Debug|Any CPU
{AEB22F94-4ECF-4008-B159-389B3F05D54B}.Debug|Mixed
Platforms.ActiveCfg = Debug|Any CPU
@@ -102,18 +85,6 @@ Global
{AC4E1909-2594-4D01-9B2B-B832C07BAFE5}.Release|Mixed
Platforms.ActiveCfg = Release|Any CPU
{AC4E1909-2594-4D01-9B2B-B832C07BAFE5}.Release|Mixed
Platforms.Build.0 = Release|Any CPU
{AC4E1909-2594-4D01-9B2B-B832C07BAFE5}.Release|x86.ActiveCfg =
Release|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Debug|Any CPU.Build.0 =
Debug|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Debug|Mixed
Platforms.ActiveCfg = Debug|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Debug|Mixed
Platforms.Build.0 = Debug|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Debug|x86.ActiveCfg =
Debug|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Debug|x86.Build.0 =
Debug|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Release|Any CPU.Build.0
= Release|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Release|Mixed
Platforms.ActiveCfg = Release|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Release|Mixed
Platforms.Build.0 = Release|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Release|x86.ActiveCfg =
Release|Any CPU
- {A5C8B22C-BC43-4763-8B92-EB0CEA739ED1}.Release|x86.Build.0 =
Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/lang/csharp/README.md b/lang/csharp/README.md
index 8286591..508a2d3 100644
--- a/lang/csharp/README.md
+++ b/lang/csharp/README.md
@@ -1,38 +1,19 @@
-# Avro C#
+# Avro C# [](https://travis-ci.org/apache/avro)
[](https://www.nuget.org/packages/Apache.Avro)
-## Build & Test
-
-### Windows
-
-1. Install [Microsoft Visual Studio Community
2017](https://www.visualstudio.com/downloads/)
-2. `./build.ps1 Test`
-
-### Linux with .NET SDK
+
[](http://avro.apache.org/)
-1. Install [.NET Core SDK 2.1+](https://www.microsoft.com/net/download/linux)
-2. `./build.sh test`
+ ## Install
-### Linux with Mono
+ Install the Apache.Avro package from NuGet:
-1. Install [Mono v5.18+](https://www.mono-project.com/download/stable/).
Install the **mono-devel**
- and **mono-complete** packages.
-2. Build: `msbuild /t:"restore;build" /p:"Configuration=Release"`
-3. Test: `mono
~/.nuget/packages/nunit.consolerunner/3.9.0/tools/nunit3-console.exe
src/apache/test/bin/Release/net40/Avro.test.dll`
+ ```
+Install-Package Apache.Avro
+```
-## Target Frameworks
-
-The table below shows the frameworks that the various projects target.
-
-Project | Type | .NET Standard 2.0 | .NET Core 2.0 | .NET
Framework 4.0
------------- | ------------
|:------------------:|:------------------:|:------------------:
-Avro.codegen | Exe | | :heavy_check_mark: |
:heavy_check_mark:
-Avro.ipc | Library | | |
:heavy_check_mark:
-Avro.ipc.test | Unit Tests | | |
:heavy_check_mark:
-Avro.main | Exe | :heavy_check_mark: | |
:heavy_check_mark:
-Avro.msbuild | Library | :heavy_check_mark: | |
:heavy_check_mark:
-Avro.perf | Exe | | :heavy_check_mark: |
:heavy_check_mark:
-Avro.test | Unit Tests | | :heavy_check_mark: |
:heavy_check_mark:
+## Build & Test
+1. Install [.NET Core SDK 2.2+](https://www.microsoft.com/net/download/linux)
+2. `dotnet test`
## Notes
diff --git a/lang/csharp/build.ps1 b/lang/csharp/build.ps1
deleted file mode 100644
index 6f2630d..0000000
--- a/lang/csharp/build.ps1
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env pwsh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-param(
- [Parameter(Position=0)]
- [ValidateSet('Test')]
- [string]
- $Target = 'Test',
-
- [Parameter()]
- [ValidateSet('Release', 'Debug')]
- [string]
- $Configuration = 'Release',
-
- [Parameter()]
- [int]
- $BuildNumber = 0,
-
- [Parameter()]
- [string]
- $VersionSuffix,
-
- [Parameter()]
- [string]
- $RepositoryUrl
-)
-
-# Catch any PowerShell errors and exit with a non-zero exit code.
-$ErrorActionPreference = 'Stop'
-trap {
- $ErrorActionPreference = 'Continue'
- Write-Error $_
- exit 1
-}
-
-# Checks the LASTEXITCODE. If it is non-zero, exits with that code.
-function checkExitCode {
- if ($LASTEXITCODE) {
- exit $LASTEXITCODE
- }
-}
-
-try {
- Push-Location $PSScriptRoot
-
- switch ($Target) {
- "Test" {
- $buildCmd = "dotnet build --configuration $Configuration
-p:BuildNumber=$BuildNumber " +
- "-p:RepositoryCommit=$(git rev-parse HEAD) "
-
- if ($VersionSuffix) {
- $buildCmd += "-p:VersionSuffix=$VersionSuffix "
- }
-
- if ($RepositoryUrl) {
- $buildCmd += "-p:RepositoryUrl=$RepositoryUrl "
- }
-
- Invoke-Expression $buildCmd
- checkExitCode
-
- dotnet test --configuration $Configuration --no-build
./src/apache/test/Avro.test.csproj
- checkExitCode
- }
- }
-} finally {
- Pop-Location
-}
diff --git a/lang/csharp/build.sh b/lang/csharp/build.sh
index 7d06041..d8ca0f5 100755
--- a/lang/csharp/build.sh
+++ b/lang/csharp/build.sh
@@ -26,23 +26,20 @@ VERSION=`cat $ROOT/share/VERSION.txt`
case "$1" in
test)
- dotnet build --configuration Release --framework netcoreapp2.0
./src/apache/codegen/Avro.codegen.csproj
- dotnet build --configuration Release --framework netstandard2.0
./src/apache/msbuild/Avro.msbuild.csproj
+ dotnet build --configuration Release Avro.sln
# AVRO-2442: Explictly set LANG to work around ICU bug in `dotnet test`
- LANG=en_US.UTF-8 dotnet test --configuration Release --framework
netcoreapp2.0 ./src/apache/test/Avro.test.csproj
+ LANG=en_US.UTF-8 dotnet test --configuration Release --no-build Avro.sln
;;
perf)
pushd ./src/apache/perf/
- dotnet run --configuration Release --framework netcoreapp2.0
+ dotnet run --configuration Release --framework netcoreapp2.2
;;
dist)
- # build binary tarball
- dotnet build --configuration Release --framework netcoreapp2.0
./src/apache/codegen/Avro.codegen.csproj
- dotnet build --configuration Release --framework netstandard2.0
./src/apache/msbuild/Avro.msbuild.csproj
- dotnet build --configuration Release --framework netstandard2.0
./src/apache/ipc/Avro.ipc.csproj
+ # pack NuGet packages
+ dotnet pack --configuration Release Avro.sln
# add the binary LICENSE and NOTICE to the tarball
mkdir build/
@@ -53,12 +50,10 @@ case "$1" in
cp -R src/apache/main/bin/Release/* build/main/
mkdir build/codegen/
cp -R src/apache/codegen/bin/Release/* build/codegen/
- mkdir build/ipc/
- cp -R src/apache/ipc/bin/Release/* build/ipc/
# build the tarball
mkdir -p ${ROOT}/dist/csharp
- (cd build; tar czf ${ROOT}/../dist/csharp/avro-csharp-${VERSION}.tar.gz
main codegen ipc LICENSE NOTICE)
+ (cd build; tar czf ${ROOT}/../dist/csharp/avro-csharp-${VERSION}.tar.gz
main codegen LICENSE NOTICE)
# build documentation
doxygen Avro.dox
diff --git a/lang/csharp/src/apache/codegen/Avro.codegen.csproj
b/lang/csharp/src/apache/codegen/Avro.codegen.csproj
index 8ff9f83..50fa517 100644
--- a/lang/csharp/src/apache/codegen/Avro.codegen.csproj
+++ b/lang/csharp/src/apache/codegen/Avro.codegen.csproj
@@ -16,9 +16,11 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="../../../common.props" />
+
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
+ <TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>avrogen</AssemblyName>
<RootNamespace>Avro.codegen</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -26,6 +28,22 @@
<AssemblyOriginatorKeyFile>..\..\..\Avro.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
+ <PropertyGroup>
+ <!-- NuGet Package Settings -->
+ <PackageId>Apache.Avro.Tools</PackageId>
+ <PackAsTool>true</PackAsTool>
+ <ToolCommandName>avrogen</ToolCommandName>
+ <Description>
+ Avro provides:
+
+ Rich data structures.
+ A compact, fast, binary data format.
+ A container file, to store persistent data.
+ Remote procedure call (RPC).
+ Simple integration with dynamic languages. Code generation is not
required to read or write data files nor to use or implement RPC protocols.
Code generation as an optional optimization, only worth implementing for
statically typed languages.
+ </Description>
+ </PropertyGroup>
+
<ItemGroup>
<ProjectReference Include="..\main\Avro.main.csproj" />
</ItemGroup>
diff --git a/lang/csharp/src/apache/main/Avro.main.csproj
b/lang/csharp/src/apache/main/Avro.main.csproj
index 01f8543..c39371c 100644
--- a/lang/csharp/src/apache/main/Avro.main.csproj
+++ b/lang/csharp/src/apache/main/Avro.main.csproj
@@ -19,7 +19,7 @@
<Import Project="../../../common.props" />
<PropertyGroup>
- <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>Avro</AssemblyName>
<RootNamespace>Avro</RootNamespace>
<SignAssembly>true</SignAssembly>
@@ -29,7 +29,6 @@
<PropertyGroup>
<!-- NuGet Package Settings -->
- <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>Apache.Avro</PackageId>
<Description>
Avro provides:
@@ -42,17 +41,14 @@
</Description>
</PropertyGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <PackageReference Include="System.CodeDom" Version="4.4.0" />
- <PackageReference Include="System.Reflection" Version="4.3.0" />
- <PackageReference Include="System.Reflection.Emit.ILGeneration"
Version="4.3.0" />
- <PackageReference Include="System.Reflection.Emit.Lightweight"
Version="4.3.0" />
- </ItemGroup>
-
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="3.5.8">
<NoWarn>NU1701</NoWarn>
</PackageReference>
+ <PackageReference Include="System.CodeDom" Version="4.4.0" />
+ <PackageReference Include="System.Reflection" Version="4.3.0" />
+ <PackageReference Include="System.Reflection.Emit.ILGeneration"
Version="4.3.0" />
+ <PackageReference Include="System.Reflection.Emit.Lightweight"
Version="4.3.0" />
</ItemGroup>
</Project>
diff --git a/lang/csharp/src/apache/msbuild/Avro.msbuild.csproj
b/lang/csharp/src/apache/msbuild/Avro.msbuild.csproj
index 11a9bb8..53c0b69 100644
--- a/lang/csharp/src/apache/msbuild/Avro.msbuild.csproj
+++ b/lang/csharp/src/apache/msbuild/Avro.msbuild.csproj
@@ -17,7 +17,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+ <TargetFrameworks
Condition="'$(OS)'!='Windows_NT'">netstandard2.0</TargetFrameworks>
+ <TargetFrameworks
Condition="'$(OS)'=='Windows_NT'">net461;netstandard2.0</TargetFrameworks>
<AssemblyName>Avro.msbuild</AssemblyName>
<RootNamespace>Avro.msbuild</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -28,7 +29,7 @@
<PackageReference Include="Microsoft.Build.Utilities.Core"
Version="15.6.82" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net40'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Tasks.v4.0" />
<Reference Include="Microsoft.Build.Utilities.v4.0" />
diff --git a/lang/csharp/src/apache/perf/Avro.perf.csproj
b/lang/csharp/src/apache/perf/Avro.perf.csproj
index 7dfa31d..37e54e1 100644
--- a/lang/csharp/src/apache/perf/Avro.perf.csproj
+++ b/lang/csharp/src/apache/perf/Avro.perf.csproj
@@ -18,7 +18,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
+ <TargetFrameworks
Condition="'$(OS)'!='Windows_NT'">netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks
Condition="'$(OS)'=='Windows_NT'">net461;netcoreapp2.2</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 3b6e775..e73878c 100644
--- a/lang/csharp/src/apache/test/Avro.test.csproj
+++ b/lang/csharp/src/apache/test/Avro.test.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -17,7 +17,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
+ <TargetFrameworks
Condition="'$(OS)'!='Windows_NT'">netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks
Condition="'$(OS)'=='Windows_NT'">net461;netcoreapp2.2</TargetFrameworks>
<RootNamespace>Avro.test</RootNamespace>
<AssemblyName>Avro.test</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -35,11 +36,11 @@
</PackageReference>
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.0'">
+ <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.2'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
+ <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.2'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
</ItemGroup>
diff --git a/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
b/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
index 0754767..7e1a96d 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_0 // System.CodeDom compilation not supported in .NET Core:
https://github.com/dotnet/corefx/issues/12180
+#if !NETCOREAPP2_2 // System.CodeDom compilation not supported in .NET Core:
https://github.com/dotnet/corefx/issues/12180
[TestCase(@"{
""type"" : ""record"",
""name"" : ""ClassKeywords"",
@@ -148,7 +148,7 @@ namespace Avro.Test
{
var compileUnit = schema.GenerateCode();
- var comparam = new CompilerParameters(new string[] {
"mscorlib.dll" });
+ var comparam = new CompilerParameters(new string[] {
"netstandard.dll" });
comparam.ReferencedAssemblies.Add("System.dll");
comparam.ReferencedAssemblies.Add(Path.Combine(TestContext.CurrentContext.TestDirectory,
"Avro.dll"));
comparam.GenerateInMemory = true;
diff --git a/lang/csharp/src/apache/test/Specific/SpecificTests.cs
b/lang/csharp/src/apache/test/Specific/SpecificTests.cs
index 74f579d..99df3bf 100644
--- a/lang/csharp/src/apache/test/Specific/SpecificTests.cs
+++ b/lang/csharp/src/apache/test/Specific/SpecificTests.cs
@@ -31,7 +31,7 @@ namespace Avro.Test
[TestFixture]
class SpecificTests
{
-#if !NETCOREAPP2_0 // System.CodeDom compilation not supported in .NET Core:
https://github.com/dotnet/corefx/issues/12180
+#if !NETCOREAPP2_2 // 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
@@ -189,7 +189,7 @@ namespace Avro.Test
// compile
- var comparam = new CompilerParameters(new string[] {
"mscorlib.dll" });
+ var comparam = new CompilerParameters(new string[] {
"netstandard.dll" });
comparam.ReferencedAssemblies.Add("System.dll");
comparam.ReferencedAssemblies.Add(Path.Combine(TestContext.CurrentContext.TestDirectory,
"Avro.dll"));
comparam.GenerateInMemory = true;
