Merge pull request #6755 from dotnet/main

Merge main into live
dotnet · Mar 20, 2024 · d5e3a9f · d5e3a9f
2 parents 5372f58 + df7ffb6
commit d5e3a9f
Show file tree

Hide file tree

Showing 47 changed files with 174 additions and 207 deletions.
diff --git a/dotnet-versionsweeper.json b/dotnet-versionsweeper.json
@@ -23,6 +23,9 @@
         "**/wpf/WPF-WinRT/**/*.csproj",
         "**/core/porting/upgrade-assistant-wcf-framework/CalculatorSample/**/*.csproj",
         "**/core/extensions/ExcelDemo/ExcelDemo.csproj",
-        "**/core/extensions/VisioDemo/VisioDemo.csproj"
+        "**/core/extensions/VisioDemo/VisioDemo.csproj",
+        "**/wpf/Threading/MultithreadedWindow/net48/vb/ProjectVB.vbproj",
+        "**/wpf/Threading/PrimeNumber/net48/vb/PrimeNumber.vbproj",
+        "**/wpf/Threading/Weather/net48/vb/ProjectVB.vbproj"
     ]
 }
diff --git a/orleans/Blazor/BlazorServer/BlazorServer.csproj b/orleans/Blazor/BlazorServer/BlazorServer.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Streaming" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Streaming" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/orleans/Blazor/BlazorServer/BlazorServer.sln b/orleans/Blazor/BlazorServer/BlazorServer.sln
@@ -1,9 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34701.34
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorServer", "BlazorServer.csproj", "{EB758977-3FA0-450C-9862-D3EFC6A3C019}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "BlazorServer.csproj", "{EB758977-3FA0-450C-9862-D3EFC6A3C019}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F38AA530-C62F-48B9-B85C-95100081981F}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -14,9 +19,6 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -31,4 +33,10 @@ Global
 		{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x86.ActiveCfg = Release|Any CPU
 		{EB758977-3FA0-450C-9862-D3EFC6A3C019}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2410FA5C-535D-4486-BE8A-650E9C8DB2D3}
+	EndGlobalSection
 EndGlobal
