diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a9e8f5f..c5fb7b1 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,7 +2,7 @@ name: .NET on: push: - branches: [ main, dev, dev/*, feature/*, fix/*, release/* ] + branches: [ main, dev, feature/*, fix/*, release/* ] pull_request: branches: [ main ] @@ -17,12 +17,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x - include-prerelease: false + dotnet-version: | + 6.0.x + 7.0.x + 8.0.x + + # Create Local NuGet Source - name: Create Local NuGet Directory run: mkdir ~/nuget @@ -30,6 +34,8 @@ jobs: - name: Add Local Nuget Source run: dotnet nuget add source ~/nuget + # DependencyRegistry + - name: Restore DependencyRegistry run: dotnet restore ./src/*/*/DependencyRegistry.csproj @@ -45,6 +51,12 @@ jobs: - name: Test DependencyRegistry.Tests run: dotnet test ./src/*/*/DependencyRegistry.Tests.csproj --no-restore -c Release + # Push + - name: Push Packages if: ${{ github.event_name == 'release' }} - run: dotnet nuget push "../../../nuget/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetSourcePassword }} --skip-duplicate + run: > + dotnet nuget push "../../../nuget/*.nupkg" + -s https://api.nuget.org/v3/index.json + -k ${{ secrets.NuGetSourcePassword }} + --skip-duplicate diff --git a/.gitignore b/.gitignore index 26ab8f4..8a30d25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files *.rsuser @@ -206,9 +206,6 @@ PublishScripts/ *.nuget.props *.nuget.targets -# Nuget personal access tokens and Credentials -# nuget.config - # Microsoft Azure Build Output csx/ *.build.csdef @@ -297,6 +294,17 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -353,6 +361,9 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ +# Visual Studio History (VSHistory) files +.vshistory/ + # BeatPulse healthcheck temp database healthchecksdb @@ -384,5 +395,4 @@ FodyWeavers.xsd *.msp # JetBrains Rider -.idea/ *.sln.iml diff --git a/LICENSE b/LICENSE index 36a3d9b..64bdac4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2022 Andrei Sergeev, Pavel Moskovoy +Copyright (c) 2020-2023 Andrei Sergeev, Pavel Moskovoy Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj b/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj index 40ccce4..4ed6cbf 100644 --- a/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj +++ b/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj @@ -1,14 +1,14 @@ - net6.0 + net6.0;net7.0;net8.0 disable enable true true false Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2022 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack.DependencyRegistry.Tests PrimeFuncPack.DependencyRegistry.Tests @@ -18,15 +18,15 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.RegisterScoped.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.RegisterScoped.cs index 787b4bb..5c1376d 100644 --- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.RegisterScoped.cs +++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar.T/Test.RegisterScoped.cs @@ -12,12 +12,12 @@ partial class DependencyRegistrarTypedTest [Theory] [InlineData(null)] [InlineData(SomeString)] - public void RegisterScoped_ExpectSourceServices(string regService) + public void RegisterScoped_ExpectSourceServices(string? regService) { var mockServices = MockServiceCollection.CreateMock(); var sourceServices = mockServices.Object; - var registrar = DependencyRegistrar.Create(sourceServices, _ => regService); + var registrar = DependencyRegistrar.Create(sourceServices, _ => regService!); var actualServices = registrar.RegisterScoped(); Assert.Same(sourceServices, actualServices); diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs index 914059e..acadb77 100644 --- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs +++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs @@ -12,12 +12,12 @@ partial class DependencyRegistrarTest [Theory] [InlineData(null)] [InlineData(SomeString)] - public void RegisterScoped_ExpectSourceServices(string regService) + public void RegisterScoped_ExpectSourceServices(string? regService) { var mockServices = MockServiceCollection.CreateMock(); var sourceServices = mockServices.Object; - var registrar = DependencyRegistrar.Create(sourceServices, _ => regService); + var registrar = DependencyRegistrar.Create(sourceServices, _ => regService!); var actualServices = registrar.RegisterScoped(); Assert.Same(sourceServices, actualServices); diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj b/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj index 8c0c086..28dcd92 100644 --- a/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj +++ b/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-dependency-registry pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2022 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees built by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism. PrimeFuncPack PrimeFuncPack.DependencyRegistry - 2.0.2 + 2.1.0-rc.1 @@ -32,8 +32,10 @@ - - + + + +