Merge pull request #7001 from dotnet/main

Merge main into live
dotnet · Nov 22, 2024 · 32cb2e4 · 32cb2e4
2 parents d7fa66c + 945afd8
commit 32cb2e4
Show file tree

Hide file tree

Showing 123 changed files with 507 additions and 848 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/dependabot-approve-and-automerge.yml b/.github/workflows/dependabot-approve-and-automerge.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.4
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve a PR

diff --git a/.github/workflows/dotnet-code-metrics.yml b/.github/workflows/dotnet-code-metrics.yml
@@ -22,7 +22,7 @@ jobs:
         pull-requests: write
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.2.2
 
     - name: 'Print manual run reason'
       if: ${{ github.event_name == 'workflow_dispatch' }}
@@ -41,7 +41,7 @@ jobs:
         dir: ${{ './github-actions/DotNet.GitHubAction' }}
 
     - name: Create pull request
-      uses: peter-evans/create-pull-request@v3.4.1
+      uses: peter-evans/create-pull-request@v7.0.5
       if: ${{ steps.dotnet-code-metrics.outputs.updated-metrics }} == 'true'
       with:
         title: '${{ steps.dotnet-code-metrics.outputs.summary-title }}'

diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 #@v2
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #@v2
     - name: Use Node.js
-      uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d #@v1
+      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af #@v1
       with:
         node-version: 12.x
     - name: Run Markdownlint

diff --git a/.github/workflows/publish-mono-samples.yml b/.github/workflows/publish-mono-samples.yml
@@ -23,7 +23,7 @@ jobs:
   build-mono:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 #@v2
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #@v2
     - name: Setup .NET SDK 6
       if: ${{ env.DOTNET_DO_INSTALL == 'true' }}
       run: |

diff --git a/.github/workflows/snippets5000.yml b/.github/workflows/snippets5000.yml
@@ -32,7 +32,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #@v3.1.0
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #@v4.2.2
 
     # Get the latest preview SDK (or sdk not installed by the runner)
     - name: Setup .NET SDK
@@ -62,7 +62,7 @@ jobs:
 
     # Update build output json file
     - name: Upload build results
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #@v3.1.2
+      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 #@v4.4.3
       with:
         name: build
         path: ./output.json
diff --git a/azure/sdk-identity-resources-storage/AzureIdentityStorageExample.csproj b/azure/sdk-identity-resources-storage/AzureIdentityStorageExample.csproj
@@ -20,10 +20,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.11.0" />
-    <PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.1" />
-    <PackageReference Include="Azure.ResourceManager.Storage" Version="1.2.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageReference Include="Azure.Identity" Version="1.12.0" />
+    <PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.3" />
+    <PackageReference Include="Azure.ResourceManager.Storage" Version="1.2.3" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
   </ItemGroup>
 
 </Project>
diff --git a/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj b/core/console-apps/NewTypesMsBuild/test/NewTypesTests/NewTypesTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/diagnostics/DiagnosticScenarios/DiagnosticScenarios.csproj b/core/diagnostics/DiagnosticScenarios/DiagnosticScenarios.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
   </ItemGroup>
 
 </Project>
