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.

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

Improve AOT support, update references #258

Merged
merged 3 commits into from
Aug 20, 2024
Merged

Improve AOT support, update references #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abcdfa7
Consolidate 'NuGet.Build.Tasks.Pack' to 5.7.0
Sergio0694 Aug 19, 2024
2be0232
Update WinAppSDK projects to latest
Sergio0694 Aug 19, 2024
46dcc6e
Update CsWinRT, enable generators, fix warnings
Sergio0694 Aug 19, 2024
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 scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<tags>Behavior Action Behaviors Actions Blend Managed C# Interaction Interactivity Interactions WinUI</tags>
<dependencies>
<group targetFramework="net8.0-windows10.0.17763.0">
<dependency id="Microsoft.WindowsAppSDK" version="1.5.240607001" />
<dependency id="Microsoft.WindowsAppSDK" version="1.6.240807006-preview1" />
</group>
</dependencies>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion src/BehaviorsSDKManaged/ManagedUnitTests/ManagedUnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<Version>2.2.10</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.2</Version>
<Version>13.0.3</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
Expand Down
4 changes: 2 additions & 2 deletions ...rsSDKManaged/Microsoft.Xaml.Interactions.Design/Microsoft.Xaml.Interactions.Design.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NuGet.Build.Tasks.Pack.6.10.1\build\NuGet.Build.Tasks.Pack.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGet.Build.Tasks.Pack.6.10.1\build\NuGet.Build.Tasks.Pack.targets'))" />
<Error Condition="!Exists('..\packages\NuGet.Build.Tasks.Pack.5.7.0\build\NuGet.Build.Tasks.Pack.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGet.Build.Tasks.Pack.5.7.0\build\NuGet.Build.Tasks.Pack.targets'))" />
Sergio0694 marked this conversation as resolved.
Show resolved Hide resolved
<Error Condition="!Exists('..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets'))" />
</Target>
<Import Project="..\packages\NuGet.Build.Tasks.Pack.6.10.1\build\NuGet.Build.Tasks.Pack.targets" Condition="Exists('..\packages\NuGet.Build.Tasks.Pack.6.10.1\build\NuGet.Build.Tasks.Pack.targets')" />
<Import Project="..\packages\NuGet.Build.Tasks.Pack.5.7.0\build\NuGet.Build.Tasks.Pack.targets" Condition="Exists('..\packages\NuGet.Build.Tasks.Pack.5.7.0\build\NuGet.Build.Tasks.Pack.targets')" />
<Import Project="..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets" Condition="Exists('..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets')" />
</Project>
2 changes: 1 addition & 1 deletion src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Design/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudioEng.MicroBuild.Core" version="1.0.0" targetFramework="net48" developmentDependency="true" />
<package id="NuGet.Build.Tasks.Pack" version="6.10.1" targetFramework="net48" developmentDependency="true" />
<package id="NuGet.Build.Tasks.Pack" version="5.7.0" targetFramework="net48" developmentDependency="true" />
</packages>
9 changes: 8 additions & 1 deletion ...iorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<WindowsSdkPackageVersion>10.0.17763.41</WindowsSdkPackageVersion>
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
<RootNamespace>Microsoft.Xaml.Interactions</RootNamespace>
<Platforms>AnyCPU;x86;x64;arm64</Platforms>
Expand All @@ -10,6 +11,11 @@
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<IsAotCompatible>true</IsAotCompatible>
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
<CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>

<!-- Temporary workaround for a WebView2 bug -->
<WebView2EnableCsWinRTProjectionExcludeCoreRef>true</WebView2EnableCsWinRTProjectionExcludeCoreRef>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -104,7 +110,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" PrivateAssets="all" />
Sergio0694 marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Xaml.Interactivity.WinUI\Microsoft.Xaml.Interactivity.WinUI.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions/Microsoft.Xaml.Interactions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
<Version>6.2.14</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core">
<Version>1.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ActionCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Microsoft.Xaml.Interactivity
/// <summary>
/// Represents a collection of IActions.
/// </summary>
public sealed class ActionCollection : DependencyObjectCollection
public sealed partial class ActionCollection : DependencyObjectCollection
{
/// <summary>
/// Initializes a new instance of the <see cref="ActionCollection"/> class.
Expand Down
2 changes: 1 addition & 1 deletion src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/BehaviorCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Microsoft.Xaml.Interactivity
/// <summary>
/// Represents a collection of IBehaviors with a shared <see cref="Microsoft.Xaml.Interactivity.BehaviorCollection.AssociatedObject"/>.
/// </summary>
public sealed class BehaviorCollection : DependencyObjectCollection
public sealed partial class BehaviorCollection : DependencyObjectCollection
{
// After a VectorChanged event we need to compare the current state of the collection
// with the old collection so that we can call Detach on all removed items.
Expand Down
11 changes: 9 additions & 2 deletions ...rsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<WindowsSdkPackageVersion>10.0.17763.41</WindowsSdkPackageVersion>
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
<RootNamespace>Microsoft.Xaml.Interactivity</RootNamespace>
<Platforms>AnyCPU;x86;x64;arm64</Platforms>
Expand All @@ -10,6 +11,11 @@
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<IsAotCompatible>true</IsAotCompatible>
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
<CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>

<!-- Temporary workaround for a WebView2 bug -->
<WebView2EnableCsWinRTProjectionExcludeCoreRef>true</WebView2EnableCsWinRTProjectionExcludeCoreRef>
</PropertyGroup>
<PropertyGroup>
<OutputPath>..\..\..\out\WinUI\$(SolutionName)\bin\$(Platform)\$(Configuration)\</OutputPath>
Expand Down Expand Up @@ -101,7 +107,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
</ItemGroup>
<ItemGroup>
<PRIResource Include="..\Microsoft.Xaml.Interactivity\Resources\de-DE\Strings.resw">
Expand Down Expand Up @@ -181,7 +188,7 @@
<PackageOutputPath>..\..\..\out\NuGetPackages</PackageOutputPath>
</PropertyGroup>
<Import Project="..\Version\NuGetPackageVersion.props" />
<Import Project="..\packages\NuGet.Build.Tasks.Pack.4.9.4\build\NuGet.Build.Tasks.Pack.targets" Condition="Exists('..\packages\NuGet.Build.Tasks.Pack.4.9.4\build\NuGet.Build.Tasks.Pack.targets')" />
<Import Project="..\packages\NuGet.Build.Tasks.Pack.5.7.0\build\NuGet.Build.Tasks.Pack.targets" Condition="Exists('..\packages\NuGet.Build.Tasks.Pack.5.7.0\build\NuGet.Build.Tasks.Pack.targets')" />
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DocumentationFile>..\..\..\out\WinUI\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactivity.xml</DocumentationFile>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity/Microsoft.Xaml.Interactivity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
<Version>6.2.14</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core">
<Version>1.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion ...orsSDKNative/Microsoft.Xaml.Interactions.Design/Microsoft.Xaml.Interactions.Design.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks.Pack">
<Version>4.9.4</Version>
<Version>5.7.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading