Merge branch 'master' into exclude-testdata-from-releases

Author: vincent-psarga

Cucumber.Messages.Specs/Cucumber.Messages.Specs.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Cucumber.Messages/Cucumber.Messages.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
-    <VersionNumber>12.1.1</VersionNumber>
+    <VersionNumber>12.2.0</VersionNumber>
     <Version Condition="'$(SnapshotSuffix)' != ''">$(VersionNumber)-$(SnapshotSuffix)</Version>
     <Version Condition="'$(SnapshotSuffix)' == ''">$(VersionNumber)</Version>
     <SignAssembly>true</SignAssembly>
@@ -29,13 +29,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.7.0"/>
-    <PackageReference Include="Grpc.Tools" Version="1.20.1">
+    <PackageReference Include="Google.Protobuf" Version="3.12.3"/>
+    <PackageReference Include="Grpc.Tools" Version="2.30.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

messages.proto

@@ -19,7 +19,7 @@ message Envelope {
     // Compiler(s)
     Pickle pickle = 3;
 
-    // 
+    //
     StepDefinition step_definition = 4;
     Hook hook = 5;
     ParameterType parameter_type = 6;
@@ -37,7 +37,7 @@ message Envelope {
 
     // Parsing
     ParseError parse_error = 16;
-    
+
     Meta meta = 17;
   }
 }
@@ -63,14 +63,36 @@ message Meta {
 
   // 386, arm, amd64 etc
   Product cpu = 5;
-  
+
+  // CI environment
+  CI ci = 6;
+
   // A product has a name and a version
   message Product {
     // The product name
     string name = 1;
     // The product version
     string version = 2;
   }
+
+  message CI {
+    // Name of the CI product, e.g. "Jenkins", "CircleCI" etc.
+    string name = 1;
+
+    // Link to the build
+    string url = 2;
+
+    // Information about Git, provided by the Build/CI server as environment
+    // variables.
+    Git git = 3;
+
+    message Git {
+      string remote = 1;
+      string revision = 2;
+      string branch = 3;
+      string tag = 4;
+    }
+  }
 }
 
 
@@ -340,7 +362,7 @@ message Attachment {
    * - stream => BASE64
    */
   ContentEncoding content_encoding = 6;
-  
+
   enum ContentEncoding {
     IDENTITY = 0;
     // When this is used, the data field is a single line base64 string
@@ -535,7 +557,7 @@ message TestStepFinished {
   string test_step_id = 3;
   string test_case_started_id = 4;
 
-  
+
   message TestStepResult {
     Status status = 1;
     string message = 2;
@@ -580,9 +602,9 @@ message TestRunFinished {
   // Timestamp when the TestRun is finished
   Timestamp timestamp = 2;
   // Error message. Can be a stack trace from a failed `BeforeAll` or `AfterAll`.
-  // If there are undefined parameter types, the message is simply 
-  // "The following parameter type(s() are not defined: xxx, yyy". 
-  // The independent `UndefinedParameterType` messages can be used to generate 
+  // If there are undefined parameter types, the message is simply
+  // "The following parameter type(s() are not defined: xxx, yyy".
+  // The independent `UndefinedParameterType` messages can be used to generate
   // snippets for those parameter types.
   string message = 3;
 }