Skip to content

Commit 7326f73

Browse files
mrlaceymrlacey
authored
Merge pull request #74 from CommunityToolkit/TestPropsFiles
Moved repeated test project properties into shared props files
2 parents d6cd9f8 + ec58226 commit 7326f73

File tree

14 files changed

+226
-487
lines changed

14 files changed

+226
-487
lines changed

‎Toolkit.Labs.All.sln

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{583C9ADC
6868
common\Labs.MultiTarget.props = common\Labs.MultiTarget.props
6969
common\Labs.SampleRefs.props = common\Labs.SampleRefs.props
7070
common\Labs.TargetFrameworks.props = common\Labs.TargetFrameworks.props
71+
common\Labs.Uwp.Base.props = common\Labs.Uwp.Base.props
7172
common\Labs.Uwp.props = common\Labs.Uwp.props
7273
common\Labs.Wasm.props = common\Labs.Wasm.props
7374
common\Labs.WinAppSdk.props = common\Labs.WinAppSdk.props
7475
Windows.Toolkit.Common.props = Windows.Toolkit.Common.props
7576
EndProjectSection
7677
EndProject
78+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{DB021AE9-57A4-41BA-822F-2C76AF4A385B}"
79+
ProjectSection(SolutionItems) = preProject
80+
tests\Labs.Tests.props = tests\Labs.Tests.props
81+
tests\Labs.Tests.Uwp.props = tests\Labs.Tests.Uwp.props
82+
tests\Labs.Tests.WinAppSdk.props = tests\Labs.Tests.WinAppSdk.props
83+
EndProjectSection
84+
EndProject
7785
Global
7886
GlobalSection(SharedMSBuildProjectFiles) = preSolution
7987
labs\CanvasLayout\tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{2c7a065b-9349-4071-af95-e88f320a09a9}*SharedItemsImports = 13
@@ -1151,6 +1159,7 @@ Global
11511159
{DD69BA61-C86D-4138-AE6F-76E2C8445C9A} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
11521160
{2C7A065B-9349-4071-AF95-E88F320A09A9} = {DD69BA61-C86D-4138-AE6F-76E2C8445C9A}
11531161
{583C9ADC-96A6-446D-9573-7C33B0640915} = {24A1D6DC-FF32-4D9D-9FC2-8EB3E356A2C0}
1162+
{DB021AE9-57A4-41BA-822F-2C76AF4A385B} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
11541163
EndGlobalSection
11551164
GlobalSection(ExtensibilityGlobals) = postSolution
11561165
SolutionGuid = {1F0A4823-84EF-41AA-BBF9-A07B38DDC555}

‎common/Labs.Uwp.Base.props

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
<Project>
2+
<!-- Common properties needed for a labs project (UWP) -->
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
5+
<PropertyGroup>
6+
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
7+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
8+
<IncludeContentInPack>false</IncludeContentInPack>
9+
</PropertyGroup>
10+
11+
<PropertyGroup>
12+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
13+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
14+
<OutputType>AppContainerExe</OutputType>
15+
<AppDesignerFolder>Properties</AppDesignerFolder>
16+
<DefaultLanguage>en-US</DefaultLanguage>
17+
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
18+
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
19+
<FileAlignment>512</FileAlignment>
20+
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
21+
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
22+
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
23+
</PropertyGroup>
24+
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
26+
<DebugSymbols>true</DebugSymbols>
27+
<OutputPath>bin\x86\Debug\</OutputPath>
28+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
29+
<NoWarn>;2008</NoWarn>
30+
<DebugType>full</DebugType>
31+
<PlatformTarget>x86</PlatformTarget>
32+
<UseVSHostingProcess>false</UseVSHostingProcess>
33+
<ErrorReport>prompt</ErrorReport>
34+
<Prefer32Bit>true</Prefer32Bit>
35+
</PropertyGroup>
36+
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
38+
<OutputPath>bin\x86\Release\</OutputPath>
39+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
40+
<Optimize>true</Optimize>
41+
<NoWarn>;2008</NoWarn>
42+
<DebugType>pdbonly</DebugType>
43+
<PlatformTarget>x86</PlatformTarget>
44+
<UseVSHostingProcess>false</UseVSHostingProcess>
45+
<ErrorReport>prompt</ErrorReport>
46+
<Prefer32Bit>true</Prefer32Bit>
47+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
48+
</PropertyGroup>
49+
50+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
51+
<DebugSymbols>true</DebugSymbols>
52+
<OutputPath>bin\ARM\Debug\</OutputPath>
53+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
54+
<NoWarn>;2008</NoWarn>
55+
<DebugType>full</DebugType>
56+
<PlatformTarget>ARM</PlatformTarget>
57+
<UseVSHostingProcess>false</UseVSHostingProcess>
58+
<ErrorReport>prompt</ErrorReport>
59+
<Prefer32Bit>true</Prefer32Bit>
60+
</PropertyGroup>
61+
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
63+
<OutputPath>bin\ARM\Release\</OutputPath>
64+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
65+
<Optimize>true</Optimize>
66+
<NoWarn>;2008</NoWarn>
67+
<DebugType>pdbonly</DebugType>
68+
<PlatformTarget>ARM</PlatformTarget>
69+
<UseVSHostingProcess>false</UseVSHostingProcess>
70+
<ErrorReport>prompt</ErrorReport>
71+
<Prefer32Bit>true</Prefer32Bit>
72+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
73+
</PropertyGroup>
74+
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
76+
<DebugSymbols>true</DebugSymbols>
77+
<OutputPath>bin\ARM64\Debug\</OutputPath>
78+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
79+
<NoWarn>;2008</NoWarn>
80+
<DebugType>full</DebugType>
81+
<PlatformTarget>ARM64</PlatformTarget>
82+
<UseVSHostingProcess>false</UseVSHostingProcess>
83+
<ErrorReport>prompt</ErrorReport>
84+
<Prefer32Bit>true</Prefer32Bit>
85+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
86+
</PropertyGroup>
87+
88+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
89+
<OutputPath>bin\ARM64\Release\</OutputPath>
90+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
91+
<Optimize>true</Optimize>
92+
<NoWarn>;2008</NoWarn>
93+
<DebugType>pdbonly</DebugType>
94+
<PlatformTarget>ARM64</PlatformTarget>
95+
<UseVSHostingProcess>false</UseVSHostingProcess>
96+
<ErrorReport>prompt</ErrorReport>
97+
<Prefer32Bit>true</Prefer32Bit>
98+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
99+
</PropertyGroup>
100+
101+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
102+
<DebugSymbols>true</DebugSymbols>
103+
<OutputPath>bin\x64\Debug\</OutputPath>
104+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
105+
<NoWarn>;2008</NoWarn>
106+
<DebugType>full</DebugType>
107+
<PlatformTarget>x64</PlatformTarget>
108+
<UseVSHostingProcess>false</UseVSHostingProcess>
109+
<ErrorReport>prompt</ErrorReport>
110+
<Prefer32Bit>true</Prefer32Bit>
111+
</PropertyGroup>
112+
113+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
114+
<OutputPath>bin\x64\Release\</OutputPath>
115+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
116+
<Optimize>true</Optimize>
117+
<NoWarn>;2008</NoWarn>
118+
<DebugType>pdbonly</DebugType>
119+
<PlatformTarget>x64</PlatformTarget>
120+
<UseVSHostingProcess>false</UseVSHostingProcess>
121+
<ErrorReport>prompt</ErrorReport>
122+
<Prefer32Bit>true</Prefer32Bit>
123+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
124+
</PropertyGroup>
125+
126+
<PropertyGroup>
127+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
128+
</PropertyGroup>
129+
130+
<ItemGroup>
131+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
132+
<Version>6.2.12</Version>
133+
</PackageReference>
134+
<PackageReference Include="Microsoft.UI.Xaml">
135+
<Version>2.7.0</Version>
136+
</PackageReference>
137+
</ItemGroup>
138+
139+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
140+
<VisualStudioVersion>14.0</VisualStudioVersion>
141+
</PropertyGroup>
142+
143+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
144+
</Project>

‎common/Labs.Uwp.props

Lines changed: 2 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,8 @@
11
<Project>
2-
<!-- Common properties needed for a labs project (UWP) -->
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
42
<Import Project="$(RepositoryDirectory)common\Labs.TargetFrameworks.props" />
3+
<Import Project="$(RepositoryDirectory)common\Labs.Uwp.Base.props" />
54

65
<PropertyGroup>
7-
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
8-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
9-
<IncludeContentInPack>false</IncludeContentInPack>
106
<TargetFramework>$(UwpTargetFramework)</TargetFramework>
117
</PropertyGroup>
12-
13-
<PropertyGroup>
14-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
15-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
16-
<OutputType>AppContainerExe</OutputType>
17-
<AppDesignerFolder>Properties</AppDesignerFolder>
18-
<DefaultLanguage>en-US</DefaultLanguage>
19-
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
20-
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
21-
<FileAlignment>512</FileAlignment>
22-
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
23-
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
24-
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
25-
</PropertyGroup>
26-
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
28-
<DebugSymbols>true</DebugSymbols>
29-
<OutputPath>bin\x86\Debug\</OutputPath>
30-
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
31-
<NoWarn>;2008</NoWarn>
32-
<DebugType>full</DebugType>
33-
<PlatformTarget>x86</PlatformTarget>
34-
<UseVSHostingProcess>false</UseVSHostingProcess>
35-
<ErrorReport>prompt</ErrorReport>
36-
<Prefer32Bit>true</Prefer32Bit>
37-
</PropertyGroup>
38-
39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
40-
<OutputPath>bin\x86\Release\</OutputPath>
41-
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
42-
<Optimize>true</Optimize>
43-
<NoWarn>;2008</NoWarn>
44-
<DebugType>pdbonly</DebugType>
45-
<PlatformTarget>x86</PlatformTarget>
46-
<UseVSHostingProcess>false</UseVSHostingProcess>
47-
<ErrorReport>prompt</ErrorReport>
48-
<Prefer32Bit>true</Prefer32Bit>
49-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
50-
</PropertyGroup>
51-
52-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
53-
<DebugSymbols>true</DebugSymbols>
54-
<OutputPath>bin\ARM\Debug\</OutputPath>
55-
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
56-
<NoWarn>;2008</NoWarn>
57-
<DebugType>full</DebugType>
58-
<PlatformTarget>ARM</PlatformTarget>
59-
<UseVSHostingProcess>false</UseVSHostingProcess>
60-
<ErrorReport>prompt</ErrorReport>
61-
<Prefer32Bit>true</Prefer32Bit>
62-
</PropertyGroup>
63-
64-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
65-
<OutputPath>bin\ARM\Release\</OutputPath>
66-
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
67-
<Optimize>true</Optimize>
68-
<NoWarn>;2008</NoWarn>
69-
<DebugType>pdbonly</DebugType>
70-
<PlatformTarget>ARM</PlatformTarget>
71-
<UseVSHostingProcess>false</UseVSHostingProcess>
72-
<ErrorReport>prompt</ErrorReport>
73-
<Prefer32Bit>true</Prefer32Bit>
74-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
75-
</PropertyGroup>
76-
77-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
78-
<DebugSymbols>true</DebugSymbols>
79-
<OutputPath>bin\ARM64\Debug\</OutputPath>
80-
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
81-
<NoWarn>;2008</NoWarn>
82-
<DebugType>full</DebugType>
83-
<PlatformTarget>ARM64</PlatformTarget>
84-
<UseVSHostingProcess>false</UseVSHostingProcess>
85-
<ErrorReport>prompt</ErrorReport>
86-
<Prefer32Bit>true</Prefer32Bit>
87-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
88-
</PropertyGroup>
89-
90-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
91-
<OutputPath>bin\ARM64\Release\</OutputPath>
92-
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
93-
<Optimize>true</Optimize>
94-
<NoWarn>;2008</NoWarn>
95-
<DebugType>pdbonly</DebugType>
96-
<PlatformTarget>ARM64</PlatformTarget>
97-
<UseVSHostingProcess>false</UseVSHostingProcess>
98-
<ErrorReport>prompt</ErrorReport>
99-
<Prefer32Bit>true</Prefer32Bit>
100-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
101-
</PropertyGroup>
102-
103-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
104-
<DebugSymbols>true</DebugSymbols>
105-
<OutputPath>bin\x64\Debug\</OutputPath>
106-
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
107-
<NoWarn>;2008</NoWarn>
108-
<DebugType>full</DebugType>
109-
<PlatformTarget>x64</PlatformTarget>
110-
<UseVSHostingProcess>false</UseVSHostingProcess>
111-
<ErrorReport>prompt</ErrorReport>
112-
<Prefer32Bit>true</Prefer32Bit>
113-
</PropertyGroup>
114-
115-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
116-
<OutputPath>bin\x64\Release\</OutputPath>
117-
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
118-
<Optimize>true</Optimize>
119-
<NoWarn>;2008</NoWarn>
120-
<DebugType>pdbonly</DebugType>
121-
<PlatformTarget>x64</PlatformTarget>
122-
<UseVSHostingProcess>false</UseVSHostingProcess>
123-
<ErrorReport>prompt</ErrorReport>
124-
<Prefer32Bit>true</Prefer32Bit>
125-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
126-
</PropertyGroup>
127-
128-
<PropertyGroup>
129-
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
130-
</PropertyGroup>
131-
132-
<ItemGroup>
133-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
134-
<Version>6.2.12</Version>
135-
</PackageReference>
136-
<PackageReference Include="Microsoft.UI.Xaml">
137-
<Version>2.7.0</Version>
138-
</PackageReference>
139-
</ItemGroup>
140-
141-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
142-
<VisualStudioVersion>14.0</VisualStudioVersion>
143-
</PropertyGroup>
144-
145-
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
146-
</Project>
8+
</Project>

‎common/Labs.WinAppSdk.props

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,11 @@
1414
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
1515
<DefineConstants>WINAPPSDK</DefineConstants>
1616
</PropertyGroup>
17-
</Project>
17+
18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
20+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
21+
<Manifest Include="$(ApplicationManifest)" />
22+
</ItemGroup>
23+
24+
</Project>

0 commit comments

Comments
 (0)