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.

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

Merge Dev/split controls Refactoring to Main #3752

Merged
merged 105 commits into from
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
6956c73
Move some controls to Primitives.
Rosuavio Dec 10, 2020
e885c10
Update Primiative controls ns
Rosuavio Dec 10, 2020
2fdcbe6
Apply change for platform uno compatiblity #3651
Rosuavio Jan 6, 2021
7431e17
Update Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit…
Rosuavio Jan 8, 2021
1e34abf
Remove System.ValueTuple from Controls.Primitives
Rosuavio Jan 8, 2021
ac71f64
Added SwitchPresenter in description of Control.Primitives project
Rosuavio Jan 8, 2021
b6bc173
Revert "Update Primiative controls ns"
Rosuavio Jan 8, 2021
04869f4
Add SwitchPresenter tag to Controls.Primitives
Rosuavio Jan 8, 2021
b6ca5af
Split out primitives design project
Rosuavio Jan 8, 2021
06a9822
Fix primitives deisgn tools ref
Rosuavio Jan 11, 2021
8fd51a1
Merge branch 'master' into split-controls
Rosuavio Jan 11, 2021
96e1aba
Fix finding desing output for controls.primitives
Rosuavio Jan 12, 2021
3fb9053
Add smoke test for Controls.Primitivs
Rosuavio Jan 12, 2021
4f83e08
List SwitchPresenter for DesignTools
Rosuavio Jan 12, 2021
0043ecd
Better wording for titles and descriptions around primitivs package
Rosuavio Jan 12, 2021
3cc5a64
Remove exposing internals to xmalisland test, not needed.
Rosuavio Jan 12, 2021
c763049
WIP: move Eyedropper, ImageCropper, InfiniteCanvas
Rosuavio Jan 12, 2021
f66ae16
Controls.Media: Remove System.ValueTuple
Rosuavio Jan 12, 2021
8927201
Controls: Remove System.ValueTuple, System.Text.Json
Rosuavio Jan 12, 2021
0869c79
Fix assemly name in test file
Rosuavio Jan 12, 2021
3ffa9b5
Remove unneded deps
Rosuavio Jan 12, 2021
b298fd0
Controls.Media: ControlHelpers.XamlHost.cs, use file like in project …
Rosuavio Jan 13, 2021
fc221a7
Merge pull request #3660 from RosarioPulella/split-controls
michael-hawker Jan 13, 2021
b85d0dd
Merge branch 'dev/split-controls' into split-media
Rosuavio Jan 14, 2021
e8ff462
Merge remote-tracking branch 'origin/master' into dev/split-controls
michael-hawker Jan 15, 2021
e4db504
Handle V1 of InfiniteCanvasExport data, and regresion test for V2
Rosuavio Jan 15, 2021
250f5d4
Merge branch 'dev/split-controls' into split-media
Rosuavio Jan 15, 2021
8ee6b1a
Controls.Media: Add smoke tests.
Rosuavio Jan 15, 2021
ddc7950
Controls.Media: Eyedroper to Project description and Package Tags
Rosuavio Jan 15, 2021
8f60463
Controls.Media: change title to include Media
Rosuavio Jan 15, 2021
97dda4a
Controls.Media: List Eyedropper and ImageCropper in VisualStudioTools…
Rosuavio Jan 15, 2021
fb228c3
Controls.Media: Imporove description
Rosuavio Jan 15, 2021
c61156d
Fix usages of old assembly name
Rosuavio Jan 19, 2021
56609a0
Handel descirminator textDrawable from Control Assembly
Rosuavio Jan 19, 2021
53344dc
Test sample exported from inifinate canvase instead of modified from …
Rosuavio Jan 19, 2021
70de6df
Merge remote-tracking branch 'origin/master' into dev/split-controls
michael-hawker Jan 19, 2021
5a987f9
Merge branch 'dev/split-controls' into split-media
Rosuavio Jan 20, 2021
aed5068
TEMP: Remove usages of graph controls
Rosuavio Jan 20, 2021
2376dd3
Merge pull request #3669 from RosarioPulella/split-media
michael-hawker Jan 20, 2021
f55f101
Merge remote-tracking branch 'origin/master' into dev/split-controls
michael-hawker Jan 21, 2021
704a356
Move Controls to Controls.Core folder
Rosuavio Jan 19, 2021
41bb7e5
Reanme controls package to controls.core
Rosuavio Jan 19, 2021
c26afc9
Move Controls.Desin to Controls.Core.Desin
Rosuavio Jan 19, 2021
28b6056
Rename Contols.Design -> Controls.Core.Design
Rosuavio Jan 21, 2021
298b95b
Controls.Core: Remove animation proj ref
Rosuavio Jan 21, 2021
123b864
SmokeTests: update ref to Controls.Core
Rosuavio Jan 21, 2021
d9f6e18
Rename folder: MasterDetailsView -> ListDetailsView
Rosuavio Jan 21, 2021
a3c2cf7
Rename file: MasterDetailView -> ListDetailView
Rosuavio Jan 21, 2021
d422af7
Rename class: MasterDetailsView -> ListDetailsView
Rosuavio Jan 21, 2021
d7ba284
Rename all the master things in MasterDetailsView to list
Rosuavio Jan 21, 2021
150795d
Update PackageTags to List and ListDetail
Rosuavio Jan 21, 2021
a85f880
Sample: Ref ListDetailView
Rosuavio Jan 21, 2021
2a5718c
Smaple: rename MasterDetailView folder to ListDetialView
Rosuavio Jan 21, 2021
831b0d5
Smaples: Rename MasterDetailViewPage -> ListDetailsViewPage
Rosuavio Jan 22, 2021
b4e018d
Core.Design: Rename MasterDetailView Files
Rosuavio Jan 22, 2021
d5cb0af
Core.Design: Change metadata to relfect ListDetailView
Rosuavio Jan 22, 2021
a96150d
UnitTest: Use ListDetailsView where posible
Rosuavio Jan 22, 2021
6fc1bd8
UnitTest: Rename Test_MasterDetailsView.cs -> Test_ListDetailsView.cs
Rosuavio Jan 22, 2021
24a32ed
Fix: put Controls.Core Desin assemblies in correct folder.
Rosuavio Jan 25, 2021
d09c667
Merge remote-tracking branch 'origin/master' into dev/split-controls
michael-hawker Jan 26, 2021
fefbccd
Merge branch 'dev/split-controls' into rename-controls-to-core
Rosuavio Jan 26, 2021
50c7c6b
Merge remote-tracking branch 'origin/master' into dev/split-controls
michael-hawker Jan 28, 2021
2ed7e86
Merge branch 'dev/split-controls' into rename-controls-to-core
michael-hawker Jan 28, 2021
57e42fe
Merge pull request #3676 from RosarioPulella/rename-controls-to-core
michael-hawker Feb 2, 2021
c2a56ea
Sample: update CodeUrl props in samples.json
Rosuavio Jan 21, 2021
7650906
Move StaggeredLayout and WrapLayout to Primitives
Rosuavio Feb 1, 2021
049e26c
Move Layout controls to Layout Package
Rosuavio Feb 1, 2021
3fb8b94
Fix Generic.xaml for Layout package test
michael-hawker Feb 1, 2021
01ad1bd
Clean-up Project Files and remove link from Core to Layout package fo…
michael-hawker Feb 1, 2021
439b505
Fix Stylecop Issues
michael-hawker Feb 2, 2021
e0be87f
fix smoke tests for moved controls.
Rosuavio Feb 2, 2021
b040f86
simplify and fix layout smoke test
Rosuavio Feb 2, 2021
61ec403
fix typeo
Rosuavio Feb 2, 2021
24843b4
Layout: remove Primitivs dep
Rosuavio Feb 2, 2021
2f0dbf4
Move over over some more refrences to layout controls
Rosuavio Feb 3, 2021
6b54cf8
Split out Contorls.Layout.Design
Rosuavio Feb 3, 2021
b3babef
Merge pull request #3682 from RosarioPulella/fix-samples-CodeUrl
michael-hawker Feb 4, 2021
d9f6174
Merge branch 'dev/split-controls' into reorg-layout
Rosuavio Feb 4, 2021
7c7d1ef
Fix Layout package Resource Strings
michael-hawker Feb 4, 2021
7463d9f
Merge pull request #3714 from RosarioPulella/reorg-layout
michael-hawker Feb 4, 2021
c767314
Split out input controls from core
Rosuavio Feb 3, 2021
1293b2c
Include Controls.Input in Tests and Sample App proejcts
Rosuavio Feb 3, 2021
1f70b68
Update Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml to…
michael-hawker Feb 4, 2021
f9a0f0b
Update TokenizingTextBoxItem locations to correct assembly
michael-hawker Feb 4, 2021
d456a53
Fix TokenizingTextBox Resource Strings
michael-hawker Feb 4, 2021
c67193d
Add Input package to Smoke Tests
michael-hawker Feb 4, 2021
a68dd95
Fix reference in Input package to Primitives package
michael-hawker Feb 4, 2021
f1fe78d
Input: Split out design tools
Rosuavio Feb 4, 2021
7a7ec26
Merge pull request #3727 from RosarioPulella/refactor/input-controls
michael-hawker Feb 8, 2021
bfedaa9
Smaple.cs LookForTypeByName(string) add assmbiles to search in
Rosuavio Feb 5, 2021
99faaf3
Smaple.cs: Simplfy LookForTypeByName
Rosuavio Feb 8, 2021
ba5f7ff
Make execution more "lazy"
Rosuavio Feb 8, 2021
be2ebd7
Smaple.cs LookForTypeByName(string) add assmbiles to search for types…
Feb 9, 2021
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
c7bdaf2
Merge pull request #3689 from RosarioPulella/aggregate-packages
michael-hawker Feb 11, 2021
6428d8a
Merge branch 'master' into dev/split-controls
michael-hawker Feb 12, 2021
c36cccc
Add missing category for Controls.Core.Design Merge
michael-hawker Feb 12, 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
Original file line number Diff line number Diff line change
Expand Up @@ -1498,6 +1498,10 @@
<Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj">
<Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
<Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
<Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@
<Compile Include="Common\Constants.cs" />
<Compile Include="Common\MetadataRegistrationBase.cs" />
<Compile Include="Common\PlatformTypes.cs" />
<Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
<Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
<Compile Include="Controls\BladeItem.Metadata.cs" />
<Compile Include="Controls\BladeItem.Typedata.cs" />
<Compile Include="Controls\BladeView.Metadata.cs" />
Expand Down Expand Up @@ -123,8 +121,6 @@
<Compile Include="Controls\TextToolbar.Typedata.cs" />
<Compile Include="Controls\TileControl.Metadata.cs" />
<Compile Include="Controls\TileControl.Typedata.cs" />
<Compile Include="Controls\WrapPanel.Metadata.cs" />
<Compile Include="Controls\WrapPanel.Typedata.cs" />
<Compile Include="MetadataRegistration.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,6 @@
<data name="CategoryInteractions" xml:space="preserve">
<value>Interactions</value>
</data>
<data name="CategoryLayout" xml:space="preserve">
<value>Layout</value>
</data>
<data name="CategoryMarkdownCodeStyle" xml:space="preserve">
<value>Markdown Style - Code</value>
</data>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetPlatformVersion>8.1</TargetPlatformVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Debug\uap10.0.17763\Design\</OutputPath>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Release\uap10.0.17763\Design\</OutputPath>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
<Reference Include="System.ObjectModel" />
<Reference Include="System.Runtime.WindowsRuntime" />
<Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
<Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup Label="WinRT References">
<Reference Include="System.Xaml" />
<Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
<Reference Include="Windows.Foundation.FoundationContract">
<HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
<Aliases>WindowsRuntime</Aliases>
<Private>False</Private>
</Reference>
<Reference Include="Windows.Foundation.UniversalApiContract">
<HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
<Aliases>WindowsRuntime</Aliases>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
<Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
<Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
<Compile Include="Controls\WrapPanel.Metadata.cs" />
<Compile Include="Controls\WrapPanel.Typedata.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<AppDesigner Include="Properties\" />
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml">
<Link>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml</Link>
<Visible>False</Visible>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- No-op to avoid build error when packing solution from commandline -->
<Target Name="Pack" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// 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.

using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Windows Community Toolkit Primitive Controls (Design)")]
[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitive Controls")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Windows Community Toolkit")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US English
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.

//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading