Skip to content
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.

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

Add CsWinRT projection #9976

Draft
wants to merge 26 commits into
base: release/2.8
Choose a base branch
from
Draft

Add CsWinRT projection #9976

wants to merge 26 commits into from

Conversation

kmahone
Copy link
Member

@kmahone kmahone commented Sep 11, 2024

No description provided.

@microsoft-github-policy-service microsoft-github-policy-service bot added the needs-triage Issue needs to be triaged by the area owners label Sep 11, 2024
@kmahone kmahone marked this pull request as draft September 11, 2024 20:32
Copy link
Member

@Sergio0694 Sergio0694 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking great! Left a few updates following the latest changes in CsWinRT/tooling 🙂

Comment on lines 4 to 5
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Copy link
Member

@Sergio0694 Sergio0694 Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove these, especially Nullable. WinRT doesn't support annotations. #Resolved

<Platform>AnyCPU</Platform>
<UseUwp>true</UseUwp>
<IsAotCompatible>true</IsAotCompatible>
<WindowsSdkPackageVersion>10.0.22621.37-preview</WindowsSdkPackageVersion>
Copy link
Member

@Sergio0694 Sergio0694 Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<WindowsSdkPackageVersion>10.0.22621.37-preview</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion>10.0.22621.39</WindowsSdkPackageVersion>
``` #Resolved

<Nullable>enable</Nullable>
<Platform>AnyCPU</Platform>
<UseUwp>true</UseUwp>
<IsAotCompatible>true</IsAotCompatible>
Copy link
Member

@Sergio0694 Sergio0694 Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also add

Suggested change
<IsAotCompatible>true</IsAotCompatible>
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
``` #Resolved

</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.1" />
Copy link
Member

@Sergio0694 Sergio0694 Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.1" />
<PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.3" />
``` #Resolved

Comment on lines 18 to 20
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15">
<IncludeAssets>none</IncludeAssets>
</PackageReference>
Copy link
Member

@Sergio0694 Sergio0694 Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: can make this a one liner

Suggested change
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15">
<IncludeAssets>none</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" IncludeAssets="none" />
``` #Resolved

<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<Platform>AnyCPU</Platform>
<UseUwp>true</UseUwp>
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
Copy link
Member

@Sergio0694 Sergio0694 Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, you also need IsAotCompatible 😅
I just meant delete the first two, not that one too, my bad. #Resolved

@@ -28,6 +28,8 @@
<file target="lib\uap10.0\Microsoft.UI.Xaml\Themes" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Generic.xaml"/>
<file target="lib\uap10.0\Design" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml.Design\Microsoft.UI.Xaml.design.dll"/>

<file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml.Projection.dll" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml.Projection\Microsoft.UI.Xaml.Projection.dll" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to pack a few more things here. This is what the package looks like now:

image

We also need:

  • The Generic.xaml file, in the same subfolder but under the new TFM
  • The generated .xml file for the projections .dll

Not entirely sure what that Design.dll file is? Is it for the XAML Designer? I assume we need that one too?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-triage Issue needs to be triaged by the area owners
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants