Switch to using ms ref aseemblies for build (#1327)

- Closes #1326
- Remove mono hackery around finding reference assemblies
- Add common.props inclusion for Disassembler project (was missing)
- Manually add package-refs (not through common.props) for FSharp
  samples project that cannot include common.props for some reason
This commit is contained in:
damageboy 2019-12-12 07:49:54 +02:00 коммит произвёл Adam Sitnik
Родитель 0c48c2862f
Коммит 0995505f91
4 изменённых файлов: 16 добавлений и 9 удалений

Просмотреть файл

@ -57,9 +57,10 @@
<InformationalVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)$(PrereleaseLabel)</InformationalVersion>
<PackageVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)$(PrereleaseLabel)</PackageVersion>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworkRootPath Condition="'$(TargetFrameworkRootPath)' == '' AND Exists('/Library/Frameworks/Mono.framework/Versions/Current')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks</TargetFrameworkRootPath>
<TargetFrameworkRootPath Condition="'$(TargetFrameworkRootPath)' == '' AND Exists('/usr/local/lib/mono/xbuild-frameworks')">/usr/local/lib/mono/xbuild-frameworks</TargetFrameworkRootPath>
<TargetFrameworkRootPath Condition="'$(TargetFrameworkRootPath)' == '' AND Exists('/usr/lib/mono/xbuild-frameworks')">/usr/lib/mono/xbuild-frameworks</TargetFrameworkRootPath>
</PropertyGroup>
</Project>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

Просмотреть файл

@ -19,7 +19,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="FSharp.Core" Version="4.6.0" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
</Project>
</Project>

Просмотреть файл

@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<OutputType>Exe</OutputType>
@ -16,4 +17,4 @@
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="0.9.180305.1" />
<PackageReference Include="Mono.Cecil" Version="0.10.1" />
</ItemGroup>
</Project>
</Project>

Просмотреть файл

@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<OutputType>Exe</OutputType>
@ -21,4 +22,4 @@
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="0.9.180305.1" />
<PackageReference Include="Mono.Cecil" Version="0.10.1" />
</ItemGroup>
</Project>
</Project>