Skip to content

Commit

Permalink
Merge pull request #2 from luboshl/feature/non-nullable-reference-types
Browse files Browse the repository at this point in the history
Non-nullable reference types
  • Loading branch information
luboshl authored Jul 16, 2024
2 parents 08a416a + 74d4cdf commit 2b2d663
Show file tree
Hide file tree
Showing 22 changed files with 432 additions and 183 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Build

on:
workflow_call:
inputs:
packShipCandidate:
required: false
type: boolean
default: false
# inputs:
# packShipCandidate:
# required: false
# type: boolean
# default: false

jobs:
build:
Expand Down Expand Up @@ -38,25 +38,25 @@ jobs:
- name: Test
run: dotnet test --configuration Release --no-restore --no-build

- name: Publish samples
run: |
for projectPath in ./samples/**/*.csproj ; do
projectFileName=${projectPath##*/}
projectName=${projectFileName%.*}
dotnet publish "$projectPath" --output "./artifacts/$projectName" --configuration Release --no-build --verbosity normal
done;
./artifacts/Samples.Console/Samples.Console "MiniValidation"
# - name: Publish samples
# run: |
# for projectPath in ./samples/**/*.csproj ; do
# projectFileName=${projectPath##*/}
# projectName=${projectFileName%.*}
# dotnet publish "$projectPath" --output "./artifacts/$projectName" --configuration Release --no-build --verbosity normal
# done;
# ./artifacts/Samples.Console/Samples.Console "MiniValidationPlus"

- name: Pack (ci)
run: dotnet pack --configuration Release --output ./artifacts/ci --verbosity normal -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
# - name: Pack (ci)
# run: dotnet pack --configuration Release --output ./artifacts/ci --verbosity normal -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true

- name: Pack (ship candidate)
if: ${{ inputs.packShipCandidate }}
# if: ${{ inputs.packShipCandidate }}
run: dotnet pack --configuration Release --output ./artifacts/ship --verbosity normal -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true -p:IsShipCandidate=true

- name: Upload artifacts (packages)
uses: actions/upload-artifact@v4
with:
name: nupkg
path: ./artifacts/**/*.nupkg
path: ./artifacts/ship/*.nupkg
retention-days: 5
29 changes: 0 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,7 @@ on:

workflow_dispatch:

env:
PACKAGE_ID: MiniValidation

jobs:
build:
name: Build & Test
uses: ./.github/workflows/_build.yml
with:
packShipCandidate: true

deploy:
name: Deploy
needs: build
runs-on: ubuntu-latest

steps:
- name: Download artifacts
uses: actions/download-artifact@v4

- name: Setup .NET SDK
uses: actions/setup-dotnet@v4

- name: Add GitHub Package Repository source
run: dotnet nuget add source --username ${{ secrets.GPR_USERNAME }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name GPR ${{ secrets.GPR_URI }}

- name: Push to GitHub Packages
run: dotnet nuget push **/ci/*.nupkg -s "GPR" --skip-duplicate

- name: Delete old packages
uses: smartsquaregmbh/[email protected]
with:
keep: 5
names: ${{ env.PACKAGE_ID }}
19 changes: 19 additions & 0 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: NuGet

on:
workflow_dispatch:

jobs:
push-package:
name: Publish NuGet Package
runs-on: ubuntu-latest

steps:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4

- name: Add nuget.org source
run: dotnet nuget add source --name NUGET https://www.nuget.org

- name: Push to nuget.org
run: dotnet nuget push **/*.nupkg -s "NUGET" -k ${{ secrets.NUGET_APIKEY }}
79 changes: 0 additions & 79 deletions .github/workflows/release.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .idea/.idea.MiniValidationPlus/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.MiniValidationPlus/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.MiniValidationPlus/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
The MIT License (MIT)

Copyright (c) 2021 Damian Edwards
Copyright (c) 2024 Lubos Hladik (non-nullable and other enhancements)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
File renamed without changes.
10 changes: 10 additions & 0 deletions MiniValidationPlus.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EXTRA_SPACES/@EntryValue">LEAVE_ALL</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">135</s:Int64>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
Loading

0 comments on commit 2b2d663

Please sign in to comment.