Skip to content

feat: Updated ReactiveUI.WinUI to use Microsoft.WindowsAppSDK. #2985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2021
Merged

feat: Updated ReactiveUI.WinUI to use Microsoft.WindowsAppSDK. #2985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f918db2
feat: Updated ReactiveUI.WinUI to use Microsoft.WindowsAppSDK.
HavenDV Oct 28, 2021
be1d2d1
Update ci-build.yml
glennawatson Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
$process = New-Object System.Diagnostics.Process
$process.StartInfo = $startInfo
$process.Start()
$process.WaitForExit()
$process.WaitForExit()

- name: Checkout
uses: actions/checkout@v2
Expand Down
14 changes: 10 additions & 4 deletions src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0-windows10.0.19041.0;net6.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net5.0-windows10.0.17763.0;net6.0-windows10.0.17763.0</TargetFrameworks>
<PackageDescription>Contains the ReactiveUI platform specific extensions for WinUI Desktop</PackageDescription>
<RootNamespace>ReactiveUI.WinUI.Desktop</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64</RuntimeIdentifiers>
<DefineConstants>HAS_WINUI</DefineConstants>
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;winui</PackageTags>
<UseWinUI>true</UseWinUI>
<LangVersion>preview</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
</ItemGroup>

<!-- Workaround for https://github.com/microsoft/WindowsAppSDK/issues/1217 -->
<Target Name="FixReferenceCopyLocalPaths" BeforeTargets="ResolvePackageAssets">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="$(PkgMicrosoft_WindowsAppSDK)\build\..\runtimes\lib\native\AnyCPU\Microsoft.WindowsAppRuntime.Bootstrap.dll"/>
</ItemGroup>
</Target>

<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>
Expand Down