R (#19)

* style remove space * housekeeping missing stuff
AngelMunoz · Dec 7, 2020 · 6bbcec4 · 6bbcec4
1 parent 4fde51e
commit 6bbcec4
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
         uses: microsoft/setup-msbuild@v1
 
       - name: Build
-        run: dotnet build src/Mondocks --configuration ${{ env.configuration }}
+        run: dotnet build --configuration ${{ env.configuration }}
 
       - name: Create NuGet Artifacts
         uses: actions/upload-artifact@master

diff --git a/Directory.build.props b/Directory.build.props
@@ -0,0 +1,24 @@
+<Project>
+    <PropertyGroup>
+        <Product>Mondocks</Product>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <Copyright>Copyright 2020 Angel D. Munoz.</Copyright>
+        <Authors>Angel Munoz and contributors</Authors>
+
+        <RepositoryType>git</RepositoryType>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <PackageId>Mondocks</PackageId>
+        <PackageTags>mongodb;fsharp;nosql;library;dotnet;dotnet5;dotnet-core</PackageTags>
+        <RepositoryUrl>https://github.com/AngelMunoz/Mondocks.git</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/AngelMunoz/Mondocks</PackageProjectUrl>
+        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/AngelMunoz/Mondocks</RepositoryUrl>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+    </ItemGroup>
+    <ItemGroup>
+        <None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="LICENSE" />
+    </ItemGroup>
+</Project> 
diff --git a/samples/Aggregation/Aggregation.fsproj b/samples/Aggregation/Aggregation.fsproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
 

diff --git a/samples/Commands/Commands.fsproj b/samples/Commands/Commands.fsproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Indexes/Indexes.fsproj b/samples/Indexes/Indexes.fsproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Mondocks/Library.fs b/src/Mondocks/Library.fs
@@ -192,4 +192,3 @@ module internal Json =
 
     let Serialize<'T> (value: 'T) =
         JsonSerializer.Serialize<'T>(value, defaults)
-
diff --git a/src/Mondocks/Mondocks.fsproj b/src/Mondocks/Mondocks.fsproj
@@ -1,24 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyName>Mondocks</AssemblyName>
-    <Version>0.2.0</Version>
-    <Description>A CE library for F# that may provide better interactions with mongo databases</Description>
-    <Copyright>Copyright 2020 Angel D. Munoz.</Copyright>
-    <Authors>Angel Munoz and contributors</Authors>
-
     <!-- Build settings -->
     <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
-    <OutputType>Library</OutputType>
-
-    <!-- NuGet Pack settings -->
-    <PackageId>Mondocks</PackageId>
-    <PackageTags>mongodb;fsharp;nosql;library;dotnet;dotnet5;dotnet-core</PackageTags>
-    <PackageProjectUrl>https://github.com/AngelMunoz/Mondocks</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/AngelMunoz/Mondocks</RepositoryUrl>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/version.json b/version.json
@@ -0,0 +1,16 @@
+{
+  "version": "0.3",
+  "publicReleaseRefSpec": [
+    "^refs/heads/main$", // we release out of main
+    "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
+  ],
+  "nugetPackageVersion": {
+    "semVer": 2
+  },
+  "cloudBuild": {
+    "setVersionVariables": true,
+    "buildNumber": {
+      "enabled": false
+    }
+  }
+}