Skip to content

Commit 952ac8f

Browse files
neildsouthneildsouth
committed
tidy up
Signed-off-by: Neil South <[email protected]>
1 parent 1a5a507 commit 952ac8f

File tree

5 files changed

+61
-68
lines changed

5 files changed

+61
-68
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ jobs:
4545
- uses: actions/setup-dotnet@v3
4646
with:
4747
dotnet-version: "6.0.x"
48-
- name: Enable Homebrew
49-
run: echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
5048

5149
- name: Enable Homebrew
5250
run: echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH

‎src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,36 @@
1616

1717
<Project Sdk="Microsoft.NET.Sdk">
1818

19-
<PropertyGroup>
20-
<TargetFramework>net6.0</TargetFramework>
21-
<LangVersion>latest</LangVersion>
22-
<RootNamespace>Monai.Deploy.Storage.AWSS3</RootNamespace>
23-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
24-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
25-
</PropertyGroup>
19+
<PropertyGroup>
20+
<TargetFramework>net6.0</TargetFramework>
21+
<LangVersion>latest</LangVersion>
22+
<RootNamespace>Monai.Deploy.Storage.AWSS3</RootNamespace>
23+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
24+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
25+
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
29-
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
30-
</ItemGroup>
27+
<ItemGroup>
28+
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
29+
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
30+
</ItemGroup>
3131

32-
<PropertyGroup>
33-
<PackageId>Monai.Deploy.Storage.AWSS3</PackageId>
34-
<Version>0.1.0</Version>
35-
<Authors>MONAI Consortium</Authors>
36-
<Company>MONAI Consortium</Company>
37-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
38-
<Description>Amazon S3 plug-in for MONAI Deploy Storage Service.</Description>
39-
<Copyright>MONAI Consortium</Copyright>
40-
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
41-
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
42-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
43-
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
44-
</PropertyGroup>
32+
<PropertyGroup>
33+
<PackageId>Monai.Deploy.Storage.AWSS3</PackageId>
34+
<Version>0.1.0</Version>
35+
<Authors>MONAI Consortium</Authors>
36+
<Company>MONAI Consortium</Company>
37+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
38+
<Description>Amazon S3 plug-in for MONAI Deploy Storage Service.</Description>
39+
<Copyright>MONAI Consortium</Copyright>
40+
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
41+
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
42+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
43+
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
44+
</PropertyGroup>
4545

46-
<ItemGroup>
47-
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
48-
</ItemGroup>
46+
<ItemGroup>
47+
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
48+
</ItemGroup>
4949

5050
<ItemGroup>
5151
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
@@ -56,9 +56,9 @@
5656
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
5757
</ItemGroup>
5858

59-
<ItemGroup>
60-
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
61-
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
62-
</ItemGroup>
59+
<ItemGroup>
60+
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
61+
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
62+
</ItemGroup>
6363

6464
</Project>

‎src/Plugins/MinIO/MinIoAdminHealthCheck.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ public MinIoAdminHealthCheck(IStorageAdminService storageAdminService, ILogger<M
3838
{
3939
var hasConnection = await _storageAdminService.HasConnectionAsync().ConfigureAwait(false);
4040
if (hasConnection is false)
41-
{ await _storageAdminService.SetConnectionAsync().ConfigureAwait(false); }
41+
{
42+
await _storageAdminService.SetConnectionAsync().ConfigureAwait(false);
43+
}
4244

4345
var connectionResult = await _storageAdminService.GetConnectionAsync().ConfigureAwait(false);
4446
var joinedResult = string.Join("\n", connectionResult);

‎src/Plugins/MinIO/Monai.Deploy.Storage.MinIO.csproj‎

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
<Project Sdk="Microsoft.NET.Sdk">
1818

19-
<PropertyGroup>
20-
<TargetFramework>net6.0</TargetFramework>
21-
<LangVersion>latest</LangVersion>
22-
<ImplicitUsings>enable</ImplicitUsings>
23-
<RootNamespace>Monai.Deploy.Storage.MinIO</RootNamespace>
24-
<Nullable>enable</Nullable>
25-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
26-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
27-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28-
</PropertyGroup>
19+
<PropertyGroup>
20+
<TargetFramework>net6.0</TargetFramework>
21+
<LangVersion>latest</LangVersion>
22+
<ImplicitUsings>enable</ImplicitUsings>
23+
<RootNamespace>Monai.Deploy.Storage.MinIO</RootNamespace>
24+
<Nullable>enable</Nullable>
25+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
26+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
27+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28+
</PropertyGroup>
2929

30-
<ItemGroup>
31-
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
32-
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
33-
</ItemGroup>
30+
<ItemGroup>
31+
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
32+
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
33+
</ItemGroup>
3434

3535
<PropertyGroup>
3636
<PackageId>Monai.Deploy.Storage.MinIO</PackageId>
@@ -53,28 +53,20 @@
5353
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
5454
<PackageReference Include="Minio" Version="4.0.6" />
5555
</ItemGroup>
56-
57-
<ItemGroup>
58-
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
59-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.100.1" />
60-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
61-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
62-
<PackageReference Include="Minio" Version="4.0.5" />
63-
</ItemGroup>
6456

65-
<ItemGroup>
66-
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
67-
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
68-
</ItemGroup>
57+
<ItemGroup>
58+
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
59+
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
60+
</ItemGroup>
6961

70-
<ItemGroup>
71-
<Compile Remove="Tests\**" />
72-
<EmbeddedResource Remove="Tests\**" />
73-
<None Remove="Tests\**" />
74-
</ItemGroup>
62+
<ItemGroup>
63+
<Compile Remove="Tests\**" />
64+
<EmbeddedResource Remove="Tests\**" />
65+
<None Remove="Tests\**" />
66+
</ItemGroup>
7567

76-
<ItemGroup>
77-
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
78-
</ItemGroup>
68+
<ItemGroup>
69+
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
70+
</ItemGroup>
7971

8072
</Project>

‎third-party-licenses.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21497,3 +21497,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
2149721497
```
2149821498

2149921499
</details>
21500+

0 commit comments

Comments
 (0)