Skip to content
This repository was archived by the owner on Jan 27, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ env:
matrix:
include:
- os: linux
dotnet: 2.1.301
dist: xenial
dotnet: 2.2
- os: osx
osx_image: xcode9 # OSX 10.12
dotnet: 2.1.301
dotnet: 2.2.104
before_install:
- ulimit -n 4096
script:
- dotnet restore
- dotnet build --configuration Release
- dotnet test test/Winton.DomainModelling.DocumentDb.Tests/ --no-build --configuration Release --framework netcoreapp2.1
- dotnet build -c Release
- dotnet test -c Release --no-build --filter Integration!=true
notifications:
on_success: always
on_failure: always
Expand Down
26 changes: 26 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
assembly-versioning-scheme: MajorMinorPatch
mode: ContinuousDeployment

branches:

master:
regex: master
tag: master
increment: Minor
prevent-increment-of-merged-branch-version: true
feature:
regex: feature[/-]
tag: a{BranchName}
increment: Minor
prevent-increment-of-merged-branch-version: false
patch:
regex: patch[/-]
tag: useBranchName
increment: Patch
prevent-increment-of-merged-branch-version: false
source-branches: ['release']
release:
regex: release[/-]
tag: rc
increment: None
prevent-increment-of-merged-branch-version: false
50 changes: 0 additions & 50 deletions GitVersionConfig.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion Winton.DomainModelling.DocumentDb.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
CONTRIBUTING.md = CONTRIBUTING.md
GitVersionConfig.yaml = GitVersionConfig.yaml
GitVersion.yml = GitVersion.yml
icon.jpg = icon.jpg
LICENSE = LICENSE
README.md = README.md
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ install:
- ps: Import-Module "C:\Program Files\Azure Cosmos DB Emulator\PSModules\Microsoft.Azure.CosmosDB.Emulator"
- ps: Start-CosmosDbEmulator -NoUI -Timeout 0
before_build:
- dotnet restore
- dotnet tool install -g GitVersion.Tool --version 4.0.1-beta1-58
- dotnet gitversion /l console /output buildserver
build_script:
- msbuild /p:GetVersion=True /p:WriteVersionInfoToBuildLog=True
- dotnet build -c Release -p:Version=%GitVersion_NuGetVersion%
test_script:
- dotnet test test/Winton.DomainModelling.DocumentDb.Tests/ --no-build --configuration Release
- dotnet test test/Winton.DomainModelling.DocumentDb.IntegrationTests/ --no-build --configuration Release
- dotnet test -c Release --no-build
artifacts:
- path: .\**\*.nupkg
name: NuGet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<Copyright>Copyright 2018 Winton</Copyright>
<Description>Provides common types for persisting domain objects to DocumentDB.</Description>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<GetVersion>False</GetVersion>
<NoWarn>$(NoWarn);SA1101;SA1309</NoWarn>
<PackageId>Winton.DomainModelling.DocumentDb</PackageId>
<PackageIconUrl>https://raw.githubusercontent.com/wintoncode/Winton.DomainModelling.DocumentDb/master/icon.jpg</PackageIconUrl>
Expand All @@ -20,7 +19,6 @@
<TargetFramework>netstandard1.6</TargetFramework>
<Title>Winton Domain Modelling DocumentDB</Title>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<WriteVersionInfoToBuildLog>False</WriteVersionInfoToBuildLog>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
Expand All @@ -32,7 +30,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" PrivateAssets="All" />
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.1.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
<PackageReference Include="Winton.DomainModelling.Abstractions" Version="1.1.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

namespace Winton.DomainModelling.DocumentDb
{
[Trait("Integration", "true")]
public class EntityDtoPersistenceTests : IDisposable
{
private readonly Database _database;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

namespace Winton.DomainModelling.DocumentDb
{
[Trait("Integration", "true")]
public class EntityPersistenceTests : IDisposable
{
private readonly Database _database;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

namespace Winton.DomainModelling.DocumentDb
{
[Trait("Integration", "true")]
public class ValueObjectDtoPersistenceTests : IDisposable
{
private readonly Database _database;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Winton.DomainModelling.DocumentDb
{
[Trait("Integration", "true")]
public class ValueObjectPersistenceTests : IDisposable
{
private readonly Database _database;
Expand Down