Skip to content

Commit

Permalink
Merge pull request #42457 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 Sep 4, 2024
2 parents 52ba127 + e5b0850 commit aab41f8
Show file tree
Hide file tree
Showing 41 changed files with 930 additions and 904 deletions.
148 changes: 74 additions & 74 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -811,39 +811,6 @@ updates:
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/additional-auth/interactive" #InteractiveBrokeredAuthSample.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/additional-auth/username-password" #UsernamePassword.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/authentication/credential-chains" #AuthenticationSampleApp.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/logging" #LoggingSampleApp.csproj
schedule:
Expand All @@ -867,40 +834,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/protocol-convenience-methods/AzureCoreConvenience" #AzureCoreConvenience.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/protocol-convenience-methods/AzureCoreProtocol" #AzureCoreProtocol.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/protocol-convenience-methods/SCMConvenience" #SCMConvenience.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/protocol-convenience-methods/SCMProtocol" #SCMProtocol.csproj
directory: "/docs/azure/sdk/snippets/unit-testing" #UnitTestingSampleApp.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -911,7 +845,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/unit-testing" #UnitTestingSampleApp.csproj
directory: "/docs/core/diagnostics/snippets/exception-summary" #exception-summary.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -922,7 +856,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/core/diagnostics/snippets/exception-summary" #exception-summary.csproj
directory: "/docs/core/diagnostics/snippets/health-checks" #health-checks.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -933,7 +867,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/core/diagnostics/snippets/health-checks" #health-checks.csproj
directory: "/docs/core/diagnostics/snippets/lifetime-health-checks" #lifetime-health-checks.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -944,7 +878,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/core/diagnostics/snippets/lifetime-health-checks" #lifetime-health-checks.csproj
directory: "/docs/core/diagnostics/snippets/Metrics" #metric-instr.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -955,7 +889,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/core/diagnostics/snippets/Metrics" #metric-instr.csproj
directory: "/docs/core/diagnostics/snippets/Microsoft.Diagnostics.NETCore.Client/csharp" #Microsoft.Diagnostics.NETCore.Client.Samples.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -966,7 +900,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/core/diagnostics/snippets/Microsoft.Diagnostics.NETCore.Client/csharp" #Microsoft.Diagnostics.NETCore.Client.Samples.csproj
directory: "/docs/core/diagnostics/snippets/OTel-Prometheus-Grafana-Jaeger/csharp" #OTel-Prometheus-Grafana-Jaeger.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -977,7 +911,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/core/diagnostics/snippets/OTel-Prometheus-Grafana-Jaeger/csharp" #OTel-Prometheus-Grafana-Jaeger.csproj
directory: "/docs/core/diagnostics/snippets/OTLP-Example/csharp" #OTLP-Example.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand Down Expand Up @@ -2197,3 +2131,69 @@ updates:
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/machine-learning/tutorials/snippets/phone-calls-anomaly-detection/csharp" #PhoneCallsAnomalyDetection.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/machine-learning/tutorials/snippets/predict-prices/csharp" #TaxiFarePrediction.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/machine-learning/tutorials/snippets/sales-anomaly-detection/csharp" #ProductSalesAnomalyDetection.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/machine-learning/tutorials/snippets/sentiment-analysis/csharp" #SentimentAnalysis.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/machine-learning/tutorials/snippets/text-classification-tf/csharp" #TextClassificationTF.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/orleans/deployment/snippets/consul/Silo" #Silo.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
2 changes: 1 addition & 1 deletion .github/workflows/clean-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

# Create the PR for the work done by the "clean repo" tool
- name: create-pull-request
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
with:
branch: create-cleanrepo-pull-request/patch
title: "Monthly chores: Automated repo cleanup"
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 @@ -52,7 +52,7 @@ jobs:
dependabot-yml-path: ".github/dependabot.yml"
- name: Create pull request
if: github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet'
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
with:
branch: create-dependabotconfig-pull-request/patch
title: "Update dependabot.yml - automatically."
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/whats-new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
savedir: './docs/whats-new'

- name: create-pull-request
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
with:
branch: create-whatsnew-pull-request/patch
title: "What's new article"
Expand Down
Loading

0 comments on commit aab41f8

Please sign in to comment.