Merge remote-tracking branch 'origin/main'

# Conflicts:
#	Coroutine/Coroutine.csproj
This commit is contained in:
Ell 2021-11-07 15:32:43 +01:00
commit a73c3f7843
3 changed files with 3 additions and 3 deletions

View file

@ -13,7 +13,7 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile> <PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>Logo.png</PackageIcon> <PackageIcon>Logo.png</PackageIcon>
<VersionPrefix>2.1.0</VersionPrefix> <VersionPrefix>2.1.1</VersionPrefix>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
Jenkinsfile vendored
View file

@ -16,7 +16,7 @@ pipeline {
stage('Publish') { stage('Publish') {
when { when {
branch 'master' branch 'main'
} }
steps { steps {
sh 'dotnet nuget push -s http://localhost:5000/v3/index.json **/*.nupkg -k $BAGET -n true' sh 'dotnet nuget push -s http://localhost:5000/v3/index.json **/*.nupkg -k $BAGET -n true'

View file

@ -68,4 +68,4 @@ CoroutineHandler.RaiseEvent(TestEvent);
``` ```
## Additional Examples ## Additional Examples
For additional examples, take a look at the [Example class](https://github.com/Ellpeck/Coroutine/blob/master/Example/Example.cs). For additional examples, take a look at the [Example class](https://github.com/Ellpeck/Coroutine/blob/main/Example/Example.cs).