Skip to content

Merge main into live - #56217

Merged
gewarren merged 13 commits into
livefrom
main
Sep 23, 2026
Merged

gewarren merged 13 commits into
livefrom
main

Conversation

@dotnet-policy-service

@dotnet-policy-service dotnet-policy-service Bot commented Sep 23, 2026 •

Copy link
Copy Markdown
Contributor

eiriktsarpalis and others added 6 commits September 23, 2026 03:23
…hrough (#56207)

* Fix key and IV derivation in the VB encryption walkthrough

The Simple3Des sample derived its key by hashing the specified key once
with SHA-256 and truncating the result, and derived the initialization
vector from an empty string. The IV was therefore constant, so
encrypting the same plain text under one key always produced the same
cipher text, and each guess in an offline attack cost a single hash.

Derive the key with PBKDF2 (600,000 iterations, SHA-256) over a random
16-byte salt, generate a random IV per message, and store both in front
of the cipher text. DecryptData rejects a payload too short to contain
them, so malformed input still surfaces as CryptographicException, which
is what the existing TestDecoding snippet catches.

The class name, the algorithm, the public API, and the snippet IDs are
unchanged, and every code hunk falls inside snippets 39 to 43. The
article changes are limited to the three steps that describe the
rewritten members.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add a format version byte to the encrypted payload

Per review feedback, write a version identifier in front of the salt and
initialization vector, so that a later change to the salt length or
iteration count can still read data written by this version. DecryptData
rejects any payload that does not begin with version 1, which also stops
unversioned data from being misread as versioned.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Bumps Microsoft.Extensions.Logging from 8.0.0 to 10.0.12
Bumps Microsoft.Extensions.Logging.Console from 8.0.0 to 10.0.12
Bumps Microsoft.ML from 4.0.0 to 5.0.0
Bumps Microsoft.ML.FastTree from 4.0.0 to 5.0.0
Bumps Microsoft.ML.ImageAnalytics from 4.0.0 to 5.0.0
Bumps Microsoft.ML.Recommender from 0.22.0 to 0.23.0
Bumps Microsoft.ML.SampleUtils from 0.22.0 to 0.23.0
Bumps Microsoft.ML.TensorFlow from 4.0.0 to 5.0.0
Bumps Microsoft.ML.TimeSeries from 4.0.0 to 5.0.0
Bumps Microsoft.ML.Vision from 4.0.0 to 5.0.0
Bumps Newtonsoft.Json from 13.0.3 to 13.0.4
Bumps Spectre.Console from 0.48.0 to 0.57.2
Bumps System.CommandLine to 2.0.12
Bumps System.Drawing.Common to 10.0.12
Bumps System.IO.Pipelines from 8.0.0 to 10.0.12
Bumps System.Reflection.Metadata from 8.0.0 to 10.0.12
Bumps System.Reflection.MetadataLoadContext from 8.0.0 to 10.0.12
Bumps System.Security.Cryptography.ProtectedData from 10.0.10 to 10.0.12
Bumps System.Threading.Tasks.Dataflow from 9.0.4 to 10.0.12

---
updated-dependencies:
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.ImageAnalytics
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.Vision
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.ImageAnalytics
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.TensorFlow
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.Recommender
  dependency-version: 0.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.TimeSeries
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.FastTree
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.TimeSeries
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.SampleUtils
  dependency-version: 0.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.ML.TensorFlow
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Reflection.Metadata
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Reflection.Metadata
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Reflection.MetadataLoadContext
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Drawing.Common
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Threading.Tasks.Dataflow
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Drawing.Common
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Threading.Tasks.Dataflow
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Drawing.Common
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Drawing.Common
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.Extensions.Logging
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Microsoft.Extensions.Logging.Console
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: Spectre.Console
  dependency-version: 0.57.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.CommandLine
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.IO.Pipelines
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.IO.Pipelines
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Security.Cryptography.ProtectedData
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: System.Security.Cryptography.ProtectedData
  dependency-version: 10.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
- dependency-name: Newtonsoft.Json
  dependency-version: 13.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget/Microsoft.ML
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: azure-sdk <azuresdk@microsoft.com>
Added scheduling and limits for NuGet updates.
Co-authored-by: azure-sdk <azuresdk@microsoft.com>
@github-advanced-security

Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

@dotnetrepoman dotnetrepoman Bot added this to the September 2026 milestone Sep 23, 2026
BillWagner and others added 7 commits September 23, 2026 08:23
* Update C# 15 diagnostics

Fixes #55923

Add more of the upcoming C# 15 diagnostics.

* Fix compiler error messages in documentation

Corrected error messages for collection expressions and preprocessor directives in documentation.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* format updates

* More consolidation.

* Proofread

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
)

* Fix await Task.FromResult antipattern in async scenarios snippet

Fixes #43094

* Apply suggestion from @BillWagner: use Task.Yield instead of Task.Delay
Removed author information and updated date.
@gewarren
gewarren merged commit a05e49d into live Sep 23, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants