Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build schema registry signed assemblies #1000

Merged
merged 7 commits into from
Aug 20, 2019
Merged

build schema registry signed assemblies #1000

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c05a0f
make consumer benchmark 5x faster (#998)
mhowlett Jun 28, 2019
c768f75
build schema registry signed assemblies
mhowlett Jul 1, 2019
94b4c82
-> avro 1.7.7.7
mhowlett Jul 17, 2019
cb45485
notest
mhowlett Jul 17, 2019
0b60dd8
always apply strong name to CK and CS
mhowlett Jul 17, 2019
99ba6aa
strong names for many projects
mhowlett Jul 17, 2019
495ead0
Fix parentheses inconsistency
mhowlett Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,27 @@ environment:
PATH: $(PATH);$(PROGRAMFILES)\dotnet\

build_script:
- 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\
- appveyor-retry dotnet restore -v Minimal
- appveyor-retry dotnet restore -v Minimal test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj
- dotnet build Confluent.Kafka.sln -c %CONFIGURATION%
- dotnet build src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% %STRONG_NAME_OPTIONS%
- 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%)
- 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%)
- docfx doc/docfx.json

- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION%)
- cmd: IF NOT "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.Kafka/Confluent.Kafka.csproj -c %CONFIGURATION% --version-suffix ci-%APPVEYOR_BUILD_NUMBER%)

- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj -c %CONFIGURATION%)
- cmd: IF NOT "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj -c %CONFIGURATION% --version-suffix ci-%APPVEYOR_BUILD_NUMBER%)
- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" (dotnet pack src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj -c %CONFIGURATION%)
- 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%)

- cmd: IF "%APPVEYOR_REPO_TAG%" == "true" dotnet pack src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj -c %CONFIGURATION%
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistency: the IF statements above have () around the dotnet command

- 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%

- docfx doc/docfx.json

after_build:
- 7z a docs-%APPVEYOR_REPO_COMMIT%.zip doc/_site/*

test_script:
- dotnet test -c %CONFIGURATION% --no-build test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj
- dotnet test -c %CONFIGURATION% test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj
- dotnet test -c %CONFIGURATION% --no-build test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj
- dotnet test -c %CONFIGURATION% --no-build test/Confluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.csproj

artifacts:
- path: ./src/Confluent.Kafka/bin*/Release/*.nupkg
Expand Down
2 changes: 2 additions & 0 deletions src/Confluent.Kafka/Confluent.Kafka.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<TargetFrameworks>net45;net46;netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Confluent.Kafka.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
<TargetFrameworks>netstandard2.0;net452;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Confluent.SchemaRegistry.Serdes.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Confluent.Apache.Avro" Version="1.7.7.6" />
<PackageReference Include="Confluent.Apache.Avro" Version="1.7.7.7" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>

Expand Down
Binary file added src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.snk
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<TargetFrameworks>net452;netstandard1.4;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Confluent.SchemaRegistry.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Binary file added src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.snk
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion test/Confluent.Kafka.Benchmark/BenchmarkConsumer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public static void BenchmarkConsumerImpl(string bootstrapServers, string topic,
GroupId = "benchmark-consumer-group",
BootstrapServers = bootstrapServers,
SessionTimeoutMs = 6000,
ConsumeResultFields = nHeaders == 0 ? "none" : "headers"
ConsumeResultFields = nHeaders == 0 ? "none" : "headers",
QueuedMinMessages = 1000000
};

using (var consumer = new ConsumerBuilder<Ignore, Ignore>(consumerConfig).Build())
Expand Down
44 changes: 0 additions & 44 deletions test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj
View file
Open in desktop

This file was deleted.

Binary file removed test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.snk
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions test/Confluent.Kafka.StrongName.UnitTests/README.md
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<AssemblyName>Confluent.Kafka.UnitTests</AssemblyName>
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Confluent.Kafka.UnitTests.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Binary file added test/Confluent.Kafka.UnitTests/Confluent.Kafka.UnitTests.snk
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...onfluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworks>netcoreapp2.1;net452;</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Confluent.SchemaRegistry.Serdes.UnitTests.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Binary file added test/Confluent.SchemaRegistry.Serdes.UnitTests/Confluent.SchemaRegistry.Serdes.UnitTests.snk
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworks>netcoreapp2.1;</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Confluent.SchemaRegistry.UnitTests.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Binary file added test/Confluent.SchemaRegistry.UnitTests/Confluent.SchemaRegistry.UnitTests.snk
View file
Open in desktop
Binary file not shown.