Skip to content

Commit 300fecd

Browse files
chitsawsandrist
chitsaw
authored and
sandrist
committed
Merged PR 77106: March 2024 Release
1 parent 5386e8a commit 300fecd

568 files changed

Lines changed: 31503 additions & 6086 deletions

File tree

Some content is hidden

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

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,58 +13,72 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master, gh-pages ]
16+
branches: [ "master" ]
1717
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ master ]
18+
branches: [ "master" ]
2019
schedule:
21-
- cron: '28 20 * * 4'
20+
- cron: '28 3 * * 6'
2221

2322
jobs:
2423
analyze:
2524
name: Analyze
26-
runs-on: windows-2019
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners
29+
# Consider using larger runners for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'windows-latest' }}
31+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
2732
permissions:
33+
# required for all workflows
34+
security-events: write
35+
36+
# only required for workflows in private repositories
2837
actions: read
2938
contents: read
30-
security-events: write
3139

3240
strategy:
3341
fail-fast: false
3442
matrix:
35-
language: [ 'cpp', 'csharp' ]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37-
# Learn more about CodeQL language support at https://git.io/codeql-language-support
43+
language: [ 'c-cpp', 'csharp', 'python' ]
44+
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
45+
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
46+
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
47+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3848

3949
steps:
4050
- name: Checkout repository
41-
uses: actions/checkout@v2
51+
uses: actions/checkout@v4
4252

4353
# Initializes the CodeQL tools for scanning.
4454
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
55+
uses: github/codeql-action/init@v3
4656
with:
4757
languages: ${{ matrix.language }}
4858
# If you wish to specify custom queries, you can do so here or in a config file.
4959
# By default, queries listed here will override any specified in a config file.
5060
# Prefix the list here with "+" to use these queries and those in the config file.
51-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5261

53-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
62+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
63+
# queries: security-extended,security-and-quality
64+
65+
66+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
5467
# If this step fails, then you should remove it and run the build manually (see below)
5568
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v2
69+
uses: github/codeql-action/autobuild@v3
5770

5871
# ℹ️ Command-line programs to run using the OS shell.
59-
# 📚 https://git.io/JvXDl
72+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6073

61-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62-
# and modify them (or add more) to build your code if your project
63-
# uses a compiled language
74+
# If the Autobuild fails above, remove it and uncomment the following three lines.
75+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
6476

65-
#- run: |
66-
# make bootstrap
67-
# make release
77+
# - run: |
78+
# echo "Run, Build Application using script"
79+
# ./location_of_script_within_repo/buildscript.sh
6880

6981
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v2
82+
uses: github/codeql-action/analyze@v3
83+
with:
84+
category: "/language:${{matrix.language}}"

‎.github/workflows/msbuild.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
SOLUTION_FILE_PATH: ./Psi.sln
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232

3333
- name: Add MSBuild to PATH
34-
uses: microsoft/setup-msbuild@v1.1
34+
uses: microsoft/setup-msbuild@v2
3535

3636
- name: Restore NuGet packages
3737
working-directory: ${{env.GITHUB_WORKSPACE}}
@@ -43,34 +43,28 @@ jobs:
4343
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
4444
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
4545

46-
- name: Install .NET 3.1
47-
# Required to run the cross-framework serialization tests
48-
uses: actions/setup-dotnet@v3
49-
with:
50-
dotnet-version: '3.1.x'
51-
5246
- name: Get Test Assemblies (.NET Framework)
53-
uses: tj-actions/glob@v17.2.6
47+
uses: tj-actions/glob@v21
5448
id: get-framework-tests
5549
with:
5650
files: |
5751
**\bin\**\*Test.Psi*.exe
5852
**\bin\**\*Test.Psi*.dll
5953
!**\bin\**\netcoreapp*\*
60-
!**\bin\**\net5.0*\*
54+
!**\bin\**\net[0-9].[0-9]*\*
6155
!**\bin\**\*Test.Psi*.Common.dll
6256
!**\bin\**\Test.Psi.exe
6357
6458
- name: Run Tests
6559
run: dotnet test --filter "TestCategory!=Performance" -l "console;verbosity=detailed" ${{ steps.get-framework-tests.outputs.paths }}
6660

6761
- name: Get Test Assemblies (.NET Core)
68-
uses: tj-actions/glob@v17.2.6
62+
uses: tj-actions/glob@v21
6963
id: get-netcore-tests
7064
with:
7165
files: |
72-
**\bin\**\netcoreapp*\*Test.Psi*.dll
73-
!**\bin\**\netcoreapp*\*Test.Psi*.Common.dll
66+
**\bin\**\net[0-9].[0-9]\Test.Psi*.dll
67+
!**\bin\**\net[0-9].[0-9]\Test.Psi*.Common.dll
7468
7569
- name: Run Tests
7670
run: dotnet test --filter "TestCategory!=Performance" -l "console;verbosity=detailed" ${{ steps.get-netcore-tests.outputs.paths }}

‎Applications/Directory.Build.props‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<PropertyGroup>
5+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
6+
<Company>Microsoft Corporation</Company>
7+
<Owners>microsoft,psi</Owners>
8+
<Authors>Microsoft</Authors>
9+
<AssemblyVersion>0.19.100.1</AssemblyVersion>
10+
<FileVersion>$(AssemblyVersion)</FileVersion>
11+
<Version>$(AssemblyVersion)-beta</Version>
12+
<SignAssembly>false</SignAssembly>
13+
<PackageLicenseFile>LICENSE-APPLICATIONS.txt</PackageLicenseFile>
14+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
15+
<RepositoryUrl>https://github.com/microsoft/psi/</RepositoryUrl>
16+
<PackageProjectUrl>https://github.com/microsoft/psi/wiki</PackageProjectUrl>
17+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
18+
<IncludeSymbols>true</IncludeSymbols>
19+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
20+
<NeutralLanguage>en</NeutralLanguage>
21+
<PackageTags>Psi;Microsoft</PackageTags>
22+
<RepositoryType>git</RepositoryType>
23+
<LangVersion>latest</LangVersion>
24+
<RunCodeAnalysis>false</RunCodeAnalysis>
25+
</PropertyGroup>
26+
27+
<ItemGroup>
28+
<!-- Include LICENSE.txt file as licenseUrl has been deprecated in NuGet -->
29+
<None Include="$(MSBuildThisFileDirectory)\..\LICENSE-APPLICATIONS.txt" Pack="true" PackagePath="$(PackageLicenseFile)"/>
30+
</ItemGroup>
31+
32+
</Project>

‎Applications/Microsoft.Psi.MixedReality.Applications.UniversalWindows/Microsoft.Psi.MixedReality.Applications.UniversalWindows.csproj‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">ARM</Platform>
7+
<ProjectGuid>{1AFBBD50-CE3A-4792-BE84-15E897D281DD}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Microsoft.Psi.MixedReality.Applications</RootNamespace>
11+
<AssemblyName>Microsoft.Psi.MixedReality.Applications.UniversalWindows</AssemblyName>
12+
<DefaultLanguage>en-US</DefaultLanguage>
13+
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
16+
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
17+
<FileAlignment>512</FileAlignment>
18+
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
19+
</PropertyGroup>
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
21+
<PlatformTarget>ARM</PlatformTarget>
22+
<DebugSymbols>true</DebugSymbols>
23+
<OutputPath>bin\ARM\Debug\</OutputPath>
24+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
25+
<NoWarn>;2008</NoWarn>
26+
<DebugType>full</DebugType>
27+
<UseVSHostingProcess>false</UseVSHostingProcess>
28+
<ErrorReport>prompt</ErrorReport>
29+
<DocumentationFile>bin\ARM\Release\Microsoft.Psi.MixedReality.Applications.UniversalWindows.XML</DocumentationFile>
30+
<CodeAnalysisRuleSet>..\..\Build\Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
31+
<RunCodeAnalysis>false</RunCodeAnalysis>
32+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
35+
<PlatformTarget>ARM</PlatformTarget>
36+
<OutputPath>bin\ARM\Release\</OutputPath>
37+
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
38+
<Optimize>true</Optimize>
39+
<NoWarn>;2008</NoWarn>
40+
<DebugType>pdbonly</DebugType>
41+
<UseVSHostingProcess>false</UseVSHostingProcess>
42+
<ErrorReport>prompt</ErrorReport>
43+
<DocumentationFile>bin\ARM\Release\Microsoft.Psi.MixedReality.Applications.UniversalWindows.XML</DocumentationFile>
44+
<CodeAnalysisRuleSet>..\..\Build\Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
45+
<RunCodeAnalysis>false</RunCodeAnalysis>
46+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
47+
</PropertyGroup>
48+
<PropertyGroup>
49+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
50+
</PropertyGroup>
51+
<ItemGroup>
52+
<Compile Include="StereoKitClientApp.cs" />
53+
<Compile Include="Properties\AssemblyInfo.cs" />
54+
<EmbeddedResource Include="Properties\Microsoft.Psi.MixedReality.Applications.UniversalWindows.rd.xml" />
55+
</ItemGroup>
56+
<ItemGroup>
57+
<AdditionalFiles Include="stylecop.json" />
58+
</ItemGroup>
59+
<ItemGroup>
60+
<PackageReference Include="MathNet.Spatial.Signed">
61+
<Version>0.6.0</Version>
62+
</PackageReference>
63+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
64+
<Version>8.0.0</Version>
65+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
66+
<PrivateAssets>all</PrivateAssets>
67+
</PackageReference>
68+
<PackageReference Include="Microsoft.MixedReality.SceneUnderstanding">
69+
<Version>0.5.2069</Version>
70+
</PackageReference>
71+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
72+
<Version>6.2.14</Version>
73+
</PackageReference>
74+
<PackageReference Include="NuGet.Build.Tasks.Pack">
75+
<Version>6.0.0</Version>
76+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
77+
<PrivateAssets>all</PrivateAssets>
78+
</PackageReference>
79+
<PackageReference Include="StereoKit">
80+
<Version>0.3.6</Version>
81+
</PackageReference>
82+
<PackageReference Include="StyleCop.Analyzers">
83+
<Version>1.1.118</Version>
84+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
85+
<PrivateAssets>all</PrivateAssets>
86+
</PackageReference>
87+
</ItemGroup>
88+
<ItemGroup>
89+
<ProjectReference Include="..\..\Sources\Audio\Microsoft.Psi.Audio\Microsoft.Psi.Audio.csproj">
90+
<Project>{ac5745da-570c-4e57-9ae4-d1974f629428}</Project>
91+
<Name>Microsoft.Psi.Audio</Name>
92+
</ProjectReference>
93+
<ProjectReference Include="..\..\Sources\Imaging\Microsoft.Psi.Imaging\Microsoft.Psi.Imaging.csproj">
94+
<Project>{9bf2e5ef-186a-4179-b753-ae11ee90e026}</Project>
95+
<Name>Microsoft.Psi.Imaging</Name>
96+
</ProjectReference>
97+
<ProjectReference Include="..\..\Sources\Integrations\CognitiveServices\Microsoft.Psi.CognitiveServices.Speech\Microsoft.Psi.CognitiveServices.Speech.csproj">
98+
<Project>{cfb5e6d3-c2fd-4d46-b8ac-7e39634e2ca9}</Project>
99+
<Name>Microsoft.Psi.CognitiveServices.Speech</Name>
100+
</ProjectReference>
101+
<ProjectReference Include="..\..\Sources\MixedReality\Microsoft.Psi.MixedReality.UniversalWindows\Microsoft.Psi.MixedReality.UniversalWindows.csproj">
102+
<Project>{ecd9e150-8104-4da3-b807-a6a4392a67c6}</Project>
103+
<Name>Microsoft.Psi.MixedReality.UniversalWindows</Name>
104+
</ProjectReference>
105+
<ProjectReference Include="..\..\Sources\MixedReality\Microsoft.Psi.MixedReality\Microsoft.Psi.MixedReality.csproj">
106+
<Project>{067b824e-5ee7-4561-9ff0-9bea6beff441}</Project>
107+
<Name>Microsoft.Psi.MixedReality</Name>
108+
</ProjectReference>
109+
<ProjectReference Include="..\..\Sources\Runtime\Microsoft.Psi.Interop\Microsoft.Psi.Interop.csproj">
110+
<Project>{d6be6801-7a6e-4c33-a681-e6e7306106a3}</Project>
111+
<Name>Microsoft.Psi.Interop</Name>
112+
</ProjectReference>
113+
<ProjectReference Include="..\..\Sources\Runtime\Microsoft.Psi\Microsoft.Psi.csproj">
114+
<Project>{04147400-0ab0-4f07-9975-d4b7e58150db}</Project>
115+
<Name>Microsoft.Psi</Name>
116+
</ProjectReference>
117+
<ProjectReference Include="..\..\Sources\Spatial\Microsoft.Psi.Spatial.Euclidean\Microsoft.Psi.Spatial.Euclidean.csproj">
118+
<Project>{05f10501-fc07-4f5b-a73d-98290326870d}</Project>
119+
<Name>Microsoft.Psi.Spatial.Euclidean</Name>
120+
</ProjectReference>
121+
<ProjectReference Include="..\Microsoft.Psi.MixedReality.Applications\Microsoft.Psi.MixedReality.Applications.csproj">
122+
<Project>{949BD664-E37A-4246-95DA-4A39AB3591AA}</Project>
123+
<Name>Microsoft.Psi.MixedReality.Applications</Name>
124+
</ProjectReference>
125+
</ItemGroup>
126+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
127+
<VisualStudioVersion>14.0</VisualStudioVersion>
128+
</PropertyGroup>
129+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
130+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
131+
Other similar extension points exist, see Microsoft.Common.targets.
132+
<Target Name="BeforeBuild">
133+
</Target>
134+
<Target Name="AfterBuild">
135+
</Target>
136+
-->
137+
</Project>

