Skip to content

Commit

Permalink
Merge branch 'dependabot/nuget/main/System.ServiceModel.Http-8.0.0' of
Browse files Browse the repository at this point in the history
…https://github.com/HicServices/HICPlugin into dependabot/nuget/main/System.ServiceModel.Http-8.0.0
  • Loading branch information
jas88 committed Oct 22, 2024
2 parents 40b533e + 0187939 commit 708419c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion HICPluginTests/HICPluginTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NunitXml.TestLogger" Version="4.0.254" />
<PackageReference Include="NunitXml.TestLogger" Version="4.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RDMP\Tests.Common\Tests.Common.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion JiraPlugin/JiraPlugin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="RestSharp" Version="111.4.1" />
<PackageReference Include="RestSharp" Version="112.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RDMP\Rdmp.Core\Rdmp.Core.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion RDMP
Submodule RDMP updated 31 files
+2 −2 .github/workflows/build.yml
+1 −1 .github/workflows/docker.yml
+42 −27 Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs
+6 −5 CHANGELOG.md
+1 −1 Directory.Build.props
+7 −7 Directory.Packages.props
+7 −11 Rdmp.Core/Providers/CatalogueProblemProvider.cs
+90 −83 Rdmp.UI/Collections/CatalogueCollectionUI.Designer.cs
+4 −2 Rdmp.UI/Collections/CatalogueCollectionUI.cs
+75 −76 Rdmp.UI/Collections/CatalogueCollectionUI.resx
+48 −37 Rdmp.UI/Collections/CohortIdentificationCollectionUI.Designer.cs
+2 −1 Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs
+25 −25 Rdmp.UI/Collections/CohortIdentificationCollectionUI.resx
+55 −46 Rdmp.UI/Collections/DataExportCollectionUI.Designer.cs
+2 −1 Rdmp.UI/Collections/DataExportCollectionUI.cs
+25 −25 Rdmp.UI/Collections/DataExportCollectionUI.resx
+49 −36 Rdmp.UI/Collections/DatasetsCollectionUI.Designer.cs
+3 −1 Rdmp.UI/Collections/DatasetsCollectionUI.cs
+25 −25 Rdmp.UI/Collections/DatasetsCollectionUI.resx
+44 −33 Rdmp.UI/Collections/FavouritesCollectionUI.Designer.cs
+1 −1 Rdmp.UI/Collections/FavouritesCollectionUI.cs
+25 −25 Rdmp.UI/Collections/FavouritesCollectionUI.resx
+48 −37 Rdmp.UI/Collections/LoadMetadataCollectionUI.Designer.cs
+1 −1 Rdmp.UI/Collections/LoadMetadataCollectionUI.cs
+25 −25 Rdmp.UI/Collections/LoadMetadataCollectionUI.resx
+46 −4 Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs
+52 −43 Rdmp.UI/Collections/SavedCohortsCollectionUI.Designer.cs
+1 −1 Rdmp.UI/Collections/SavedCohortsCollectionUI.cs
+25 −25 Rdmp.UI/Collections/SavedCohortsCollectionUI.resx
+3 −3 SharedAssemblyInfo.cs
+2 −2 rdmp-client.xml
6 changes: 3 additions & 3 deletions SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
[assembly: AssemblyCulture("")]

// These should be overwritten by release builds
[assembly: AssemblyVersion("6.1.9")]
[assembly: AssemblyFileVersion("6.1.9")]
[assembly: AssemblyInformationalVersion("6.1.9")]
[assembly: AssemblyVersion("6.1.10")]
[assembly: AssemblyFileVersion("6.1.10")]
[assembly: AssemblyInformationalVersion("6.1.10")]

0 comments on commit 708419c

Please sign in to comment.