Skip to content

Commit

Permalink
Upgrade.
Browse files Browse the repository at this point in the history
  • Loading branch information
wasabii committed Dec 21, 2024
1 parent 15215a4 commit 8a7d2c4
Show file tree
Hide file tree
Showing 33 changed files with 346 additions and 46 deletions.
133 changes: 133 additions & 0 deletions .github/workflows/Cogito.Quartz.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
name: Cogito.Quartz

on:
workflow_dispatch:
push:
branches:
- main
- develop
pull_request:
branches:
- main
- develop
release:
types:
- created

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout Source
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
- name: Setup .NET 8.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v3
with:
versionSpec: 5.x
- name: Execute GitVersion
uses: gittools/actions/gitversion/execute@v3
with:
useConfigFile: true
- name: Add NuGet Source (GitHub)
shell: pwsh
run: dotnet nuget add source --username USERNAME --password $env:GITHUB_TOKEN --store-password-in-clear-text --name alethic $env:GITHUB_REPOS
env:
GITHUB_REPOS: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: NuGet Restore
run: dotnet restore Cogito.Quartz.sln
- name: Build
shell: pwsh
run: |
dotnet msbuild /m /bl `
/p:Configuration="Release" `
/p:Platform="Any CPU" `
/p:Version=${env:GitVersion_FullSemVer} `
/p:AssemblyVersion=${env:GitVersion_AssemblySemVer} `
/p:InformationalVersion=${env:GitVersion_InformationalVersion} `
/p:FileVersion=${env:GitVersion_AssemblySemFileVer} `
/p:PackageVersion=${env:GitVersion_FullSemVer} `
/p:RepositoryUrl="${env:GITHUB_SERVER_URL}/${env:GITHUB_REPOSITORY}.git" `
/p:PackageProjectUrl="${env:GITHUB_SERVER_URL}/${env:GITHUB_REPOSITORY}" `
/p:BuildInParallel=true `
/p:ContinuousIntegrationBuild=true `
Cogito.Quartz.dist.msbuildproj
- name: Upload MSBuild Log
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: msbuild.binlog
path: msbuild.binlog
- name: Upload NuGet Packages
uses: actions/upload-artifact@v4
with:
name: nuget
path: dist/nuget
- name: Package Tests
run: tar czvf tests.tar.gz tests
working-directory: dist
- name: Upload Tests
uses: actions/upload-artifact@v4
with:
name: tests
path: dist/tests.tar.gz
release:
name: Release
if: github.event_name != 'pull_request'
needs:
- build
runs-on: ubuntu-22.04
steps:
- name: Checkout Source
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v3
with:
versionSpec: 5.x
- name: Execute GitVersion
id: GitVersion
uses: gittools/actions/gitversion/execute@v3
with:
useConfigFile: true
- name: Download NuGet Packages
uses: actions/download-artifact@v4
with:
name: nuget
path: dist/nuget
- name: Create Release
if: github.ref_type == 'tag'
uses: ncipollo/release-action@v1
with:
tag: ${{ steps.GitVersion.outputs.semVer }}
allowUpdates: true
omitBodyDuringUpdate: true
artifacts: dist/nuget/*.nupkg,dist/nuget/*.snupkg,dist/doc.zip
makeLatest: true
token: ${{ secrets.GITHUB_TOKEN }}
- name: Push NuGet (GitHub)
if: github.event_name != 'pull_request'
shell: pwsh
run: dotnet nuget push dist/nuget/*.nupkg --source $env:GITHUB_REPOS --api-key $env:GITHUB_TOKEN --skip-duplicate
env:
GITHUB_REPOS: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Push NuGet
if: github.ref_type == 'tag'
shell: pwsh
run: dotnet nuget push dist/nuget/*.nupkg --source $env:NUGET_REPOS --api-key $env:NUGET_TOKEN --skip-duplicate
env:
NUGET_REPOS: https://api.nuget.org/v3/index.json
NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,6 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
*.pyc

/dist
32 changes: 32 additions & 0 deletions Cogito.Quartz.dist.msbuildproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project DefaultTargets="Publish">
<PropertyGroup>
<DistDir Condition="'$(DistDir)' == ''">$(DISTDIR)</DistDir>
<DistDir Condition="'$(DistDir)' == ''">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'dist'))</DistDir>
<DistDir>$([System.IO.Path]::GetFullPath('$(DistDir)'))</DistDir>
<SolutionFile>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'Cogito.Quartz.sln'))</SolutionFile>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
</PropertyGroup>

<ItemGroup>
<TargetsForPublish Include="$(SolutionFile)">
<Targets>dist%5Cdist-nuget:Publish</Targets>
<Properties>PublishDir=$(DistDir)\nuget</Properties>
</TargetsForPublish>
<TargetsForPublish Include="$(SolutionFile)">
<Targets>dist%5Cdist-tests:Publish</Targets>
<Properties>PublishDir=$(DistDir)\tests</Properties>
</TargetsForPublish>
</ItemGroup>

<Target Name="Publish">
<ItemGroup>
<_TargetsForPublish Include="@(TargetsForPublish)">
<Properties>%(TargetsForPublish.Properties)</Properties>
</_TargetsForPublish>
</ItemGroup>

<MSBuild BuildInParallel="$(BuildInParallel)" ContinueOnError="false" Projects="@(_TargetsForPublish)" Targets="%(_TargetsForPublish.Targets)" />
</Target>

</Project>
47 changes: 39 additions & 8 deletions Cogito.Quartz.sln
Original file line number Diff line number Diff line change
@@ -1,23 +1,37 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29721.120
# Visual Studio Version 17
VisualStudioVersion = 17.12.35527.113 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7271F8CF-C4EC-47FE-91F3-FF3331482C4F}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
.gitattributes = .gitattributes
.gitignore = .gitignore
Cogito.Quartz.dist.msbuildproj = Cogito.Quartz.dist.msbuildproj
.github\workflows\Cogito.Quartz.yml = .github\workflows\Cogito.Quartz.yml
Directory.Build.props = Directory.Build.props
GitVersion.yml = GitVersion.yml
global.json = global.json
icon.png = icon.png
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Quartz", "Cogito.Quartz\Cogito.Quartz.csproj", "{D19FDDD4-BEBF-4D6D-82A7-01AB87B5E582}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Quartz", "src\Cogito.Quartz\Cogito.Quartz.csproj", "{D19FDDD4-BEBF-4D6D-82A7-01AB87B5E582}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Quartz.Sample1", "Cogito.Quartz.Sample1\Cogito.Quartz.Sample1.csproj", "{A462141A-5ABA-438B-B00B-5A5CA8C0B1CD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Quartz.Sample1", "src\Cogito.Quartz.Sample1\Cogito.Quartz.Sample1.csproj", "{A462141A-5ABA-438B-B00B-5A5CA8C0B1CD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cogito.Quartz.Serilog", "Cogito.Quartz.Serilog\Cogito.Quartz.Serilog.csproj", "{0298DF51-81F8-4676-BBEF-2E88379170B5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cogito.Quartz.Serilog", "src\Cogito.Quartz.Serilog\Cogito.Quartz.Serilog.csproj", "{0298DF51-81F8-4676-BBEF-2E88379170B5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cogito.Quartz.Autofac", "Cogito.Quartz.Autofac\Cogito.Quartz.Autofac.csproj", "{50045FEC-896F-4B85-95C7-97566111B05C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cogito.Quartz.Autofac", "src\Cogito.Quartz.Autofac\Cogito.Quartz.Autofac.csproj", "{50045FEC-896F-4B85-95C7-97566111B05C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cogito.Quartz.Serilog.Autofac", "Cogito.Quartz.Serilog.Autofac\Cogito.Quartz.Serilog.Autofac.csproj", "{EFADDB69-863C-484B-8DC2-24DAB8B1F707}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cogito.Quartz.Serilog.Autofac", "src\Cogito.Quartz.Serilog.Autofac\Cogito.Quartz.Serilog.Autofac.csproj", "{EFADDB69-863C-484B-8DC2-24DAB8B1F707}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47CA832B-6C87-491D-BDDC-221D08C5F392}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dist", "dist", "{8B55C9EF-F027-476A-BA44-5A33EDFB41B2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dist-nuget", "src\dist-nuget\dist-nuget.csproj", "{1CFE8537-6564-46B1-906F-D5F32873AF34}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dist-tests", "src\dist-tests\dist-tests.csproj", "{61DE1824-EFC8-4B55-BAE4-C178D51EF210}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -45,10 +59,27 @@ Global
{EFADDB69-863C-484B-8DC2-24DAB8B1F707}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFADDB69-863C-484B-8DC2-24DAB8B1F707}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFADDB69-863C-484B-8DC2-24DAB8B1F707}.Release|Any CPU.Build.0 = Release|Any CPU
{1CFE8537-6564-46B1-906F-D5F32873AF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CFE8537-6564-46B1-906F-D5F32873AF34}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CFE8537-6564-46B1-906F-D5F32873AF34}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1CFE8537-6564-46B1-906F-D5F32873AF34}.Release|Any CPU.Build.0 = Release|Any CPU
{61DE1824-EFC8-4B55-BAE4-C178D51EF210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61DE1824-EFC8-4B55-BAE4-C178D51EF210}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61DE1824-EFC8-4B55-BAE4-C178D51EF210}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61DE1824-EFC8-4B55-BAE4-C178D51EF210}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D19FDDD4-BEBF-4D6D-82A7-01AB87B5E582} = {47CA832B-6C87-491D-BDDC-221D08C5F392}
{A462141A-5ABA-438B-B00B-5A5CA8C0B1CD} = {47CA832B-6C87-491D-BDDC-221D08C5F392}
{0298DF51-81F8-4676-BBEF-2E88379170B5} = {47CA832B-6C87-491D-BDDC-221D08C5F392}
{50045FEC-896F-4B85-95C7-97566111B05C} = {47CA832B-6C87-491D-BDDC-221D08C5F392}
{EFADDB69-863C-484B-8DC2-24DAB8B1F707} = {47CA832B-6C87-491D-BDDC-221D08C5F392}
{1CFE8537-6564-46B1-906F-D5F32873AF34} = {8B55C9EF-F027-476A-BA44-5A33EDFB41B2}
{61DE1824-EFC8-4B55-BAE4-C178D51EF210} = {8B55C9EF-F027-476A-BA44-5A33EDFB41B2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF4B3820-4206-4316-82A5-DEA5792C6A71}
EndGlobalSection
Expand Down
42 changes: 33 additions & 9 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,15 +1,39 @@
<Project>
<PropertyGroup>
<Authors>Jerome Haltom</Authors>
<Company>Alethic Solutions</Company>
<RepositoryUrl>https://github.com/alethic/Cogito.Quartz</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://github.com/alethic/Cogito.Quartz</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>icon.png</PackageIcon>
<LangVersion>8.0</LangVersion>
<LangVersion Condition=" '$(LangVersion)' == '' ">12.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" />
<Authors Include="Alethic Solutions" />
</ItemGroup>

<PropertyGroup Label="Copyright Info">
<ProductName>Cogito.Quartz</ProductName>
<Authors>@(Authors, ',')</Authors>
<CurrentYear Condition=" '$(CurrentYear)' == '' ">$([System.DateTime]::UtcNow.Year.ToString())</CurrentYear>
<Copyright>Copyright © $(CurrentYear) @(Authors, ', ')</Copyright>
</PropertyGroup>

<PropertyGroup Label="Version Info">
<DefaultMajorVersion>0</DefaultMajorVersion>
<Version Condition=" '$(Version)' == '' ">$(DefaultMajorVersion).0.0-dev</Version>
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(DefaultMajorVersion).0.0.0</AssemblyVersion>
<FileVersion Condition=" '$(FileVersion)' == '' ">$(DefaultMajorVersion).0.0.0</FileVersion>
<InformationalVersion Condition=" '$(InformationalVersion)' == '' ">$(DefaultMajorVersion).0.0.0</InformationalVersion>
</PropertyGroup>

<PropertyGroup Label="Package Info">
<RepositoryUrl Condition=" '$(RepositoryUrl)' == '' ">https://github.com/alethic/Cogito.Quartz.git</RepositoryUrl>
<RepositoryType Condition=" '$(RepositoryType)' == '' ">git</RepositoryType>
<PackageProjectUrl Condition=" '$(PackageProjectUrl)' == '' ">https://github.com/alethic/Cogito.Quartz</PackageProjectUrl>
<PackageVersion Condition=" '$(PackageVersion)' == '' ">$(Version)</PackageVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IKVM.Core.MSBuild" Version="0.1.106">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
16 changes: 15 additions & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
mode: Mainline
mode: ContinuousDeployment
assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber ?? 0}'
major-version-bump-message: '\+semver:\s?(major)'
minor-version-bump-message: '\+semver:\s?(minor)'
patch-version-bump-message: '\+semver:\s?(patch)'
branches:
main:
regex: ^main$
tag: pre
increment: Patch
develop:
regex: ^develop$
tag: dev
increment: Minor

6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ before_build:

build:
verbosity: minimal
project: Cogito.Quartz.sln
project: Cogito.Extensions.Options.sln

artifacts:
- path: pkg\*.nupkg
name: Cogito.Quartz

name: Cogito.Extensions.Options
deploy:
- provider: NuGet
server: https://nuget.pkg.github.com/alethic/index.json
Expand Down
9 changes: 9 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.56"
}
}
Binary file modified icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Provides utilites and extensions for Quartz and Autofac.</Description>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac.Extras.Quartz" Version="9.0.0" />
<PackageReference Include="Cogito.Autofac" Version="5.0.4" />
<PackageReference Include="Cogito.Extensions.Options.Autofac" Version="3.0.3" />
<PackageReference Include="Cogito.Extensions.Options.Configuration.Autofac" Version="3.0.3" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="Autofac.Extras.Quartz" Version="10.0.0" />
<PackageReference Include="Cogito.Autofac" Version="6.0.0" />
<PackageReference Include="Cogito.Extensions.Options.Autofac" Version="4.0.0" />
<PackageReference Include="Cogito.Extensions.Options.Configuration.Autofac" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cogito.Extensions.Configuration.Autofac" Version="3.0.2" />
<PackageReference Include="Cogito.Extensions.Logging.Serilog.Autofac" Version="2.0.20" />
<PackageReference Include="Cogito.Extensions.Options.Autofac" Version="3.0.3" />
<PackageReference Include="Cogito.Extensions.Options.Configuration.Autofac" Version="3.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Cogito.Extensions.Configuration.Autofac" Version="4.0.0" />
<PackageReference Include="Cogito.Extensions.Logging.Serilog.Autofac" Version="3.0.0" />
<PackageReference Include="Cogito.Extensions.Options.Autofac" Version="4.0.0" />
<PackageReference Include="Cogito.Extensions.Options.Configuration.Autofac" Version="4.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Include="Quartz.Spi.CosmosDbJobStore" Version="1.1.0" />
</ItemGroup>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Automatically registers Serilog extensions with Autofac.</Description>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 8a7d2c4

Please sign in to comment.