Browse Source
fixes: warning MSB4011 Microsoft.NET.Sdk.WindowsDesktop.props cannot … (#6813)
* fixes: warning MSB4011 Microsoft.NET.Sdk.WindowsDesktop.props cannot be imported again.
* fixes: nits
Co-authored-by: Steven Kirk <grokys@users.noreply.github.com>
pull/7094/head
workgroupengineering
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
5 deletions
-
global.json
-
src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
-
src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
|
|
@ -4,7 +4,7 @@ |
|
|
}, |
|
|
}, |
|
|
"msbuild-sdks": { |
|
|
"msbuild-sdks": { |
|
|
"Microsoft.Build.Traversal": "1.0.43", |
|
|
"Microsoft.Build.Traversal": "1.0.43", |
|
|
"MSBuild.Sdk.Extras": "2.0.54", |
|
|
"MSBuild.Sdk.Extras": "3.0.22", |
|
|
"AggregatePackage.NuGet.Sdk" : "0.1.12" |
|
|
"AggregatePackage.NuGet.Sdk" : "0.1.12" |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
@ -1,8 +1,9 @@ |
|
|
<Project Sdk="MSBuild.Sdk.Extras"> |
|
|
<Project Sdk="Microsoft.NET.Sdk"> |
|
|
<PropertyGroup> |
|
|
<PropertyGroup> |
|
|
<TargetFramework>net461</TargetFramework> |
|
|
<TargetFramework>net461</TargetFramework> |
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
<UseWpf>true</UseWpf> |
|
|
<UseWpf>true</UseWpf> |
|
|
|
|
|
<UseWindowsForms>true</UseWindowsForms> |
|
|
<ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences> |
|
|
<ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences> |
|
|
<UseDirect3D9>true</UseDirect3D9> |
|
|
<UseDirect3D9>true</UseDirect3D9> |
|
|
<PackageId>Avalonia.Win32.Interoperability</PackageId> |
|
|
<PackageId>Avalonia.Win32.Interoperability</PackageId> |
|
|
|
|
|
@ -1,5 +1,4 @@ |
|
|
<Project> |
|
|
<Project Sdk="MSBuild.Sdk.Extras"> |
|
|
<Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" /> |
|
|
|
|
|
<PropertyGroup> |
|
|
<PropertyGroup> |
|
|
<TargetFramework>xamarin.ios10</TargetFramework> |
|
|
<TargetFramework>xamarin.ios10</TargetFramework> |
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
@ -20,5 +19,4 @@ |
|
|
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" /> |
|
|
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" /> |
|
|
<ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" /> |
|
|
<ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" /> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
<Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" /> |
|
|
|
|
|
</Project> |
|
|
</Project> |
|
|
|
