Skip to content

Commit d253e0a

Browse files
nums11nums11
committed
Fix merge conflicts
2 parents 77fd28a + 93e6abb commit d253e0a

39 files changed

+3658
-1117
lines changed

‎SECURITY.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
2+
3+
## Security
4+
5+
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
6+
7+
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
8+
9+
## Reporting Security Issues
10+
11+
**Please do not report security vulnerabilities through public GitHub issues.**
12+
13+
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
14+
15+
If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
16+
17+
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
18+
19+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
20+
21+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
22+
* Full paths of source file(s) related to the manifestation of the issue
23+
* The location of the affected source code (tag/branch/commit or direct URL)
24+
* Any special configuration required to reproduce the issue
25+
* Step-by-step instructions to reproduce the issue
26+
* Proof-of-concept or exploit code (if possible)
27+
* Impact of the issue, including how an attacker might exploit the issue
28+
29+
This information will help us triage your report more quickly.
30+
31+
If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
32+
33+
## Preferred Languages
34+
35+
We prefer all communications to be in English.
36+
37+
## Policy
38+
39+
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
40+
41+
<!-- END MICROSOFT SECURITY.MD BLOCK -->

‎Samples/BatchSupport/BatchSupport/BatchSupport.vcxproj‎

Lines changed: 198 additions & 198 deletions
Large diffs are not rendered by default.

‎Samples/SampleSharedLib/SampleSharedLib/SampleSharedLib.vcxproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug_NuGet|Win32">
65
<Configuration>Debug_NuGet</Configuration>
@@ -69,7 +68,7 @@
6968
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7069
<ConfigurationType>StaticLibrary</ConfigurationType>
7170
<UseDebugLibraries>false</UseDebugLibraries>
72-
<PlatformToolset>v142</PlatformToolset>
71+
<PlatformToolset>v143</PlatformToolset>
7372
<WholeProgramOptimization>true</WholeProgramOptimization>
7473
<CharacterSet>Unicode</CharacterSet>
7574
</PropertyGroup>
@@ -250,14 +249,9 @@
250249
<None Include="packages.config" />
251250
</ItemGroup>
252251
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
253-
<ImportGroup Label="ExtensionTargets">
254-
<Import Project="..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
255-
</ImportGroup>
256252
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
257253
<PropertyGroup>
258254
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
259255
</PropertyGroup>
260-
<Error Condition="!Exists('..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
261-
<Error Condition="!Exists('..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\BatchSupport\packages\Microsoft.Windows.CppWinRT.2.0.220131.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
262256
</Target>
263257
</Project>

‎Samples/Tutorial Samples/WinMLPIXSample/WinMLPIXSample.sln‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32210.238
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMLPIXSample", "WinMLPIXSample\WinMLPIXSample.vcxproj", "{3F9AE007-1715-46FF-8A52-E0A420290FCC}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{12103A5B-677A-4286-83D2-54EAB9010C16} = {12103A5B-677A-4286-83D2-54EAB9010C16}
9+
EndProjectSection
10+
EndProject
11+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleSharedLib", "..\..\SampleSharedLib\SampleSharedLib\SampleSharedLib.vcxproj", "{12103A5B-677A-4286-83D2-54EAB9010C16}"
12+
EndProject
13+
Global
14+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15+
Debug_NuGet|x64 = Debug_NuGet|x64
16+
Debug_NuGet|x86 = Debug_NuGet|x86
17+
Debug|x64 = Debug|x64
18+
Debug|x86 = Debug|x86
19+
Release|x64 = Release|x64
20+
Release|x86 = Release|x86
21+
EndGlobalSection
22+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug_NuGet|x64.ActiveCfg = Debug|x64
24+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug_NuGet|x64.Build.0 = Debug|x64
25+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug_NuGet|x86.ActiveCfg = Debug|Win32
26+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug_NuGet|x86.Build.0 = Debug|Win32
27+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug|x64.ActiveCfg = Debug|x64
28+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug|x64.Build.0 = Debug|x64
29+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug|x86.ActiveCfg = Debug|Win32
30+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Debug|x86.Build.0 = Debug|Win32
31+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Release|x64.ActiveCfg = Release|x64
32+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Release|x64.Build.0 = Release|x64
33+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Release|x86.ActiveCfg = Release|Win32
34+
{3F9AE007-1715-46FF-8A52-E0A420290FCC}.Release|x86.Build.0 = Release|Win32
35+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug_NuGet|x64.ActiveCfg = Debug_NuGet|x64
36+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug_NuGet|x64.Build.0 = Debug_NuGet|x64
37+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug_NuGet|x86.ActiveCfg = Debug_NuGet|Win32
38+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug_NuGet|x86.Build.0 = Debug_NuGet|Win32
39+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug|x64.ActiveCfg = Debug|x64
40+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug|x64.Build.0 = Debug|x64
41+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug|x86.ActiveCfg = Debug|Win32
42+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Debug|x86.Build.0 = Debug|Win32
43+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Release|x64.ActiveCfg = Release|x64
44+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Release|x64.Build.0 = Release|x64
45+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Release|x86.ActiveCfg = Release|Win32
46+
{12103A5B-677A-4286-83D2-54EAB9010C16}.Release|x86.Build.0 = Release|Win32
47+
EndGlobalSection
48+
GlobalSection(SolutionProperties) = preSolution
49+
HideSolutionNode = FALSE
50+
EndGlobalSection
51+
GlobalSection(ExtensibilityGlobals) = postSolution
52+
SolutionGuid = {62F16753-E82E-4C01-884A-ABF36DAC7BEB}
53+
EndGlobalSection
54+
EndGlobal

0 commit comments

Comments
 (0)