Skip to content

Commit 4fea135

Browse files
BillWagnerBillWagner
authored
Merge pull request #7090 from dotnet/main
Merge main into live
2 parents a26b993 + 4affa94 commit 4fea135

File tree

219 files changed

+2598
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+2598
-688
lines changed

‎.github/workflows/dependabot-approve-and-automerge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Dependabot metadata
1414
id: metadata
15-
uses: dependabot/fetch-metadata@v2.4.0
15+
uses: dependabot/fetch-metadata@v2.5.0
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Approve a PR

‎.github/workflows/dotnet-code-metrics.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@ jobs:
2222
pull-requests: write
2323

2424
steps:
25-
- uses: actions/checkout@v5.0.0
25+
- uses: actions/checkout@v6.0.2
2626

2727
- name: 'Print manual run reason'
2828
if: ${{ github.event_name == 'workflow_dispatch' }}
2929
run: |
30-
echo 'Reason: ${{ github.event.inputs.reason }}'
30+
echo 'Reason: $REASON'
31+
env:
32+
REASON: ${{ github.event.inputs.reason }}
3133

3234
- name: .NET code metrics
3335
id: dotnet-code-metrics

‎.github/workflows/markdownlint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #@v2
17+
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 #@v2
1818
- name: Use Node.js
19-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 #@v1
19+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 #@v1
2020
with:
2121
node-version: 12.x
2222
- name: Run Markdownlint

‎.github/workflows/publish-mono-samples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build-mono:
2424
runs-on: macos-latest
2525
steps:
26-
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #@v2
26+
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 #@v2
2727
- name: Setup .NET SDK 6
2828
if: ${{ env.DOTNET_DO_INSTALL == 'true' }}
2929
run: |

‎.github/workflows/snippets5000.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# Steps represent a sequence of tasks that will be executed as part of the job
3333
steps:
3434
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
35-
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #@v4.2.2
35+
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 #@v4.2.2
3636

3737
# Get the latest preview SDK (or sdk not installed by the runner)
3838
- name: Setup .NET SDK
@@ -62,7 +62,7 @@ jobs:
6262
6363
# Update build output json file
6464
- name: Upload build results
65-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 #@v5.0.0
65+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f #@v6.0.0
6666
with:
6767
name: build
6868
path: ./output.json

‎core/encoding/cyrillic-to-latin/cs/ConsoleModule.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,14 @@ static void Main()
8686

8787
private static void ShowSyntax()
8888
{
89-
Console.WriteLine("\nSyntax: CyrillicToRoman <source> <destination>");
90-
Console.WriteLine(" where <source> = source filename");
91-
Console.WriteLine(" <destination> = destination filename\n");
89+
StringBuilder sb = new StringBuilder();
90+
91+
sb.AppendLine();
92+
sb.AppendLine("Syntax: CyrillicToRoman <source> <destination>");
93+
sb.AppendLine(" where <source> = source filename");
94+
sb.AppendLine(" <destination> = destination filename");
95+
sb.AppendLine();
96+
97+
Console.WriteLine(sb.ToString());
9298
}
9399
}

‎orleans/Adventure/AdventureClient/AdventureClient.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
3+
<TargetFramework>net10.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
46
<ServerGarbageCollection>true</ServerGarbageCollection>
7+
<OutputType>Exe</OutputType>
58
</PropertyGroup>
69
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.Hosting"/>
8-
<PackageReference Include="Microsoft.Extensions.Logging.Console"/>
9-
<PackageReference Include="Microsoft.Orleans.Client"/>
10+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
12+
<PackageReference Include="Microsoft.Orleans.Client" Version="10.0.0" />
1013
</ItemGroup>
1114
<ItemGroup>
12-
<ProjectReference Include="..\AdventureGrainInterfaces\AdventureGrainInterfaces.csproj"/>
15+
<ProjectReference Include="..\AdventureGrainInterfaces\AdventureGrainInterfaces.csproj" />
1316
</ItemGroup>
1417
</Project>

‎orleans/Adventure/AdventureGrainInterfaces/AdventureGrainInterfaces.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net10.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
6+
<ServerGarbageCollection>true</ServerGarbageCollection>
7+
</PropertyGroup>
28
<ItemGroup>
3-
<PackageReference Include="Microsoft.Orleans.Sdk"/>
9+
<PackageReference Include="Microsoft.Orleans.Sdk" Version="10.0.0" />
410
</ItemGroup>
511
</Project>
612

‎orleans/Adventure/AdventureGrains/AdventureGrains.csproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net10.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
6+
<ServerGarbageCollection>true</ServerGarbageCollection>
7+
</PropertyGroup>
8+
29
<ItemGroup>
3-
<PackageReference Include="Microsoft.Orleans.Sdk"/>
10+
<PackageReference Include="Microsoft.Orleans.Sdk" Version="10.0.0" />
411
</ItemGroup>
12+
513
<ItemGroup>
6-
<ProjectReference Include="..\AdventureGrainInterfaces\AdventureGrainInterfaces.csproj"/>
14+
<ProjectReference Include="..\AdventureGrainInterfaces\AdventureGrainInterfaces.csproj" />
715
</ItemGroup>
816
</Project>

‎orleans/Adventure/AdventureServer/AdventureServer.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
3+
<TargetFramework>net10.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
46
<ServerGarbageCollection>true</ServerGarbageCollection>
7+
<OutputType>Exe</OutputType>
58
</PropertyGroup>
69
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.Hosting"/>
8-
<PackageReference Include="Microsoft.Extensions.Logging.Console"/>
9-
<PackageReference Include="Microsoft.Orleans.Server"/>
10+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
12+
<PackageReference Include="Microsoft.Orleans.Server" Version="10.0.0" />
1013
</ItemGroup>
1114
<ItemGroup>
12-
<ProjectReference Include="..\AdventureGrainInterfaces\AdventureGrainInterfaces.csproj"/>
13-
<ProjectReference Include="..\AdventureGrains\AdventureGrains.csproj"/>
15+
<ProjectReference Include="..\AdventureGrainInterfaces\AdventureGrainInterfaces.csproj" />
16+
<ProjectReference Include="..\AdventureGrains\AdventureGrains.csproj" />
1417
</ItemGroup>
1518
<ItemGroup>
1619
<None Update="AdventureMap.json">

0 commit comments

Comments
 (0)