From 48a92f09f85ea11b2f503c5cefb11ee42d7578ba Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Tue, 14 Jan 2020 16:20:57 -0600 Subject: [PATCH] Build cleanup --- .dockerignore | 11 --------- .github/workflows/build.yml | 4 ++-- .gitignore | 23 +++++++++++++++++-- Foundatio.Redis.sln | 1 - README.md | 2 +- .../Foundatio.SampleJobClient.csproj | 2 +- src/Foundatio.Redis/Foundatio.Redis.csproj | 2 +- .../Foundatio.Redis.Tests.csproj | 2 +- 8 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 8abd46a..0000000 --- a/.dockerignore +++ /dev/null @@ -1,11 +0,0 @@ -Dockerfile* -docker-compose* -.dockerignore -.vscode -.idea -.vs -**/artifacts/ -**/bin/ -**/obj/ -**/TestResult/ -**/out/ \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4074120..ba36df4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.gitignore b/.gitignore index 6f5ee68..d5e8c22 100644 --- a/.gitignore +++ b/.gitignore @@ -29,5 +29,24 @@ _NCrunch_* # NuGet Packages *.nupkg -# Common Platform excludes -.idea/ \ No newline at end of file +# 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 \ No newline at end of file diff --git a/Foundatio.Redis.sln b/Foundatio.Redis.sln index da6d239..d8b300f 100644 --- a/Foundatio.Redis.sln +++ b/Foundatio.Redis.sln @@ -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 diff --git a/README.md b/README.md index a3c6d75..c55f1ac 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/samples/Foundatio.SampleJobClient/Foundatio.SampleJobClient.csproj b/samples/Foundatio.SampleJobClient/Foundatio.SampleJobClient.csproj index c431eb3..cd6d1f9 100644 --- a/samples/Foundatio.SampleJobClient/Foundatio.SampleJobClient.csproj +++ b/samples/Foundatio.SampleJobClient/Foundatio.SampleJobClient.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Foundatio.Redis/Foundatio.Redis.csproj b/src/Foundatio.Redis/Foundatio.Redis.csproj index 3fdf351..d30cd33 100644 --- a/src/Foundatio.Redis/Foundatio.Redis.csproj +++ b/src/Foundatio.Redis/Foundatio.Redis.csproj @@ -1,7 +1,7 @@  - + diff --git a/tests/Foundatio.Redis.Tests/Foundatio.Redis.Tests.csproj b/tests/Foundatio.Redis.Tests/Foundatio.Redis.Tests.csproj index b767d8e..d2d6265 100644 --- a/tests/Foundatio.Redis.Tests/Foundatio.Redis.Tests.csproj +++ b/tests/Foundatio.Redis.Tests/Foundatio.Redis.Tests.csproj @@ -7,7 +7,7 @@ - +