Skip to content

Commit

Permalink
Merge pull request #1166 from ssc-sp/ep/nuget_updates_202406
Browse files Browse the repository at this point in the history 
updated nuget packages
  • Loading branch information
@ErikApption
ErikApption authored Jun 12, 2024
2 parents 2bca5b3 + 931c8fe commit 8c37bba
Show file tree
Hide file tree
Showing 57 changed files with 881 additions and 858 deletions.
12 changes: 10 additions & 2 deletions Desktop/Desktop.Uploader/Desktop.Uploader.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.18.*" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.20.*" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.*" />
<PackageReference Include="SuchByte.SpeedTestSharp" Version="1.0.2" />
</ItemGroup>
Expand Down Expand Up @@ -102,4 +102,12 @@

<Import Project="..\Desktop.SharedCode\Desktop.SharedCode.projitems" Label="Shared" />

<ItemGroup>
<PackageReference Update="Microsoft.Maui.Controls" Version="8.0.40" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.40" />
</ItemGroup>

</Project>
24 changes: 12 additions & 12 deletions Portal/src/Datahub.Application/Datahub.Application.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Datahub.Core\Datahub.Core.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Datahub.Core\Datahub.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.ResourceManager" Version="1.9.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.*" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.0.1" />
<ItemGroup>
<PackageReference Include="Azure.ResourceManager" Version="1.12.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.*" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
</ItemGroup>
</Project>
52 changes: 26 additions & 26 deletions Portal/src/Datahub.Core/Datahub.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@
<PackageReference Include="Ae.MudBlazor.Forms" Version="0.5.22329.4-beta" />
<PackageReference Include="AElemental.Blazor" Version="1.6.22173.2" />
<PackageReference Include="AElemental.Blazor.Theme" Version="1.6.22173.2" />
<PackageReference Include="Askmethat.Aspnet.JsonLocalizer" Version="4.0.1" />
<PackageReference Include="Azure.Identity" Version="1.11.0" />
<PackageReference Include="Azure.Monitor.Query" Version="1.3.1" />
<PackageReference Include="Azure.Search.Documents" Version="11.4.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.16.0" />
<PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
<PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
<PackageReference Include="BlazorInputFile" Version="0.2.0" />
<PackageReference Include="BlazorTemplater" Version="1.5.1" />
<PackageReference Include="ByteSize" Version="2.1.1" />
<PackageReference Include="DeepL.net" Version="1.7.1" />
<PackageReference Include="Askmethat.Aspnet.JsonLocalizer" Version="4.0.*" />
<PackageReference Include="Azure.Identity" Version="1.11.4" />
<PackageReference Include="Azure.Monitor.Query" Version="1.3.*" />
<PackageReference Include="Azure.Search.Documents" Version="11.5.*" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.20.*" />
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.18.*" />
<PackageReference Include="BlazorDownloadFile" Version="2.4.*" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="BlazorInputFile" Version="0.2.*" />
<PackageReference Include="BlazorTemplater" Version="1.5.*" />
<PackageReference Include="ByteSize" Version="2.1.*" />
<PackageReference Include="DeepL.net" Version="1.9.0" />

<PackageReference Include="Foundatio.AzureStorage" Version="10.6.1" />
<PackageReference Include="Localization.AspNetCore.TagHelpers" Version="0.6.0" />
<PackageReference Include="MailKit" Version="4.2.0" />
<PackageReference Include="Markdig" Version="0.33.0" />
<PackageReference Include="Foundatio.AzureStorage" Version="10.7.1" />
<PackageReference Include="Localization.AspNetCore.TagHelpers" Version="0.6.*" />
<PackageReference Include="MailKit" Version="4.6.0" />
<PackageReference Include="Markdig" Version="0.37.0" />


<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />

<PackageReference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.22" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.31" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="8.0.*" />
<PackageReference Include="Microsoft.Azure.Databricks.Client" Version="2.3.0" />
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
Expand All @@ -65,21 +65,21 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.*" />
<PackageReference Include="Microsoft.Graph" Version="5.39.0" />
<PackageReference Include="Microsoft.Graph" Version="5.56.0" />
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />

<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.4" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.19.1" />

<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.170.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="16.170.0" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
<PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="19.225.1" />

<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />

<PackageReference Include="RulesEngine" Version="5.0.2" />
<PackageReference Include="RulesEngine" Version="5.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.*" />
<PackageReference Include="MudBlazor" Version="6.10.0" />
<PackageReference Include="MudBlazor.Markdown" Version="0.1.2" />
<PackageReference Include="MudBlazor" Version="6.20.0" />
<PackageReference Include="MudBlazor.Markdown" Version="1.0.2" />
<PackageReference Include="System.Drawing.Common" Version="8.0.*" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="System.Runtime.Caching" Version="8.0.*" />
Expand Down
31 changes: 15 additions & 16 deletions Portal/src/Datahub.Infrastructure/Datahub.Infrastructure.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.ResourceManager" Version="1.11.0" />
<PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.2" />
<PackageReference Include="Azure.ResourceManager.Consumption" Version="1.0.1" />
<PackageReference Include="Azure.ResourceManager.CostManagement" Version="1.0.1" />
<PackageReference Include="Azure.ResourceManager.Monitor" Version="1.3.0" />
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.2.0" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.6.0" />
<PackageReference Include="MassTransit" Version="8.2.2" />
<PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.2.2" />
<PackageReference Include="MediatR" Version="12.1.1" />
<PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.*" />
<PackageReference Include="Azure.ResourceManager.Consumption" Version="1.0.*" />
<PackageReference Include="Azure.ResourceManager.CostManagement" Version="1.0.*" />
<PackageReference Include="Azure.ResourceManager.Monitor" Version="1.3.*" />
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.2.*" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.10.0" />
<PackageReference Include="MassTransit" Version="8.2.*" />
<PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.2.*" />
<PackageReference Include="MediatR" Version="12.3.0" />
<!--<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />-->
<PackageReference Include="Azure.Storage.Common" Version="12.17.0" />
<PackageReference Include="Azure.Storage.Queues" Version="12.16.0" />
<PackageReference Include="Microsoft.Azure.Databricks.Client" Version="2.3.0" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
<PackageReference Include="AWSSDK.S3" Version="3.7.203.10" />
<PackageReference Include="Yarp.Telemetry.Consumption" Version="2.1.0" />
<PackageReference Include="Azure.Storage.Common" Version="12.19.0" />
<PackageReference Include="Azure.Storage.Queues" Version="12.18.0" />
<PackageReference Include="Microsoft.Azure.Databricks.Client" Version="2.4.0" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.*" />
<PackageReference Include="AWSSDK.S3" Version="3.7.*" />
<PackageReference Include="Yarp.Telemetry.Consumption" Version="2.1.*" />

<!--<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.*" />-->

Expand Down
4 changes: 2 additions & 2 deletions Portal/src/Datahub.Metadata/Datahub.Metadata.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.*">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions Portal/src/Datahub.Portal/Controllers/OpenDataApprovalController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static Stream CompleteDocument(Stream inputDoc, Dictionary<string, string> conte
inputDoc.CopyTo(mem);
mem.Seek(0, SeekOrigin.Begin);

var document = WordprocessingDocument.Open(mem, true);
using var document = WordprocessingDocument.Open(mem, true);

var elementsToUpdate = document.MainDocumentPart?.Document.Descendants()
.Where(d => d.LocalName == "r" && MatchesField(d.InnerText))
Expand All @@ -120,7 +120,6 @@ static Stream CompleteDocument(Stream inputDoc, Dictionary<string, string> conte
}

document.MainDocumentPart?.Document.Save();
document.Close();

mem.Seek(0, SeekOrigin.Begin);

Expand Down
28 changes: 14 additions & 14 deletions Portal/src/Datahub.Portal/Datahub.Portal.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
<UserSecretsId>b1e84dc3-b45f-428e-bf71-7eec3434b232</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.11.2" />
<PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.2" />
<PackageReference Include="Azure.ResourceManager.PostgreSql" Version="1.1.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.*">
<PackageReference Include="Azure.Identity" Version="1.11.4" />
<PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.*" />
<PackageReference Include="Azure.ResourceManager.PostgreSql" Version="1.1.*" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.2" />
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.13.4" />
<PackageReference Include="Microsoft.PowerBI.JavaScript" Version="2.22.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.3.8" />
<PackageReference Include="Octokit" Version="10.0.0" />
<PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="2.0.11" />
<PackageReference Include="MudBlazor" Version="6.10.0" />
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.*" />
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.19.1" />
<PackageReference Include="Microsoft.PowerBI.JavaScript" Version="2.23.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.*" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.*" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.3.*" />
<PackageReference Include="Octokit" Version="12.0.0" />
<PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.0" />
<PackageReference Include="MudBlazor" Version="6.20.0" />
</ItemGroup>
<ItemGroup>
<Content Update="wwwroot\infinite-scrolling.js">
Expand Down
11 changes: 7 additions & 4 deletions Portal/test/Datahub.Infrastructure.UnitTests/Datahub.Infrastructure.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@


<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.7.0" />
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="NUnit.Analyzers" Version="4.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
16 changes: 8 additions & 8 deletions Portal/test/Datahub.SpecflowTests/Datahub.SpecflowTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@

<ItemGroup>
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.17.5" />
<PackageReference Include="bunit" Version="1.27.17" />
<PackageReference Include="Deque.AxeCore.Commons" Version="4.8.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="bunit" Version="1.28.9" />
<PackageReference Include="Deque.AxeCore.Commons" Version="4.9.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.17.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Reqnroll" Version="1.0.1" />
<PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="Reqnroll" Version="2.0.3" />
<PackageReference Include="Reqnroll.xUnit" Version="2.0.3" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit 8c37bba

Please sign in to comment.