Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 0 additions & 125 deletions .editorconfig

This file was deleted.

1 change: 1 addition & 0 deletions .editorconfig
12 changes: 9 additions & 3 deletions .github/workflows/test-publish.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: Test and publish

on:
["push","pull_request"]
push:
branches: [main]
tags: ['v*']
pull_request:
branches: [main]

jobs:
build:
Expand All @@ -11,6 +15,8 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v6
with:
submodules: recursive
- name: Install .Net
uses: actions/setup-dotnet@v5
with:
Expand All @@ -26,7 +32,7 @@ jobs:
- name : Test
run: |
dotnet test --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
mv nccid.Test/TestResults/*/coverage.info lcov.info
cp nccid.Tests/TestResults/*/coverage.info lcov.info
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v4
if: startsWith(github.event_name, 'pull_request')
Expand All @@ -36,7 +42,7 @@ jobs:
uses: coverallsapp/github-action@v2.3.7
if: startsWith(github.event_name, 'pull_request')
with:
github-token: ${{secrets.GITHUB_TOKEN }}
github-token: ${{secrets.GITHUB_TOKEN }}
path-to-lcov: 'lcov.info'
- name: Build
run: ./build.sh
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.vs/**
**/bin/**
**/obj/**
nccid.Tests/TestResults/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "build-standards"]
path = build-standards
url = https://github.com/jas88/build-standards.git
24 changes: 11 additions & 13 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

<Project>
<PropertyGroup>
<Version>0.0.6</Version>
<AnalysisMode>Recommended</AnalysisMode>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
</Project>
<Import Project="build-standards/Directory.Build.props.executable-repo" />
<Import Project="build-standards/Directory.Build.props.shared" />

<PropertyGroup>
<MinVerMinimumMajorMinor>0.0</MinVerMinimumMajorMinor>
<Product>nccid</Product>
<Description>Tooling for the National Covid-19 Chest Imaging Database</Description>
<PackageProjectUrl>https://github.com/jas88/nccid</PackageProjectUrl>
<RepositoryUrl>https://github.com/jas88/nccid</RepositoryUrl>
</PropertyGroup>
</Project>
25 changes: 25 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<Import Project="build-standards/Directory.Packages.props.shared" />

<ItemGroup>
<!-- Main project dependencies -->
<PackageVersion Include="AWSSDK.S3" Version="4.0.17" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="CsvHelper" Version="33.1.0" />
<PackageVersion Include="fo-dicom" Version="5.2.5" />
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
<PackageVersion Include="System.IO.Abstractions" Version="22.1.0" />

<!-- Test project dependencies -->
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions build-standards
Submodule build-standards added at 0914f1
31 changes: 0 additions & 31 deletions nccid.Test/nccid.Test.csproj

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 23 additions & 0 deletions nccid.Tests/nccid.Tests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit.Analyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" />
<PackageReference Include="coverlet.collector" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\nccid\nccid.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion nccid.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 17.13.35825.156
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nccid", "nccid\nccid.csproj", "{751A4447-B2F6-4596-8550-28201251356A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nccid.Test", "nccid.Test\nccid.Test.csproj", "{00FBCA52-D210-4179-A10E-B28923DBADE1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nccid.Tests", "nccid.Tests\nccid.Tests.csproj", "{00FBCA52-D210-4179-A10E-B28923DBADE1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
ProjectSection(SolutionItems) = preProject
Expand Down
22 changes: 13 additions & 9 deletions nccid/nccid.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
<!--EXTERNAL_PROPERTIES: NETCoreAppMaximumVersion-->
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net$(NETCoreAppMaximumVersion)</TargetFramework>
<!-- Disable AOT/trimming - uses reflection-based JSON serialization -->
<IsAotCompatible>false</IsAotCompatible>
<IsTrimmable>false</IsTrimmable>
</PropertyGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>nccid.Test</_Parameter1>
<_Parameter1>nccid.Tests</_Parameter1>
</AssemblyAttribute>
<PackageReference Include="AWSSDK.S3" Version="4.0.17" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="CsvHelper" Version="33.1.0" />
<PackageReference Include="fo-dicom" Version="5.2.5" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4" />
<PackageReference Include="System.IO.Abstractions" Version="22.1.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.S3" />
<PackageReference Include="CommandLineParser" />
<PackageReference Include="CsvHelper" />
<PackageReference Include="fo-dicom" />
<PackageReference Include="JetBrains.Annotations" />
<PackageReference Include="System.IO.Abstractions" />
</ItemGroup>

</Project>