Skip to content

Commit 7a9a2d7

Browse files
author
Vincent Wilms
committed
Merge commit 'f7d65edec47d83fa9067eab3c58c012559b4d919'
2 parents ddc5150 + f7d65ed commit 7a9a2d7

File tree

88 files changed

+3047
-1032
lines changed

Some content is hidden

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

88 files changed

+3047
-1032
lines changed

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*
4343
* 3. Replace <container host> below with the actual host
4444
*
45-
* 4. Test the connection: ssh root@<container host> -p 2222
45+
* 4. Test the connection: ssh app@<container host> -p 2222
4646
*/
4747
"name": "Attach to Nexus (Docker)",
4848
"type": "coreclr",

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"python.testing.unittestEnabled": false,
66
"python.testing.pytestEnabled": true,
77
"editor.formatOnSave": true,
8+
"[razor]": {
9+
"editor.formatOnSave": false
10+
},
811
"[aspnetcorerazor]": {
912
"editor.formatOnSave": false
1013
}

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## v2.0.0-beta.51 - 2025-03-04
2+
- UI improvements
3+
14
## v2.0.0-beta.50 - 2025-02-04
25
- Add missing self paramter in IUpgradableDataSource
36

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</RestoreAdditionalProjectSources>
1212
<UseArtifactsOutput>true</UseArtifactsOutput>
1313
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
14+
<NoWarn>NU1507</NoWarn>
1415
</PropertyGroup>
1516

1617
</Project>

‎Directory.Packages.props‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Apollo3zehn.OpenApiClientGenerator" Version="1.0.0-beta.19" />
7+
<PackageVersion Include="Apollo3zehn.PackageManagement" Version="1.0.0-beta.9" />
8+
<PackageVersion Include="BlazorJsonForm" Version="1.0.0-beta.4" />
9+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.3.0" />
10+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.2" />
11+
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.2" />
12+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
13+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
14+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
16+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
17+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
18+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2" />
20+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.2" />
21+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
22+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
23+
<PackageVersion Include="Moq" Version="4.20.72" />
24+
<PackageVersion Include="MudBlazor" Version="8.3.0" />
25+
<PackageVersion Include="Namotion.Reflection" Version="3.2.4" />
26+
<PackageVersion Include="NJsonSchema" Version="11.1.0" />
27+
<PackageVersion Include="NSwag.AspNetCore" Version="14.2.0" />
28+
<PackageVersion Include="OpenIddict" Version="6.1.0" />
29+
<PackageVersion Include="OpenIddict.AspNetCore" Version="6.1.0" />
30+
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="6.1.0" />
31+
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
32+
<PackageVersion Include="Serilog.Enrichers.ClientInfo" Version="2.1.2" />
33+
<PackageVersion Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" />
34+
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
35+
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
36+
<PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
37+
<PackageVersion Include="Serilog.Sinks.Seq" Version="9.0.0" />
38+
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
39+
<PackageVersion Include="SkiaSharp" Version="3.118.0-preview.2.3" />
40+
<PackageVersion Include="SkiaSharp.Views.Blazor" Version="3.118.0-preview.2.3" />
41+
<PackageVersion Include="xunit" Version="2.9.3" />
42+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
43+
</ItemGroup>
44+
</Project>

‎Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# use "dotnet/sdk" to get the compiler for extensions
22
FROM mcr.microsoft.com/dotnet/sdk:9.0
3+
4+
ENV NUGET_XMLDOC_MODE=none
5+
36
WORKDIR /app
47
COPY app .
58

