Skip to content

ci: Fix CI for .NET 10 SDK and Windows runner compatibility #3476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tippmar-nr merged 7 commits into from
Mar 11, 2026
Merged

ci: Fix CI for .NET 10 SDK and Windows runner compatibility #3476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a123767
ci: Don't forcibly install latest .NET 10
tippmar-nr Mar 11, 2026
dd0eba0
ci: Use windows-2025 runners instead of windows-2022
tippmar-nr Mar 11, 2026
0291836
chore: Replace hard-coded Windows SDK path and use dynamic discovery …
tippmar-nr Mar 11, 2026
ba33d20
chore: Specify digest algorithm for signtool
tippmar-nr Mar 11, 2026
3efa2e8
ci: Revert back to windows-2022 runners except for build and run inte…
tippmar-nr Mar 11, 2026
34fed13
Rework, cleanup
tippmar-nr Mar 11, 2026
9394ba3
More cleanup, build nugethelper with dotnet instead of msbuild
tippmar-nr Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions .github/workflows/all_solutions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
build-integration-tests:
needs: build-fullagent-msi
name: Build IntegrationTests
runs-on: windows-2022
runs-on: windows-2025-vs2026

env:
integration_solution_path: ${{ github.workspace }}\tests\Agent\IntegrationTests\IntegrationTests.sln
Expand All @@ -183,16 +183,17 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
with:
vs-prerelease: true
# if needed for future .NET preview builds:
#with:
# vs-prerelease: true

- name: List SDKS
run: dotnet --list-sdks
Expand Down Expand Up @@ -220,7 +221,7 @@ jobs:
build-unbounded-tests:
needs: build-fullagent-msi
name: Build UnboundedIntegrationTests
runs-on: windows-2022
runs-on: windows-2025-vs2026

env:
unbounded_solution_path: ${{ github.workspace }}\tests\Agent\IntegrationTests\UnboundedIntegrationTests.sln
Expand All @@ -231,16 +232,17 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
with:
vs-prerelease: true
# if needed for future .NET preview builds:
#with:
# vs-prerelease: true

- name: Build UnboundedIntegrationTests.sln
run: |
Expand All @@ -264,7 +266,7 @@ jobs:
run-integration-tests:
needs: [build-integration-tests]
name: Run IntegrationTests
runs-on: windows-2022
runs-on: windows-2025-vs2026
strategy:
matrix:
namespace: [
Expand Down Expand Up @@ -347,12 +349,6 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Disable TLS 1.3
run: |
$registryPath = "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.3\Client"
Expand Down Expand Up @@ -418,12 +414,12 @@ jobs:
choco install azure-functions-core-tools -y --params "'/x64'"
shell: powershell

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Run Integration Tests
run: |
if ($Env:enhanced_logging -eq $True) {
Expand Down Expand Up @@ -520,7 +516,7 @@ jobs:
run-unbounded-tests:
needs: [build-unbounded-tests]
name: Run Unbounded Tests
runs-on: windows-2022
runs-on: windows-2025-vs2026
strategy:
matrix:
namespace:
Expand Down Expand Up @@ -619,7 +615,7 @@ jobs:
# Start-CosmosDbEmulator
# shell: pwsh

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
Expand Down Expand Up @@ -838,7 +834,7 @@ jobs:
runs-on: windows-2022

steps:
- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build_buildtools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ permissions:

jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
runs-on: windows-latest

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

- name: Setup .NET 10 Preview
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Build the solution
run: dotnet build build/BuildTools.sln -c Release -m -p:Platform="Any CPU" --restore
- name: Build the solution
run: dotnet build build/BuildTools.sln -c Release -m -p:Platform="Any CPU" --restore
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotty.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ jobs:
with:
egress-policy: audit # Leave it audit mode

- name: Install .NET 10
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux_container_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ jobs:
run: |
echo $INTEGRATION_TEST_SECRETS | dotnet user-secrets set --project ${{ env.integration_tests_shared_project }}

- name: Install .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Build & Run Linux Container Integration Tests
env:
BUILD_ARCH: ${{ matrix.arch }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/post_deploy_agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ jobs:
disable-sudo: true
egress-policy: audit

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
Expand All @@ -270,7 +270,7 @@ jobs:
disable-sudo: true
egress-policy: audit

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
Expand Down Expand Up @@ -304,12 +304,12 @@ jobs:
disable-sudo: true
egress-policy: audit

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_release_notes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Download Deploy Artifacts
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
with:
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/siteextension_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,17 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
dotnet-quality: 'ga'

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0

- name: Build NewRelic.NuGetHelper
run: |
Write-Host "Build NewRelic.NuGetHelper"
dotnet nuget list source
Write-Host "MSBuild.exe -restore -m -p:Configuration=Release -p:AllowUnsafeBlocks=true ${{ env.nuget_helper_project_path }}"
MSBuild.exe -restore -m -p:Configuration=Release -p:AllowUnsafeBlocks=true ${{ env.nuget_helper_project_path }}
dotnet build --configuration Release ${{ env.nuget_helper_project_path }}

@nrcventura nrcventura Mar 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the build no longer require the AllowUnsafeBlocks setting?

shell: powershell

- name: Run ArtifactBuilder
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 10 Preview
- name: Install latest .NET 10 SDK
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
with:
dotnet-version: '10.0.x'
Expand Down
24 changes: 12 additions & 12 deletions src/Agent/MsiInstaller/Installer/Installer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputPath>$(SolutionDir)..\..\_build\$(Platform)-$(Configuration)\$(OutputName)\</OutputPath>
<DebugType>full</DebugType>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\InstallerActions\InstallerActions.csproj">
<Name>InstallerActions</Name>
Expand All @@ -16,29 +16,29 @@
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="WixToolset.NetFx.wixext" Version="5.0.2" />
<PackageReference Include="WixToolset.Iis.wixext" Version="5.0.2" />
<PackageReference Include="WixToolset.UI.wixext" Version="5.0.2" />
<PackageReference Include="WixToolset.Util.wixext" Version="5.0.2" />
</ItemGroup>

<PropertyGroup>
<WindowsSdkPathBin>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformSDKLocation('Windows', '10.0'))bin</WindowsSdkPathBin>
<WindowsSdkPath>$(WindowsSdkPathBin)\10.0.19041.0</WindowsSdkPath>
<SignToolPath>$(WindowsSdkPath)\x64\signtool.exe</SignToolPath>
</PropertyGroup>


<Target Name="SignInstaller" BeforeTargets="AfterBuild">
<Exec Command="&quot;$(SignToolPath)&quot; sign /d &quot;New Relic .NET Agent&quot; /a &quot;$(OutputPath)$(OutputName).msi&quot;" StandardOutputImportance="high" />
<ItemGroup>
<SignToolCandidates Include="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformSDKLocation('Windows', '10.0'))bin\*\x64\signtool.exe" />
</ItemGroup>
<PropertyGroup>
<SignToolPath>%(SignToolCandidates.Identity)</SignToolPath>
</PropertyGroup>
<Exec Command="&quot;$(SignToolPath)&quot; sign /fd SHA256 /d &quot;New Relic .NET Agent&quot; /a &quot;$(OutputPath)$(OutputName).msi&quot;" StandardOutputImportance="high" />
<ReadFileVersionFromDll FilePath="$(SolutionDir)..\..\_build\AnyCPU-$(Configuration)\NewRelic.Agent.Core\net462\NewRelic.Agent.Core.dll">
<Output PropertyName="FileVersionString" TaskParameter="FileVersionString" />
</ReadFileVersionFromDll>
<Copy SourceFiles="$(OutputPath)\$(OutputName).msi" DestinationFiles="$(OutputPath)\NewRelicAgent_$(Platform)_$(FileVersionString).msi" />
<Delete Files="$(OutputPath)\$(OutputName).msi" />
</Target>

<UsingTask TaskName="ReadFileVersionFromDll" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<FilePath ParameterType="System.String" Required="true" />
Expand All @@ -52,4 +52,4 @@
]]></Code>
</Task>
</UsingTask>
</Project>
</Project>
Loading