Skip to content

Merge develop back into master - #2302

Merged
AArnott merged 13 commits into
masterfrom
develop
Sep 18, 2026
Merged

AArnott merged 13 commits into
masterfrom
develop

Conversation

@AArnott

@AArnott AArnott commented Sep 17, 2026

Copy link
Copy Markdown
Collaborator

Develop really didn't have that much unique from master. None of it is incompatible with servicing master IMO, and we haven't really been using develop. So I suggest we merge develop back into master and then decide whether/how to use develop going forward.

dependabot Bot and others added 13 commits January 5, 2025 08:06
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.11.1 to 17.12.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](microsoft/vstest@v17.11.1...v17.12.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [nunit](https://github.com/nunit/nunit) from 4.2.2 to 4.3.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/main/CHANGES.md)
- [Commits](nunit/nunit@4.2.2...4.3.2)

---
updated-dependencies:
- dependency-name: nunit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) and [Newtonsoft.Json.Bson](https://github.com/JamesNK/Newtonsoft.Json.Bson). These dependencies needed to be updated together.

Updates `Newtonsoft.Json` from 13.0.3 to 13.0.1
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](JamesNK/Newtonsoft.Json@13.0.3...13.0.1)

Updates `Newtonsoft.Json.Bson` from 1.0.2 to 1.0.3
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json.Bson/releases)
- [Commits](JamesNK/Newtonsoft.Json.Bson@1.0.2...1.0.3)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: Newtonsoft.Json.Bson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump MicrosoftCodeAnalysisVersion from 4.8.0 to 4.12.0

Bumps `MicrosoftCodeAnalysisVersion` from 4.8.0 to 4.12.0.

Updates `Microsoft.CodeAnalysis.CSharp` from 4.8.0 to 4.12.0
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](https://github.com/dotnet/roslyn/commits)

Updates `Microsoft.CodeAnalysis.CSharp.Workspaces` from 4.8.0 to 4.12.0
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](https://github.com/dotnet/roslyn/commits)

Updates `Microsoft.CodeAnalysis.VisualBasic.Workspaces` from 4.8.0 to 4.12.0
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](https://github.com/dotnet/roslyn/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.CSharp
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: Microsoft.CodeAnalysis.CSharp.Workspaces
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: Microsoft.CodeAnalysis.VisualBasic.Workspaces
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Don't change the VS version we target

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Arnott <andrewarnott@gmail.com>
* Bump FluentAssertions from 6.12.0 to 7.0.0

Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 6.12.0 to 7.0.0.
- [Release notes](https://github.com/fluentassertions/fluentassertions/releases)
- [Changelog](https://github.com/fluentassertions/fluentassertions/blob/develop/AcceptApiChanges.ps1)
- [Commits](fluentassertions/fluentassertions@6.12.0...7.0.0)

---
updated-dependencies:
- dependency-name: FluentAssertions
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Rollback CodeAnalysis version bump

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Arnott <andrewarnott@gmail.com>
Consolidation of AssemblyBuilderAccess when generating dynamic assemblies
@AArnott
AArnott requested a review from neuecc September 17, 2026 16:33

@neuecc neuecc left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I think it's fine to go ahead and delete develop.

@AArnott
AArnott merged commit 451d729 into master Sep 18, 2026
7 checks passed
@AArnott
AArnott deleted the develop branch September 18, 2026 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants