Move more over to default.props and fix the csproj files

dolittle · Mar 8, 2022 · b981500 · b981500
1 parent 5fcca4c
commit b981500
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/Generation/CSharp/Fundamentals/Fundamentals.csproj b/Generation/CSharp/Fundamentals/Fundamentals.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="../../../default.props"/>
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
         <AssemblyName>Dolittle.Contracts</AssemblyName>
-        <DolittleProtoProject>../../../Source/Fundamentals</DolittleProtoProject>
-        <DolittleProtoRoot>../../../Source</DolittleProtoRoot>
-        <DolittleProtoKeepFiles>VersionInfo.cs</DolittleProtoKeepFiles>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Dolittle.Common" Version="2.*" PrivateAssets="All"/>
-        <PackageReference Include="Dolittle.Protobuf.MSBuild" Version="4.0.1"/>
+        <Protobuf Include="../../../Source/Fundamentals/**/*.proto"
+                    ProtoRoot="../../../Source"
+                    OutputDir="%(RecursiveDir)"
+                    GrpcServices="None" />
     </ItemGroup>
 </Project>
diff --git a/Generation/CSharp/Runtime/Runtime.csproj b/Generation/CSharp/Runtime/Runtime.csproj
@@ -1,18 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="../../../default.props"/>
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
         <AssemblyName>Dolittle.Runtime.Contracts</AssemblyName>
-        <DolittleProtoProject>../../../Source/Runtime</DolittleProtoProject>
-        <DolittleProtoRoot>../../../Source</DolittleProtoRoot>
-        <DolittleProtoKeepFiles>VersionInfo.cs</DolittleProtoKeepFiles>
     </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="../Fundamentals/Fundamentals.csproj" />
     </ItemGroup>
-
     <ItemGroup>
-        <PackageReference Include="Dolittle.Common" Version="2.*" PrivateAssets="All"/>
-        <PackageReference Include="Dolittle.Protobuf.MSBuild" Version="4.0.1"/>
+        <Protobuf Include="../../../Source/Runtime/**/*.proto"
+                    ProtoRoot="../../../Source"
+                    OutputDir="%(RecursiveDir)"
+                    GrpcServices="Both" />
     </ItemGroup>
+
 </Project>
diff --git a/default.props b/default.props
@@ -7,4 +7,17 @@
         <Protobuf_NoWarnMissingExpected>true</Protobuf_NoWarnMissingExpected>
         <Protobuf_TouchMissingExpected>true</Protobuf_TouchMissingExpected>
     </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Dolittle.Common" Version="2.*" PrivateAssets="All"/>
+        <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
+        <PackageReference Include="Google.Protobuf.Tools" Version="$(GoogleProtobufToolsVersion)" PrivateAssets="All"/>
+        <PackageReference Include="Grpc.Tools" Version="$(GrpcVersion)" PrivateAssets="All"/>
+        <PackageReference Include="Grpc.Core.Api" Version="$(GrpcVersion)" />
+    </ItemGroup>
+    <Target Name="DeleteSourceFiles" BeforeTargets="BeforeBuild">
+        <ItemGroup>
+            <FilesToDelete Include="**/*.cs" Exclude="VersionInfo.cs"/>
+        </ItemGroup>
+        <Delete Files="@(FilesToDelete)"/>
+    </Target>
 </Project>