Merge branch 'master' into multiboot_plug

This commit is contained in:
Quajak 2020-10-12 16:51:26 +02:00 committed by GitHub
commit 0262fa29a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<ApprovalTestsVersion>3.0.22</ApprovalTestsVersion> <ApprovalTestsVersion>3.0.22</ApprovalTestsVersion>
<AvaloniaVersion>0.7.0</AvaloniaVersion> <AvaloniaVersion>0.7.0</AvaloniaVersion>
<MicrosoftBuildVersion>16.0.461</MicrosoftBuildVersion> <MicrosoftBuildVersion>16.7.0</MicrosoftBuildVersion>
<MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0</MicrosoftNETFrameworkReferenceAssembliesVersion> <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0</MicrosoftNETFrameworkReferenceAssembliesVersion>
<MicrosoftNETTestSdkVersion>16.0.1</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>16.0.1</MicrosoftNETTestSdkVersion>
<MicrosoftTestPlatformObjectModelVersion>16.0.1</MicrosoftTestPlatformObjectModelVersion> <MicrosoftTestPlatformObjectModelVersion>16.0.1</MicrosoftTestPlatformObjectModelVersion>