diff --git a/core/extensions/AppWithPlugin/AppWithPlugin/AppWithPlugin.csproj b/core/extensions/AppWithPlugin/AppWithPlugin/AppWithPlugin.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/core/extensions/AppWithPlugin/AppWithPlugin/Program.cs b/core/extensions/AppWithPlugin/AppWithPlugin/Program.cs
@@ -21,11 +21,11 @@ static void Main(string[] args)
 
                 string[] pluginPaths = new string[]
                 {
-                    @"HelloPlugin\bin\Debug\net7.0\HelloPlugin.dll",
-                    @"JsonPlugin\bin\Debug\net7.0\JsonPlugin.dll",
-                    @"OldJsonPlugin\bin\Debug\net7.0\OldJsonPlugin.dll",
-                    @"FrenchPlugin\bin\Debug\net7.0\FrenchPlugin.dll",
-                    @"UVPlugin\bin\Debug\net7.0\UVPlugin.dll",
+                    @"HelloPlugin\bin\Debug\net8.0\HelloPlugin.dll",
+                    @"JsonPlugin\bin\Debug\net8.0\JsonPlugin.dll",
+                    @"OldJsonPlugin\bin\Debug\net8.0\OldJsonPlugin.dll",
+                    @"FrenchPlugin\bin\Debug\net8.0\FrenchPlugin.dll",
+                    @"UVPlugin\bin\Debug\net8.0\UVPlugin.dll",
                 };
 
                 IEnumerable<ICommand> commands = pluginPaths.SelectMany(pluginPath =>

diff --git a/core/extensions/AppWithPlugin/FrenchPlugin/FrenchPlugin.csproj b/core/extensions/AppWithPlugin/FrenchPlugin/FrenchPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 

diff --git a/core/extensions/AppWithPlugin/HelloPlugin/HelloPlugin.csproj b/core/extensions/AppWithPlugin/HelloPlugin/HelloPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 

diff --git a/core/extensions/AppWithPlugin/JsonPlugin/JsonPlugin.csproj b/core/extensions/AppWithPlugin/JsonPlugin/JsonPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 

diff --git a/core/extensions/AppWithPlugin/OldJsonPlugin/OldJsonPlugin.csproj b/core/extensions/AppWithPlugin/OldJsonPlugin/OldJsonPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 

diff --git a/core/extensions/AppWithPlugin/PluginBase/PluginBase.csproj b/core/extensions/AppWithPlugin/PluginBase/PluginBase.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/core/extensions/AppWithPlugin/ReadMe.md b/core/extensions/AppWithPlugin/ReadMe.md
@@ -21,7 +21,7 @@ By using `AssemblyDependencyResolver` along with a custom `AssemblyLoadContext`,
 
 ## Build and Run
 
-1. Install .NET 7.0 or newer. The sample targets .NET 7.0, but support for all the features it uses was added in .NET Core 3.0.
+1. Install .NET 8.0 or newer. The sample targets .NET 8.0, but support for all the features it uses was added in .NET Core 3.0.
 2. Use the .NET SDK to build the project via `dotnet build`.
    - The AppWithPlugin project does not contain any references to the plugin projects, so you need to build the solution.
 3. Go to the AppWithPlugin directory and use `dotnet run` to run the app.

diff --git a/core/extensions/AppWithPlugin/UVPlugin/UVPlugin.csproj b/core/extensions/AppWithPlugin/UVPlugin/UVPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 

diff --git a/core/extensions/AssemblyLoading/AssemblyLoading/AssemblyLoading.csproj b/core/extensions/AssemblyLoading/AssemblyLoading/AssemblyLoading.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/core/extensions/AssemblyLoading/MyLibrary/MyLibrary.csproj b/core/extensions/AssemblyLoading/MyLibrary/MyLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/core/extensions/AssemblyLoading/README.md b/core/extensions/AssemblyLoading/README.md
@@ -24,7 +24,7 @@ The following hooks into the [managed assembly loading algorithm](https://docs.m
 
 ## Build and Run
 
-1) Install [.NET 6.0 SDK](https://dotnet.microsoft.com/download) or later
+1) Install [.NET 8.0 SDK](https://dotnet.microsoft.com/download) or later
 
 1) Build the solution with `dotnet build`
 

diff --git a/core/extensions/OutOfProcCOM/COMRegistration/COMRegistration.csproj b/core/extensions/OutOfProcCOM/COMRegistration/COMRegistration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/core/extensions/OutOfProcCOM/DllServer/DllServer.cs b/core/extensions/OutOfProcCOM/DllServer/DllServer.cs
@@ -4,6 +4,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
+// The Assembly GUID and TLB version must match what
+// is defined in Contract.idl when defining the library.
+[assembly: Guid("46F3FEB2-121D-4830-AA22-0CDA9EA90DC3")]
+[assembly: TypeLibVersion(1, 0)]
+
 namespace OutOfProcCOM
 {
     [ComVisible(true)]

diff --git a/core/extensions/OutOfProcCOM/DllServer/DllServer.csproj b/core/extensions/OutOfProcCOM/DllServer/DllServer.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\Contract\Server.Contract.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
 
     <!-- Indicate the assembly is providing a COM server -->
     <EnableComHosting>true</EnableComHosting>

diff --git a/core/extensions/OutOfProcCOM/ExeServer/ExeServer.csproj b/core/extensions/OutOfProcCOM/ExeServer/ExeServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/core/extensions/OutOfProcCOM/NativeClient/NativeClient.cpp b/core/extensions/OutOfProcCOM/NativeClient/NativeClient.cpp
@@ -1,4 +1,3 @@
-#include <atlbase.h>
 #include <iostream>
 #include <iomanip>
 
@@ -17,7 +16,7 @@ int main()
         return EXIT_FAILURE;
     }
 
-    CComPtr<IServer> server;
+    IServer* server;
     hr = ::CoCreateInstance(CLSID_Server, nullptr, CLSCTX_LOCAL_SERVER, __uuidof(IServer), (void **)&server);
     if (FAILED(hr))
     {
@@ -27,6 +26,8 @@ int main()
 
     double pi;
     hr = server->ComputePi(&pi);
+    server->Release();
+    server = NULL;
     if (FAILED(hr))
     {
         std::cout << "Failure: " << std::hex << std::showbase << hr << std::endl;

diff --git a/core/extensions/OutOfProcCOM/Server.Contract/Contract.idl b/core/extensions/OutOfProcCOM/Server.Contract/Contract.idl
@@ -12,8 +12,10 @@ interface IServer : IDispatch
         [out, retval] double *ret);
 };
 
+// See the matching Guid and TLB version in DllServer.cs
 [
-    uuid(46F3FEB2-121D-4830-AA22-0CDA9EA90DC3)
+    uuid(46F3FEB2-121D-4830-AA22-0CDA9EA90DC3),
+    version( 1.0 )
 ]
 library ServerLib
 {

diff --git a/core/getting-started/golden/test-library/test-library.csproj b/core/getting-started/golden/test-library/test-library.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/getting-started/golden/test/test-library/test-library.csproj b/core/getting-started/golden/test/test-library/test-library.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...tting-started/unit-testing-using-dotnet-test/PrimeService.Tests/PrimeService.Tests.csproj b/...tting-started/unit-testing-using-dotnet-test/PrimeService.Tests/PrimeService.Tests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/getting-started/unit-testing-using-mstest/PrimeService.Tests/PrimeService.Tests.csproj b/core/getting-started/unit-testing-using-mstest/PrimeService.Tests/PrimeService.Tests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/getting-started/unit-testing-using-nunit/PrimeService.Tests/PrimeService.Tests.csproj b/core/getting-started/unit-testing-using-nunit/PrimeService.Tests/PrimeService.Tests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
   </ItemGroup>
   <!--</snippetPackages>-->
 

diff --git a/.../getting-started/unit-testing-vb-dotnet-test/PrimeService.Tests/PrimeService.Tests.vbproj b/.../getting-started/unit-testing-vb-dotnet-test/PrimeService.Tests/PrimeService.Tests.vbproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/getting-started/unit-testing-vb-mstest/PrimeService.Tests/PrimeService.Tests.vbproj b/core/getting-started/unit-testing-vb-mstest/PrimeService.Tests/PrimeService.Tests.vbproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/core/getting-started/unit-testing-vb-nunit/PrimeService.Tests/PrimeService.Tests.vbproj b/core/getting-started/unit-testing-vb-nunit/PrimeService.Tests/PrimeService.Tests.vbproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
   </ItemGroup>
   <!--</snippetPackages>-->
 

diff --git a/...etting-started/unit-testing-with-fsharp-mstest/MathService.Tests/MathService.Tests.fsproj b/...etting-started/unit-testing-with-fsharp-mstest/MathService.Tests/MathService.Tests.fsproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="3.3.1" />
+    <PackageReference Include="MSTest" Version="3.4.3" />
   </ItemGroup>
 
   <ItemGroup>