Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x
- name: Restore dependencies
shell: bash
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v6
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x
- uses: ./.github/workflows/build-action
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v6
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x
- name: Create Version
run: echo "VERSION=$(grep -oPm1 "(?<=<VersionPrefix>)[^<]+" ./Directory.Build.props)" >> $GITHUB_ENV
- name: Print Version
Expand Down
47 changes: 44 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,26 @@ We value any feedback and contributions whether it's a bug report, bugfix, addit
Please read this document before submitting an issue or pull request to ensure that your contributions can
be handled effectively.

Please note that this project is in an early stage and we still have to learn how to run an open source project.
So please be patient with us.
# Building and testing locally

You will need an installed and configured [.NET 10 SDK](https://dotnet.microsoft.com/download).

```bash
# Build the entire solution
dotnet build DvelopSdk.sln

# Run all tests
dotnet test DvelopSdk.sln

# Run the tests of a single module
dotnet test dvelop-sdk-tenant\TenantMiddleware.UnitTest\TenantMiddleware.UnitTest.csproj

# Run a single test by name
dotnet test --filter "FullyQualifiedName~TestNoHeadersButDefaults"

# Build the NuGet packages (alpha) into ./dist
dotnet pack -o dist --version-suffix alpha
```

# How to report a bug

Expand Down Expand Up @@ -131,4 +149,27 @@ Further paragraphs come after blank lines.

- Typically a hyphen or asterisk is used for the bullet, followed by a
single space, with blank lines in between, but conventions vary here
```
```

# Releasing

Releases are published to [nuget.org](https://www.nuget.org/packages/Dvelop.Sdk) by the GitHub Actions workflow
[`publish.yml`](.github/workflows/publish.yml). Only maintainers with access to the `NUGET_PUSH` secret can release.

1. Set `<VersionPrefix>` in `Directory.Build.props` to the new `Major.Minor.Patch` version and merge the change to `main`.

2. Push a tag starting with `v` (e.g. `v0.3.0`) on that commit:

```bash
git tag v0.3.0
git push origin v0.3.0
```

3. The workflow builds and tests the solution, then packs and pushes all packages to nuget.org
as version `<VersionPrefix>.<run number>` (e.g. `0.3.0.57`).

Please note:

* The version is taken from `VersionPrefix`, **not** from the tag name. Keep both in sync.
* Every push to `main` publishes a prerelease (Debug build) as `<VersionPrefix>.<run number>-prerelease`.
* `build.yml` builds and tests every push on every branch.
12 changes: 1 addition & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The project has alpha status. **So for now expect things to change.**

## Usage

Include the d.velop sdk packages as dependencies in your .NET 8 project file (`myproject.csproj`) and restore them with `dotnet restore` via commandline or from within your IDE.
Include the d.velop sdk packages as dependencies in your .NET 10 project file (`myproject.csproj`) and restore them with `dotnet restore` via commandline or from within your IDE.

Example:
```xml
Expand Down Expand Up @@ -88,16 +88,6 @@ Use `ToString("s")` for `Major.Minor.Patch`; the default format additionally app

Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.

## Build local

You can build a version of this library with following command:

```bash
dotnet pack -o dist --version-suffix alpha
```

You will need to have an installed and configured dotnet SDK.

## Versioning

We use [SemVer](http://semver.org/) for versioning. For the versions available, see
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-all/DvelopSdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<PackageId>Dvelop.Sdk</PackageId>

<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Dvelop.Sdk</AssemblyName>
<RootNamespace>Dvelop.Sdk</RootNamespace>
<Copyright>Copyright (c) 2024</Copyright>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>Dvelop.Sdk.ApplicationInformation</AssemblyName>
Expand Down
6 changes: 3 additions & 3 deletions dvelop-sdk-application/ApplicationInformation/SemVer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ namespace Dvelop.Sdk.ApplicationInformation
{
public partial class SemVer
{
public int Major { get; set; } = 0;
public int Minor { get; set; } = 0;
public int Patch { get; set; } = 0;
public int Major { get; set; }
public int Minor { get; set; }
public int Patch { get; set; }
public string Qualifier { get; set; } = string.Empty;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public SemVer Version
get
{
var assemblyInfoVersion = _assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
Match version = Regex.Match(assemblyInfoVersion?.InformationalVersion ?? "", @"(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)[\s-]*(?<qualifier>.*)", RegexOptions.None, TimeSpan.FromMinutes(1));
string qualifier = version.Groups["qualifier"].Value;
var version = Regex.Match(assemblyInfoVersion?.InformationalVersion ?? "", @"(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)[\s-]*(?<qualifier>.*)", RegexOptions.None, TimeSpan.FromMinutes(1));
var qualifier = version.Groups["qualifier"].Value;
return new SemVer
{
Major = int.Parse(version.Groups["major"].Value),
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-base/BaseDtos/BaseDtos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>latestmajor</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-base/BaseInterfaces/BaseInterfaces.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>latestmajor</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>Dvelop.Sdk.CloudCenter.Dto</RootNamespace>
<AssemblyName>Dvelop.Sdk.CloudCenter.Dto</AssemblyName>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-config/ConfigDtos/ConfigDtos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>latestmajor</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-dash/DashboardDtos/DashboardDtos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>latestmajor</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-home/HomeDtos/HomeDtos.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net10.0;netstandard2.0</TargetFrameworks>
<AssemblyName>Dvelop.Sdk.Home.Dto</AssemblyName>
<RootNamespace>Dvelop.Sdk.Home.Dto</RootNamespace>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>Dvelop.Sdk.HttpClientExtensions.UnitTest</AssemblyName>
<RootNamespace>Dvelop.Sdk.HttpClientExtensions.UnitTest</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>true</IsPackable>
<RootNamespace>Dvelop.Sdk.HttpClientExtensions</RootNamespace>
<AssemblyName>Dvelop.Sdk.HttpClientExtensions</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>latestmajor</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>latestmajor</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>Dvelop.Sdk.IdentityProviderMiddleware.UnitTest</AssemblyName>
<RootNamespace>Dvelop.Sdk.IdentityProviderMiddleware.UnitTest</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Dvelop.Sdk.IdentityProvider.Middleware</AssemblyName>
<RootNamespace>Dvelop.Sdk.IdentityProvider.Middleware</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Dvelop.Sdk.Logging.Abstractions</AssemblyName>
<RootNamespace>Dvelop.Sdk.Logging.Abstractions</RootNamespace>
<LangVersion>latestmajor</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Dvelop.Sdk.Logging.OtelJsonConsole</AssemblyName>
<RootNamespace>Dvelop.Sdk.Logging.OtelJsonConsole</RootNamespace>
<LangVersion>latestmajor</LangVersion>
Expand All @@ -17,7 +17,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.12" />
<PackageReference Include="System.Text.Encodings.Web" Version="10.0.12" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>Dvelop.Sdk.SigningAlgorithms.UnitTest</AssemblyName>
<RootNamespace>Dvelop.Sdk.SigningAlgorithms.UnitTest</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<IsPackable>true</IsPackable>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Dvelop.Sdk.SigningAlgorithms</AssemblyName>
<RootNamespace>Dvelop.Sdk.SigningAlgorithms</RootNamespace>
<LangVersion>latestmajor</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>Dvelop.Sdk.TenantMiddleware.UnitTest</AssemblyName>
<RootNamespace>Dvelop.Sdk.TenantMiddleware.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-tenant/TenantMiddleware/TenantMiddleware.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>Dvelop.Sdk.TenantMiddleware</PackageId>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Dvelop.Sdk.TenantMiddleware</AssemblyName>
<RootNamespace>Dvelop.Sdk.TenantMiddleware</RootNamespace>
<Copyright>Copyright (c) 2019</Copyright>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>Dvelop.Sdk.WebApiExtensions.UnitTest</AssemblyName>
<RootNamespace>Dvelop.Sdk.WebApiExtensions.UnitTest</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion dvelop-sdk-webapi/WebApiExtensions/WebApiExtensions.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Dvelop.Sdk.WebApiExtensions</AssemblyName>
<RootNamespace>Dvelop.Sdk.WebApiExtensions</RootNamespace>
<LangVersion>latestmajor</LangVersion>
Expand Down
Loading