Skip to content

[main] Update dependencies from dotnet/aspnetcore #40389

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.

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

Merged
merged 30 commits into from
Apr 29, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Apr 23, 2024

This pull request updates the following dependencies

From https://github.com/dotnet/aspnetcore

  • Subscription: 4491d9a4-839d-4af5-f3e4-08d8e97c775d
  • Build: 20240425.4
  • Date Produced: April 26, 2024 2:34:28 AM UTC
  • Commit: c157c5c1962a66c4fe0212ed767f167bb9cdfb79
  • Branch: refs/heads/main

…0240423.2

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.4.24223.2
@ghost ghost added Area-CodeFlow untriaged Request triage from a team member labels Apr 23, 2024
…0240423.3

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.4.24223.3
…0240423.4

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.4.24223.4
Copy link
Contributor Author

Notification for subscribed users from https://github.com/dotnet/aspnetcore:

@dotnet/aspnet-build

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/aspnetcore) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation

…0240423.5

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.4.24223.5
@joeloff
Copy link
Member

joeloff commented Apr 23, 2024

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

…0240423.8

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.4.24223.8
…0240423.10

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24223.10
…0240423.11

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24223.11
…0240423.12

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24223.12
…0240424.1

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24224.1
@wtgodbe
Copy link
Member

wtgodbe commented Apr 24, 2024

Aspnetcore just updated our Roslyn deps to 4.11 as part of dotnet/aspnetcore#55285, which is conflicting w/ the 4.10 version depended upon by this repo. @marcpopMSFT @joeloff can SDK update to 4.11, or do we need to revert? That PR added a feature that we'd rather not revert in main, though we can back it out of Preview4 if need be. CC @captainsafia

…0240424.2

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24224.2
…0240424.7

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24224.7
@captainsafia
Copy link
Member

@marcpopMSFT @joeloff Any thoughts on Will's question above? If the SDK can't bump to 4.11, I can revert this PR to unblock code flow.

…0240425.2

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24225.2
@marcpopMSFT
Copy link
Member

@captainsafia @wtgodbe are you referring to the stage 0 (global.json) sdk or stage 2 sdk? We have a subscriptions from the 17.11 channel for Roslyn so will get it with normal codeflow. If you need a stage 0 sdk, there should be builds already since roslyn has flowed to installer already.

@wtgodbe
Copy link
Member

wtgodbe commented Apr 25, 2024

are you referring to the stage 0 (global.json) sdk or stage 2 sdk? We have a subscriptions from the 17.11 channel for Roslyn so will get it with normal codeflow. If you need a stage 0 sdk, there should be builds already since roslyn has flowed to installer already.

We mean the direct dependencies in this repo. If that'll get updated to 17.11 soon, then that should solve the problem

…0240425.3

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24225.3
@marcpopMSFT
Copy link
Member

@wtgodbe the stage 2 version is already 4.11: https://github.com/dotnet/sdk/blob/main/eng/Versions.props#L240

I think you need to update the version in global.json then if that's not sufficient.

dotnet-maestro bot and others added 2 commits April 26, 2024 02:42
…0240425.4

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.0-preview.4.24223.1 -> To Version 9.0.0-preview.5.24225.4
@ViktorHofer ViktorHofer enabled auto-merge (squash) April 26, 2024 08:12
@ViktorHofer
Copy link
Member

To unblock this PR we can either:

  • Set this to true unconditionally which would have negative impact on the VMR build:

    <UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>

  • or update the bootstrap (stage 0) SDK to a version that includes roslyn4.11.

@ViktorHofer
Copy link
Member

@marcpopMSFT can you please help with updating the stage 0 SDK? Is it just updating the version in global.json?

@kasperk81
Copy link
Contributor

