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

Update Microsoft.WindowsAppSDK to 1.6-preview2 #208

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Conversation

Arlodotexe
Copy link
Member

@Arlodotexe Arlodotexe commented Aug 26, 2024

This PR updates our tooling to use Microsoft.WindowsAppSDK 1.6-preview2 and removes prior workarounds only needed for preview1.

  • Update WindowsAppSDK to preview2
  • Update WindowsSdkPackageVersion for net6 and net8
  • Remove workaround for wasdk 1.6 < preview2

Progress towards #205

Comment on lines +36 to +38

<WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">10.0.22621.41</WindowsSdkPackageVersion>
<WindowsSdkPackageVersion Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">10.0.22621.38</WindowsSdkPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

Do we have a note somewhere or docs about why this is conditional between .NET 6/8?

Copy link
Member Author

Choose a reason for hiding this comment

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

See @Sergio0694's comment here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Docs can be found here

@Sergio0694
Copy link
Member

We should also set DisableRuntimeMarshalling next to where we're setting IsAotCompatible (see here).

@Arlodotexe
Copy link
Member Author

We should also set DisableRuntimeMarshalling next to where we're setting IsAotCompatible (see here).

For reference, docs on this can be found here -> https://learn.microsoft.com/en-us/dotnet/standard/native-interop/disabled-marshalling

@Arlodotexe
Copy link
Member Author

We should also set DisableRuntimeMarshalling next to where we're setting IsAotCompatible (see here).

For reference, docs on this can be found here -> https://learn.microsoft.com/en-us/dotnet/standard/native-interop/disabled-marshalling

Since this is specific to Rive and 1.6 stable is out now, we'll do this in a future PR to keep things moving.

@Arlodotexe Arlodotexe merged commit 249e2c0 into main Sep 6, 2024
8 checks passed
@Arlodotexe Arlodotexe deleted the wasdk/1.6 branch September 6, 2024 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants