Skip to content

Commit 399cfc4

Browse files
committed
Modernize project
1 parent 1663144 commit 399cfc4

25 files changed

+2670
-95
lines changed

.github/workflows/cd.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: CD
2+
3+
on:
4+
workflow_dispatch:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: false
9+
10+
jobs:
11+
main:
12+
name: CD
13+
uses: zysharp/workflows/.github/workflows/cd.yaml@master
14+
secrets:
15+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

.github/workflows/ci.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [opened, synchronize, reopened]
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
main:
16+
name: CI
17+
uses: zysharp/workflows/.github/workflows/ci.yaml@master
18+
secrets:
19+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/main.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

Assets/logo.png

-9.88 KB
Loading

Directory.Packages.props

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!-- https://devblogs.microsoft.com/nuget/introducing-central-package-management/ -->
2+
<Project>
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
9+
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
10+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
11+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
12+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
13+
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.3.1" />
14+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.109" PrivateAssets="all" />
15+
<PackageVersion Include="Nullable" Version="1.3.1" PrivateAssets="all" />
16+
<PackageVersion Include="xunit" Version="2.4.2" />
17+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
18+
<PackageVersion Include="ZySharp.Validation" Version="1.2.6" />
19+
</ItemGroup>
20+
</Project>

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 Florian Bernd
3+
Copyright (c) 2022 Florian Bernd
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

NuGet.Config

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6+
</packageSources>
7+
<!-- https://devblogs.microsoft.com/nuget/introducing-package-source-mapping/ -->
8+
<packageSourceMapping>
9+
<packageSource key="nuget.org">
10+
<package pattern="*" />
11+
</packageSource>
12+
</packageSourceMapping>
13+
</configuration>

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# ZySharp Progress
22

33
![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)
4-
[![GitHub Actions](https://github.com/flobernd/zysharp-progress/actions/workflows/main.yml/badge.svg)](https://github.com/flobernd/zysharp-progress/actions)
4+
[![Build](https://github.com/zysharp/progress/actions/workflows/ci.yaml/badge.svg)](https://github.com/zysharp/progress/actions/workflows/ci.yaml)
5+
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=zysharp_progress&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=zysharp_progress)
6+
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=zysharp_progress&metric=coverage)](https://sonarcloud.io/summary/new_code?id=zysharp_progress)
57
[![NuGet](https://img.shields.io/nuget/v/ZySharp.Progress.svg)](https://nuget.org/packages/ZySharp.Progress)
68
[![Nuget](https://img.shields.io/nuget/dt/ZySharp.Progress.svg)](https://nuget.org/packages/ZySharp.Progress)
79

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<ImplicitUsings>disable</ImplicitUsings>
8+
9+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
10+
<RestoreLockedMode Condition="'$(ContinuousIntegrationBuild)' == 'true'" />
11+
412
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
13+
<IsPublishable>false</IsPublishable>
614
<IsPackable>false</IsPackable>
7-
<LangVersion>latest</LangVersion>
8-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
15+
916
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10-
<NeutralLanguage>en</NeutralLanguage>
1117
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1219
</PropertyGroup>
1320

21+
<ItemGroup>
22+
<None Include="packages.lock.json" Visible="false" />
23+
</ItemGroup>
24+
1425
<ItemGroup>
1526
<ProjectReference Include="..\ZySharp.Progress\ZySharp.Progress.csproj" />
1627
</ItemGroup>
1728

18-
</Project>
29+
</Project>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": 2,
3+
"dependencies": {
4+
"net6.0": {
5+
"JetBrains.Annotations": {
6+
"type": "Transitive",
7+
"resolved": "2022.1.0",
8+
"contentHash": "ASfpoFJxiRsC9Xc4TWuPM41Zb/gl64xwfMOhnOZ3RnVWGYIZchjpWQV5zshJgoc/ZxVtgjaF7b577lURj7E6ig=="
9+
},
10+
"zysharp.progress": {
11+
"type": "Project",
12+
"dependencies": {
13+
"ZySharp.Validation": "[1.2.6, )"
14+
}
15+
},
16+
"ZySharp.Validation": {
17+
"type": "CentralTransitive",
18+
"requested": "[1.2.6, )",
19+
"resolved": "1.2.6",
20+
"contentHash": "nz8AfHi7E59k9ArgapYXG/UHQJNCGHW3LVcj/spHlKZErjMMvjDuzOoKiToqIZk2UtRnoYPR2XE4Nh9XlnM7KA==",
21+
"dependencies": {
22+
"JetBrains.Annotations": "2022.1.0"
23+
}
24+
}
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)