Skip to content

Commit dd9219f

Browse files
michael-hawkermichael-hawker
authored
Merge branch 'master' into mhawker/sample-fixes
2 parents c925a6b + 6d65c4c commit dd9219f

File tree

143 files changed

+8267
-1174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+8267
-1174
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Bug report
33
about: Create a report to help us fix something that isn't working as expected
44
title: ''
5-
labels: bug
5+
labels: "bug :bug:"
66
assignees: ''
77

88
---

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Feature request
33
about: I have a new idea or improvement for the toolkit
44
title: "[Feature]"
5-
labels: feature request
5+
labels: "feature request :mailbox_with_mail:"
66
assignees: ''
77

88
---

‎.github/ISSUE_TEMPLATE/question.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Question
33
about: I have a question about how to use something in the toolkit.
44
title: "[Question]"
5-
labels: question
5+
labels: "question :grey_question:"
66
assignees: ''
77

88
---

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,5 @@ AppPackages
223223
project.lock.json
224224
msbuild.binlog
225225
*.project.lock.json
226-
/build/tools
226+
/build/tools/**
227+
!/build/tools/packages.config

‎GazeInputTest/GazeInputTest.csproj

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,29 @@
6565
<Prefer32Bit>true</Prefer32Bit>
6666
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
6767
</PropertyGroup>
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
69+
<DebugSymbols>true</DebugSymbols>
70+
<OutputPath>bin\ARM64\Debug\</OutputPath>
71+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
72+
<NoWarn>;2008</NoWarn>
73+
<DebugType>full</DebugType>
74+
<PlatformTarget>ARM64</PlatformTarget>
75+
<UseVSHostingProcess>false</UseVSHostingProcess>
76+
<ErrorReport>prompt</ErrorReport>
77+
<Prefer32Bit>true</Prefer32Bit>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
80+
<OutputPath>bin\ARM64\Release\</OutputPath>
81+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
82+
<Optimize>true</Optimize>
83+
<NoWarn>;2008</NoWarn>
84+
<DebugType>pdbonly</DebugType>
85+
<PlatformTarget>ARM64</PlatformTarget>
86+
<UseVSHostingProcess>false</UseVSHostingProcess>
87+
<ErrorReport>prompt</ErrorReport>
88+
<Prefer32Bit>true</Prefer32Bit>
89+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
90+
</PropertyGroup>
6891
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
6992
<DebugSymbols>true</DebugSymbols>
7093
<OutputPath>bin\x64\Debug\</OutputPath>
@@ -127,7 +150,7 @@
127150
</ItemGroup>
128151
<ItemGroup>
129152
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
130-
<Version>6.1.5</Version>
153+
<Version>6.2.9</Version>
131154
</PackageReference>
132155
</ItemGroup>
133156
<ItemGroup>

‎Microsoft.Toolkit.Services/Services/OneDrive/OneDriveStorageItem.cs

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using Microsoft.Graph;
11+
using Microsoft.Toolkit.Extensions;
1112
using Newtonsoft.Json;
1213

1314
namespace Microsoft.Toolkit.Services.OneDrive
@@ -69,35 +70,7 @@ public string FormattedFileSize
6970
{
7071
get
7172
{
72-
var size = FileSize.HasValue ? FileSize.Value : 0;
73-
if (size < 1024)
74-
{
75-
return size.ToString("F0") + " bytes";
76-
}
77-
else if ((size >> 10) < 1024)
78-
{
79-
return (size / (float)1024).ToString("F1") + " KB";
80-
}
81-
else if ((size >> 20) < 1024)
82-
{
83-
return ((size >> 10) / (float)1024).ToString("F1") + " MB";
84-
}
85-
else if ((size >> 30) < 1024)
86-
{
87-
return ((size >> 20) / (float)1024).ToString("F1") + " GB";
88-
}
89-
else if ((size >> 40) < 1024)
90-
{
91-
return ((size >> 30) / (float)1024).ToString("F1") + " TB";
92-
}
93-
else if ((size >> 50) < 1024)
94-
{
95-
return ((size >> 40) / (float)1024).ToString("F1") + " PB";
96-
}
97-
else
98-
{
99-
return ((size >> 50) / (float)1024).ToString("F0") + " EB";
100-
}
73+
return FileSize.HasValue ? Converters.ToFileSizeString(FileSize.Value) : Converters.ToFileSizeString(0L);
10174
}
10275
}
10376

‎Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Debug|Win32">
913
<Configuration>Debug</Configuration>
1014
<Platform>Win32</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>Release</Configuration>
1822
<Platform>ARM</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|ARM64">
25+
<Configuration>Release</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
2028
<ProjectConfiguration Include="Release|Win32">
2129
<Configuration>Release</Configuration>
2230
<Platform>Win32</Platform>
@@ -51,6 +59,11 @@
5159
<UseDebugLibraries>true</UseDebugLibraries>
5260
<PlatformToolset>v142</PlatformToolset>
5361
</PropertyGroup>
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
63+
<ConfigurationType>DynamicLibrary</ConfigurationType>
64+
<UseDebugLibraries>true</UseDebugLibraries>
65+
<PlatformToolset>v142</PlatformToolset>
66+
</PropertyGroup>
5467
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5568
<ConfigurationType>DynamicLibrary</ConfigurationType>
5669
<UseDebugLibraries>true</UseDebugLibraries>
@@ -68,6 +81,12 @@
6881
<WholeProgramOptimization>true</WholeProgramOptimization>
6982
<PlatformToolset>v142</PlatformToolset>
7083
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
85+
<ConfigurationType>DynamicLibrary</ConfigurationType>
86+
<UseDebugLibraries>false</UseDebugLibraries>
87+
<WholeProgramOptimization>true</WholeProgramOptimization>
88+
<PlatformToolset>v142</PlatformToolset>
89+
</PropertyGroup>
7190
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7291
<ConfigurationType>DynamicLibrary</ConfigurationType>
7392
<UseDebugLibraries>false</UseDebugLibraries>
@@ -88,9 +107,15 @@
88107
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
89108
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
90109
</ImportGroup>
110+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
111+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
112+
</ImportGroup>
91113
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
92114
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
93115
</ImportGroup>
116+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
117+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
118+
</ImportGroup>
94119
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
95120
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
96121
</ImportGroup>
@@ -109,10 +134,17 @@
109134
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
110135
<GenerateManifest>false</GenerateManifest>
111136
</PropertyGroup>
137+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
138+
<GenerateManifest>false</GenerateManifest>
139+
</PropertyGroup>
112140
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
113141
<GenerateManifest>false</GenerateManifest>
114142
<OutDir>$(SolutionDir)$(MSBuildProjectName)\Output\$(Platform)\$(Configuration)\</OutDir>
115143
</PropertyGroup>
144+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
145+
<GenerateManifest>false</GenerateManifest>
146+
<OutDir>$(SolutionDir)$(MSBuildProjectName)\Output\$(Platform)\$(Configuration)\</OutDir>
147+
</PropertyGroup>
116148
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
117149
<GenerateManifest>false</GenerateManifest>
118150
</PropertyGroup>
@@ -168,6 +200,21 @@
168200
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
169201
</Link>
170202
</ItemDefinitionGroup>
203+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
204+
<ClCompile>
205+
<PrecompiledHeader>Use</PrecompiledHeader>
206+
<PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
207+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
208+
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
209+
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
210+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
211+
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
212+
</ClCompile>
213+
<Link>
214+
<SubSystem>Console</SubSystem>
215+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
216+
</Link>
217+
</ItemDefinitionGroup>
171218
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
172219
<ClCompile>
173220
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -184,6 +231,22 @@
184231
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
185232
</Link>
186233
</ItemDefinitionGroup>
234+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
235+
<ClCompile>
236+
<PrecompiledHeader>Use</PrecompiledHeader>
237+
<PreprocessorDefinitions>_WINRT_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
238+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
239+
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
240+
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
241+
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
242+
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
243+
<ControlFlowGuard>Guard</ControlFlowGuard>
244+
</ClCompile>
245+
<Link>
246+
<SubSystem>Console</SubSystem>
247+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
248+
</Link>
249+
</ItemDefinitionGroup>
187250
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
188251
<ClCompile>
189252
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -255,7 +318,9 @@
255318
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
256319
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
257320
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
321+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
258322
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
323+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
259324
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
260325
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
261326
</ClCompile>

‎Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
<None Include="Microsoft.Toolkit.Uwp.Notifications.targets" Pack="true" PackagePath="build\native" />
2424
</ItemGroup>
2525

26+
<ItemGroup>
27+
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
28+
</ItemGroup>
29+
2630
<ItemGroup Condition="!('$(TargetFramework)'=='net461')">
2731
<Compile Remove="DesktopNotificationManager\**\*" />
2832
</ItemGroup>

0 commit comments

Comments
 (0)