Skip to content

Commit

Permalink
Update CommunityToolkit package references to version 8.2.241223-buil…
Browse files Browse the repository at this point in the history
…d.1367
  • Loading branch information
Arlodotexe committed Dec 24, 2024
1 parent 5c0fb58 commit b2c0ab9
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 44 deletions.
8 changes: 4 additions & 4 deletions components/CanvasView/src/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
<Project>
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.241223-build.1367"/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions components/DataTable/samples/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<Project>
<!-- WinUI 2 / UWP / Uno -->
<ItemGroup Condition="'$(IsUwp)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2')">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.HeaderedControls" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.HeaderedControls" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk / Uno -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3')">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 2 / UWP -->
Expand Down
12 changes: 6 additions & 6 deletions components/DataTable/src/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

<!-- WinUI 2 / UWP / Uno -->
<ItemGroup Condition="'$(IsUwp)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2')">
<PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk / Uno -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3')">
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.241223-build.1367"/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions components/RivePlayer/samples/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11"/> -->
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<!-- <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2"/> -->
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.100-dev.15.g12261e2626"/> -->
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions components/Shimmer/src/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.1.3"/> -->
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241219-pull-584.1339" />
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241223-build.1367" />
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="7.1.11"/> -->
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241219-pull-584.1339" />
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241223-build.1367" />
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<!-- <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2"/> -->
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241219-pull-584.1339" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241223-build.1367" />
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI" Version="7.1.100"/> -->
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241219-pull-584.1339" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241223-build.1367" />
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions components/TokenView/src/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
<Project>
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.241223-build.1367"/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions components/TransitionHelper/samples/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
<Project>
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241223-build.1367"/>
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions components/TransitionHelper/src/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
<Project>
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241223-build.1367"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241219-pull-584.1339"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.241223-build.1367"/>
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.2.241223-build.1367"/>
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="MainLatest" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-MainLatest/nuget/v3/index.json" protocolVersion="3" />
<add key="PullRequests" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-PullRequests/nuget/v3/index.json" protocolVersion="3" />
<add key="LabsFeed" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" protocolVersion="3" />
</packageSources>
<disabledPackageSources>
Expand Down
2 changes: 1 addition & 1 deletion tooling
Submodule tooling updated 27 files
+0 −4 .github/workflows/config/Directory.Build.props
+4 −4 Build-Toolkit-Components.ps1
+18 −0 MultiTarget/AvailableMultiTargets.props
+16 −9 MultiTarget/AvailableTargetFrameworks.props
+3 −10 MultiTarget/EnabledMultiTargets.props
+23 −22 MultiTarget/EnabledTargetFrameworks.props
+40 −0 MultiTarget/Extra.props
+6 −0 MultiTarget/GlobalUsings.props
+7 −4 MultiTarget/Library.props
+28 −21 MultiTarget/MultiTargetIdentifiers.props
+0 −31 MultiTarget/MultiTargetToTargetFramework.props
+13 −68 MultiTarget/UseTargetFrameworks.ps1
+0 −58 MultiTarget/WinUI.Extra.props
+3 −0 ProjectHeads/AllComponents/Tests.Uwp/CommunityToolkit.Tests.Uwp.csproj
+3 −0 ProjectHeads/AllComponents/Tests.Wasdk/CommunityToolkit.Tests.Wasdk.csproj
+3 −0 ProjectHeads/AllComponents/Wasdk/CommunityToolkit.App.Wasdk.csproj
+4 −0 ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
+1 −1 ProjectHeads/App.Head.Uwp.props
+7 −4 ProjectHeads/App.Head.props
+0 −1 ProjectHeads/GenerateSingleSampleHeads.ps1
+1 −1 ProjectHeads/Head.WinAppSdk.props
+3 −0 ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
+3 −0 ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
+3 −0 ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
+5 −0 ProjectHeads/SingleComponent/Wasdk/ProjectTemplate.Wasdk.csproj
+4 −1 ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
+4 −1 ProjectHeads/Tests.Head.props

0 comments on commit b2c0ab9

Please sign in to comment.