Skip to content

Commit

Permalink
Merge pull request #41574 from dotnet/main
Browse files Browse the repository at this point in the history
Merge main into live
  • Loading branch information
dotnet-policy-service[bot] committed Jun 27, 2024
2 parents e513d16 + 3ac2424 commit 6ff9e07
Show file tree
Hide file tree
Showing 43 changed files with 261 additions and 341 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-for-build-warnings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/[email protected].5
- uses: actions/[email protected].7
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/[email protected].5
- uses: actions/[email protected].7

# Call clean repo
- name: Clean repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

# Checkout the repo into the workspace within the VM
steps:
- uses: actions/[email protected].5
- uses: actions/[email protected].7
# - name: Setup .NET
# uses: actions/setup-dotnet@4d4a70f4a5b2a5a5329f13be4ac933f2c9206ac0
# with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-verifier-tryfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
core.setFailed(`Request failed with error ${err}`)
}
- name: Checkout the repository
uses: actions/[email protected].5
uses: actions/[email protected].7

- name: Checkout Pull Request
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-verifier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/[email protected].5
uses: actions/[email protected].7

- name: Validate
uses: dotnet/docs-actions/actions/docs-verifier@main
2 changes: 1 addition & 1 deletion .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
statuses: write

steps:
- uses: actions/[email protected].5
- uses: actions/[email protected].7
- name: Use Node.js
uses: actions/setup-node@eff380dfbcf941bf8832e4acb788cebe13dfd758
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snippets5000.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
# Checkout the repository for the PR
- name: Checkout repository
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b #@v4.1.5
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #@v4.1.7

# Get the latest preview SDK (or sdk not installed by the runner)
- name: Setup .NET
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/whats-new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/[email protected].5
- uses: actions/[email protected].7

- name: "Print manual run reason"
if: ${{ github.event_name == 'workflow_dispatch' }}
Expand Down
8 changes: 6 additions & 2 deletions .openpublishing.redirection.core.json
Original file line number Diff line number Diff line change
Expand Up @@ -701,13 +701,17 @@
"source_path_from_root": "/docs/core/install/dependencies.md",
"redirect_url": "/dotnet/core/install/windows"
},
{
"source_path_from_root": "/docs/core/install/linux-centos.md",
"redirect_url": "/dotnet/core/install/linux-rhel#where-is-centos-linux"
},
{
"source_path_from_root": "/docs/core/install/linux-package-manager-centos7.md",
"redirect_url": "/dotnet/core/install/linux-centos"
"redirect_url": "/dotnet/core/install/linux-rhel#where-is-centos-linux"
},
{
"source_path_from_root": "/docs/core/install/linux-package-manager-centos8.md",
"redirect_url": "/dotnet/core/install/linux-centos"
"redirect_url": "/dotnet/core/install/linux-rhel#where-is-centos-linux"
},
{
"source_path_from_root": "/docs/core/install/linux-package-manager-debian10.md",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="1.9.0-alpha" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Redis" Version="1.9.0-alpha" />
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.9.0-alpha" />
<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
<PackageReference Include="StackExchange.Redis" Version="2.8.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public partial class Counter : System.Web.UI.UserControl
}
```

In Blazor, you can register handlers for DOM UI events directly `using` directive attributes of the form `@on{event}`. The `{event}` placeholder represents the name of the event. For example, you can listen for button clicks like this:
In Blazor, you can register handlers for DOM UI events directly using directive attributes of the form `@on{event}`. The `{event}` placeholder represents the name of the event. For example, you can listen for button clicks like this:

```razor
<button @onclick="OnClick">Click me!</button>
Expand Down
6 changes: 3 additions & 3 deletions docs/architecture/maui/accessing-remote-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ Distributed applications, such as the eShop reference application, should provid
- A shared cache, which can be accessed by multiple processes or machines.
- A private cache, where data is held locally on the device running the app.

The eShop multi-platform app uses a private cache, where data is held locally on the device that's running an instance of the app. For information about the cache used by the eShop reference application, see [.NET Microservices: Architecture for Containerized .NET Applications](https://aka.ms/microservicesebook).
The eShop multi-platform app uses a private cache, where data is held locally on the device that's running an instance of the app.

> [!TIP]
> Think of the cache as a transient data store that could disappear at any time.
Expand Down Expand Up @@ -352,7 +352,7 @@ If a request still fails after a number of retries, it's better for the app to p
Use a finite number of retries, or implement the [Circuit Breaker](/azure/architecture/patterns/circuit-breaker) pattern to allow a service to recover.

The eShop reference application does implement the retry pattern. For more information, including a discussion of how to combine the retry pattern with the HttpClient class, see [.NET Microservices: Architecture for Containerized .NET Applications](https://aka.ms/microservicesebook).
The eShop reference application does implement the retry pattern.

For more information about the retry pattern, see the [Retry](/azure/architecture/patterns/retry) pattern on Microsoft Docs.

Expand All @@ -367,7 +367,7 @@ The circuit breaker pattern can prevent an app from repeatedly trying to execute
A circuit breaker acts as a proxy for operations that might fail. The proxy should monitor the number of recent failures that have occurred, and use this information to decide whether to allow the operation to proceed, or to return an exception immediately.

The eShop multi-platform app does not currently implement the circuit breaker pattern. However, the eShop does. For more information, see [.NET Microservices: Architecture for Containerized .NET Applications](https://aka.ms/microservicesebook).
The eShop multi-platform app does not currently implement the circuit breaker pattern. However, the eShop does.

> [!TIP]
> Combine the retry and circuit breaker patterns.
Expand Down
Loading

0 comments on commit 6ff9e07

Please sign in to comment.