C:\h\w\9C9E086D\p\d\dotnet.exe add reference ..\TestProject exited with 1 in 2150 ms.
    Microsoft.NET.Build.Tests.ReferenceExeTests.ExeProjectCanReferenceTestProject(testTemplateName: "mstest") [FAIL]
      Expected command to pass but it did not.
      File Name: C:\h\w\9C9E086D\p\d\dotnet.exe
      Arguments: add reference ..\TestProject
      Exit Code: 1
      StdOut:
      
      StdErr:
      Project `C:\h\w\9C9E086D\t\dotnetSdkTests\qxd2axyt.wp3\ExeProjectCan---317DC12F\TestProject\TestProject.csproj` could not be evaluated. Evaluation failed with following error:
      SDK Resolver Failure: "The SDK resolver "Microsoft.DotNet.MSBuildSdkResolver" failed while attempting to resolve the SDK "MSTest.Sdk/3.3.1". Exception: "System.IO.FileNotFoundException: Could not load file or assembly 'Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. The system cannot find the file specified.
      File name: 'Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
         at System.Text.Json.Serialization.Metadata.DefaultJsonTypeInfoResolver.GetDefaultSimpleConverters()
         at System.Text.Json.Serialization.Metadata.DefaultJsonTypeInfoResolver..ctor(Boolean mutable)
         at System.Text.Json.Serialization.Metadata.DefaultJsonTypeInfoResolver.RootDefaultInstance()
         at System.Text.Json.JsonSerializerOptions.ConfigureForJsonSerializer()
         at System.Text.Json.JsonSerializerOptions.MakeReadOnly(Boolean populateMissingResolver)
         at System.Text.Json.JsonSerializer.GetTypeInfo(JsonSerializerOptions options, Type inputType)
         at System.Text.Json.JsonSerializer.GetTypeInfo[T](JsonSerializerOptions options)
         at System.Text.Json.JsonSerializer.Deserialize[TValue](String json, JsonSerializerOptions options)
         at Microsoft.DotNet.Workloads.Workload.InstallStateContents.FromString(String contents) in /_/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs:line 31
         at Microsoft.DotNet.Workloads.Workload.InstallStateContents.FromPath(String path) in /_/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs:line 36
         at Microsoft.NET.Sdk.WorkloadManifestReader.SdkDirectoryWorkloadManifestProvider.RefreshWorkloadManifests() in /_/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs:line 151

@kasperk81
Copy link
Contributor

perhaps needs <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" /> at

…ft.NET.Sdk.WorkloadManifestReader.csproj

Co-authored-by: kasperk81 <83082615+kasperk81@users.noreply.github.com>
@ViktorHofer
Copy link
Member

ViktorHofer commented Apr 29, 2024

at System.Text.Json.JsonSerializer.Deserialize[TValue](String json, JsonSerializerOptions options)
at Microsoft.DotNet.Workloads.Workload.InstallStateContents.FromString(String contents) in //src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs:line 31
at Microsoft.DotNet.Workloads.Workload.InstallStateContents.FromPath(String path) in /
/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs:line 36
at Microsoft.NET.Sdk.WorkloadManifestReader.SdkDirectoryWorkloadManifestProvider.RefreshWorkloadManifests() in /_/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs:line 151

This suggests that System.Text.Json is used on .NET Framework which presumably is wrong.

EDIT: Okay I just checked a binlog, System.Text.Json is already brought in transitively via Microsoft.Deployment.DotNet.Releases. So its usage is fine and just proves that #40520 is needed to clean-up dependencies. Using both STJ and NJ doesn't make sense.

@kasperk81
Copy link
Contributor

#40520 is passing ci, can revert Microsoft.NET.Sdk.WorkloadManifestReader.csproj here. should work because AsyncInterfaces is its dependency on older framework
image

@ViktorHofer
Copy link
Member

Right, but it still didn't work and I'm not sure why. That said, I just merged your PR and rebased. Let's see if this will fix it.

@ViktorHofer
Copy link
Member

Hmm still same test failure

@kasperk81
Copy link
Contributor

weird, lets try adding package

…ft.NET.Sdk.WorkloadManifestReader.csproj

Co-authored-by: kasperk81 <83082615+kasperk81@users.noreply.github.com>
@ViktorHofer
Copy link
Member

Btw, I'm trying to reproduce this locally

@kasperk81
Copy link
Contributor

it's listed in the assembly metadata as well. see Referenced assemblies:
image

@kasperk81
Copy link
Contributor

<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" /> didnt help

@ViktorHofer
Copy link
Member

ViktorHofer commented Apr 29, 2024

While I have kind of a repro I still don't understand how the net472 assembly even gets loaded in those tests.

@ViktorHofer
Copy link
Member

ViktorHofer commented Apr 29, 2024

So it actually was the MSBuildSdkResolver that needed the Bcl.AsyncInterfaces dependency as that got automatically pinned to a higher version by CPM's transitive pinning feature. While S.T.J 8.0.0 would have brought the 8.0.0 version in, CPM upgraded that.

MSBuildSdkResolver is the plugin host and dictates the versions of dependencies when loading sdk resolvers (plugins).

@ViktorHofer ViktorHofer merged commit 368240d into main Apr 29, 2024
@ViktorHofer ViktorHofer deleted the darc-main-d80d79ca-47d1-4596-b5b7-58f7ee92e42c branch April 29, 2024 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants