Skip to content

Commit

Permalink
Build cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ejsmith committed Jan 14, 2020
1 parent 25ba0da commit 48a92f0
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 20 deletions.
11 changes: 0 additions & 11 deletions .dockerignore

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
with:
tag-prefix: v
- name: Build
run: dotnet build --configuration Release --nologo
run: dotnet build --configuration Release
- name: Start Services
run: docker-compose up -d
- name: Run Tests
run: dotnet test --configuration Release --nologo --results-directory artifacts --no-build --logger:trx
run: dotnet test --configuration Release --results-directory artifacts --no-build --logger:trx
- name: Package
if: github.event_name != 'pull_request'
run: dotnet pack --configuration Release --no-build
Expand Down
23 changes: 21 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,24 @@ _NCrunch_*
# NuGet Packages
*.nupkg

# Common Platform excludes
.idea/
# Rider

# User specific
**/.idea/**/workspace.xml
**/.idea/**/tasks.xml
**/.idea/shelf/*
**/.idea/dictionaries

# Sensitive or high-churn files
**/.idea/**/dataSources/
**/.idea/**/dataSources.ids
**/.idea/**/dataSources.xml
**/.idea/**/dataSources.local.xml
**/.idea/**/sqlDataSources.xml
**/.idea/**/dynamic.xml

# Rider
# Rider auto-generates .iml files, and contentModel.xml
**/.idea/**/*.iml
**/.idea/**/contentModel.xml
**/.idea/**/modules.xml
1 change: 0 additions & 1 deletion Foundatio.Redis.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E12E4C1-2EC6-4EC7-8956-AF2721DA4ECE}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
build\common.props = build\common.props
README.md = README.md
docker-compose.yml = docker-compose.yml
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Foundatio](https://raw.githubusercontent.com/FoundatioFx/Foundatio/master/media/foundatio.png "Foundatio")

[![Build status](https://ci.appveyor.com/api/projects/status/dyaa7xd7a3m0q82r?svg=true)](https://ci.appveyor.com/project/Exceptionless/foundatio-redis)
[![Build status](https://github.com/FoundatioFx/Foundatio.Redis/workflows/Build/badge.svg)](https://github.com/FoundatioFx/Foundatio.Redis/actions)
[![NuGet Version](http://img.shields.io/nuget/v/Foundatio.Redis.svg?style=flat)](https://www.nuget.org/packages/Foundatio.Redis/)
[![Slack Status](https://slack.exceptionless.com/badge.svg)](https://slack.exceptionless.com)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Foundatio.Logging.Xunit" Version="9.1.0-rc1.10" />
<PackageReference Include="Foundatio.Logging.Xunit" Version="9.1.0-rc1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Foundatio.Redis/Foundatio.Redis.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<ItemGroup>
<PackageReference Include="Foundatio" Version="9.1.0-rc1.10" />
<PackageReference Include="Foundatio" Version="9.1.0-rc1" />
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/Foundatio.Redis.Tests/Foundatio.Redis.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectReference Include="..\..\src\Foundatio.Redis\Foundatio.Redis.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Foundatio.TestHarness" Version="9.1.0-rc1.10" />
<PackageReference Include="Foundatio.TestHarness" Version="9.1.0-rc1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
Expand Down

0 comments on commit 48a92f0

Please sign in to comment.