update build (#92)

* update build * fsproj fixes * trigger build
ctaggart · Sep 30, 2018 · 785ea27 · 785ea27
1 parent adfe3d9
commit 785ea27
Show file tree

Hide file tree

Showing 22 changed files with 101 additions and 677 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/Compiler/Froto.Compiler.fsproj b/Compiler/Froto.Compiler.fsproj
@@ -1,22 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyName>froto</AssemblyName>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <PackAsTool>True</PackAsTool>
+    <ToolCommandName>froto</ToolCommandName>
+
+    <Authors>Cameron Taggart</Authors>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <Description>code generator for Protocol Buffers</Description>
+    <PackageTags>froto protobuf binary protocol buffers serialization deserialization</PackageTags>
+
+    <!-- SourceLink related properties https://github.com/dotnet/SourceLink#using-sourcelink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" Condition="Exists('AssemblyInfo.fs')" />
     <Compile Include="Program.fs" />
     <None Include="App.config" />
-    <None Include="Froto.Compiler.nuspec" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Argu" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Parser\Froto.Parser.fsproj" />
+    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="Argu" Version="4.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Compiler/Froto.Compiler.nuspec b/Compiler/Froto.Compiler.nuspec
diff --git a/Froto.unix.sln b/Froto.unix.sln
diff --git a/Parser.Test/Froto.Parser.Test.fsproj b/Parser.Test/Froto.Parser.Test.fsproj
@@ -5,17 +5,16 @@
   <ItemGroup>
     <Compile Include="TestParser.fs" />
     <Compile Include="TestClassModel.fs" />
-    <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Parser\Froto.Parser.fsproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FsUnit.xUnit" Version="3.1.0-beta2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="Unquote" Version="4.0.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FsUnit.Xunit" Version="3.2.0" />
   </ItemGroup>
 </Project>
diff --git a/Parser.Test/Program.fs b/Parser.Test/Program.fs
diff --git a/Parser/Froto.Parser.fsproj b/Parser/Froto.Parser.fsproj
@@ -1,16 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+
+    <Authors>Cameron Taggart, James Hugard</Authors>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <Description>A parser for .proto files for Protocol Buffers.</Description>
+    <PackageTags>froto protobuf parser binary protocol buffers serialization deserialization</PackageTags>
+
+    <!-- SourceLink related properties https://github.com/dotnet/SourceLink#using-sourcelink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" Condition="Exists('AssemblyInfo.fs')" />
     <Compile Include="Ast.fs" />
     <Compile Include="Parser.fs" />
     <Compile Include="ClassModel.fs" />
-    <None Include="Froto.Parser.nuspec" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="4.5.2" />
     <PackageReference Include="FParsec" Version="1.0.3" />
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.6.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Parser/Froto.Parser.nuspec b/Parser/Froto.Parser.nuspec
diff --git a/Serialization.Test/Froto.Serialization.Test.fsproj b/Serialization.Test/Froto.Serialization.Test.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -12,17 +12,16 @@
     <Compile Include="TestClassSerialization.fs" />
     <Compile Include="ExampleProtoRecord.fs" />
     <Compile Include="ExampleProtoClass.fs" />
-    <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Serialization\Froto.Serialization.fsproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FsUnit.xUnit" Version="3.1.0-beta2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="Unquote" Version="4.0.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FsUnit.Xunit" Version="3.2.0" />
   </ItemGroup>
 </Project>
diff --git a/Serialization.Test/Program.fs b/Serialization.Test/Program.fs
diff --git a/Serialization.Test/packages.config b/Serialization.Test/packages.config
diff --git a/Serialization/Froto.Serialization.fsproj b/Serialization/Froto.Serialization.fsproj
@@ -1,6 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+
+    <Authors>Cameron Taggart, James Hugard</Authors>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <Description>A serialization library for Protocol Buffers.</Description>
+    <PackageTags>froto protobuf binary protocol buffers serialization deserialization</PackageTags>
+
+    <!-- SourceLink related properties https://github.com/dotnet/SourceLink#using-sourcelink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Exceptions.fs" />
@@ -10,9 +20,9 @@
     <Compile Include="Utility.fs" />
     <Compile Include="Encoding.fs" />
     <Compile Include="Serialization.fs" />
-    <None Include="Froto.Serialization.nuspec" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.6.0" PrivateAssets="All" />
+    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Serialization/Froto.Serialization.nuspec b/Serialization/Froto.Serialization.nuspec
diff --git a/TypeProvider.Test/Froto.TypeProvider.Test.fsproj b/TypeProvider.Test/Froto.TypeProvider.Test.fsproj
@@ -33,11 +33,15 @@
     </When>
   </Choose>
   <ItemGroup>
+    <ProjectReference Include="..\Serialization\Froto.Serialization.fsproj" />
+    <PackageReference Update="FSharp.Core" Version="4.5.2" />
     <PackageReference Include="FParsec" Version="1.0.3" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.1.0-beta2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Unquote" Version="4.0.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FsUnit.Xunit" Version="3.2.0" />
   </ItemGroup>
 </Project>
diff --git a/TypeProvider/Froto.TypeProvider.fsproj b/TypeProvider/Froto.TypeProvider.fsproj
@@ -1,6 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
+
+    <Authors>Cameron Taggart, James Hugard, Uladzimir Makarau</Authors>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <projectUrl>https://github.com/ctaggart/froto</projectUrl>
+    <Description>A type provider for Protocol Buffers.</Description>
+    <PackageTags>froto protobuf binary protocol buffers serialization deserialization type provider</PackageTags>
+
+    <!-- SourceLink related properties https://github.com/dotnet/SourceLink#using-sourcelink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="lib/ProvidedTypes.fsi" />
@@ -33,7 +44,8 @@
     <ProjectReference Include="..\Serialization\Froto.Serialization.fsproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="4.5.2" />
     <Reference Include="System.Runtime.Caching" />
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.6.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/TypeProvider/Froto.TypeProvider.nuspec b/TypeProvider/Froto.TypeProvider.nuspec