Bump flatted from 3.2.9 to 3.4.2

Bumps [flatted](https://github.com/WebReflection/flatted) from 3.2.9 to 3.4.2.
- [Commits](https://github.com/WebReflection/flatted/compare/v3.2.9...v3.4.2)

---
updated-dependencies:
- dependency-name: flatted
  dependency-version: 3.4.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/basic-validation.yml

@@ -16,4 +16,4 @@ jobs:
     name: Basic validation
     uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
     with:
-      node-version: '20'
+      node-version: '24'

.github/workflows/check-dist.yml

@@ -16,4 +16,4 @@ jobs:
     name: Check dist/
     uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main
     with:
-      node-version: '20'
+      node-version: '24'

.github/workflows/publish-immutable-actions.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checking out
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Publish
         id: publish
         uses: actions/publish-immutable-action@v0.0.4

.github/workflows/release-new-action-version.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Update the ${{ env.TAG_NAME }} tag
         id: update-major-tag
-        uses: actions/publish-action@v0.3.0
+        uses: actions/publish-action@v0.4.0
         with:
           source-tag: ${{ env.TAG_NAME }}
           slack-webhook: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/test-dotnet.yml

@@ -18,32 +18,17 @@ jobs:
       fail-fast: false
       matrix:
         operating-system:
-          [ubuntu-latest, ubuntu-22.04, windows-latest, macos-13, macos-latest]
-        dotnet-version: ['2.1', '2.2', '3.0', '3.1', '5.0', '6.0', '7.0', '8.0']
-        exclude:
-          - dotnet-version: '2.1'
-            operating-system: ubuntu-latest
-          - dotnet-version: '2.2'
-            operating-system: ubuntu-latest
-          - dotnet-version: '3.0'
-            operating-system: ubuntu-latest
-          - dotnet-version: '3.1'
-            operating-system: ubuntu-latest
-          - dotnet-version: '5.0'
-            operating-system: ubuntu-latest
-          - dotnet-version: '2.1'
-            operating-system: macos-latest
-          - dotnet-version: '2.2'
-            operating-system: macos-latest
-          - dotnet-version: '3.0'
-            operating-system: macos-latest
-          - dotnet-version: '3.1'
-            operating-system: macos-latest
-          - dotnet-version: '5.0'
-            operating-system: macos-latest
+          [
+            ubuntu-latest,
+            ubuntu-22.04,
+            windows-latest,
+            macos-15-intel,
+            macos-latest
+          ]
+        dotnet-version: ['8.0', '9.0', '10.0']
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Clear toolcache
         shell: pwsh
         run: __tests__/clear-toolcache.ps1 ${{ runner.os }}

README.md

@@ -15,6 +15,13 @@ documentation:
 [Software installed on github hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-software)
 for .NET SDK versions that are currently available.
 
+## Breaking changes in V5
+
+- Upgraded action from node20 to node24
+  > Make sure your runner is on version v2.327.1 or later to ensure compatibility with this release. see [Release Notes](https://github.com/actions/runner/releases/tag/v2.327.1)
+
+For more details, see the full release notes on the [release page](https://github.com/actions/setup-dotnet/releases/tag/v5.0.0)
+
 ## Usage
 
 See [action.yml](action.yml)
@@ -22,10 +29,10 @@ See [action.yml](action.yml)
 **Basic**:
 ```yaml
 steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-dotnet@v4
+- uses: actions/checkout@v6
+- uses: actions/setup-dotnet@v5
   with:
-    dotnet-version: '3.1.x'
+    dotnet-version: '8.0.x'
 - run: dotnet build <my project>
 ```
 > **Warning**: Unless a concrete version is specified in the [`global.json`](https://learn.microsoft.com/en-us/dotnet/core/tools/global-json) file, **_the latest .NET version installed on the runner (including preinstalled versions) will be used [by default](https://learn.microsoft.com/en-us/dotnet/core/versions/selection#the-sdk-uses-the-latest-installed-version)_**. Please refer to the [documentation](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-software) for the currently preinstalled .NET SDK versions.
@@ -33,25 +40,42 @@ steps:
 **Multiple version installation**:
 ```yml
 steps:
-- uses: actions/checkout@v4
+- uses: actions/checkout@v6
 - name: Setup dotnet
-  uses: actions/setup-dotnet@v4
+  uses: actions/setup-dotnet@v5
   with:
     dotnet-version: | 
-      3.1.x
-      5.0.x
+      8.0.x
+      9.0.x
 - run: dotnet build <my project>
 ```
 ## Supported version syntax
 
 The `dotnet-version` input supports following syntax:
 
-- **A.B.C** (e.g 6.0.400, 7.0.100-preview.7.22377.5) - installs exact version of .NET SDK
-- **A.B** or **A.B.x** (e.g. 3.1, 3.1.x) - installs the latest patch version of .NET SDK on the channel `3.1`, including prerelease versions (preview, rc)
-- **A** or **A.x** (e.g. 3, 3.x) - installs the latest minor version of the specified major tag, including prerelease versions (preview, rc)
-- **A.B.Cxx** (e.g. 6.0.4xx) - available since `.NET 5.0` release. Installs the latest version of the specific SDK release, including prerelease versions (preview, rc). 
+- **A.B.C** (e.g 9.0.308, 10.0.100-preview.1.25120.13) - installs exact version of .NET SDK
+- **A.B** or **A.B.x** (e.g. 8.0, 8.0.x) - installs the latest patch version of .NET SDK on the channel `8.0`, including prerelease versions (preview, rc)
+- **A** or **A.x** (e.g. 8, 8.x) - installs the latest minor version of the specified major tag, including prerelease versions (preview, rc)
+- **A.B.Cxx** (e.g. 8.0.4xx) - available since `.NET 5.0` release. Installs the latest version of the specific SDK release, including prerelease versions (preview, rc). 
 
 
+## Using the `architecture` input
+Using the architecture input, it is possible to specify the required .NET SDK architecture. Possible values:  `x64`, `x86`, `arm64`, `amd64`, `arm`, `s390x`, `ppc64le`, `riscv64`. If the input is not specified, the architecture defaults to the host OS architecture (not all of the architectures are available on all platforms).
+
+**Example: Install multiple SDK versions for a specific architecture**
+```yml
+steps:
+- uses: actions/checkout@v6
+- name: Setup dotnet (x86)
+  uses: actions/setup-dotnet@v5
+  with:
+    dotnet-version: |
+      8.0.x
+      9.0.x
+    architecture: x86
+- run: dotnet build <my project>
+```
+
 ## Using the `dotnet-quality` input
 This input sets up the action to install the latest build of the specified quality in the channel. The possible values of `dotnet-quality` are: **daily**, **signed**, **validated**, **preview**, **ga**.
 
@@ -59,10 +83,10 @@ This input sets up the action to install the latest build of the specified quali
 
 ```yml
 steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-dotnet@v4
+- uses: actions/checkout@v6
+- uses: actions/setup-dotnet@v5
   with:
-    dotnet-version: '6.0.x'
+    dotnet-version: '8.0.x'
     dotnet-quality: 'preview'
 - run: dotnet build <my project>
 ```
@@ -74,8 +98,8 @@ steps:
 
 ```yml
 steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-dotnet@v4
+- uses: actions/checkout@v6
+- uses: actions/setup-dotnet@v5
   with:
     global-json-file: csharp/global.json
 - run: dotnet build <my project>
@@ -91,10 +115,10 @@ The action searches for [NuGet Lock files](https://learn.microsoft.com/nuget/con
 
 ```yaml
 steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-dotnet@v4
+- uses: actions/checkout@v6
+- uses: actions/setup-dotnet@v5
   with:
-    dotnet-version: 6.x
+    dotnet-version: 8.x
     cache: true
 - run: dotnet restore --locked-mode
 ```
@@ -116,10 +140,10 @@ steps:
 env:
   NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
 steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-dotnet@v4
+- uses: actions/checkout@v6
+- uses: actions/setup-dotnet@v5
   with:
-    dotnet-version: 6.x
+    dotnet-version: 8.x
     cache: true
 - run: dotnet restore --locked-mode
 ```
@@ -130,10 +154,10 @@ steps:
 env:
   NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
 steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-dotnet@v4
+- uses: actions/checkout@v6
+- uses: actions/setup-dotnet@v5
   with:
-    dotnet-version: 6.x
+    dotnet-version: 8.x
     cache: true
     cache-dependency-path: subdir/packages.lock.json
 - run: dotnet restore --locked-mode
@@ -147,12 +171,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet: [ '2.1.x', '3.1.x', '5.0.x' ]
+        dotnet: [ '8.0.x', '9.0.x', '10.0.x' ]
     name: Dotnet ${{ matrix.dotnet }} sample
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - name: Execute dotnet
@@ -167,12 +191,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet: [ '2.1.x', '3.1.x', '5.0.x' ]
+        dotnet: [ '8.0.x', '9.0.x', '10.0.x' ]
     name: Dotnet ${{ matrix.dotnet }} sample
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         id: stepid
         with:
           dotnet-version: ${{ matrix.dotnet }}
@@ -181,15 +205,16 @@ jobs:
       - name: Execute dotnet
         run: dotnet build <my project>
 ```
+>**Note**: When generating a temporary `global.json` within your workflow on Windows, ensure the command is executed using a shell such as PowerShell Core (`pwsh`) or `bash` (where supported) to avoid formatting inconsistencies that could cause .NET commands to fail.
 ## Setting up authentication for nuget feeds
 
 ### Github Package Registry (GPR)
 ```yml
 steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-dotnet@v4
+- uses: actions/checkout@v6
+- uses: actions/setup-dotnet@v5
   with:
-    dotnet-version: '3.1.x'
+    dotnet-version: '8.0.x'
     source-url: https://nuget.pkg.github.com/<owner>/index.json
   env:
     NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -202,7 +227,7 @@ steps:
 
 ### Azure Artifacts
 ```yml
-- uses: actions/setup-dotnet@v4
+- uses: actions/setup-dotnet@v5
   with:
     source-url: https://pkgs.dev.azure.com/<your-organization>/_packaging/<your-feed-name>/nuget/v3/index.json
   env:
@@ -213,9 +238,9 @@ steps:
 
 ### nuget.org
 ```yml
-- uses: actions/setup-dotnet@v4
+- uses: actions/setup-dotnet@v5
   with:
-    dotnet-version: 3.1.x
+    dotnet-version: 8.0.x
 - name: Publish the package to nuget.org
   run: dotnet nuget push */bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
   env:
@@ -223,6 +248,22 @@ steps:
 ```
 > **Note**: It's the only way to push a package to nuget.org feed for macOS/Linux machines due to API key config store limitations.
 
+## Using the `workloads` input
+The `workloads` input allows you to install .NET workloads as part of the SDK setup. Workloads provide additional platform tools and dependencies for frameworks. This action automatically runs `dotnet workload update` before installing the specified workloads to ensure manifests are refreshed and existing workloads are updated to their latest compatible versions.
+
+```yaml
+steps:
+- uses: actions/checkout@v5
+- name: Setup .NET with workloads
+  uses: actions/setup-dotnet@v5
+  with:
+    dotnet-version: '9.0.x'
+    workloads: workload1, workload2  # Specify the workloads required for the project, such as wasm-tools, maui, etc.
+- run: dotnet build <my project>
+```
+
+> **Note**: Ensure workloads are compatible with your runner's OS, architecture, and .NET SDK version before enabling workload installation. Some workloads may require additional installation time due to large toolchain downloads.
+
 # Outputs and environment variables
 
 ## Outputs
@@ -236,11 +277,11 @@ Using the **dotnet-version** output it's possible to get the installed by the ac
 In case of a single version installation, the `dotnet-version` output contains the version that is installed by the action.
 
 ```yaml
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/setup-dotnet@v5
       id: stepid
       with:
-        dotnet-version: 3.1.422
-    - run: echo '${{ steps.stepid.outputs.dotnet-version }}' # outputs 3.1.422
+        dotnet-version: 8.0.416
+    - run: echo '${{ steps.stepid.outputs.dotnet-version }}' # outputs 8.0.416
 ```
 
 **Multiple version installation**
@@ -248,27 +289,27 @@ In case of a single version installation, the `dotnet-version` output contains t
 In case of a multiple version installation, the `dotnet-version` output contains the latest version that is installed by the action.
 
 ```yaml
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/setup-dotnet@v5
       id: stepid
       with:
         dotnet-version: | 
-          3.1.422
-          5.0.408
-    - run: echo '${{ steps.stepid.outputs.dotnet-version }}' # outputs 5.0.408
+          8.0.416
+          9.0.308
+    - run: echo '${{ steps.stepid.outputs.dotnet-version }}' # outputs 9.0.308
 ```
 **Installation from global.json**
 
 When the `dotnet-version` input is used along with the `global-json-file` input, the `dotnet-version` output contains the version resolved from the `global.json`.
 
 ```yaml
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/setup-dotnet@v5
       id: stepid
       with:
         dotnet-version: | 
-          3.1.422
-          5.0.408
-        global-json-file: "./global.json" # contains version 2.2.207
-    - run: echo '${{ steps.stepid.outputs.dotnet-version }}' # outputs 2.2.207
+          9.0.308
+          10.0.101
+        global-json-file: "./global.json" # contains version 8.0.416
+    - run: echo '${{ steps.stepid.outputs.dotnet-version }}' # outputs 8.0.416
 ```
 
 ### `cache-hit`
@@ -301,12 +342,19 @@ build:
     DOTNET_INSTALL_DIR: "path/to/directory"
     NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
   steps:
-    - uses: actions/checkout@main
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/checkout@v6
+    - uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '8.0.x'
         cache: true
 ```
+You can also set `DOTNET_INSTALL_DIR` to a value based on runtime variables, such as `$HOME/.dotnet` or `${{ runner.temp }}/.dotnet` before the `setup-dotnet` step:
+
+```yml
+    - name: Set DOTNET_INSTALL_DIR
+      run: echo "DOTNET_INSTALL_DIR=$HOME/.dotnet" >> $GITHUB_ENV
+```
+> **Note**: On some self-hosted or large Linux runners, installing .NET under the default `/usr/share/dotnet` location may fail due to insufficient permissions. To ensure successful installation, set `DOTNET_INSTALL_DIR` to a user-writable path.
 
 ## Recommended permissions
 

__tests__/e2e-test-csproj/AssemblyInfo.cs

@@ -0,0 +1,4 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+// Sequential test execution
+[assembly: DoNotParallelize]

__tests__/e2e-test-csproj/Test.cs

@@ -12,7 +12,7 @@ namespace test_csproj
             Console.WriteLine("TestMethod");
             int calculatedResult = 1000 / 25;
             int expectedResult = 40;
-            Assert.AreEqual(calculatedResult, expectedResult);
+            Assert.AreEqual(expectedResult, calculatedResult);
         }
     }
 }

__tests__/e2e-test-csproj/test.csproj

@@ -8,9 +8,9 @@
 
   <ItemGroup>
     <!-- These packages will be downloaded over the network for testing proxy settings -->
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
   </ItemGroup>
 
 </Project>

__tests__/installer.test.ts

@@ -2,6 +2,7 @@ import each from 'jest-each';
 import semver from 'semver';
 import fs from 'fs';
 import fspromises from 'fs/promises';
+import os from 'os';
 import * as exec from '@actions/exec';
 import * as core from '@actions/core';
 import * as io from '@actions/io';
@@ -38,7 +39,7 @@ describe('installer tests', () => {
       });
 
       it('should throw the error in case of non-zero exit code of the installation script. The error message should contain logs.', async () => {
-        const inputVersion = '3.1.100';
+        const inputVersion = '10.0.101';
         const inputQuality = '' as QualityOptions;
         const errorMessage = 'fictitious error message!';
 
@@ -60,7 +61,7 @@ describe('installer tests', () => {
       });
 
       it('should return version of .NET SDK after installation complete', async () => {
-        const inputVersion = '3.1.100';
+        const inputVersion = '10.0.101';
         const inputQuality = '' as QualityOptions;
         const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
         getExecOutputSpy.mockImplementation(() => {
@@ -82,7 +83,7 @@ describe('installer tests', () => {
       });
 
       it(`should supply 'version' argument to the installation script if supplied version is in A.B.C syntax`, async () => {
-        const inputVersion = '6.0.300';
+        const inputVersion = '10.0.101';
         const inputQuality = '' as QualityOptions;
         const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
 
@@ -120,7 +121,7 @@ describe('installer tests', () => {
       });
 
       it(`should warn if the 'quality' input is set and the supplied version is in A.B.C syntax`, async () => {
-        const inputVersion = '6.0.300';
+        const inputVersion = '10.0.101';
         const inputQuality = 'ga' as QualityOptions;
         const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
         getExecOutputSpy.mockImplementation(() => {
@@ -147,7 +148,7 @@ describe('installer tests', () => {
       it(`should warn if the 'quality' input is set and version isn't in A.B.C syntax but major tag is lower then 6`, async () => {
         const inputVersion = '3.1';
         const inputQuality = 'ga' as QualityOptions;
-        const stdout = `Fictitious dotnet version 3.1.100 is installed`;
+        const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
 
         getExecOutputSpy.mockImplementation(() => {
           return Promise.resolve({
@@ -170,12 +171,12 @@ describe('installer tests', () => {
         );
       });
 
-      each(['6', '6.0', '6.0.x', '6.0.*', '6.0.X']).test(
+      each(['10', '10.0', '10.0.x', '10.0.*', '10.0.X']).test(
         `should supply 'quality' argument to the installation script if quality input is set and version (%s) is not in A.B.C syntax`,
         async inputVersion => {
           const inputQuality = 'ga' as QualityOptions;
           const exitCode = 0;
-          const stdout = `Fictitious dotnet version 6.0.0 is installed`;
+          const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
           getExecOutputSpy.mockImplementation(() => {
             return Promise.resolve({
               exitCode: exitCode,
@@ -210,12 +211,12 @@ describe('installer tests', () => {
         }
       );
 
-      each(['6', '6.0', '6.0.x', '6.0.*', '6.0.X']).test(
+      each(['10', '10.0', '10.0.x', '10.0.*', '10.0.X']).test(
         `should supply 'channel' argument to the installation script if version (%s) isn't in A.B.C syntax`,
         async inputVersion => {
           const inputQuality = '' as QualityOptions;
           const exitCode = 0;
-          const stdout = `Fictitious dotnet version 6.0.0 is installed`;
+          const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
           getExecOutputSpy.mockImplementation(() => {
             return Promise.resolve({
               exitCode: exitCode,
@@ -243,8 +244,8 @@ describe('installer tests', () => {
             getExecOutputSpy.mock.calls[callIndex][1] as string[]
           ).join(' ');
           const expectedArgument = IS_WINDOWS
-            ? `-Channel 6.0`
-            : `--channel 6.0`;
+            ? `-Channel 10.0`
+            : `--channel 10.0`;
 
           expect(scriptArguments).toContain(expectedArgument);
         }
@@ -253,7 +254,7 @@ describe('installer tests', () => {
       if (IS_WINDOWS) {
         it(`should supply '-ProxyAddress' argument to the installation script if env.variable 'https_proxy' is set`, async () => {
           process.env['https_proxy'] = 'https://proxy.com';
-          const inputVersion = '6.0.100';
+          const inputVersion = '10.0.101';
           const inputQuality = '' as QualityOptions;
           const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
 
@@ -291,9 +292,9 @@ describe('installer tests', () => {
 
         it(`should supply '-ProxyBypassList' argument to the installation script if env.variable 'no_proxy' is set`, async () => {
           process.env['no_proxy'] = 'first.url,second.url';
-          const inputVersion = '6.0.100';
+          const inputVersion = '10.0.101';
           const inputQuality = '' as QualityOptions;
-          const stdout = `Fictitious dotnet version 6.0.0 is installed`;
+          const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
 
           getExecOutputSpy.mockImplementation(() => {
             return Promise.resolve({
@@ -327,6 +328,143 @@ describe('installer tests', () => {
           );
         });
       }
+
+      it(`should supply 'architecture' argument to the installation script when architecture is provided`, async () => {
+        const inputVersion = '10.0.101';
+        const inputQuality = '' as QualityOptions;
+        const inputArchitecture = 'x64';
+        const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
+
+        getExecOutputSpy.mockImplementation(() => {
+          return Promise.resolve({
+            exitCode: 0,
+            stdout: `${stdout}`,
+            stderr: ''
+          });
+        });
+        maxSatisfyingSpy.mockImplementation(() => inputVersion);
+
+        const dotnetInstaller = new installer.DotnetCoreInstaller(
+          inputVersion,
+          inputQuality,
+          inputArchitecture
+        );
+
+        await dotnetInstaller.installDotnet();
+
+        const callIndex = 1;
+        const scriptArguments = (
+          getExecOutputSpy.mock.calls[callIndex][1] as string[]
+        ).join(' ');
+        const expectedArgument = IS_WINDOWS
+          ? `-Architecture ${inputArchitecture}`
+          : `--architecture ${inputArchitecture}`;
+
+        expect(scriptArguments).toContain(expectedArgument);
+      });
+
+      it(`should NOT supply 'architecture' argument when architecture is not provided`, async () => {
+        const inputVersion = '10.0.101';
+        const inputQuality = '' as QualityOptions;
+        const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
+
+        getExecOutputSpy.mockImplementation(() => {
+          return Promise.resolve({
+            exitCode: 0,
+            stdout: `${stdout}`,
+            stderr: ''
+          });
+        });
+        maxSatisfyingSpy.mockImplementation(() => inputVersion);
+
+        const dotnetInstaller = new installer.DotnetCoreInstaller(
+          inputVersion,
+          inputQuality
+        );
+
+        await dotnetInstaller.installDotnet();
+
+        const callIndex = 1;
+        const scriptArguments = (
+          getExecOutputSpy.mock.calls[callIndex][1] as string[]
+        ).join(' ');
+
+        expect(scriptArguments).not.toContain('--architecture');
+        expect(scriptArguments).not.toContain('-Architecture');
+      });
+
+      it(`should supply 'install-dir' with arch subdirectory for cross-arch install`, async () => {
+        const inputVersion = '10.0.101';
+        const inputQuality = '' as QualityOptions;
+        const inputArchitecture = 'x64';
+        const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
+
+        getExecOutputSpy.mockImplementation(() => {
+          return Promise.resolve({
+            exitCode: 0,
+            stdout: `${stdout}`,
+            stderr: ''
+          });
+        });
+        maxSatisfyingSpy.mockImplementation(() => inputVersion);
+
+        // Mock os.arch() to return a different arch to simulate cross-arch
+        const archSpy = jest.spyOn(os, 'arch').mockReturnValue('arm64');
+
+        const dotnetInstaller = new installer.DotnetCoreInstaller(
+          inputVersion,
+          inputQuality,
+          inputArchitecture
+        );
+
+        await dotnetInstaller.installDotnet();
+
+        const callIndex = 1;
+        const scriptArguments = (
+          getExecOutputSpy.mock.calls[callIndex][1] as string[]
+        ).join(' ');
+
+        const expectedInstallDirFlag = IS_WINDOWS
+          ? '-InstallDir'
+          : '--install-dir';
+
+        expect(scriptArguments).toContain(expectedInstallDirFlag);
+        expect(scriptArguments).toContain(inputArchitecture);
+
+        archSpy.mockRestore();
+      });
+
+      it(`should NOT supply 'install-dir' when architecture matches runner's native arch`, async () => {
+        const inputVersion = '10.0.101';
+        const inputQuality = '' as QualityOptions;
+        const nativeArch = os.arch().toLowerCase();
+        const stdout = `Fictitious dotnet version ${inputVersion} is installed`;
+
+        getExecOutputSpy.mockImplementation(() => {
+          return Promise.resolve({
+            exitCode: 0,
+            stdout: `${stdout}`,
+            stderr: ''
+          });
+        });
+        maxSatisfyingSpy.mockImplementation(() => inputVersion);
+
+        const dotnetInstaller = new installer.DotnetCoreInstaller(
+          inputVersion,
+          inputQuality,
+          nativeArch
+        );
+
+        await dotnetInstaller.installDotnet();
+
+        const callIndex = 1;
+        const scriptArguments = (
+          getExecOutputSpy.mock.calls[callIndex][1] as string[]
+        ).join(' ');
+
+        expect(scriptArguments).not.toContain('--install-dir');
+        expect(scriptArguments).not.toContain('-InstallDir');
+      });
     });
 
     describe('addToPath() tests', () => {
@@ -346,17 +484,43 @@ describe('installer tests', () => {
     });
   });
 
+  describe('normalizeArch() tests', () => {
+    it(`should normalize 'amd64' to 'x64'`, () => {
+      expect(installer.normalizeArch('amd64')).toBe('x64');
+    });
+
+    it(`should normalize 'AMD64' to 'x64' (case-insensitive)`, () => {
+      expect(installer.normalizeArch('AMD64')).toBe('x64');
+    });
+
+    it(`should pass through 'x64' unchanged`, () => {
+      expect(installer.normalizeArch('x64')).toBe('x64');
+    });
+
+    it(`should pass through 'arm64' unchanged`, () => {
+      expect(installer.normalizeArch('arm64')).toBe('arm64');
+    });
+
+    it(`should lowercase 'ARM64'`, () => {
+      expect(installer.normalizeArch('ARM64')).toBe('arm64');
+    });
+
+    it(`should pass through 'x86' unchanged`, () => {
+      expect(installer.normalizeArch('x86')).toBe('x86');
+    });
+  });
+
   describe('DotnetVersionResolver tests', () => {
     describe('createDotnetVersion() tests', () => {
       each([
-        '3.1',
-        '3.x',
-        '3.1.x',
-        '3.1.*',
-        '3.1.X',
-        '3.1.2',
-        '3.1.0-preview1',
-        '6.0.2xx'
+        '10.0',
+        '10.x',
+        '10.0.x',
+        '10.0.*',
+        '10.0.X',
+        '10.0.0',
+        '10.0.0-preview7',
+        '10.0.1xx'
       ]).test(
         'if valid version is supplied (%s), it should return version object with some value',
         async version => {
@@ -408,7 +572,7 @@ describe('installer tests', () => {
         }
       );
 
-      each(['3', '3.1', '3.1.x', '3.1.*', '3.1.X', '6.0.2xx']).test(
+      each(['10', '10.0', '10.0.x', '10.0.*', '10.0.X', '10.0.1xx']).test(
         "if version that can be resolved to 'channel' option is supplied (%s), it should set type to 'channel' in version object",
         async version => {
           const dotnetVersionResolver = new installer.DotnetVersionResolver(
@@ -423,7 +587,7 @@ describe('installer tests', () => {
         }
       );
 
-      each(['6.0', '6.0.x', '6.0.*', '6.0.X', '6.0.2xx']).test(
+      each(['10.0', '10.0.x', '10.0.*', '10.0.X', '10.0.1xx']).test(
         "if version that can be resolved to 'channel' option is supplied and its major tag is >= 6 (%s), it should set type to 'channel' and qualityFlag to 'true' in version object",
         async version => {
           const dotnetVersionResolver = new installer.DotnetVersionResolver(
@@ -439,7 +603,7 @@ describe('installer tests', () => {
         }
       );
 
-      each(['3.1.2', '3.1.0-preview1']).test(
+      each(['10.0.0', '10.0.0-preview7']).test(
         "if version that can be resolved to 'version' option is supplied (%s), it should set quality flag to 'false' and type to 'version' in version object",
         async version => {
           const dotnetVersionResolver = new installer.DotnetVersionResolver(
@@ -455,7 +619,7 @@ describe('installer tests', () => {
         }
       );
 
-      each(['3.1.2', '3.1']).test(
+      each(['10.0.0', '10.0']).test(
         'it should create proper line arguments for powershell/bash installation scripts',
         async version => {
           const dotnetVersionResolver = new installer.DotnetVersionResolver(

__tests__/setup-dotnet.test.ts

@@ -2,7 +2,7 @@ import * as core from '@actions/core';
 import fs from 'fs';
 import semver from 'semver';
 import * as auth from '../src/authutil';
-
+import os from 'os';
 import * as setup from '../src/setup-dotnet';
 import {DotnetCoreInstaller, DotnetInstallDir} from '../src/installer';
 import * as cacheUtils from '../src/cache-utils';
@@ -81,7 +81,7 @@ describe('setup-dotnet tests', () => {
 
     it('should fail the action if quality is supplied but its value is not supported', async () => {
       inputs['global-json-file'] = '';
-      inputs['dotnet-version'] = ['6.0'];
+      inputs['dotnet-version'] = ['10.0'];
       inputs['dotnet-quality'] = 'fictitiousQuality';
 
       const expectedErrorMessage = `Value '${inputs['dotnet-quality']}' is not supported for the 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`;
@@ -92,7 +92,7 @@ describe('setup-dotnet tests', () => {
 
     it('should call installDotnet() multiple times if dotnet-version multiline input is provided', async () => {
       inputs['global-json-file'] = '';
-      inputs['dotnet-version'] = ['6.0', '7.0'];
+      inputs['dotnet-version'] = ['9.0', '10.0'];
       inputs['dotnet-quality'] = '';
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(''));
@@ -103,7 +103,7 @@ describe('setup-dotnet tests', () => {
 
     it('should call addToPath() after installation complete', async () => {
       inputs['global-json-file'] = '';
-      inputs['dotnet-version'] = ['6.0', '7.0'];
+      inputs['dotnet-version'] = ['9.0', '10.0'];
       inputs['dotnet-quality'] = '';
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(''));
@@ -145,7 +145,7 @@ describe('setup-dotnet tests', () => {
     });
 
     it('should call setOutput() after installation complete successfully', async () => {
-      inputs['dotnet-version'] = ['6.0.300'];
+      inputs['dotnet-version'] = ['10.0.101'];
 
       installDotnetSpy.mockImplementation(() =>
         Promise.resolve(`${inputs['dotnet-version']}`)
@@ -156,7 +156,7 @@ describe('setup-dotnet tests', () => {
     });
 
     it(`shouldn't call setOutput() if parsing dotnet-installer logs failed`, async () => {
-      inputs['dotnet-version'] = ['6.0.300'];
+      inputs['dotnet-version'] = ['10.0.101'];
       const warningMessage = `Failed to output the installed version of .NET. The 'dotnet-version' output will not be set.`;
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(null));
@@ -177,7 +177,7 @@ describe('setup-dotnet tests', () => {
     });
 
     it(`should get 'cache-dependency-path' and call restoreCache() if input cache is set to true and cache feature is available`, async () => {
-      inputs['dotnet-version'] = ['6.0.300'];
+      inputs['dotnet-version'] = ['10.0.101'];
       inputs['dotnet-quality'] = '';
       inputs['cache'] = true;
       inputs['cache-dependency-path'] = 'fictitious.package.lock.json';
@@ -195,7 +195,7 @@ describe('setup-dotnet tests', () => {
     });
 
     it(`shouldn't call restoreCache() if input cache isn't set to true`, async () => {
-      inputs['dotnet-version'] = ['6.0.300'];
+      inputs['dotnet-version'] = ['10.0.101'];
       inputs['dotnet-quality'] = '';
       inputs['cache'] = false;
 
@@ -209,7 +209,7 @@ describe('setup-dotnet tests', () => {
     });
 
     it(`shouldn't call restoreCache() if cache feature isn't available`, async () => {
-      inputs['dotnet-version'] = ['6.0.300'];
+      inputs['dotnet-version'] = ['10.0.101'];
       inputs['dotnet-quality'] = '';
       inputs['cache'] = true;
 
@@ -221,5 +221,40 @@ describe('setup-dotnet tests', () => {
       await setup.run();
       expect(restoreCacheSpy).not.toHaveBeenCalled();
     });
+
+    it('should pass valid architecture input to DotnetCoreInstaller', async () => {
+      inputs['dotnet-version'] = ['10.0.101'];
+      inputs['dotnet-quality'] = '';
+      inputs['architecture'] = os.arch().toLowerCase();
+
+      installDotnetSpy.mockImplementation(() => Promise.resolve(''));
+
+      await setup.run();
+      expect(installDotnetSpy).toHaveBeenCalledTimes(1);
+      expect(DotnetInstallDir.addToPath).toHaveBeenCalledTimes(1);
+    });
+
+    it('should work with empty architecture input for auto-detection', async () => {
+      inputs['dotnet-version'] = ['10.0.101'];
+      inputs['dotnet-quality'] = '';
+      inputs['architecture'] = '';
+
+      installDotnetSpy.mockImplementation(() => Promise.resolve(''));
+
+      await setup.run();
+      expect(installDotnetSpy).toHaveBeenCalledTimes(1);
+      expect(DotnetInstallDir.addToPath).toHaveBeenCalledTimes(1);
+    });
+
+    it('should fail the action if unsupported architecture is provided', async () => {
+      inputs['dotnet-version'] = ['10.0.101'];
+      inputs['dotnet-quality'] = '';
+      inputs['architecture'] = 'x688';
+
+      const expectedErrorMessage = `Value 'x688' is not supported for the 'architecture' option. Supported values are: x64, x86, arm64, amd64, arm, s390x, ppc64le, riscv64.`;
+
+      await setup.run();
+      expect(setFailedSpy).toHaveBeenCalledWith(expectedErrorMessage);
+    });
   });
 });

__tests__/verify-dotnet.ps1

@@ -72,6 +72,8 @@ $targetFrameworkVersionMap = @{
   "6.0" = "net6.0";
   "7.0" = "net7.0";
   "8.0" = "net8.0";
+  "9.0" = "net9.0";
+  "10.0" = "net10.0";
  }
 
 foreach ($version in $Versions)