Skip to content

Commit 0e5dcdd

Browse files
authored
Swan v3.0 (#239)
* Feature: new IPropertyProxy from Mario * Remove IComponentCollection * Remove Services and Properties * Fix Unit tests * Last review today * Remove IDataDictionary * Fix namespace * Fix build * Fix stream test * Update README.md * Remove useless directives * Fix build for NET461 * Some null checks * Working on CI * Update Swan.Lite.csproj * Update Swan.csproj
1 parent a85838d commit 0e5dcdd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+416
-3904
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: .NET Core CI
1+
name: .NET Core CI
22

33
on: [push]
44

@@ -8,7 +8,7 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
os: [windows-latest]
11+
os: [windows-latest, ubuntu-latest]
1212

1313
steps:
1414
- uses: actions/checkout@v1

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Table of contents
4444
* [Running Unit Tests](#running-unit-tests)
4545

4646
## 📚 Libraries
47-
We offer the Swan library in two flavors since version 0.24. Swan Lite provides basic classes and extension methods and Swan Standard (we call it Fat Swan) provides everything in Swan Lite plus Network, WinServices, DI and more. See the following table to understand the components available to these flavors of Swan.
47+
We offer the Swan library in two flavors since version 0.24. Swan Lite provides basic classes and extension methods and Swan Standard (we call it Fat Swan) provides everything in Swan Lite plus Network, DI and more. See the following table to understand the components available to these flavors of Swan.
4848

4949
| Component | Swan Lite | Swan Standard |
5050
|---|---|---|

StyleCop.Analyzers.ruleset

+3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,12 @@
7474
<Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
7575
<Rule Id="CA1710" Action="None" />
7676
<Rule Id="CA1720" Action="Hidden" />
77+
<Rule Id="CA1819" Action="None" />
7778
</Rules>
7879
<Rules AnalyzerId="Microsoft.NetCore.Analyzers" RuleNamespace="Microsoft.NetCore.Analyzers">
7980
<Rule Id="CA1308" Action="Hidden" />
81+
<Rule Id="CA5350" Action="None" />
82+
<Rule Id="CA5351" Action="None" />
8083
</Rules>
8184
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
8285
<Rule Id="SA1001" Action="None" />

Swan.sln

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
ProjectSection(SolutionItems) = preProject
1010
.editorconfig = .editorconfig
1111
appveyor.yml = appveyor.yml
12+
.github\workflows\build.yml = .github\workflows\build.yml
1213
docfx.json = docfx.json
1314
LICENSE = LICENSE
1415
mail.js = mail.js

appveyor.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
version: '1.00.{build}'
2-
image:
3-
- Visual Studio 2019
4-
- Ubuntu
5-
stack: node 10
2+
image: Visual Studio 2019
63
notifications:
74
- provider: Slack
85
auth_token:
@@ -18,30 +15,25 @@ environment:
1815
secure: HzWdswNyfQbQ0vLk9IQyO+Ei9mxoPYp9rvv6HPhtC9J/Fm7EHRzyV953pbPRXI9I
1916
before_build:
2017
- ps: |
21-
if(-Not $env:APPVEYOR_PULL_REQUEST_TITLE -And $isWindows)
18+
if(-Not $env:APPVEYOR_PULL_REQUEST_TITLE)
2219
{
2320
git checkout $env:APPVEYOR_REPO_BRANCH -q
2421
cinst docfx -y --no-progress
2522
}
26-
- ps: |
27-
if($isWindows)
28-
{
29-
Install-Product node 10
30-
}
23+
- ps: Install-Product node 10
3124
- npm ci
3225
- ps: $SMTP = Start-Process node mail.js -PassThru
3326
- ps: $WEB = Start-Process node web.js -PassThru
3427
- ps: $TCP = Start-Process node tcp.js -PassThru
3528
- ps: $NTP = Start-Process node ntp.js -PassThru
3629
- dotnet restore -v Minimal
37-
- cmd: mkdir tools
3830
build_script:
3931
- msbuild /p:Configuration=Release /verbosity:quiet
4032
test_script:
4133
- dotnet test test/Swan.Test/Swan.Test.csproj -c Release
4234
after_build:
4335
- ps: |
44-
if(-Not $env:APPVEYOR_PULL_REQUEST_TITLE -And $isWindows -And $env:APPVEYOR_REPO_BRANCH -eq "master")
36+
if(-Not $env:APPVEYOR_PULL_REQUEST_TITLE -And $env:APPVEYOR_REPO_BRANCH -eq "master")
4537
{
4638
git config --global credential.helper store
4739
Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):[email protected]`n"

src/Swan.Lite/Collections/CollectionCacheRepository.cs

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public class CollectionCacheRepository<TValue>
3737
/// or
3838
/// factory.
3939
/// </exception>
40-
/// <exception cref="System.ArgumentNullException">type.</exception>
4140
public IEnumerable<TValue> Retrieve(Type key, Func<Type, IEnumerable<TValue>> factory)
4241
{
4342
if (key == null)

src/Swan.Lite/Collections/ComponentCollection`1.cs

-77
This file was deleted.

0 commit comments

Comments
 (0)