Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/net8 #214

Merged
merged 5 commits into from
Mar 20, 2024
Merged

Feature/net8 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd5a616
Update CHANGELOG.md
jas88 Mar 19, 2024
b602f42
csproj updates
jas88 Mar 19, 2024
c763f48
Update testpack.yml
jas88 Mar 19, 2024
0ab1c21
Prepare removal of dev branch
Mar 19, 2024
b728318
Populate CHANGELOG for 0.1.0 release
Mar 19, 2024
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
1 change: 0 additions & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 99
target-branch: develop
reviewers:
- SMI/reviewers
2 changes: 1 addition & 1 deletion .github/workflows/testpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Package
run: |
mkdir -p dist
dotnet pack ./BadMedicine.Dicom/BadMedicine.Dicom.csproj -c Release -p:IncludeSymbols=true -p:Version=$(grep AssemblyInformationalVersion SharedAssemblyInfo.cs | cut -d'"' -f2) -nologo
dotnet pack ./BadMedicine.Dicom/BadMedicine.Dicom.csproj -c Release -p:DebugType=full -p:SymbolPackageFormat=snupkg -p:IncludeSymbols=true -p:Version=$(grep AssemblyInformationalVersion SharedAssemblyInfo.cs | cut -d'"' -f2) -nologo
for platform in linux-x64 win-x64 osx-{arm64,x64}
do
dotnet publish BadDicom/BadDicom.csproj -c Release -r $platform -o $platform --self-contained true -nologo -v q -p:PublishSingleFile=true -p:DebugType=embedded -p:GenerateDocumentationFile=false
Expand Down
3 changes: 1 addition & 2 deletions BadDicom/BadDicom.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<ApplicationIcon />
<OutputType>Exe</OutputType>
Expand All @@ -11,7 +11,6 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<DebugType>embedded</DebugType>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PublishSingleFile>true</PublishSingleFile>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion BadMedicine.Dicom.Tests/BadMedicine.Dicom.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<IsPublishable>false</IsPublishable>
</PropertyGroup>
Expand Down
92 changes: 48 additions & 44 deletions BadMedicine.Dicom/BadMedicine.Dicom.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,52 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageId>HIC.BadMedicine.Dicom</PackageId>
<Authors>Health Informatics Centre - University of Dundee</Authors>
<PackageDescription>Generate large volumes of complex (in terms of tags) DICOM images for integration/stress testing ETL and image management tools. BadMedicine.Dicom generates DICOM images on demand based on an anonymous aggregate model of tag data found in Scottish medical imaging with a small memory footprint.</PackageDescription>
<PackageProjectUrl>https://github.com/SMI/BadMedicine.Dicom</PackageProjectUrl>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<Copyright>Copyright 2019</Copyright>
<PackageTags>DICOM,Test Data,Random,Synthetic Data,Health</PackageTags>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="fo-dicom" Version="5.1.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>


<ItemGroup>
<None Remove="DicomDataGeneratorDescBodyPart.csv" />
<None Remove="DicomDataGeneratorModalities.csv" />
<None Remove="DicomDataGeneratorTags.csv" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="DicomDataGeneratorDescBodyPart.csv" />
<EmbeddedResource Include="DicomDataGeneratorModalities.csv" />
<EmbeddedResource Include="DicomDataGeneratorTags.csv" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="HIC.BadMedicine" Version="1.1.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2" />
</ItemGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageId>HIC.BadMedicine.Dicom</PackageId>
<Authors>Health Informatics Centre - University of Dundee</Authors>
<PackageDescription>Generate large volumes of complex (in terms of tags) DICOM images for integration/stress testing ETL and image management tools. BadMedicine.Dicom generates DICOM images on demand based on an anonymous aggregate model of tag data found in Scottish medical imaging with a small memory footprint.</PackageDescription>
<PackageProjectUrl>https://github.com/SMI/BadMedicine.Dicom</PackageProjectUrl>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<Copyright>Copyright 2019</Copyright>
<PackageTags>DICOM,Test Data,Random,Synthetic Data,Health</PackageTags>
<Nullable>enable</Nullable>
<IsAotCompatible>true</IsAotCompatible>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="fo-dicom" Version="5.1.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>


<ItemGroup>
<None Include="..\README.md" Pack="true" PackagePath="\"/>
<None Remove="DicomDataGeneratorDescBodyPart.csv" />
<None Remove="DicomDataGeneratorModalities.csv" />
<None Remove="DicomDataGeneratorTags.csv" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="DicomDataGeneratorDescBodyPart.csv" />
<EmbeddedResource Include="DicomDataGeneratorModalities.csv" />
<EmbeddedResource Include="DicomDataGeneratorTags.csv" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="HIC.BadMedicine" Version="1.2.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2" />
</ItemGroup>

</Project>
17 changes: 16 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

...

## [0.1.0] - 2024-03-20

* Target .Net 8 not 6
* Bump fo-dicom from 5.0.3 to 5.1.2
* Bump HIC.BadMedicine from 1.1.1 to 1.1.2
* Bump HIC.DicomTypeTranslation from 4.0.1 to 4.0.3
* Bump SixLabors.ImageSharp from 2.1.3 to 3.1.3
* Bump SixLabors.ImageSharp.Drawing from 1.0.0 to 2.1.2
* Bump Vecc.YamlDotNet.Analyzers.StaticGenerator from 13.4.0 to 13.5.1
* Bump YamlDotNet from 12.0.2 to 15.1.2

### Dependencies

## [0.0.16] - 2023-10-04

### Dependencies
Expand Down Expand Up @@ -152,7 +165,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Support for PatientAge, Modality, Address, UIDs, StudyDate/Time
- Support for pixel data / NoPixels flag

[Unreleased]: https://github.com/SMI/BadMedicine.Dicom/compare/v0.0.15...develop
[Unreleased]: https://github.com/SMI/BadMedicine.Dicom/compare/v0.1.0...develop
[0.1.0]: https://github.com/SMI/BadMedicine.Dicom/compare/v0.0.16...v0.1.0
[0.0.16]: https://github.com/SMI/BadMedicine.Dicom/compare/v0.0.15...v0.0.16
[0.0.15]: https://github.com/SMI/BadMedicine.Dicom/compare/v0.0.14...v0.0.15
[0.0.14]: https://github.com/SMI/BadMedicine.Dicom/compare/v0.0.13...v0.0.14
[0.0.13]: https://github.com/SMI/BadMedicine.Dicom/compare/v0.0.12...v0.0.13
Expand Down