Skip to content

Commit 67f3906

Browse files
Nirmal4GNirmal4G
committed
Add Design project for the UWP Media controls
Basic DesignTime support on-par with other controls in the toolkit. Reverts the following commit - Commit Message: `Media Controls does not have a "DesignTools" project` - Commit Hash : `1781e7f4291061c642fedfa5307aa80879838b56`
1 parent ea41b48 commit 67f3906

File tree

5 files changed

+255
-3
lines changed

5 files changed

+255
-3
lines changed

‎Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net472</TargetFramework>
5+
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<AssemblyTitle>Windows Community Toolkit - Media Controls (Design)</AssemblyTitle>
10+
<Description>Design time support for Windows Community Toolkit Media Controls</Description>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Common\*.cs" LinkBase="Common" />
15+
</ItemGroup>
16+
17+
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.targets" />
18+
19+
</Project>

‎Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs

Lines changed: 81 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="CategoryCommon" xml:space="preserve">
121+
<value>Common</value>
122+
</data>
123+
<data name="CategoryLayout" xml:space="preserve">
124+
<value>Layout</value>
125+
</data>
126+
</root>

‎Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525

2626
<ItemGroup>
2727
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
28-
<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
2928
</ItemGroup>
3029

3130
<ItemGroup>
3231
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
3332
</ItemGroup>
3433

3534
<ItemGroup>
36-
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.2" />
3735
<PackageReference Include="System.Text.Json" Version="5.0.2" />
3836
<PackageReference Include="Win2D.uwp" Version="1.25.0" />
3937
</ItemGroup>
4038

39+
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
40+
4141
</Project>

‎Windows Community Toolkit.sln

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Diagnosti
136136
EndProject
137137
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media", "Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj", "{43BD2A36-9E12-4788-80AE-2377E41E6D05}"
138138
EndProject
139+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Media.Design\Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj", "{B9940334-BD06-44E2-B9E9-A65DA791CE32}"
140+
ProjectSection(ProjectDependencies) = postProject
141+
{43BD2A36-9E12-4788-80AE-2377E41E6D05} = {43BD2A36-9E12-4788-80AE-2377E41E6D05}
142+
EndProjectSection
143+
EndProject
139144
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}"
140145
EndProject
141146
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}"
@@ -161,7 +166,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm.Sour
161166
EndProject
162167
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.SourceGenerators", "UnitTests\UnitTests.SourceGenerators\UnitTests.SourceGenerators.csproj", "{338C3BE4-2E71-4F21-AD30-03FDBB47A272}"
163168
EndProject
164-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.NetStandard", "UnitTests\UnitTests.NetStandard\UnitTests.NetStandard.csproj", "{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}"
169+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard", "UnitTests\UnitTests.NetStandard\UnitTests.NetStandard.csproj", "{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}"
165170
EndProject
166171
Global
167172
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -996,6 +1001,26 @@ Global
9961001
{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x64.Build.0 = Release|Any CPU
9971002
{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.ActiveCfg = Release|Any CPU
9981003
{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.Build.0 = Release|Any CPU
1004+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1005+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|Any CPU.Build.0 = Debug|Any CPU
1006+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM.ActiveCfg = Debug|Any CPU
1007+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM.Build.0 = Debug|Any CPU
1008+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM64.ActiveCfg = Debug|Any CPU
1009+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|ARM64.Build.0 = Debug|Any CPU
1010+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x64.ActiveCfg = Debug|Any CPU
1011+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x64.Build.0 = Debug|Any CPU
1012+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x86.ActiveCfg = Debug|Any CPU
1013+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Debug|x86.Build.0 = Debug|Any CPU
1014+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|Any CPU.ActiveCfg = Release|Any CPU
1015+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|Any CPU.Build.0 = Release|Any CPU
1016+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM.ActiveCfg = Release|Any CPU
1017+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM.Build.0 = Release|Any CPU
1018+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM64.ActiveCfg = Release|Any CPU
1019+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|ARM64.Build.0 = Release|Any CPU
1020+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x64.ActiveCfg = Release|Any CPU
1021+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x64.Build.0 = Release|Any CPU
1022+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x86.ActiveCfg = Release|Any CPU
1023+
{B9940334-BD06-44E2-B9E9-A65DA791CE32}.Release|x86.Build.0 = Release|Any CPU
9991024
{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10001025
{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
10011026
{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1219,6 +1244,7 @@ Global
12191244
{1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C}
12201245
{D4FF799D-0DF2-495A-ADC9-3BBC4AEF8971} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
12211246
{43BD2A36-9E12-4788-80AE-2377E41E6D05} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
1247+
{B9940334-BD06-44E2-B9E9-A65DA791CE32} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
12221248
{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
12231249
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
12241250
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}

0 commit comments

Comments
 (0)