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

Add new 'DesignTools' projects #3318

Merged
11 commits merged into from
Dec 10, 2020
Merged

Add new 'DesignTools' projects #3318

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4d47615
Removed Settings from Design projects
Nirmal4G May 30, 2020
b796cf0
Consolidate Common code
Nirmal4G May 30, 2020
65af703
Code Cleanup — Design projects only
Nirmal4G May 30, 2020
ccaf0ec
Consolidate Build logic — Design projects only
Nirmal4G May 30, 2020
fbeecf7
Support both process and surface isolated designers
Nirmal4G May 30, 2020
7ef1690
Move typeof into Typedata files
Nirmal4G May 30, 2020
ecc7f1e
Add DesignTools Project for the new Designer APIs
Nirmal4G May 30, 2020
9019a28
Remove older XAML DesignTime support
Nirmal4G Nov 25, 2020
1cace8c
Merge branch 'master' into feature/design-tools
Rosuavio Dec 2, 2020
ea949d6
Merge branch 'master' into feature/design-tools
michael-hawker Dec 8, 2020
2e2c27b
Merge branch 'master' into feature/design-tools
michael-hawker Dec 10, 2020
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
9 changes: 6 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
<IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
<DefaultTargetPlatformVersion>19041</DefaultTargetPlatformVersion>
<DefaultTargetPlatformMinVersion>17763</DefaultTargetPlatformMinVersion>
<TargetPlatformBaseVersion>10.0</TargetPlatformBaseVersion>
<TargetPlatformRevision>19041</TargetPlatformRevision>
Nirmal4G marked this conversation as resolved.
Show resolved Hide resolved
<TargetPlatformMinRevision>17763</TargetPlatformMinRevision>
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
</PropertyGroup>

Expand Down Expand Up @@ -88,7 +89,6 @@
</Choose>

<PropertyGroup Condition="'$(IsUwpProject)' == 'true'">

<!-- 8002 is a strong named -> non-strong-named reference -->
<!-- This is valid for platforms other than .NET Framework (and is needed for the UWP targets -->
<NoWarn>$(NoWarn);8002</NoWarn>
Expand All @@ -103,4 +103,7 @@
<Link>stylecop.json</Link>
</AdditionalFiles>
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'"/>

</Project>
26 changes: 7 additions & 19 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,20 @@
<Project>
<Choose>
<When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
<!-- UAP versions for uap10.0 where TPMV isn't implied -->
<PropertyGroup>
<TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.$(DefaultTargetPlatformMinVersion).0</TargetPlatformMinVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(DebugType)' == ''">
<DebugType>Portable</DebugType>
</PropertyGroup>
<PropertyGroup>
<UseUWP Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">true</UseUWP>
</PropertyGroup>

<ItemGroup>
<SDKReference Condition="'$(UseWindowsDesktopSdk)' == 'true' " Include="WindowsDesktop, Version=$(TargetPlatformVersion)">
<Name>Windows Desktop Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
</When>
</Choose>

<Choose>
<When Condition="'$(TargetFramework.Contains(`uap10.0`))' == 'false' and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true'">
<When Condition="!$(TargetFramework.Contains(`uap10.0`)) and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true'">
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
</When>
</Choose>

<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true'"/>

<Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
<ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition=" '$(SourceRevisionId)' != '' ">
Expand All @@ -36,4 +23,5 @@
</AssemblyAttribute>
</ItemGroup>
</Target>

</Project>
253 changes: 0 additions & 253 deletions Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/PlatformTypes.cs
View file
Open in desktop

This file was deleted.

Loading