Skip to content

Fix mono aot build #3122

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
merged 2 commits into from
Jul 12, 2023
Merged

Fix mono aot build #3122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2421075
Fix mono aot build
radical Jul 12, 2023
9d4d430
MicroBenchmarks.Mono.props - remove SelfContained=true as it has been…
radical Jul 12, 2023
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
28 changes: 28 additions & 0 deletions src/benchmarks/micro/MicroBenchmarks.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project>
<!-- Shared with the autogenerated project -->

<!-- out-of-band packages that are not included in NetCoreApp have TFM-specific versions -->
<Choose>
<When Condition="'$(TargetFramework)' == 'net6.0'">
<PropertyGroup>
<LangVersion>10.0</LangVersion>
<ExtensionsVersion>6.0.0</ExtensionsVersion>
<SystemVersion>6.0.0</SystemVersion>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net7.0'">
<PropertyGroup>
<LangVersion>11.0</LangVersion>
<ExtensionsVersion>7.0.0</ExtensionsVersion>
<SystemVersion>7.0.0</SystemVersion>
</PropertyGroup>
</When>
<Otherwise>
<!-- when comparing against Full .NET Framework we are usually interested in CLR differences, so net462 belongs to this block -->
<PropertyGroup>
<ExtensionsVersion>7.0.0</ExtensionsVersion>
<SystemVersion>7.0.0</SystemVersion>
</PropertyGroup>
</Otherwise>
</Choose>
</Project>
4 changes: 4 additions & 0 deletions src/benchmarks/micro/MicroBenchmarks.Mono.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<Project>
<!-- Shared with the autogenerated project -->
<Import Project="*Common.props" />
</Project>
27 changes: 3 additions & 24 deletions src/benchmarks/micro/MicroBenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,9 @@
<!-- Allow building with one major version, and running using a sdk with a higher major version -->
<RollForward Condition="'$(BuildingForWasm)' == 'true'">LatestMajor</RollForward>
</PropertyGroup>
<!-- out-of-band packages that are not included in NetCoreApp have TFM-specific versions -->
<Choose>
<When Condition="'$(TargetFramework)' == 'net6.0'">
<PropertyGroup>
<LangVersion>10.0</LangVersion>
<ExtensionsVersion>6.0.0</ExtensionsVersion>
<SystemVersion>6.0.0</SystemVersion>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net7.0'">
<PropertyGroup>
<LangVersion>11.0</LangVersion>
<ExtensionsVersion>7.0.0</ExtensionsVersion>
<SystemVersion>7.0.0</SystemVersion>
</PropertyGroup>
</When>
<Otherwise>
<!-- when comparing against Full .NET Framework we are usually interested in CLR differences, so net462 belongs to this block -->
<PropertyGroup>
<ExtensionsVersion>7.0.0</ExtensionsVersion>
<SystemVersion>7.0.0</SystemVersion>
</PropertyGroup>
</Otherwise>
</Choose>

<Import Project="$(MSBuildThisFileDirectory)MicroBenchmarks.Common.props" />

<ItemGroup>
<PackageReference Include="Jil" Version="3.0.0-alpha2" />
<PackageReference Include="MessagePack" Version="1.9.11" />
Expand Down