Skip to content

Commit 648f373

Browse files
authored
Added workaround for bug in 1.1. (#212)
1 parent 8822f51 commit 648f373

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed

Samples/SelfContainedDeployment/cpp-winui-packaged/SelfContainedDeployment.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,9 @@
210210
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.props'))" />
211211
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.targets'))" />
212212
</Target>
213+
<Target Name="_RemoveFrameworkReferences" BeforeTargets="_ConvertItems;_CalculateInputsForGenerateCurrentProjectAppxManifest">
214+
<ItemGroup>
215+
<FrameworkSdkReference Remove="@(FrameworkSdkReference)" Condition="$([System.String]::Copy('%(FrameworkSdkReference.SDKName)').StartsWith('Microsoft.WindowsAppRuntime.'))" />
216+
</ItemGroup>
217+
</Target>
213218
</Project>

Samples/SelfContainedDeployment/cs-winui-packaged-wap/SelfContainedDeployment (Package)/SelfContainedDeployment (Package).wapproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,9 @@
7171
</PackageReference>
7272
</ItemGroup>
7373
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
74+
<Target Name="_RemoveFrameworkReferences" BeforeTargets="_ConvertItems;_CalculateInputsForGenerateCurrentProjectAppxManifest">
75+
<ItemGroup>
76+
<FrameworkSdkReference Remove="@(FrameworkSdkReference)" Condition="$([System.String]::Copy('%(FrameworkSdkReference.SDKName)').StartsWith('Microsoft.WindowsAppRuntime.'))" />
77+
</ItemGroup>
78+
</Target>
7479
</Project>

Samples/SelfContainedDeployment/cs-winui-packaged-wap/SelfContainedDeployment/SelfContainedDeployment.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,10 @@
5555
<Generator>MSBuild:Compile</Generator>
5656
</None>
5757
</ItemGroup>
58+
59+
<Target Name="_RemoveFrameworkReferences" BeforeTargets="_ConvertItems;_CalculateInputsForGenerateCurrentProjectAppxManifest">
60+
<ItemGroup>
61+
<FrameworkSdkReference Remove="@(FrameworkSdkReference)" Condition="$([System.String]::Copy('%(FrameworkSdkReference.SDKName)').StartsWith('Microsoft.WindowsAppRuntime.'))" />
62+
</ItemGroup>
63+
</Target>
5864
</Project>

Samples/SelfContainedDeployment/cs-winui-packaged/SelfContainedDeployment.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,10 @@
3838
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
3939
<ProjectCapability Include="Msix" />
4040
</ItemGroup>
41+
42+
<Target Name="_RemoveFrameworkReferences" BeforeTargets="_ConvertItems;_CalculateInputsForGenerateCurrentProjectAppxManifest">
43+
<ItemGroup>
44+
<FrameworkSdkReference Remove="@(FrameworkSdkReference)" Condition="$([System.String]::Copy('%(FrameworkSdkReference.SDKName)').StartsWith('Microsoft.WindowsAppRuntime.'))" />
45+
</ItemGroup>
46+
</Target>
4147
</Project>

0 commit comments

Comments
 (0)