Skip to content

Commit 2ee4078

Browse files
azchohfiazchohfi
authored
Merge pull request #258 from Sergio0694/user/sergiopedri/update-net-tools
Improve AOT support, update references
2 parents 58532f2 + 46dcc6e commit 2ee4078

File tree

11 files changed

+27
-13
lines changed

11 files changed

+27
-13
lines changed

‎scripts/Microsoft.Xaml.Behaviors.WinUI.Managed.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<tags>Behavior Action Behaviors Actions Blend Managed C# Interaction Interactivity Interactions WinUI</tags>
1616
<dependencies>
1717
<group targetFramework="net8.0-windows10.0.17763.0">
18-
<dependency id="Microsoft.WindowsAppSDK" version="1.5.240607001" />
18+
<dependency id="Microsoft.WindowsAppSDK" version="1.6.240807006-preview1" />
1919
</group>
2020
</dependencies>
2121
</metadata>

‎src/BehaviorsSDKManaged/ManagedUnitTests/ManagedUnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<Version>2.2.10</Version>
142142
</PackageReference>
143143
<PackageReference Include="Newtonsoft.Json">
144-
<Version>13.0.2</Version>
144+
<Version>13.0.3</Version>
145145
</PackageReference>
146146
</ItemGroup>
147147
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Design/Microsoft.Xaml.Interactions.Design.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@
131131
<PropertyGroup>
132132
<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>
133133
</PropertyGroup>
134-
<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'))" />
134+
<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'))" />
135135
<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'))" />
136136
<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'))" />
137137
</Target>
138-
<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')" />
138+
<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')" />
139139
<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')" />
140140
</Project>

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.Design/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.VisualStudioEng.MicroBuild.Core" version="1.0.0" targetFramework="net48" developmentDependency="true" />
4-
<package id="NuGet.Build.Tasks.Pack" version="6.10.1" targetFramework="net48" developmentDependency="true" />
4+
<package id="NuGet.Build.Tasks.Pack" version="5.7.0" targetFramework="net48" developmentDependency="true" />
55
</packages>

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions.WinUI/Microsoft.Xaml.Interactions.WinUI.csproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
44
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
5+
<WindowsSdkPackageVersion>10.0.17763.41</WindowsSdkPackageVersion>
56
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
67
<RootNamespace>Microsoft.Xaml.Interactions</RootNamespace>
78
<Platforms>AnyCPU;x86;x64;arm64</Platforms>
@@ -10,6 +11,11 @@
1011
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
1112
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1213
<IsAotCompatible>true</IsAotCompatible>
14+
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
15+
<CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
16+
17+
<!-- Temporary workaround for a WebView2 bug -->
18+
<WebView2EnableCsWinRTProjectionExcludeCoreRef>true</WebView2EnableCsWinRTProjectionExcludeCoreRef>
1319
</PropertyGroup>
1420
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1521
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -104,7 +110,8 @@
104110
<PrivateAssets>all</PrivateAssets>
105111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
106112
</PackageReference>
107-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
113+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" PrivateAssets="all" />
114+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
108115
</ItemGroup>
109116
<ItemGroup>
110117
<ProjectReference Include="..\Microsoft.Xaml.Interactivity.WinUI\Microsoft.Xaml.Interactivity.WinUI.csproj">

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactions/Microsoft.Xaml.Interactions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</ItemGroup>
133133
<ItemGroup>
134134
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
135-
<Version>6.2.10</Version>
135+
<Version>6.2.14</Version>
136136
</PackageReference>
137137
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core">
138138
<Version>1.0.0</Version>

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/ActionCollection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Microsoft.Xaml.Interactivity
1515
/// <summary>
1616
/// Represents a collection of IActions.
1717
/// </summary>
18-
public sealed class ActionCollection : DependencyObjectCollection
18+
public sealed partial class ActionCollection : DependencyObjectCollection
1919
{
2020
/// <summary>
2121
/// Initializes a new instance of the <see cref="ActionCollection"/> class.

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.Shared/BehaviorCollection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Microsoft.Xaml.Interactivity
1717
/// <summary>
1818
/// Represents a collection of IBehaviors with a shared <see cref="Microsoft.Xaml.Interactivity.BehaviorCollection.AssociatedObject"/>.
1919
/// </summary>
20-
public sealed class BehaviorCollection : DependencyObjectCollection
20+
public sealed partial class BehaviorCollection : DependencyObjectCollection
2121
{
2222
// After a VectorChanged event we need to compare the current state of the collection
2323
// with the old collection so that we can call Detach on all removed items.

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity.WinUI/Microsoft.Xaml.Interactivity.WinUI.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
44
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
5+
<WindowsSdkPackageVersion>10.0.17763.41</WindowsSdkPackageVersion>
56
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
67
<RootNamespace>Microsoft.Xaml.Interactivity</RootNamespace>
78
<Platforms>AnyCPU;x86;x64;arm64</Platforms>
@@ -10,6 +11,11 @@
1011
<SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
1112
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1213
<IsAotCompatible>true</IsAotCompatible>
14+
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
15+
<CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
16+
17+
<!-- Temporary workaround for a WebView2 bug -->
18+
<WebView2EnableCsWinRTProjectionExcludeCoreRef>true</WebView2EnableCsWinRTProjectionExcludeCoreRef>
1319
</PropertyGroup>
1420
<PropertyGroup>
1521
<OutputPath>..\..\..\out\WinUI\$(SolutionName)\bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -101,7 +107,8 @@
101107
<PrivateAssets>all</PrivateAssets>
102108
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
103109
</PackageReference>
104-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
110+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" PrivateAssets="all" />
111+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
105112
</ItemGroup>
106113
<ItemGroup>
107114
<PRIResource Include="..\Microsoft.Xaml.Interactivity\Resources\de-DE\Strings.resw">
@@ -181,7 +188,7 @@
181188
<PackageOutputPath>..\..\..\out\NuGetPackages</PackageOutputPath>
182189
</PropertyGroup>
183190
<Import Project="..\Version\NuGetPackageVersion.props" />
184-
<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')" />
191+
<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')" />
185192
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
186193
<DocumentationFile>..\..\..\out\WinUI\BehaviorsSDKManaged\bin\$(Platform)\Release\Microsoft.Xaml.Interactivity.xml</DocumentationFile>
187194
</PropertyGroup>

‎src/BehaviorsSDKManaged/Microsoft.Xaml.Interactivity/Microsoft.Xaml.Interactivity.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
</ItemGroup>
129129
<ItemGroup>
130130
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
131-
<Version>6.2.10</Version>
131+
<Version>6.2.14</Version>
132132
</PackageReference>
133133
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core">
134134
<Version>1.0.0</Version>

0 commit comments

Comments
 (0)