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

Jump to bottom

Bump NLog from 5.3.3 to 5.3.4 #433

Merged
merged 9 commits into from
Sep 25, 2024
Merged

Bump NLog from 5.3.3 to 5.3.4 #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f77975d
Bump NLog from 5.3.3 to 5.3.4
dependabot[bot] Sep 24, 2024
b03009a
Remove NLog as provided by RdmpCore already
Sep 24, 2024
b56f453
Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.1
Sep 24, 2024
d9d33ff
Bump NUnit from 4.1.0 to 4.2.2
Sep 24, 2024
57915f6
Try passing BasicActivator
Sep 24, 2024
244cba1
Bump to support RDMP 8.3
Sep 24, 2024
31bd661
Use .Net 8 SDK not 6
Sep 24, 2024
3d2058a
Update RDMP submodule
Sep 25, 2024
4d66108
Use dotnet build not autobuilder
Sep 25, 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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v3
run: dotnet build -c Debug

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
path: RDMP
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Get version
id: version
shell: cmd
Expand Down
2 changes: 1 addition & 1 deletion RDMP
Open in desktop
Submodule RDMP updated 4 files
+42 −27 Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs
+1 −0 CHANGELOG.md
+1 −1 Directory.Build.props
+4 −4 Directory.Packages.props
4 changes: 2 additions & 2 deletions Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<ItemGroup>
<PackageReference Include="HIC.BadMedicine.Dicom" Version="0.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public override void Execute()

////////////////////////////////////////////////////////////////////////////////////////////////

var checker = new CheckEntireDataLoadProcess(NewLoadMetadata, new HICDatabaseConfiguration(NewLoadMetadata), new HICLoadConfigurationFlags());
var checker = new CheckEntireDataLoadProcess(BasicActivator, NewLoadMetadata, new HICDatabaseConfiguration(NewLoadMetadata), new HICLoadConfigurationFlags());
checker.Check(new AcceptAllCheckNotifier());
}

Expand Down Expand Up @@ -328,4 +328,4 @@ private void SetArgument(IArgument[] args, string property, object value)
arg.SetValue(value);
arg.SaveToDatabase();
}
}
}
1 change: 0 additions & 1 deletion Rdmp.Dicom/Rdmp.Dicom.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="fo-dicom" Version="5.1.3" />
<PackageReference Include="NLog" Version="5.3.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RDMP\Rdmp.Core\Rdmp.Core.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion rdmpdicom.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<authors>Health Informatics Service, University of Dundee</authors>
<description>Imaging plugin for Research Data Management Platform </description>
<dependencies>
<dependency id="HIC.RDMP.Plugin" version="8.1.4" />
<dependency id="HIC.RDMP.Plugin" version="8.3.0" />
</dependencies>
</metadata>
</package>