Skip to content

Commit ac15d4d

Browse files
authored
Merge pull request #3 from tngraf/master
local to master
2 parents 856ac8b + 591c91d commit ac15d4d

Some content is hidden

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

55 files changed

+5276
-916
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[*.cs]
2+
3+
# SA1124: Do not use regions
4+
dotnet_diagnostic.SA1124.severity = none

BuildNuGetPackages.ps1

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

ChangeLog.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# ChangeLog - FOSSology.REST.dotnet
2+
3+
## 1.1.0 (2020-06-25)
4+
* supports FOSSology REST API v1.0.16 (FOSSology 3.8.0 built @ 2020/06/19).
5+
* new method GetToken().
6+
* new method UploadPackageFromUrl().
7+
* new method UploadPackageFromVcs().
8+
* new method UploadPackageFromServer() (not tested).
9+
* new method GetUploadSummary()
10+
* new method GetUploadLicenses()
11+
* new class UploadSummary.
12+
* new class UploadLicenses.
13+
* new class VcsUpload.
14+
* new class ServerUpload.
15+
* new class UrlUpload.
16+
* class Upload has new property FileSha1
17+
* Integration test improved.
18+
* support of .Net Core (target is netstandard2.0).
19+
20+
21+
## 1.0.0 (2020-11-24)
22+
* first version released.
23+
* supports FOSSology REST API v1.0.3 (FOSSology 3.7.0).

Directory.Build.props

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Version>1.1</Version>
4+
<FileVersion>1.1.0.0</FileVersion>
5+
<Product>Fossology.Rest.Dotnet</Product>
6+
<Company></Company>
7+
<Copyright>Copyright © 2019-2020 T. Graf</Copyright>
8+
<Authors>T. Graf</Authors>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<RepositoryType>git</RepositoryType>
11+
<PackageProjectUrl>https://github.com/fossology/FOSSology.REST.dotnet</PackageProjectUrl>
12+
<RepositoryUrl>https://github.com/fossology/FOSSology.REST.dotnet</RepositoryUrl>
13+
<PackageTags>FOSSology REST API</PackageTags>
14+
</PropertyGroup>
15+
</Project>
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// ---------------------------------------------------------------------------
2+
// <copyright file="Analysis.cs" company="Tethys">
3+
// Copyright (C) 2020 T. Graf
4+
// </copyright>
5+
//
6+
// Licensed under the MIT License.
7+
// SPDX-License-Identifier: MIT
8+
//
9+
// Unless required by applicable law or agreed to in writing,
10+
// software distributed under the License is distributed on an
11+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
12+
// either express or implied.
13+
// ---------------------------------------------------------------------------
14+
15+
namespace Fossology.Rest.Dotnet.Model
16+
{
17+
using Newtonsoft.Json;
18+
19+
/// <summary>
20+
/// Trigger analysis information.
21+
/// </summary>
22+
public class Analysis
23+
{
24+
/// <summary>
25+
/// Gets or sets a value indicating whether to use the bucket.
26+
/// </summary>
27+
[JsonProperty("bucket")]
28+
public bool Bucket { get; set; }
29+
30+
/// <summary>
31+
/// Gets or sets a value indicating whether to use copyright email author.
32+
/// </summary>
33+
[JsonProperty("copyright_email_author")]
34+
public bool CopyrightEmailAuthor { get; set; }
35+
36+
/// <summary>
37+
/// Gets or sets a value indicating whether to use the ecc scanner.
38+
/// </summary>
39+
[JsonProperty("ecc")]
40+
public bool Ecc { get; set; }
41+
42+
/// <summary>
43+
/// Gets or sets a value indicating whether to use the keyword scanner.
44+
/// </summary>
45+
[JsonProperty("keyword")]
46+
public bool Keyword { get; set; }
47+
48+
/// <summary>
49+
/// Gets or sets a value indicating whether to use the mime scanner.
50+
/// </summary>
51+
[JsonProperty("mime")]
52+
public bool Mime { get; set; }
53+
54+
/// <summary>
55+
/// Gets or sets a value indicating whether to use the monk scanner.
56+
/// </summary>
57+
[JsonProperty("monk")]
58+
public bool Monk { get; set; }
59+
60+
/// <summary>
61+
/// Gets or sets a value indicating whether to use the nomos scanner.
62+
/// </summary>
63+
[JsonProperty("nomos")]
64+
public bool Nomos { get; set; }
65+
66+
/// <summary>
67+
/// Gets or sets a value indicating whether to use the <c>ojo</c> scanner.
68+
/// </summary>
69+
[JsonProperty("ojo")]
70+
public bool Ojo { get; set; }
71+
72+
/// <summary>
73+
/// Gets or sets a value indicating whether to use the package scanner.
74+
/// </summary>
75+
[JsonProperty("package")]
76+
public bool Package { get; set; }
77+
} // Analysis
78+
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// ---------------------------------------------------------------------------
2+
// <copyright file="DeciderInfo.cs" company="Tethys">
3+
// Copyright (C) 2019-2020 T. Graf
4+
// </copyright>
5+
//
6+
// Licensed under the MIT License.
7+
// SPDX-License-Identifier: MIT
8+
//
9+
// Unless required by applicable law or agreed to in writing,
10+
// software distributed under the License is distributed on an
11+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
12+
// either express or implied.
13+
// ---------------------------------------------------------------------------
14+
15+
namespace Fossology.Rest.Dotnet.Model
16+
{
17+
using Newtonsoft.Json;
18+
19+
/// <summary>
20+
/// Trigger decider information.
21+
/// </summary>
22+
public class DeciderInfo
23+
{
24+
/// <summary>
25+
/// Gets or sets a value indicating whether to use the nomos/monk decisions.
26+
/// </summary>
27+
[JsonProperty("nomos_monk")]
28+
public bool NomosMonk { get; set; }
29+
30+
/// <summary>
31+
/// Gets or sets a value indicating whether to reuse bulk result.
32+
/// </summary>
33+
[JsonProperty("bulk_reused")]
34+
public bool BulkReused { get; set; }
35+
36+
/// <summary>
37+
/// Gets or sets a value indicating whether to use the new scanner.
38+
/// </summary>
39+
[JsonProperty("new_scanner")]
40+
public bool NewScanner { get; set; }
41+
42+
/// <summary>
43+
/// Gets or sets a value indicating whether to use the <c>ojo</c> decider.
44+
/// </summary>
45+
[JsonProperty("ojo_decider")]
46+
public bool OjoDecider { get; set; }
47+
} // DeciderInfo
48+
}

Fossology.Rest.Dotnet.Model/Folder.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
#region Header
2-
// ---------------------------------------------------------------------------
1+
// ---------------------------------------------------------------------------
32
// <copyright file="Folder.cs" company="Tethys">
43
// Copyright (C) 2019 T. Graf
54
// </copyright>
65
//
76
// Licensed under the MIT License.
87
// SPDX-License-Identifier: MIT
98
//
10-
// Unless required by applicable law or agreed to in writing,
9+
// Unless required by applicable law or agreed to in writing,
1110
// software distributed under the License is distributed on an
1211
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
1312
// either express or implied.
1413
// ---------------------------------------------------------------------------
15-
#endregion
1614

1715
namespace Fossology.Rest.Dotnet.Model
1816
{
@@ -31,7 +29,7 @@ public class Folder
3129
"description": "string",
3230
"parent": 0
3331
}
34-
]
32+
]
3533
*/
3634

3735
/// <summary>

Fossology.Rest.Dotnet.Model/Fossology.Rest.Dotnet.Model.nuspec

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

0 commit comments

Comments
 (0)