diff --git a/.github/workflows/all_solutions.yml b/.github/workflows/all_solutions.yml index edbf6d624..a6cd12ab0 100644 --- a/.github/workflows/all_solutions.yml +++ b/.github/workflows/all_solutions.yml @@ -79,12 +79,6 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '9.0.x' - dotnet-quality: 'preview' - - name: Build FullAgent.sln run: | Write-Host "dotnet build --force --configuration Release -p:AllowUnsafeBlocks=true ${{ env.fullagent_solution_path }}" @@ -175,12 +169,6 @@ jobs: with: vs-prerelease: true - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '9.0.x' - dotnet-quality: 'preview' - - name: List SDKS run: dotnet --list-sdks shell: powershell @@ -223,12 +211,6 @@ jobs: with: vs-prerelease: true - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '9.0.x' - dotnet-quality: 'preview' - - name: Build UnboundedIntegrationTests.sln run: | Write-Host "List NuGet Sources" @@ -394,12 +376,6 @@ jobs: choco install azure-functions-core-tools -y --params "'/x64'" shell: powershell - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '9.0.x' - dotnet-quality: 'preview' - - name: Run Integration Tests run: | if ($Env:enhanced_logging -eq $True) { @@ -544,12 +520,6 @@ jobs: # Start-CosmosDbEmulator # shell: pwsh - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '9.0.x' - dotnet-quality: 'preview' - - name: Run Unbounded Integration Tests run: | if ($Env:enhanced_logging -eq $True) { diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7152e5bf2..9a1601b2d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -56,12 +56,6 @@ jobs: with: languages: csharp - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '9.0.x' - dotnet-quality: 'preview' - - name: Build .NET Agent Solution run: | dotnet build ${{ env.fullagent_solution_path }} diff --git a/.github/workflows/run_linux_container_tests.yml b/.github/workflows/run_linux_container_tests.yml index cbee87582..3c41db5ad 100644 --- a/.github/workflows/run_linux_container_tests.yml +++ b/.github/workflows/run_linux_container_tests.yml @@ -76,12 +76,11 @@ jobs: INTEGRATION_TEST_SECRETS: ${{ secrets.TEST_SECRETS }} run: | echo $INTEGRATION_TEST_SECRETS | dotnet user-secrets set --project ${{ env.integration_tests_shared_project }} - - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 + + - name: Install .NET 9 + uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 with: dotnet-version: '9.0.x' - dotnet-quality: 'preview' - + - name: Build & Run Linux Container Integration Tests run: dotnet test ./tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj --framework net9.0 diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 3ec511271..46d2b9a9a 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -47,12 +47,6 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET 9 Preview - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 - with: - dotnet-version: '9.0.x' - dotnet-quality: 'preview' - - name: Restore NuGet Packages run: dotnet restore diff --git a/Directory.Build.targets b/Directory.Build.targets index 55cf2f2b5..c409f045d 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,27 +1,3 @@ - - - - - - - - - - - - diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs index ed240919f..0ea0a0bfd 100644 --- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs +++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/Tests/LinuxContainerTests.cs @@ -82,22 +82,21 @@ public UbuntuArm64ContainerTest(UbuntuArm64ContainerTestFixture fixture, ITestOu } } -// Temporarily disabled until Centos updates their package repos to include .NET 9 GA -//public class CentosX64ContainerTest : LinuxContainerTest +public class CentosX64ContainerTest : LinuxContainerTest +{ + public CentosX64ContainerTest(CentosX64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output) + { + } +} + +// temporarily disabled until QEMU issue is resolved +//public class CentosArm64ContainerTest : LinuxContainerTest //{ -// public CentosX64ContainerTest(CentosX64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output) +// public CentosArm64ContainerTest(CentosArm64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output) // { // } //} -// temporarily disabled until the checksum issue is resolved -// public class CentosArm64ContainerTest : LinuxContainerTest -// { -// public CentosArm64ContainerTest(CentosArm64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output) -// { -// } -// } - public class AmazonX64ContainerTest : LinuxContainerTest { public AmazonX64ContainerTest(AmazonX64ContainerTestFixture fixture, ITestOutputHelper output) : base(fixture, output)