Skip to content

Commit aa50420

Browse files
feat: Updated ReactiveUI.WinUI to use Microsoft.WindowsAppSDK. (#2985)
* feat: Updated ReactiveUI.WinUI to use Microsoft.WindowsAppSDK. * Update ci-build.yml Co-authored-by: Glenn <[email protected]>
1 parent 0640411 commit aa50420

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/ci-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
$process = New-Object System.Diagnostics.Process
3636
$process.StartInfo = $startInfo
3737
$process.Start()
38-
$process.WaitForExit()
38+
$process.WaitForExit()
3939
4040
- name: Checkout
4141
uses: actions/checkout@v2

src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0-windows10.0.19041.0;net6.0-windows10.0.19041.0</TargetFrameworks>
3+
<TargetFrameworks>net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0</TargetFrameworks>
44
<PackageDescription>Contains the ReactiveUI platform specific extensions for WinUI Desktop</PackageDescription>
55
<RootNamespace>ReactiveUI.WinUI.Desktop</RootNamespace>
6-
<RuntimeIdentifiers>win10-x86;win10-x64</RuntimeIdentifiers>
76
<DefineConstants>HAS_WINUI</DefineConstants>
87
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;winui</PackageTags>
98
<UseWinUI>true</UseWinUI>
109
<LangVersion>preview</LangVersion>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
13+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
1514
</ItemGroup>
1615

16+
<!-- Workaround for https://github.com/microsoft/WindowsAppSDK/issues/1217 -->
17+
<Target Name="FixReferenceCopyLocalPaths" BeforeTargets="ResolvePackageAssets">
18+
<ItemGroup>
19+
<ReferenceCopyLocalPaths Remove="$(PkgMicrosoft_WindowsAppSDK)\build\..\runtimes\lib\native\AnyCPU\Microsoft.WindowsAppRuntime.Bootstrap.dll"/>
20+
</ItemGroup>
21+
</Target>
22+
1723
<ItemGroup>
1824
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
1925
</ItemGroup>

0 commit comments

Comments
 (0)