Skip to content

Commit c3d324f

Browse files
committed
switch to minver
1 parent 932d8f2 commit c3d324f

File tree

5 files changed

+35
-29
lines changed

5 files changed

+35
-29
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,3 @@ updates:
66
interval: daily
77
time: "11:00"
88
open-pull-requests-limit: 10
9-
ignore:
10-
- dependency-name: Microsoft.NET.Test.Sdk
11-
versions:
12-
- 16.9.4
13-
- dependency-name: DataGenerator
14-
versions:
15-
- 5.0.0.178
16-
- dependency-name: Npgsql
17-
versions:
18-
- 5.0.3
19-
- dependency-name: coverlet.msbuild
20-
versions:
21-
- 3.0.2

.github/workflows/dotnet.yml

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Build Project
1+
name: Build
22

33
env:
4+
DOTNET_NOLOGO: true
5+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
46
ASPNETCORE_ENVIRONMENT: github
57
BUILD_PATH: '${{github.workspace}}/artifacts'
6-
BUILD_VERSION: '10.1.${{github.run_number}}'
7-
BUILD_INFORMATION: '10.1.${{github.run_number}}+Branch.${{github.ref_name}}.Sha.${{github.sha}}'
88
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
99

1010
on:
@@ -61,8 +61,8 @@ jobs:
6161
run: dotnet restore
6262

6363
- name: Build Solution
64-
run: dotnet build --no-restore --configuration Release -p:Version="${{env.BUILD_VERSION}}" -p:InformationalVersion="${{env.BUILD_INFORMATION}}"
65-
64+
run: dotnet build --no-restore --configuration Release
65+
6666
- name: Run Test
6767
run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings
6868

@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Create Packages
8484
if: success() && github.event_name != 'pull_request'
85-
run: dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore --output "${{env.BUILD_PATH}}" -p:PackageVersion="${{env.BUILD_VERSION}}"
85+
run: dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore --output "${{env.BUILD_PATH}}"
8686

8787
- name: Upload Packages
8888
if: success() && github.event_name != 'pull_request'
@@ -91,19 +91,36 @@ jobs:
9191
name: packages
9292
path: '${{env.BUILD_PATH}}'
9393

94-
- name: Publish Packages
95-
if: success() && github.event_name != 'pull_request'
94+
deploy:
95+
runs-on: ubuntu-latest
96+
needs: build
97+
if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
98+
99+
steps:
100+
- name: Download Artifact
101+
uses: actions/download-artifact@v3
102+
with:
103+
name: packages
104+
105+
- name: Publish Packages GitHub
96106
run: |
97-
dotnet nuget add source --username pwelter34 --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/loresoft/index.json"
98107
for package in $(find -name "*.nupkg"); do
99108
echo "${0##*/}": Pushing $package...
100-
dotnet nuget push $package --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
109+
dotnet nuget push $package --source https://nuget.pkg.github.com/loresoft/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
101110
done
102111
103-
- name: Publish Release Packages
104-
if: success() && startsWith(github.ref, 'refs/tags/v')
112+
- name: Publish Packages feedz
113+
run: |
114+
for package in $(find -name "*.nupkg"); do
115+
echo "${0##*/}": Pushing $package...
116+
dotnet nuget push $package --source https://f.feedz.io/loresoft/open/nuget/index.json --api-key ${{ secrets.FEEDDZ_KEY }} --skip-duplicate
117+
done
118+
119+
- name: Publish Packages Nuget
120+
if: startsWith(github.ref, 'refs/tags/v')
105121
run: |
106122
for package in $(find -name "*.nupkg"); do
107123
echo "${0##*/}": Pushing $package...
108124
dotnet nuget push $package --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
109125
done
126+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Fluent Wrapper for DbCommand.
44

5-
[![Build status](https://github.com/loresoft/FluentCommand/workflows/Build%20Project/badge.svg)](https://github.com/loresoft/FluentCommand/actions)
5+
[![Build status](https://github.com/loresoft/FluentCommand/workflows/Build/badge.svg)](https://github.com/loresoft/FluentCommand/actions)
66

77
[![Coverage Status](https://coveralls.io/repos/github/loresoft/FluentCommand/badge.svg?branch=master)](https://coveralls.io/github/loresoft/FluentCommand?branch=master)
88

coverlet.runsettings

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<DataCollector friendlyName="XPlat code coverage">
66
<Configuration>
77
<Format>lcov</Format>
8-
<Exclude>[FluentCommand.*.Tests?]*</Exclude>
98
<ExcludeByAttribute>Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute,TestSDKAutoGeneratedCode</ExcludeByAttribute>
109
<SkipAutoProps>true</SkipAutoProps>
1110
</Configuration>

src/Directory.Build.props

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<Project>
22

33
<PropertyGroup Label="Package">
4-
<Product>FluentCommand</Product>
54
<Description>Fluent Wrapper for DbCommand</Description>
65
<Copyright>Copyright © $([System.DateTime]::Now.ToString(yyyy)) LoreSoft</Copyright>
76
<Authors>LoreSoft</Authors>
87
<NeutralLanguage>en-US</NeutralLanguage>
98
<GenerateDocumentationFile>true</GenerateDocumentationFile>
109
<PackageTags>orm;sql;micro-orm;database</PackageTags>
11-
<PackageOutputPath>$(SolutionDir)artifacts</PackageOutputPath>
1210
<PackageProjectUrl>https://github.com/loresoft/FluentCommand</PackageProjectUrl>
1311
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1412
<PackageIcon>logo.png</PackageIcon>
@@ -30,9 +28,14 @@
3028
<ImplicitUsings>enable</ImplicitUsings>
3129
<NoWarn>1591</NoWarn>
3230
</PropertyGroup>
31+
32+
<PropertyGroup>
33+
<MinVerTagPrefix>v</MinVerTagPrefix>
34+
</PropertyGroup>
3335

3436
<ItemGroup>
3537
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
38+
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
3639
</ItemGroup>
3740

3841
<ItemGroup>

0 commit comments

Comments
 (0)