Skip to content

Commit 14e0d0e

Browse files
authored
build schema registry signed assemblies (#1000)
* make consumer benchmark 5x faster (#998) * build schema registry signed assemblies * -> avro 1.7.7.7 * notest * always apply strong name to CK and CS * strong names for many projects * Fix parentheses inconsistency
1 parent 88813ff commit 14e0d0e

File tree

16 files changed

+24
-59
lines changed

16 files changed

+24
-59
lines changed

appveyor.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,27 @@ environment:
1010
PATH: $(PATH);$(PROGRAMFILES)\dotnet\
1111

1212
build_script:
13-
- cmd: SET STRONG_NAME_OPTIONS=/p:SignAssembly=true;AssemblyOriginatorKeyFile=Confluent.Kafka.snk;PackageId=Confluent.Kafka.StrongName;Title=Confluent.Kafka.StrongName;AssemblyName=Confluent.Kafka.StrongName;BaseOutputPath=bin-sn\
1413
- appveyor-retry dotnet restore -v Minimal
15-
- appveyor-retry dotnet restore -v Minimal test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj
1614
- dotnet build Confluent.Kafka.sln -c %CONFIGURATION%
17-
- dotnet build src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% %STRONG_NAME_OPTIONS%
18-
- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% & dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% %STRONG_NAME_OPTIONS%)
19-
- cmd: IF NOT "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% --version-suffix ci-%APPVEYOR_BUILD_NUMBER% & dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% %STRONG_NAME_OPTIONS% --version-suffix ci-%APPVEYOR_BUILD_NUMBER%)
20-
- docfx doc/docfx.json
15+
16+
- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION%)
17+
- cmd: IF NOT "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% --version-suffix ci-%APPVEYOR_BUILD_NUMBER%)
18+
2119
- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj -c %CONFIGURATION%)
2220
- cmd: IF NOT "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj -c %CONFIGURATION% --version-suffix ci-%APPVEYOR_BUILD_NUMBER%)
21+
2322
- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj -c %CONFIGURATION%)
2423
- cmd: IF NOT "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj -c %CONFIGURATION% --version-suffix ci-%APPVEYOR_BUILD_NUMBER%)
2524

25+
- docfx doc/docfx.json
26+
2627
after_build:
2728
- 7z a docs-%APPVEYOR_REPO_COMMIT%.zip doc/_site/*
2829

2930
test_script:
3031
- dotnet test -c %CONFIGURATION% --no-build test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj
31-
- dotnet test -c %CONFIGURATION% test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj
32+
- dotnet test -c %CONFIGURATION% --no-build test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj
33+
- dotnet test -c %CONFIGURATION% --no-build test/Confluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.csproj
3234

3335
artifacts:
3436
- path: ./src/Confluent.Kafka/bin*/Release/*.nupkg

src/Confluent.Kafka/Confluent.Kafka.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<TargetFrameworks>net45;net46;netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
1717
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1818
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19+
<SignAssembly>true</SignAssembly>
20+
<AssemblyOriginatorKeyFile>Confluent.Kafka.snk</AssemblyOriginatorKeyFile>
1921
</PropertyGroup>
2022

2123
<ItemGroup>

src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
<TargetFrameworks>netstandard2.0;net452;</TargetFrameworks>
1818
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1919
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20+
<SignAssembly>true</SignAssembly>
21+
<AssemblyOriginatorKeyFile>Confluent.SchemaRegistry.Serdes.snk</AssemblyOriginatorKeyFile>
2022
</PropertyGroup>
2123

2224
<ItemGroup>
23-
<PackageReference Include="Confluent.Apache.Avro" Version="1.7.7.6" />
25+
<PackageReference Include="Confluent.Apache.Avro" Version="1.7.7.7" />
2426
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
2527
</ItemGroup>
2628

Binary file not shown.

src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<TargetFrameworks>net452;netstandard1.4;netstandard2.0</TargetFrameworks>
1818
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1919
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20+
<SignAssembly>true</SignAssembly>
21+
<AssemblyOriginatorKeyFile>Confluent.SchemaRegistry.snk</AssemblyOriginatorKeyFile>
2022
</PropertyGroup>
2123

2224
<ItemGroup>
596 Bytes
Binary file not shown.

test/Confluent.Kafka.Benchmark/BenchmarkConsumer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public static void BenchmarkConsumerImpl(string bootstrapServers, string topic,
3030
GroupId = "benchmark-consumer-group",
3131
BootstrapServers = bootstrapServers,
3232
SessionTimeoutMs = 6000,
33-
ConsumeResultFields = nHeaders == 0 ? "none" : "headers"
33+
ConsumeResultFields = nHeaders == 0 ? "none" : "headers",
34+
QueuedMinMessages = 1000000
3435
};
3536

3637
using (var consumer = new ConsumerBuilder<Ignore, Ignore>(consumerConfig).Build())

test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj

Lines changed: 0 additions & 44 deletions
This file was deleted.
Binary file not shown.

test/Confluent.Kafka.StrongName.UnitTests/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)