Skip to content

Commit e8b624a

Browse files
committed
Added .NET 5 target (and removed built-in package)
1 parent 48157f0 commit e8b624a

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
55
<LangVersion>9.0</LangVersion>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -20,18 +20,14 @@
2020
<!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->
2121
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2222
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
23+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
2324
<PackageReference Include="System.Memory" Version="4.5.4" />
2425
</ItemGroup>
2526

2627
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
2728
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
28-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
33-
<!--Needed to support the INotifyDataErrorInfo interface-->
3429
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
30+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
3531
</ItemGroup>
3632

3733
</Project>

UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- Workaround for the .NET Core 2.1 binary not resolving the Unsafe assembly properly -->
1818
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
19-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
19+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

0 commit comments

Comments
 (0)