diff --git a/orleans/Blazor/BlazorServer/README.md b/orleans/Blazor/BlazorServer/README.md
@@ -22,7 +22,7 @@ The application is based on the [official tutorial](https://dotnet.microsoft.com
 
 ## Sample prerequisites
 
-This sample is written in C# and targets .NET 7.0. It requires the [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0) or later.
+This sample is written in C# and targets .NET 8.0. It requires the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0) or later.
 
 ## Building the sample
 

diff --git a/orleans/Blazor/BlazorWasm/BlazorWasm.Client/BlazorWasm.Client.csproj b/orleans/Blazor/BlazorWasm/BlazorWasm.Client/BlazorWasm.Client.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>BlazorWasm</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/orleans/Blazor/BlazorWasm/BlazorWasm.Server/BlazorWasm.Server.csproj b/orleans/Blazor/BlazorWasm/BlazorWasm.Server/BlazorWasm.Server.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Streaming" Version="7.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Streaming" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 </Project>
diff --git a/orleans/Blazor/BlazorWasm/README.md b/orleans/Blazor/BlazorWasm/README.md
@@ -21,7 +21,7 @@ The application is based on the [official tutorial](https://dotnet.microsoft.com
 
 ## Sample prerequisites
 
-This sample is written in C# and targets .NET 7.0. It requires the [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0) or later.
+This sample is written in C# and targets .NET 8.0. It requires the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0) or later.
 
 ## Building the sample
 

diff --git a/orleans/ChatRoom/README.md b/orleans/ChatRoom/README.md
@@ -14,7 +14,7 @@ description: "An Orleans sample chat room app."
 
 ![A screenshot of the chat client](screenshot.png)
 
-This sample uses [Orleans Streaming](http://dotnet.github.io/orleans/docs/streaming/index.html) to build a basic chat application. In this application, each client can:
+This sample uses [Orleans Streaming](https://learn.microsoft.com/dotnet/orleans/streaming) to build a basic chat application. In this application, each client can:
 
 * Set their name
 * Join and leave a channel

diff --git a/orleans/Chirper/Chirper.Client/Chirper.Client.csproj b/orleans/Chirper/Chirper.Client/Chirper.Client.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -16,12 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Client" Version="7.0.0" />
-    <PackageReference Include="Spectre.Console" Version="0.43.0" />
-    <PackageReference Include="Spectre.Console.ImageSharp" Version="0.43.0" />
+    <PackageReference Include="Spectre.Console" Version="0.48.0" />
+    <PackageReference Include="Spectre.Console.ImageSharp" Version="0.48.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/orleans/Chirper/Chirper.Client/ShellHostedService.cs b/orleans/Chirper/Chirper.Client/ShellHostedService.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using Chirper.Grains;
@@ -75,7 +75,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     var following = await _account.GetFollowingListAsync();
                     AnsiConsole.Write(new Rule($"{_account.GetPrimaryKeyString()}'s followed accounts")
                     {
-                        Alignment = Justify.Center,
+                        Justification = Justify.Center,
                         Style = Style.Parse("blue")
                     });
 
@@ -86,7 +86,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                     AnsiConsole.Write(new Rule
                     {
-                        Alignment = Justify.Center,
+                        Justification = Justify.Center,
                         Style = Style.Parse("blue")
                     });
                 }
@@ -98,7 +98,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     var followers = await _account.GetFollowersListAsync();
                     AnsiConsole.Write(new Rule($"{_account.GetPrimaryKeyString()}'s followers")
                     {
-                        Alignment = Justify.Center,
+                        Justification = Justify.Center,
                         Style = Style.Parse("blue")
                     });
 
@@ -109,7 +109,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                     AnsiConsole.Write(new Rule
                     {
-                        Alignment = Justify.Center,
+                        Justification = Justify.Center,
                         Style = Style.Parse("blue")
                     });
                 }
@@ -265,13 +265,13 @@ private static void ShowHelp(bool title = false)
 
     [GeneratedRegex("/user (?<username>\\w{1,100})")]
     private static partial Regex SetUsernameRegex();
-    
+
     [GeneratedRegex("/chirp (?<message>.+)")]
     private static partial Regex ChirpMessageRegex();
-    
+
     [GeneratedRegex("/unfollow (?<username>\\w{1,100})")]
     private static partial Regex UnfollowUsernameRegex();
-    
+
     [GeneratedRegex("/follow (?<username>\\w{1,100})")]
     private static partial Regex FollowUsernameRegex();
 }
diff --git a/orleans/Chirper/Chirper.Grains.Interfaces/Chirper.Grains.Interfaces.csproj b/orleans/Chirper/Chirper.Grains.Interfaces/Chirper.Grains.Interfaces.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/orleans/Chirper/Chirper.Grains/Chirper.Grains.csproj b/orleans/Chirper/Chirper.Grains/Chirper.Grains.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Runtime" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Runtime" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/orleans/Chirper/Chirper.Server/Chirper.Server.csproj b/orleans/Chirper/Chirper.Server/Chirper.Server.csproj
@@ -1,21 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
-    <PackageReference Include="OrleansDashboard" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0" />
+    <PackageReference Include="OrleansDashboard" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Chirper.Grains\Chirper.Grains.csproj" />
+    <ProjectReference Include="..\Chirper.Grains\Chirper.Grains.csproj">
+      <TreatAsUsed>true</TreatAsUsed>
+    </ProjectReference>
   </ItemGroup>
 
 </Project>
diff --git a/orleans/Chirper/README.md b/orleans/Chirper/README.md
@@ -43,7 +43,7 @@ There is also an `IChirperViewer` observer interface for applications to subscri
 
 ## Sample prerequisites
 
-This sample is written in C# and targets .NET 7.0. It requires the [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0) or later.
+This sample is written in C# and targets .NET 8.0. It requires the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0) or later.
 
 ## Building the sample
 

diff --git a/orleans/FSharpHelloWorld/FSharpHelloWorld.sln b/orleans/FSharpHelloWorld/FSharpHelloWorld.sln
@@ -1,13 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34701.34
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "HelloWorld\HelloWorld.csproj", "{FCA3814C-1401-4CD9-AE1D-395CC5172F3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld", "HelloWorld\HelloWorld.csproj", "{FCA3814C-1401-4CD9-AE1D-395CC5172F3F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpWorldInterfaces", "HelloWorldInterfaces\HelloWorldInterfaces.csproj", "{163CCE80-C506-468C-9B28-E2FF198097E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorldInterfaces", "HelloWorldInterfaces\HelloWorldInterfaces.csproj", "{163CCE80-C506-468C-9B28-E2FF198097E3}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Grains", "Grains\Grains.fsproj", "{86155F02-44F2-4220-80A3-537BC628012A}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Grains", "Grains\Grains.fsproj", "{86155F02-44F2-4220-80A3-537BC628012A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D20F612A-A5F8-43E8-BF55-574C7C089946}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,9 +23,6 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FCA3814C-1401-4CD9-AE1D-395CC5172F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FCA3814C-1401-4CD9-AE1D-395CC5172F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -59,4 +61,7 @@ Global
 		{86155F02-44F2-4220-80A3-537BC628012A}.Release|x86.ActiveCfg = Release|Any CPU
 		{86155F02-44F2-4220-80A3-537BC628012A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/orleans/FSharpHelloWorld/Grains/Grains.fsproj b/orleans/FSharpHelloWorld/Grains/Grains.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
@@ -11,6 +11,6 @@
     <ProjectReference Include="..\HelloWorldInterfaces\HelloWorldInterfaces.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/orleans/FSharpHelloWorld/HelloWorld/HelloWorld.csproj b/orleans/FSharpHelloWorld/HelloWorld/HelloWorld.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Grains\Grains.fsproj" />
     <ProjectReference Include="..\HelloWorldInterfaces\HelloWorldInterfaces.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Core" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/orleans/FSharpHelloWorld/HelloWorldInterfaces/HelloWorldInterfaces.csproj b/orleans/FSharpHelloWorld/HelloWorldInterfaces/HelloWorldInterfaces.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/orleans/FSharpHelloWorld/README.md b/orleans/FSharpHelloWorld/README.md
@@ -28,7 +28,7 @@ With the above attribute in place, the code generator analyzes the F# assembly a
 
 ## Sample prerequisites
 
-This sample is written in C# and targets .NET 7.0. It requires the [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0) or later.
+This sample is written in C# and targets .NET 8.0. It requires the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0) or later.
 
 ## Building the sample