Skip to content

Commit 75ecc93

Browse files
deltakoshdeltakosh
authored
Merge pull request #1074 from Microsoft/dev
1.4.1
2 parents 83919eb + a483c2f commit 75ecc93

File tree

7 files changed

+43
-104
lines changed

7 files changed

+43
-104
lines changed

‎Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<ErrorReport>prompt</ErrorReport>
3838
<WarningLevel>4</WarningLevel>
3939
<DocumentationFile>bin\Release\Microsoft.Toolkit.Uwp.DeveloperTools.XML</DocumentationFile>
40+
<RunCodeAnalysis>true</RunCodeAnalysis>
41+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4042
</PropertyGroup>
4143
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
4244
<PlatformTarget>x86</PlatformTarget>
@@ -100,11 +102,14 @@
100102
<OutputPath>bin\x64\Release\</OutputPath>
101103
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
102104
<Optimize>true</Optimize>
103-
<NoWarn>;2008</NoWarn>
105+
<NoWarn>
106+
</NoWarn>
104107
<DebugType>pdbonly</DebugType>
105108
<PlatformTarget>x64</PlatformTarget>
106109
<UseVSHostingProcess>false</UseVSHostingProcess>
107110
<ErrorReport>prompt</ErrorReport>
111+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
112+
<RunCodeAnalysis>true</RunCodeAnalysis>
108113
</PropertyGroup>
109114
<ItemGroup>
110115
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
@@ -138,4 +143,19 @@
138143
<Target Name="AfterBuild">
139144
</Target>
140145
-->
146+
<Target Name="Before_PrepareLibraryLayout" BeforeTargets="PrepareLibraryLayout">
147+
<PropertyGroup>
148+
<Saved_OutputPath>$(OutputPath)</Saved_OutputPath>
149+
<Saved_TargetPath>$(TargetPath)</Saved_TargetPath>
150+
<OutputPath>$(OutDir)</OutputPath>
151+
<TargetPath>
152+
</TargetPath>
153+
</PropertyGroup>
154+
</Target>
155+
<Target Name="After_PrepareLibraryLayout" AfterTargets="PrepareLibraryLayout">
156+
<PropertyGroup>
157+
<OutputPath>$(Saved_OutputPath)</OutputPath>
158+
<TargetPath>$(Saved_TargetPath)</TargetPath>
159+
</PropertyGroup>
160+
</Target>
141161
</Project>

‎Microsoft.Toolkit.Uwp.DeveloperTools/Properties/Microsoft.Toolkit.Uwp.DeveloperTools.rd.xml‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
This file contains Runtime Directives, specifications about types your application accesses
4-
through reflection and other dynamic code patterns. Runtime Directives are used to control the
5-
.NET Native optimizer and ensure that it does not remove code accessed by your library. If your
6-
library does not do any reflection, then you generally do not need to edit this file. However,
7-
if your library reflects over types, especially types passed to it or derived from its types,
8-
then you should write Runtime Directives.
9-
10-
The most common use of reflection in libraries is to discover information about types passed
11-
to the library. Runtime Directives have three ways to express requirements on types passed to
12-
your library.
13-
14-
1. Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
15-
Use these directives to reflect over types passed as a parameter.
16-
17-
2. SubTypes
18-
Use a SubTypes directive to reflect over types derived from another type.
19-
20-
3. AttributeImplies
21-
Use an AttributeImplies directive to indicate that your library needs to reflect over
22-
types or methods decorated with an attribute.
23-
24-
For more information on writing Runtime Directives for libraries, please visit
25-
https://go.microsoft.com/fwlink/?LinkID=391919
26-
-->
272
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
283
<Library Name="Microsoft.Toolkit.Uwp.DeveloperTools">
29-
30-
<!-- add directives for your library here -->
31-
324
</Library>
335
</Directives>
6+

‎Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@
222222
<Setter Target="ExpandButton.Content" Value="" />
223223

224224
<Setter Target="Splitter.Visibility" Value="Collapsed" />
225+
226+
<Setter Target="HamburgerMenu.DisplayMode" Value="CompactOverlay" />
225227
</VisualState.Setters>
226228
</VisualState>
227229
<VisualState x:Name="MediumState">
@@ -242,6 +244,8 @@
242244
<Setter Target="ExpandButton.Content" Value="" />
243245

244246
<Setter Target="Splitter.Visibility" Value="Collapsed" />
247+
248+
<Setter Target="HamburgerMenu.DisplayMode" Value="CompactInline" />
245249
</VisualState.Setters>
246250
</VisualState>
247251
<VisualState x:Name="WideState">
@@ -262,6 +266,8 @@
262266
<Setter Target="ExpandButton.Content" Value="" />
263267

264268
<Setter Target="Splitter.Visibility" Value="Visible" />
269+
270+
<Setter Target="HamburgerMenu.DisplayMode" Value="CompactInline" />
265271
</VisualState.Setters>
266272

267273
</VisualState>

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

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -270,72 +270,6 @@
270270
<PropertyGroup>
271271
<StartupObject />
272272
</PropertyGroup>
273-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28Version 1511%29|AnyCPU'">
274-
<DebugSymbols>true</DebugSymbols>
275-
<OutputPath>bin\Debug %28Version 1511%29\</OutputPath>
276-
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
277-
<DocumentationFile>bin\Debug\Microsoft.Windows.Toolkit.UI.Controls.XML</DocumentationFile>
278-
<NoStdLib>true</NoStdLib>
279-
<DebugType>full</DebugType>
280-
<PlatformTarget>AnyCPU</PlatformTarget>
281-
<UseVSHostingProcess>false</UseVSHostingProcess>
282-
<ErrorReport>prompt</ErrorReport>
283-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.ui.controls.ruleset</CodeAnalysisRuleSet>
284-
</PropertyGroup>
285-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28Anniversary Update%29|AnyCPU'">
286-
<DebugSymbols>true</DebugSymbols>
287-
<OutputPath>bin\Debug %28Anniversary Update%29\</OutputPath>
288-
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
289-
<DocumentationFile>bin\Debug\Microsoft.Windows.Toolkit.UI.Controls.XML</DocumentationFile>
290-
<NoStdLib>true</NoStdLib>
291-
<DebugType>full</DebugType>
292-
<PlatformTarget>AnyCPU</PlatformTarget>
293-
<UseVSHostingProcess>false</UseVSHostingProcess>
294-
<ErrorReport>prompt</ErrorReport>
295-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.ui.controls.ruleset</CodeAnalysisRuleSet>
296-
</PropertyGroup>
297-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28Version 1511%29|AnyCPU'">
298-
<OutputPath>bin\Release %28Version 1511%29\</OutputPath>
299-
<DefineConstants>CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
300-
<DocumentationFile>bin\Release\Microsoft.Windows.Toolkit.UI.Controls.XML</DocumentationFile>
301-
<Optimize>true</Optimize>
302-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
303-
<NoStdLib>true</NoStdLib>
304-
<DebugType>pdbonly</DebugType>
305-
<PlatformTarget>AnyCPU</PlatformTarget>
306-
<RunCodeAnalysis>true</RunCodeAnalysis>
307-
<UseVSHostingProcess>false</UseVSHostingProcess>
308-
<ErrorReport>prompt</ErrorReport>
309-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.ui.controls.ruleset</CodeAnalysisRuleSet>
310-
</PropertyGroup>
311-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28Anniversary Update%29|AnyCPU'">
312-
<OutputPath>bin\Release %28Anniversary Update%29\</OutputPath>
313-
<DefineConstants>CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
314-
<DocumentationFile>bin\Release\Microsoft.Windows.Toolkit.UI.Controls.XML</DocumentationFile>
315-
<Optimize>true</Optimize>
316-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
317-
<NoStdLib>true</NoStdLib>
318-
<DebugType>pdbonly</DebugType>
319-
<PlatformTarget>AnyCPU</PlatformTarget>
320-
<RunCodeAnalysis>true</RunCodeAnalysis>
321-
<UseVSHostingProcess>false</UseVSHostingProcess>
322-
<ErrorReport>prompt</ErrorReport>
323-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.ui.controls.ruleset</CodeAnalysisRuleSet>
324-
</PropertyGroup>
325-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Publish|AnyCPU'">
326-
<OutputPath>bin\Publish\</OutputPath>
327-
<DefineConstants>CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
328-
<DocumentationFile>bin\Release\Microsoft.Toolkit.Uwp.UI.Controls.xml</DocumentationFile>
329-
<Optimize>true</Optimize>
330-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
331-
<NoStdLib>true</NoStdLib>
332-
<DebugType>pdbonly</DebugType>
333-
<PlatformTarget>AnyCPU</PlatformTarget>
334-
<RunCodeAnalysis>true</RunCodeAnalysis>
335-
<UseVSHostingProcess>false</UseVSHostingProcess>
336-
<ErrorReport>prompt</ErrorReport>
337-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.ui.controls.ruleset</CodeAnalysisRuleSet>
338-
</PropertyGroup>
339273
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
340274
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
341275
Other similar extension points exist, see Microsoft.Common.targets.

‎Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,11 @@ private static async void OnImageSourceChanged(DependencyObject d, DependencyPro
387387
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
388388
private async Task<bool> LoadImageBrush(Uri uri)
389389
{
390+
if (DesignMode.DesignModeEnabled)
391+
{
392+
return false;
393+
}
394+
390395
var strategy = Strategy;
391396

392397
if (strategy == UIStrategy.Composition)

‎UWP Community Toolkit.sln‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.4
4+
VisualStudioVersion = 15.0.26228.10
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp", "Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj", "{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}"
77
EndProject
@@ -238,14 +238,14 @@ Global
238238
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|x64.Build.0 = Debug|Any CPU
239239
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|x86.ActiveCfg = Debug|Any CPU
240240
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Debug|x86.Build.0 = Debug|Any CPU
241-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
242-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|Any CPU.Build.0 = Publish|Any CPU
243-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|ARM.ActiveCfg = Publish|Any CPU
244-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|ARM.Build.0 = Publish|Any CPU
245-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x64.ActiveCfg = Publish|Any CPU
246-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x64.Build.0 = Publish|Any CPU
247-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x86.ActiveCfg = Publish|Any CPU
248-
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x86.Build.0 = Publish|Any CPU
241+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|Any CPU.ActiveCfg = Release|Any CPU
242+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|Any CPU.Build.0 = Release|Any CPU
243+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|ARM.ActiveCfg = Release|Any CPU
244+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|ARM.Build.0 = Release|Any CPU
245+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x64.ActiveCfg = Release|Any CPU
246+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x64.Build.0 = Release|Any CPU
247+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x86.ActiveCfg = Release|Any CPU
248+
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Publish|x86.Build.0 = Release|Any CPU
249249
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Release|Any CPU.ActiveCfg = Release|Any CPU
250250
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Release|Any CPU.Build.0 = Release|Any CPU
251251
{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}.Release|ARM.ActiveCfg = Release|Any CPU

‎build/Microsoft.Toolkit.Uwp.DeveloperTools.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.pdb" target="lib\uap10.0" />
2525
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.pri" target="lib\uap10.0" />
2626
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.xml" target="lib\uap10.0" />
27+
<file src="$binaries$\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools\**\*.*" target="lib\uap10.0\Microsoft.Toolkit.Uwp.DeveloperTools" />
2728
</files>
2829
</package>

0 commit comments

Comments
 (0)