From 392a8d6e70823f1f7cd4e4726ddaffcc17883c14 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 09:07:42 -0300 Subject: [PATCH 01/18] add Nerdbank.GitVersioning --- .gitignore | 3 ++- Parser/Froto.Parser.fsproj | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 02e069d..e752d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ TestResults/ /paket.exe /.fake AssemblyInfo.fs -docs/type-provider/paket.lock \ No newline at end of file +docs/type-provider/paket.lock +.idea/ \ No newline at end of file diff --git a/Parser/Froto.Parser.fsproj b/Parser/Froto.Parser.fsproj index 5768015..afe3921 100644 --- a/Parser/Froto.Parser.fsproj +++ b/Parser/Froto.Parser.fsproj @@ -21,5 +21,6 @@ + \ No newline at end of file From 6070b389ebad13e11c2ee9f4c20e29f911f422b0 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 10:26:47 -0300 Subject: [PATCH 02/18] temp remove SourceLink --- .gitignore | 3 ++- Parser/Froto.Parser.fsproj | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e752d0f..fe24a9e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ TestResults/ /.fake AssemblyInfo.fs docs/type-provider/paket.lock -.idea/ \ No newline at end of file +.idea/ +.vs/ \ No newline at end of file diff --git a/Parser/Froto.Parser.fsproj b/Parser/Froto.Parser.fsproj index afe3921..e3b98ef 100644 --- a/Parser/Froto.Parser.fsproj +++ b/Parser/Froto.Parser.fsproj @@ -20,7 +20,7 @@ - + \ No newline at end of file From 2d20555dbed94f87879b5a8dd36b04bcd3ba7e9d Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 10:36:38 -0300 Subject: [PATCH 03/18] try switching Froto.Parser.Test from netsoreapp2.0 to 2.1 --- Parser.Test/Froto.Parser.Test.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Parser.Test/Froto.Parser.Test.fsproj b/Parser.Test/Froto.Parser.Test.fsproj index 87ac494..764241b 100644 --- a/Parser.Test/Froto.Parser.Test.fsproj +++ b/Parser.Test/Froto.Parser.Test.fsproj @@ -1,6 +1,6 @@  - netcoreapp2.0 + netcoreapp2.1 From 4e608ab45e080763013eacf9894743891a984fe8 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 10:40:54 -0300 Subject: [PATCH 04/18] use Froto.sln --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1b8390..f1437b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: csharp mono: none dotnet: 2.1.3 script: - - dotnet restore Froto.unix.sln - - dotnet build Froto.unix.sln -c Release + - dotnet restore Froto.sln + - dotnet build Froto.sln -c Release - dotnet test Parser.Test/Froto.Parser.Test.fsproj - dotnet test Serialization.Test/Froto.Serialization.Test.fsproj \ No newline at end of file From c8932075f11283657e29c47017d0554ccb4fad07 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 10:45:21 -0300 Subject: [PATCH 05/18] latest dotnet 2.2.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f1437b3..3a4f66b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: csharp mono: none -dotnet: 2.1.3 +dotnet: 2.2.3 script: - dotnet restore Froto.sln - dotnet build Froto.sln -c Release From 60cd87e158c387ae532f063e03e9403a2a0ba200 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 10:55:02 -0300 Subject: [PATCH 06/18] try 2.2.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a4f66b..25f3a71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: csharp mono: none -dotnet: 2.2.3 +dotnet: 2.2.2 script: - dotnet restore Froto.sln - dotnet build Froto.sln -c Release From baef5e50ae2da308da94e31fb18f52569a687ab7 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 10:57:15 -0300 Subject: [PATCH 07/18] sdk is 2.2.105 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25f3a71..d88a7e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: csharp mono: none -dotnet: 2.2.2 +dotnet: 2.2.105 script: - dotnet restore Froto.sln - dotnet build Froto.sln -c Release From 563fa11a1f421f9636f3b692438009f57e214668 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 11:05:41 -0300 Subject: [PATCH 08/18] dist: xenial --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d88a7e2..8ed591a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: csharp +dist: xenial mono: none dotnet: 2.2.105 script: From 63cd350439b360dd1b9f7da7cce51e3ebe465a3f Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 11:16:30 -0300 Subject: [PATCH 09/18] remove Froto.TypeProvider from Froto.sln --- Froto.sln | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Froto.sln b/Froto.sln index 6c46b99..895caf2 100644 --- a/Froto.sln +++ b/Froto.sln @@ -38,17 +38,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "protobuf", "protobuf", "{82 test\google\protobuf\descriptor.proto = test\google\protobuf\descriptor.proto EndProjectSection EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Parser", "Parser/Froto.Parser.fsproj", "{1C31DA31-BEC5-4E73-9D83-E36D18847439}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Parser", "Parser\Froto.Parser.fsproj", "{1C31DA31-BEC5-4E73-9D83-E36D18847439}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Parser.Test", "Parser.Test/Froto.Parser.Test.fsproj", "{18104831-6F33-4F15-AB45-3E8527CC5181}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Parser.Test", "Parser.Test\Froto.Parser.Test.fsproj", "{18104831-6F33-4F15-AB45-3E8527CC5181}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Serialization", "Serialization/Froto.Serialization.fsproj", "{C37745D0-275D-4DCE-9DDC-C4663A462EDD}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Serialization", "Serialization\Froto.Serialization.fsproj", "{C37745D0-275D-4DCE-9DDC-C4663A462EDD}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Serialization.Test", "Serialization.Test/Froto.Serialization.Test.fsproj", "{AF2D437D-55A1-4F31-86BD-9B9D7E05CAEA}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Serialization.Test", "Serialization.Test\Froto.Serialization.Test.fsproj", "{AF2D437D-55A1-4F31-86BD-9B9D7E05CAEA}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Froto.Compiler", "Compiler/Froto.Compiler.fsproj", "{F5D8D709-919D-4539-8908-91C540C970B3}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.TypeProvider", "TypeProvider/Froto.TypeProvider.fsproj", "{837AA4FC-E2DD-48A1-A793-50DC4404EE57}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Froto.Compiler", "Compiler\Froto.Compiler.fsproj", "{F5D8D709-919D-4539-8908-91C540C970B3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -76,10 +74,6 @@ Global {F5D8D709-919D-4539-8908-91C540C970B3}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5D8D709-919D-4539-8908-91C540C970B3}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5D8D709-919D-4539-8908-91C540C970B3}.Release|Any CPU.Build.0 = Release|Any CPU - {837AA4FC-E2DD-48A1-A793-50DC4404EE57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {837AA4FC-E2DD-48A1-A793-50DC4404EE57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {837AA4FC-E2DD-48A1-A793-50DC4404EE57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {837AA4FC-E2DD-48A1-A793-50DC4404EE57}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 17a6fa60dd0a7f3d339a3bec1281d0f75e4925f3 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 11:47:35 -0300 Subject: [PATCH 10/18] back to netcoreapp2.0 --- Parser.Test/Froto.Parser.Test.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Parser.Test/Froto.Parser.Test.fsproj b/Parser.Test/Froto.Parser.Test.fsproj index 764241b..87ac494 100644 --- a/Parser.Test/Froto.Parser.Test.fsproj +++ b/Parser.Test/Froto.Parser.Test.fsproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.0 From c9ceb50677d0e69db2305472a6923c1115316c0f Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 12:27:52 -0300 Subject: [PATCH 11/18] git fetch --unshallow --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8ed591a..b1a1408 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ dist: xenial mono: none dotnet: 2.2.105 script: + - git fetch --unshallow - dotnet restore Froto.sln - dotnet build Froto.sln -c Release - dotnet test Parser.Test/Froto.Parser.Test.fsproj From 45371b4c7b3f20c1f40ed783746cf81f800f0101 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 13:03:51 -0300 Subject: [PATCH 12/18] Revert "fix Enum in message body error (#96)" This reverts commit 40a86c726a95abca52dd1fece35727c497f6b86a. --- Parser.Test/TestParser.fs | 46 ++------------------------------------- Parser/Parser.fs | 2 +- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/Parser.Test/TestParser.fs b/Parser.Test/TestParser.fs index 1be7a32..d54eba3 100644 --- a/Parser.Test/TestParser.fs +++ b/Parser.Test/TestParser.fs @@ -1060,6 +1060,7 @@ module RegressionTests = [] let ``proto3 oneof type doesn't parse (#88)`` () = + System.Diagnostics.Debugger.Break() Parse.fromStringWithParser pProto """ syntax = "proto3"; @@ -1082,47 +1083,4 @@ module RegressionTests = ]) ]) - ]) - - [] - let ``proto3 message with enum type doesn't parse (#93)`` () = - Parse.fromStringWithParser pProto """ - syntax = "proto3"; - - message SearchRequest { - string query = 1; - int32 page_number = 2; - int32 result_per_page = 3; - enum Corpus { - UNIVERSAL = 0; - WEB = 1; - IMAGES = 2; - LOCAL = 3; - NEWS = 4; - PRODUCTS = 5; - VIDEO = 6; - } - Corpus corpus = 4; - } - """ - |> should equal ( - [ - TSyntax TProto3 - TMessage ("SearchRequest", - [ - TField ("query",TOptional,TString,1u,[]) - TField ("page_number",TOptional,TInt32,2u,[]) - TField ("result_per_page",TOptional,TInt32,3u,[]) - TMessageEnum("Corpus", - [ - TEnumField ("UNIVERSAL",0,[]) - TEnumField ("WEB",1,[]) - TEnumField ("IMAGES",2,[]) - TEnumField ("LOCAL",3,[]) - TEnumField ("NEWS",4,[]) - TEnumField ("PRODUCTS",5,[]) - TEnumField ("VIDEO",6,[]) - ]) - TField ("corpus", TOptional,TIdent "Corpus",4u,[]) - ]) - ]) + ]) \ No newline at end of file diff --git a/Parser/Parser.fs b/Parser/Parser.fs index 586024a..ab86dd1 100644 --- a/Parser/Parser.fs +++ b/Parser/Parser.fs @@ -482,6 +482,7 @@ module Parse = choice [ (isProto2 >>. pGroup) // must be parsed first to avoid confusion pOneOf // must be parsed before pField, so 'oneof' isn't considered a type in Proto3 + pField pMessageEnum pMessageMessage (isProto2 >>. pMessageExtend) @@ -489,7 +490,6 @@ module Parse = pMessageOption pMap pReserved - pField ] /// Parse message option: "option" (ident | "(" fullIdent ")" { "." ident } From f06d55ad35191392a795697879ac8ddd0867069f Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 13:29:06 -0300 Subject: [PATCH 13/18] add version.json --- Compiler/Froto.Compiler.fsproj | 1 + Parser/Froto.Parser.fsproj | 2 +- Serialization.Test/TestSerialization.fs | 2 +- Serialization/Froto.Serialization.fsproj | 1 + TypeProvider/Froto.TypeProvider.fsproj | 1 + build.ps1 | 28 +++++++----------------- version.json | 17 ++++++++++++++ 7 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 version.json diff --git a/Compiler/Froto.Compiler.fsproj b/Compiler/Froto.Compiler.fsproj index a4b9b45..7b32cb8 100644 --- a/Compiler/Froto.Compiler.fsproj +++ b/Compiler/Froto.Compiler.fsproj @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/Parser/Froto.Parser.fsproj b/Parser/Froto.Parser.fsproj index e3b98ef..afe3921 100644 --- a/Parser/Froto.Parser.fsproj +++ b/Parser/Froto.Parser.fsproj @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/Serialization.Test/TestSerialization.fs b/Serialization.Test/TestSerialization.fs index aeea1ad..f61bcd8 100644 --- a/Serialization.Test/TestSerialization.fs +++ b/Serialization.Test/TestSerialization.fs @@ -206,7 +206,7 @@ module RecordSerialization = ] |> Map.ofList - static member DecodeFixup m = + static member DecodeFixup m: Proto3Message = { m with _unknownFields = List.rev m._unknownFields } static member UnknownFields m = diff --git a/Serialization/Froto.Serialization.fsproj b/Serialization/Froto.Serialization.fsproj index c8a1611..592b6de 100644 --- a/Serialization/Froto.Serialization.fsproj +++ b/Serialization/Froto.Serialization.fsproj @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/TypeProvider/Froto.TypeProvider.fsproj b/TypeProvider/Froto.TypeProvider.fsproj index 63f5080..a86799f 100644 --- a/TypeProvider/Froto.TypeProvider.fsproj +++ b/TypeProvider/Froto.TypeProvider.fsproj @@ -47,5 +47,6 @@ + \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 06c143f..863bd7c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,22 +1,10 @@ -$version = '0.7.0' # the version under development, update after a release -$versionSuffix = '-build.0' # manually incremented for local builds - -function isVersionTag($tag){ - $v = New-Object Version - [Version]::TryParse($tag, [ref]$v) -} - -if ($env:appveyor){ - $versionSuffix = '-build.' + $env:appveyor_build_number - if ($env:appveyor_repo_tag -eq 'true' -and (isVersionTag($env:appveyor_repo_tag_name))){ - $version = $env:appveyor_repo_tag_name - $versionSuffix = '' - } - Update-AppveyorBuild -Version "$version$versionSuffix" -} - -dotnet build -c Release Froto.sln /p:Version=$version$versionSuffix +dotnet build -c Release Froto.sln +if ($lastexitcode -ne 0){ exit $lastexitcode } dotnet test --no-build -c Release Parser.Test\Froto.Parser.Test.fsproj +if ($lastexitcode -ne 0){ exit $lastexitcode } dotnet test --no-build -c Release Serialization.Test\Froto.Serialization.Test.fsproj -dotnet pack --no-build -c Release Parser\Froto.Parser.fsproj /p:Version=$version$versionSuffix -o $psscriptroot/bin -dotnet pack --no-build -c Release Serialization\Froto.Serialization.fsproj /p:Version=$version$versionSuffix -o $psscriptroot/bin \ No newline at end of file +if ($lastexitcode -ne 0){ exit $lastexitcode } +dotnet pack --no-build -c Release Parser\Froto.Parser.fsproj -o $psscriptroot/bin +if ($lastexitcode -ne 0){ exit $lastexitcode } +dotnet pack --no-build -c Release Serialization\Froto.Serialization.fsproj -o $psscriptroot/bin +if ($lastexitcode -ne 0){ exit $lastexitcode } \ No newline at end of file diff --git a/version.json b/version.json new file mode 100644 index 0000000..c4845f6 --- /dev/null +++ b/version.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "0.6", + "nugetPackageVersion": { + "semVer": 2 + }, + "gitCommitIdShortAutoMinimum": 7, + "publicReleaseRefSpec": [ + "^refs/heads/master$", + "^refs/heads/\\d+\\.\\d+$" + ], + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} \ No newline at end of file From 8a37bb2899a0ea6c29299c4c3f63cc6806898644 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 13:39:12 -0300 Subject: [PATCH 14/18] disable nbgv for exe --- Compiler/Froto.Compiler.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Compiler/Froto.Compiler.fsproj b/Compiler/Froto.Compiler.fsproj index 7b32cb8..c67d8f4 100644 --- a/Compiler/Froto.Compiler.fsproj +++ b/Compiler/Froto.Compiler.fsproj @@ -27,6 +27,6 @@ - + \ No newline at end of file From d66327d24280922b7a848b6e115d86b0f9d5a6c6 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 14:29:23 -0300 Subject: [PATCH 15/18] use previous SourceLink https://github.com/dotnet/sourcelink/issues/236 --- Compiler/Froto.Compiler.fsproj | 2 +- Parser/Froto.Parser.fsproj | 2 +- Serialization/Froto.Serialization.fsproj | 2 +- TypeProvider/Froto.TypeProvider.fsproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Compiler/Froto.Compiler.fsproj b/Compiler/Froto.Compiler.fsproj index c67d8f4..3e039ce 100644 --- a/Compiler/Froto.Compiler.fsproj +++ b/Compiler/Froto.Compiler.fsproj @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/Parser/Froto.Parser.fsproj b/Parser/Froto.Parser.fsproj index afe3921..c25f4d4 100644 --- a/Parser/Froto.Parser.fsproj +++ b/Parser/Froto.Parser.fsproj @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/Serialization/Froto.Serialization.fsproj b/Serialization/Froto.Serialization.fsproj index 592b6de..bb4d577 100644 --- a/Serialization/Froto.Serialization.fsproj +++ b/Serialization/Froto.Serialization.fsproj @@ -23,7 +23,7 @@ - + \ No newline at end of file diff --git a/TypeProvider/Froto.TypeProvider.fsproj b/TypeProvider/Froto.TypeProvider.fsproj index a86799f..c742d0a 100644 --- a/TypeProvider/Froto.TypeProvider.fsproj +++ b/TypeProvider/Froto.TypeProvider.fsproj @@ -46,7 +46,7 @@ - + \ No newline at end of file From 7cf54c4eb8adb025047f63f74f72db2b9204a8c0 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 14:32:54 -0300 Subject: [PATCH 16/18] PrivateAssets="All" --- Compiler/Froto.Compiler.fsproj | 2 +- Parser/Froto.Parser.fsproj | 2 +- Serialization/Froto.Serialization.fsproj | 2 +- TypeProvider/Froto.TypeProvider.fsproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Compiler/Froto.Compiler.fsproj b/Compiler/Froto.Compiler.fsproj index 3e039ce..927ee6d 100644 --- a/Compiler/Froto.Compiler.fsproj +++ b/Compiler/Froto.Compiler.fsproj @@ -27,6 +27,6 @@ - + \ No newline at end of file diff --git a/Parser/Froto.Parser.fsproj b/Parser/Froto.Parser.fsproj index c25f4d4..5e554a6 100644 --- a/Parser/Froto.Parser.fsproj +++ b/Parser/Froto.Parser.fsproj @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/Serialization/Froto.Serialization.fsproj b/Serialization/Froto.Serialization.fsproj index bb4d577..1df2f7a 100644 --- a/Serialization/Froto.Serialization.fsproj +++ b/Serialization/Froto.Serialization.fsproj @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/TypeProvider/Froto.TypeProvider.fsproj b/TypeProvider/Froto.TypeProvider.fsproj index c742d0a..24d537d 100644 --- a/TypeProvider/Froto.TypeProvider.fsproj +++ b/TypeProvider/Froto.TypeProvider.fsproj @@ -47,6 +47,6 @@ - + \ No newline at end of file From d29f23ec260dcb33376ebb5cf351e53085681512 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 18:42:46 -0300 Subject: [PATCH 17/18] upgrade to Nerdbank.GitVersioning" Version="2.3.136 --- Compiler/Froto.Compiler.fsproj | 2 +- Parser/Froto.Parser.fsproj | 2 +- Serialization/Froto.Serialization.fsproj | 2 +- TypeProvider/Froto.TypeProvider.fsproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Compiler/Froto.Compiler.fsproj b/Compiler/Froto.Compiler.fsproj index 927ee6d..48cb305 100644 --- a/Compiler/Froto.Compiler.fsproj +++ b/Compiler/Froto.Compiler.fsproj @@ -27,6 +27,6 @@ - + \ No newline at end of file diff --git a/Parser/Froto.Parser.fsproj b/Parser/Froto.Parser.fsproj index 5e554a6..352ecae 100644 --- a/Parser/Froto.Parser.fsproj +++ b/Parser/Froto.Parser.fsproj @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/Serialization/Froto.Serialization.fsproj b/Serialization/Froto.Serialization.fsproj index 1df2f7a..01517f4 100644 --- a/Serialization/Froto.Serialization.fsproj +++ b/Serialization/Froto.Serialization.fsproj @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/TypeProvider/Froto.TypeProvider.fsproj b/TypeProvider/Froto.TypeProvider.fsproj index 24d537d..1ab22c3 100644 --- a/TypeProvider/Froto.TypeProvider.fsproj +++ b/TypeProvider/Froto.TypeProvider.fsproj @@ -47,6 +47,6 @@ - + \ No newline at end of file From e74fd35fd83eb3b541f9ca988175e9abac906d94 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 19 Mar 2019 19:16:08 -0300 Subject: [PATCH 18/18] remove Break() --- Parser.Test/TestParser.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/Parser.Test/TestParser.fs b/Parser.Test/TestParser.fs index d54eba3..7f5c8d2 100644 --- a/Parser.Test/TestParser.fs +++ b/Parser.Test/TestParser.fs @@ -1060,7 +1060,6 @@ module RegressionTests = [] let ``proto3 oneof type doesn't parse (#88)`` () = - System.Diagnostics.Debugger.Break() Parse.fromStringWithParser pProto """ syntax = "proto3";