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

Updated tooling to latest main #481

Merged
merged 5 commits into from
Aug 1, 2023
Merged

Updated tooling to latest main #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1274fdb
Remove empty sample project
Arlodotexe Jul 25, 2023
11c7e24
Updated tooling to latest main
Arlodotexe Jul 25, 2023
17ef82a
Update components to conform to latest tooling changes
michael-hawker Aug 1, 2023
ba17f29
Update all component dependencies to use new unified build of new Win…
michael-hawker Aug 1, 2023
709a1b2
Fix TokenView referencing old name of Primitives package
michael-hawker Aug 1, 2023
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
3 changes: 3 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Project>
<PropertyGroup>
<MajorVersion>0</MajorVersion>
<MinorVersion>1</MinorVersion>

<PackageIdPrefix>CommunityToolkit.Labs</PackageIdPrefix>
<RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
<ToolingDirectory>$(RepositoryDirectory)\tooling</ToolingDirectory>
Expand Down
8 changes: 0 additions & 8 deletions components/AppServices/samples/AppServices.Samples.csproj
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions components/AppServices/samples/MultiTarget.props
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion components/AppServices/src/CommunityToolkit.AppServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<ToolkitComponentName>AppServices</ToolkitComponentName>
<Description>This package contains AppServices, to easily communicate between UWP apps and Win32 extensions.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>0.0.3</Version>
<RootNamespace>CommunityToolkit.AppServices</RootNamespace>
<PackageId>$(PackageIdPrefix).$(ToolkitComponentName)</PackageId>
<HasWinUI>false</HasWinUI>
Expand Down
13 changes: 0 additions & 13 deletions components/CanvasLayout/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>CanvasLayout</ToolkitComponentName>
<Description>This package contains a CanvasLayout Layout for ItemsRepeater.</Description>
<Version>0.0.3</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.CanvasLayoutRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/CanvasView/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>CanvasView</ToolkitComponentName>
<Description>This package contains CanvasView.</Description>
<Version>0.0.2</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.CanvasViewRns</RootNamespace>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions components/CanvasView/src/Dependencies.props
View file
Open in desktop
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.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion ...Extensions.DependencyInjection/src/CommunityToolkit.Extensions.DependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<ToolkitComponentName>Extensions.DependencyInjection</ToolkitComponentName>
<Description>This package contains Extensions.DependencyInjection.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>0.0.1</Version>
<RootNamespace>CommunityToolkit.Extensions.DependencyInjection</RootNamespace>
<PackageId>$(PackageIdPrefix).$(ToolkitComponentName)</PackageId>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/MarqueeText/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>MarqueeText</ToolkitComponentName>
<Description>This package contains MarqueeText.</Description>
<Version>0.0.3</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.MarqueeTextRns</RootNamespace>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions components/RivePlayer/samples/Dependencies.props
View file
Open in desktop
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.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
</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.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
</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.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
</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.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
</ItemGroup>
</Project>
19 changes: 0 additions & 19 deletions components/RivePlayer/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>RivePlayer</ToolkitComponentName>
<Description>This package contains RivePlayer.</Description>
<Version>0.0.4</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.RivePlayerRns</RootNamespace>
</PropertyGroup>
Expand Down
13 changes: 0 additions & 13 deletions components/SegmentedControl/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>SegmentedControl</ToolkitComponentName>
<Description>This package contains SegmentedControl.</Description>
<Version>0.0.3</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.SegmentedControlRns</RootNamespace>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions components/SegmentedControl/src/Dependencies.props
View file
Open in desktop
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.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions components/Shimmer/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>Shimmer</ToolkitComponentName>
<Description>This package contains Shimmer.</Description>
<Version>0.0.1</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.ShimmerRns</RootNamespace>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions components/Shimmer/src/Dependencies.props
View file
Open in desktop
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.0.0-beta.1" />
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230801-preview" />
</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.0.0-beta.1" />
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230801-preview" />
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<!-- <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2"/> -->
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.0-beta.1" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview" />
</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.0.0-beta.1" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview" />
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ...NotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>StackedNotificationsBehavior</ToolkitComponentName>
<Description>This package contains StackedNotificationsBehavior.</Description>
<Version>0.0.2</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.StackedNotificationsBehaviorRns</RootNamespace>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions components/StackedNotificationsBehavior/src/Dependencies.props
View file
Open in desktop
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.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.1"/>
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions components/TokenView/src/AdditionalAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>TokenView</ToolkitComponentName>
<Description>This package contains TokenView.</Description>
<Version>0.0.6</Version>


<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.TokenViewRns</RootNamespace>
</PropertyGroup>
Expand Down
Loading