‎Nexus.sln‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus.Tests", "tests\Nexus.
2828
EndProject
2929
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus", "src\Nexus\Nexus.csproj", "{6DDD84D7-8FCF-4E49-A5DB-EAF95B0E040F}"
3030
EndProject
31-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet", "src\clients\dotnet\client.csproj", "{FD8E5EA0-674B-492D-8D1E-1D0B8374B71D}"
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "src\clients\dotnet\client.csproj", "{FD8E5EA0-674B-492D-8D1E-1D0B8374B71D}"
3232
EndProject
3333
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus.UI", "src\Nexus.UI\Nexus.UI.csproj", "{121840FD-19CC-4C48-86DE-AF0B6C70A089}"
3434
EndProject
35-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-tests", "tests\clients\dotnet-tests\client-tests.csproj", "{AFCE2F13-F54D-439A-B796-DC3F32E1A12B}"
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client-tests", "tests\clients\dotnet-tests\client-tests.csproj", "{AFCE2F13-F54D-439A-B796-DC3F32E1A12B}"
3636
EndProject
3737
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus.ClientGenerator", "src\Nexus.ClientGenerator\Nexus.ClientGenerator.csproj", "{E12BE061-CCEF-48AF-8442-BC23A1C4D3F2}"
3838
EndProject
@@ -50,6 +50,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-extensibility-tests"
5050
EndProject
5151
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-extensibility-analyzers", "src\extensibility\dotnet-extensibility-analyzers\dotnet-extensibility-analyzers.csproj", "{FCA09ED9-A1B3-4BA9-AD9B-7381F999A83F}"
5252
EndProject
53+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nexus.UI.Tests", "tests\Nexus.UI.Tests\Nexus.UI.Tests.csproj", "{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}"
54+
EndProject
5355
Global
5456
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5557
Debug|Any CPU = Debug|Any CPU
@@ -168,6 +170,18 @@ Global
168170
{FCA09ED9-A1B3-4BA9-AD9B-7381F999A83F}.Release|x64.Build.0 = Release|Any CPU
169171
{FCA09ED9-A1B3-4BA9-AD9B-7381F999A83F}.Release|x86.ActiveCfg = Release|Any CPU
170172
{FCA09ED9-A1B3-4BA9-AD9B-7381F999A83F}.Release|x86.Build.0 = Release|Any CPU
173+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Debug|Any CPU.Build.0 = Debug|Any CPU
175+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Debug|x64.ActiveCfg = Debug|Any CPU
176+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Debug|x64.Build.0 = Debug|Any CPU
177+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Debug|x86.ActiveCfg = Debug|Any CPU
178+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Debug|x86.Build.0 = Debug|Any CPU
179+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Release|Any CPU.ActiveCfg = Release|Any CPU
180+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Release|Any CPU.Build.0 = Release|Any CPU
181+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Release|x64.ActiveCfg = Release|Any CPU
182+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Release|x64.Build.0 = Release|Any CPU
183+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Release|x86.ActiveCfg = Release|Any CPU
184+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00}.Release|x86.Build.0 = Release|Any CPU
171185
EndGlobalSection
172186
GlobalSection(SolutionProperties) = preSolution
173187
HideSolutionNode = FALSE
@@ -186,6 +200,7 @@ Global
186200
{6B7A5EC5-213A-44CC-B279-3E0C33082FC8} = {3DBD52E4-26F8-413F-A954-2BE86E572F3E}
187201
{25A65150-BC9F-4F92-9078-18ABA7444C21} = {6B7A5EC5-213A-44CC-B279-3E0C33082FC8}
188202
{FCA09ED9-A1B3-4BA9-AD9B-7381F999A83F} = {1C0BDA12-25B4-42F8-87B5-C3B3BEF417B2}
203+
{D25220A5-8A3A-4CA8-A9D1-2198624A1B00} = {3DBD52E4-26F8-413F-A954-2BE86E572F3E}
189204
EndGlobalSection
190205
GlobalSection(ExtensibilityGlobals) = postSolution
191206
SolutionGuid = {F998BD6D-3E2B-4AA0-A7A4-FD84100C45A4}

‎README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ The following Jupyter Notebooks export the data into a `.csv` file, downloads it
6969

