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

Aggregate packages #3689

Merged
merged 9 commits into from
Feb 11, 2021
Merged

Aggregate packages #3689

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c689a51
Use csporj to aggrate controls
Rosuavio Jan 26, 2021
057f5fa
WIP: Try to fix erros when using aggregae package
Rosuavio Jan 26, 2021
bb49ce0
Controls: remove unwanted pri files.
Rosuavio Feb 2, 2021
da272cb
Add Controls.Input to meta package
Rosuavio Feb 8, 2021
14df8de
Added meta package smoke test
Rosuavio Feb 8, 2021
2482745
Remove UI.Controls project build output from package
Rosuavio Feb 9, 2021
70928b4
Remove custom RemoveUnwantedPri build target, not needed
Rosuavio Feb 10, 2021
61c08f2
Remove `EnableTypeInfoReflection`
Rosuavio Feb 11, 2021
ae3c914
Remove `EnableTypeInfoReflection` comment
Rosuavio Feb 11, 2021
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
19 changes: 19 additions & 0 deletions Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
<Title>Windows Community Toolkit Controls</Title>
<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
Rosuavio marked this conversation as resolved.
Show resolved Hide resolved
<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
Rosuavio marked this conversation as resolved.
Show resolved Hide resolved
<IncludeBuildOutput>false</IncludeBuildOutput>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj" />
</ItemGroup>
</Project>
12 changes: 12 additions & 0 deletions SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Page x:Class="SmokeTest.MainPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid>
<controls:Loading/>
</Grid>
</Page>
14 changes: 14 additions & 0 deletions SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls/MainPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

namespace SmokeTest
{
public sealed partial class MainPage
{
public MainPage()
{
InitializeComponent();
}
}
}
2 changes: 1 addition & 1 deletion SmokeTests/SmokeTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- - - - - - Don't check-in changes in between this lines. Used for development. - - - - - -->
<PropertyGroup Condition="'$(CurrentProject)' == ''">
<!-- When writting the SmokeTests, change this to whichever Toolkit project you want to build a test to, then reload the project -->
<CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls.Core</CurrentProject>
<CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls</CurrentProject>
</PropertyGroup>
<PropertyGroup Condition="'$(NuGetPackageVersion)' == ''">
<NuGetPackageVersion>To Fill In With Local Version Number</NuGetPackageVersion>
Expand Down
1 change: 1 addition & 0 deletions SmokeTests/SmokeTests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
Microsoft.Toolkit.Uwp.UI;
Microsoft.Toolkit.Uwp.UI.Animations;
Microsoft.Toolkit.Uwp.UI.Behaviors;
Microsoft.Toolkit.Uwp.UI.Controls;
Microsoft.Toolkit.Uwp.UI.Controls.Core;
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;
Microsoft.Toolkit.Uwp.UI.Controls.Layout;
Expand Down
23 changes: 23 additions & 0 deletions Windows Community Toolkit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co
{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
Expand Down Expand Up @@ -1095,6 +1097,26 @@ Global
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|x86
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.Build.0 = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM.ActiveCfg = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM.Build.0 = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|ARM64.Build.0 = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x64.ActiveCfg = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x64.Build.0 = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x86.ActiveCfg = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|x86.Build.0 = Debug|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|Any CPU.ActiveCfg = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|Any CPU.Build.0 = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM.ActiveCfg = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM.Build.0 = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM64.ActiveCfg = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|ARM64.Build.0 = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.ActiveCfg = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.Build.0 = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.ActiveCfg = Release|Any CPU
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1143,6 +1165,7 @@ Global
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
{3307BC1D-5D71-41C6-A1B3-B113B8242D08} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}
Expand Down