Skip to content

Commit 6ac2eca

Browse files
committed
Some windows fixes
1 parent 618e9b0 commit 6ac2eca

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

Directory.Build.targets

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,16 @@
1919
<Import Project="eng\NuGetVersions.targets" />
2020

2121
<PropertyGroup>
22-
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
22+
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
2323
<IgnoreMauiXamlHotReloadCompatibilityCheck>True</IgnoreMauiXamlHotReloadCompatibilityCheck>
2424
</PropertyGroup>
2525

26+
<PropertyGroup>
27+
<!-- Microsoft.Build.Msix.props" cannot be imported again -->
28+
<!-- Found version-specific or distribution-specific runtime identifier(s)-->
29+
<NoWarn>$(NoWarn);MSB4011;NETSDK1206</NoWarn>
30+
</PropertyGroup>
31+
2632
<!-- platform version number information -->
2733
<PropertyGroup Condition="'$(_MauiTargetPlatformIsiOS)' == 'True'">
2834
<SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
@@ -83,6 +89,9 @@
8389
<ItemGroup Condition=" '$(_MauiTargetPlatformIsWindows)' == 'True' AND '$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
8490
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
8591
</ItemGroup>
92+
<PropertyGroup>
93+
<WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>
94+
</PropertyGroup>
8695

8796
<!--
8897
Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684

src/Graphics/samples/GraphicsTester.Skia.Windows/GraphicsTester.Skia.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.44" TargetingPackVersion="10.0.19041.44" />
1616
</ItemGroup>
17-
17+
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\src\Graphics.Skia.WPF\Graphics.Skia.WPF.csproj" />
2020
<ProjectReference Include="..\GraphicsTester.Portable\GraphicsTester.Portable.csproj" />

src/Graphics/src/Graphics.Skia.WPF/Graphics.Skia.WPF.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<IsTrimmable>false</IsTrimmable>
1111
<NoWarn>$(NoWarn);RS0041</NoWarn>
1212
</PropertyGroup>
13+
14+
<ItemGroup Condition="'$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
15+
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
16+
</ItemGroup>
1317

1418
<ItemGroup Condition="'$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
1519
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />

src/Graphics/src/Graphics/Graphics.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<TargetFrameworks Condition="'$(IncludePreviousTfmsGraphics)' == 'true'">$(TargetFrameworks);$(_MauiPreviousDotNetTfm);$(MauiGraphicsPreviousPlatforms)</TargetFrameworks>
66
<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
77
<IncludeSymbols>true</IncludeSymbols>
8-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
98
<AssemblyName>Microsoft.Maui.Graphics</AssemblyName>
109
<RootNamespace>Microsoft.Maui.Graphics</RootNamespace>
1110
<Product>Microsoft.Maui.Graphics</Product>

0 commit comments

Comments
 (0)