7070
- [This script](https://github.com/nexus-main/nexus/blob/dev/samples/matlab/sample_export.m) exports the data into a `.csv` file, downloads it as `.zip` file including the license (if available) and extracts the data to your local disk
7171

72+
# Develop
73+
74+
```bash
75+
git clone https://github.com/nexus-main/nexus
76+
cd nexus
77+
(cd src/Nexus && libman restore)
78+
dotnet workload restore
79+
dotnet run --project src/Nexus/Nexus.csproj
80+
```
81+
82+
In a browser, navigate to http://localhost:5000.
83+
7284
___________
7385

7486
> [!Note]

‎openapi.json‎

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"x-generator": "NSwag v14.1.0.0 (NJsonSchema v11.0.2.0 (Newtonsoft.Json v13.0.0.0))",
2+
"x-generator": "NSwag v14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))",
33
"openapi": "3.0.0",
44
"info": {
55
"title": "Nexus REST API",
@@ -859,6 +859,51 @@
859859
}
860860
}
861861
}
862+
},
863+
"put": {
864+
"tags": [
865+
"PackageReferences"
866+
],
867+
"summary": "Updates a package reference.",
868+
"operationId": "PackageReferences_Update",
869+
"parameters": [
870+
{
871+
"name": "id",
872+
"in": "query",
873+
"description": "The identifier of the package reference to update.",
874+
"schema": {
875+
"type": "string",
876+
"format": "guid"
877+
},
878+
"x-position": 1
879+
}
880+
],
881+
"requestBody": {
882+
"x-name": "packageReference",
883+
"description": "The new package reference.",
884+
"content": {
885+
"application/json": {
886+
"schema": {
887+
"$ref": "#/components/schemas/PackageReference"
888+
}
889+
}
890+
},
891+
"required": true,
892+
"x-position": 2
893+
},
894+
"responses": {
895+
"200": {
896+
"description": "",
897+
"content": {
898+
"application/octet-stream": {
899+
"schema": {
900+
"type": "string",
901+
"format": "binary"
902+
}
903+
}
904+
}
905+
}
906+
}
862907
}
863908
},
864909
"/api/v1/packagereferences/{id}": {
@@ -1298,6 +1343,28 @@
12981343
}
12991344
}
13001345
},
1346+
"/api/v1/users/reauthenticate": {
1347+
"get": {
1348+
"tags": [
1349+
"Users"
1350+
],
1351+
"summary": "Allows the user to reauthenticate in case of modified claims.",
1352+
"operationId": "Users_ReAuthenticate",
1353+
"responses": {
1354+
"200": {
1355+
"description": "",
1356+
"content": {
1357+
"application/octet-stream": {
1358+
"schema": {
1359+
"type": "string",
1360+
"format": "binary"
1361+
}
1362+
}
1363+
}
1364+
}
1365+
}
1366+
}
1367+
},
13011368
"/api/v1/users/tokens/create": {
13021369
"post": {
13031370
"tags": [
@@ -2104,13 +2171,16 @@
21042171
},
21052172
"PackageReference": {
21062173
"type": "object",
2174+
"description": "A package reference.",
21072175
"additionalProperties": false,
21082176
"properties": {
21092177
"provider": {
2110-
"type": "string"
2178+
"type": "string",
2179+
"description": "The provider which loads the package."
21112180
},
21122181
"configuration": {
21132182
"type": "object",
2183+
"description": "The configuration of the package reference.",
21142184
"additionalProperties": {
21152185
"type": "string"
21162186
}
@@ -2148,7 +2218,6 @@
21482218
"additionalInformation": {
21492219
"type": "object",
21502220
"description": "Additional information about the extension.",
2151-
"nullable": true,
21522221
"additionalProperties": {}
21532222
}
21542223
}

‎src/Nexus.ClientGenerator/Nexus.ClientGenerator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Apollo3zehn.OpenApiClientGenerator" Version="1.0.0-beta.19" />
14+
<PackageReference Include="Apollo3zehn.OpenApiClientGenerator" />
1515
</ItemGroup>
1616

1717
</Project>

0 commit comments

Comments
 (0)