Merge pull request #214 from SMI/feature/net8

Feature/net8
SMI · Mar 20, 2024 · ebe407c · ebe407c
2 parents bf3ec22 + b728318
commit ebe407c
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 50 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,6 +11,5 @@ updates:
   schedule:
     interval: weekly
   open-pull-requests-limit: 99
-  target-branch: develop
   reviewers:
     - SMI/reviewers
diff --git a/.github/workflows/testpack.yml b/.github/workflows/testpack.yml
@@ -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

diff --git a/BadDicom/BadDicom.csproj b/BadDicom/BadDicom.csproj
@@ -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>
@@ -11,7 +11,6 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <DebugType>embedded</DebugType>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PublishSingleFile>true</PublishSingleFile>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/BadMedicine.Dicom.Tests/BadMedicine.Dicom.Tests.csproj b/BadMedicine.Dicom.Tests/BadMedicine.Dicom.Tests.csproj
@@ -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>

diff --git a/BadMedicine.Dicom/BadMedicine.Dicom.csproj b/BadMedicine.Dicom/BadMedicine.Dicom.csproj
@@ -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>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
@@ -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