Sources/RealSense/Microsoft.Psi.RealSense.Windows.x64/Properties/AssemblyInfo.cs renamed to Applications/Microsoft.Psi.MixedReality.Applications.UniversalWindows/Properties/AssemblyInfo.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT license.
2+
// Licensed under the Microsoft Research license.
33

44
using System.Reflection;
55
using System.Runtime.CompilerServices;
@@ -8,23 +8,15 @@
88
// General Information about an assembly is controlled through the following
99
// set of attributes. Change these attribute values to modify the information
1010
// associated with an assembly.
11-
[assembly: AssemblyTitle("Microsoft.Psi.RealSense.Windows.x64")]
11+
[assembly: AssemblyTitle("Microsoft.Psi.MixedReality.Applications.UniversalWindows")]
1212
[assembly: AssemblyDescription("")]
1313
[assembly: AssemblyConfiguration("")]
14-
[assembly: AssemblyCompany("Microsoft Corporation")]
15-
[assembly: AssemblyProduct("Microsoft.Psi.RealSense.Windows.x64")]
16-
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation. All rights reserved.")]
14+
[assembly: AssemblyCompany("")]
15+
[assembly: AssemblyProduct("Microsoft.Psi.MixedReality.Applications.UniversalWindows")]
16+
[assembly: AssemblyCopyright("Copyright © 2023")]
1717
[assembly: AssemblyTrademark("")]
1818
[assembly: AssemblyCulture("")]
1919

20-
// Setting ComVisible to false makes the types in this assembly not visible
21-
// to COM components. If you need to access a type in this assembly from
22-
// COM, set the ComVisible attribute to true on that type.
23-
[assembly: ComVisible(false)]
24-
25-
// The following GUID is for the ID of the typelib if this project is exposed to COM
26-
[assembly: Guid("7b73d864-9997-4637-8765-44c17fd09ce1")]
27-
2820
// Version information for an assembly consists of the following four values:
2921
//
3022
// Major Version
@@ -35,6 +27,6 @@
3527
// You can specify all the values or you can default the Build and Revision Numbers
3628
// by using the '*' as shown below:
3729
// [assembly: AssemblyVersion("1.0.*")]
38-
[assembly: AssemblyVersion("0.18.72.1")]
39-
[assembly: AssemblyFileVersion("0.18.72.1")]
40-
[assembly: AssemblyInformationalVersion("0.18.72.1-beta")]
30+
[assembly: AssemblyVersion("0.19.100.1")]
31+
[assembly: AssemblyFileVersion("0.19.100.1")]
32+
[assembly: ComVisible(false)]

‎Applications/Microsoft.Psi.MixedReality.Applications.UniversalWindows/Properties/Microsoft.Psi.MixedReality.Applications.UniversalWindows.rd.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?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+
-->
27+
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
28+
<Library Name="Microsoft.Psi.MixedReality.Applications.UniversalWindows">
29+
30+
<!-- add directives for your library here -->
31+
32+
</Library>
33+
</Directives>

0 commit comments

Comments
 (0)