Skip to content

Commit

Permalink
Merge pull request #66 from loresoft/develop
Browse files Browse the repository at this point in the history
switch to minver
  • Loading branch information
pwelter34 authored Jul 28, 2023
2 parents 91f19f5 + 5615889 commit 2bb3174
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 30 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Build

env:
DOTNET_NOLOGO: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
BUILD_PATH: '${{github.workspace}}/artifacts'
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

Expand Down Expand Up @@ -34,11 +36,6 @@ jobs:
6.0.x
7.0.x
- name: Update Version
uses: dotnet/nbgv@master
with:
setAllVars: true

- name: Restore Dependencies
run: dotnet restore

Expand Down Expand Up @@ -82,7 +79,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
needs: build
if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')
if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))

steps:
- name: Download Artifact
Expand All @@ -97,6 +94,13 @@ jobs:
dotnet nuget push $package --source https://nuget.pkg.github.com/loresoft/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
done
- name: Publish Packages feedz
run: |
for package in $(find -name "*.nupkg"); do
echo "${0##*/}": Pushing $package...
dotnet nuget push $package --source https://f.feedz.io/loresoft/open/nuget/index.json --api-key ${{ secrets.FEEDDZ_KEY }} --skip-duplicate
done
- name: Publish Packages Nuget
if: startsWith(github.ref, 'refs/tags/v')
run: |
Expand Down
3 changes: 1 addition & 2 deletions Cosmos.Abstracts.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{9F52E13A-7612-463F-A1EB-961EC2E17410}"
ProjectSection(SolutionItems) = preProject
coverlet.runsettings = coverlet.runsettings
Directory.Build.props = Directory.Build.props
src\Directory.Build.props = src\Directory.Build.props
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
README.md = README.md
version.json = version.json
EndProjectSection
EndProject
Global
Expand Down
3 changes: 1 addition & 2 deletions src/Cosmos.Abstracts/Cosmos.Abstracts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.1" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

</Project>
18 changes: 11 additions & 7 deletions Directory.Build.props → src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,19 @@

<PropertyGroup>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>1591</NoWarn>
</PropertyGroup>

<PropertyGroup>
<MinVerTagPrefix>v</MinVerTagPrefix>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<None Include=".\..\..\logo.png">
<Pack>true</Pack>
Expand All @@ -41,11 +51,5 @@
<Visible>false</Visible>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
<PrivateAssets>all</PrivateAssets>
<Version>3.6.133</Version>
</PackageReference>
</ItemGroup>

</Project>
13 changes: 0 additions & 13 deletions version.json

This file was deleted.

0 comments on commit 2bb3174

Please sign in to comment.