Sitelet https://github.com/MessagePack-CSharp/MessagePack-CSharp/pull/2302/files
Skip to content

Merge develop back into master #2302

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

Merged
AArnott merged 13 commits into from
Sep 18, 2026
Merged

Merge develop back into master #2302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
36dd0f9
Bump Microsoft.NET.Test.Sdk from 17.11.1 to 17.12.0 (#2116)
dependabot[bot] Jan 5, 2025
7c76470
Bump nunit from 4.2.2 to 4.3.2 (#2117)
dependabot[bot] Jan 5, 2025
dfd711d
Bump Newtonsoft.Json and Newtonsoft.Json.Bson (#2118)
dependabot[bot] Jan 5, 2025
72b7d11
Bump MicrosoftCodeAnalysisVersion from 4.8.0 to 4.12.0 (#2115)
dependabot[bot] Jan 5, 2025
8945bfe
Bump FluentAssertions from 6.12.0 to 7.0.0 (#2114)
dependabot[bot] Jan 6, 2025
4e9fee0
Updated dynamic assemblies to support unloading.
MarcusChr Jan 7, 2025
524fd55
Merge pull request #2119 from MarcusChr/develop
neuecc Jan 27, 2025
61ba79b
Merge remote-tracking branch 'origin/master' into master-to-develop
AArnott May 20, 2026
5e9e94d
Merge pull request #2267 from MessagePack-CSharp/master-to-develop
AArnott May 20, 2026
8168981
Merge pull request #2273 from MessagePack-CSharp/master
AArnott Jun 9, 2026
7686468
Merge pull request #2275 from MessagePack-CSharp/master-fix-all
AArnott Jun 9, 2026
4415526
Merge remote-tracking branch 'origin/master' into develop
AArnott Sep 17, 2026
a895c2e
Merge pull request #2301 from MessagePack-CSharp/master-to-develop
AArnott Sep 17, 2026
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
11 changes: 6 additions & 5 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<BenchmarkDotNetVersion>0.14.0</BenchmarkDotNetVersion>
<!-- https://learn.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support?view=vs-2022 -->
<MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisVersion>4.12.0</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisVersion Condition="'$(IsAnalyzerProject)'=='true'">4.3.0</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2</MicrosoftCodeAnalysisTestingVersion>
</PropertyGroup>
Expand All @@ -15,7 +15,7 @@
<PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
<PackageVersion Include="Ceras" Version="4.1.7" />
<PackageVersion Include="ConsoleAppFramework" Version="4.2.4" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
<PackageVersion Include="FsPickler" Version="5.3.2" />
<PackageVersion Include="Hyperion" Version="0.12.2" />
<PackageVersion Include="IsExternalInit" Version="1.0.3" />
Expand All @@ -32,20 +32,21 @@
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="$(MicrosoftCodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.NET.StringTools" Version="17.11.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
<PackageVersion Include="Newtonsoft.Json.Bson" Version="1.0.2" />
<PackageVersion Include="Newtonsoft.Json.Bson" Version="1.0.3" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NuGet.Protocol" Version="6.8.0" />
<PackageVersion Include="nunit" Version="4.2.2" />
<PackageVersion Include="nunit" Version="4.3.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="protobuf-net" Version="3.2.30" />
<PackageVersion Include="RandomFixtureKit" Version="1.0.1" />
<PackageVersion Include="ReactiveProperty" Version="9.6.0" />
<PackageVersion Include="Required" Version="1.0.0" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="Sigil" version="5.0.0" />
<PackageVersion Include="SpanJson" Version="4.2.1" />
<PackageVersion Include="Utf8Json" Version="1.3.7" />
Expand Down
6 changes: 2 additions & 4 deletions src/MessagePack/Internal/DynamicAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ internal class DynamicAssembly
/// <param name="skipVisibilityChecksTo">The names of assemblies that should be fully accessible to this dynamic one, bypassing visibility checks.</param>
public DynamicAssembly(string moduleName, ImmutableHashSet<AssemblyName> skipVisibilityChecksTo)
{
#if NETFRAMEWORK // We don't ship a net472 target, but we might add one for debugging purposes
AssemblyBuilderAccess builderAccess = AssemblyBuilderAccess.RunAndSave;
#if NETFRAMEWORK
this.moduleName = moduleName;
#else
AssemblyBuilderAccess builderAccess = AssemblyBuilderAccess.RunAndCollect;
#endif
AssemblyBuilderAccess builderAccess = AssemblyBuilderAccess.RunAndCollect;
this.assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(moduleName), builderAccess);
this.moduleBuilder = this.assemblyBuilder.DefineDynamicModule(moduleName + ".dll");

Expand Down
Loading