Skip to content

Commit 10a43c9

Browse files
authored
ci: Fix build for the dotnet SDK and macOS runner image (#636)
* chore: update SDK version and rollForward policy in global.json Signed-off-by: André Silva <[email protected]> * feat: add workaround for .NET Framework 4.6.2 build warnings Signed-off-by: André Silva <[email protected]> * chore: update macOS version in AOT compatibility workflow Signed-off-by: André Silva <[email protected]> --------- Signed-off-by: André Silva <[email protected]>
1 parent ee862f0 commit 10a43c9

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.github/workflows/aot-compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
arch: arm64
3535
runtime: win-arm64
3636
# macOS x64
37-
- os: macos-13
37+
- os: macos-15-intel
3838
arch: x64
3939
runtime: osx-x64
4040
# macOS ARM64 (Apple Silicon)

build/Common.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,11 @@
2828
<ItemGroup Condition="'$(OS)' == 'Unix'">
2929
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
3030
</ItemGroup>
31+
32+
<!-- This is a workaround for targeting .NET Framework 4.6.2 (it fails to build with certain
33+
warnings) -->
34+
<PropertyGroup
35+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net462'))">
36+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
37+
</PropertyGroup>
3138
</Project>

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"rollForward": "latestFeature",
4-
"version": "9.0.300",
3+
"rollForward": "disable",
4+
"version": "9.0.306",
55
"allowPrerelease": false
66
}
7-
}
7+
}

0 commit comments

Comments
 (0)