Skip to content

Commit 7a98919

Browse files
xen2xen2
committed
Merge remote-tracking branch 'origin/directx-silk'
2 parents 1d45526 + 2b9a6e7 commit 7a98919

File tree

657 files changed

+54331
-37937
lines changed

Some content is hidden

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

657 files changed

+54331
-37937
lines changed

‎build/Stride.Android.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 17
3-
VisualStudioVersion = 17.0.31612.314
4-
MinimumVisualStudioVersion = 16.0
2+
# Visual Studio Version 18
3+
VisualStudioVersion = 18.0.11205.157
4+
MinimumVisualStudioVersion = 18.0
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
66
EndProject
77
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-StrideRuntime", "20-StrideRuntime", "{4C142567-C42B-40F5-B092-798882190209}"

‎build/Stride.Launcher.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<StrideCommonPreSettingsName>Stride</StrideCommonPreSettingsName>
5-
5+
66
<!-- Defines the platform used by Stride - Values are Windows/Android/iOS...etc. -->
77
<StridePlatform Condition=" '$(StridePlatform)' == '' ">Windows</StridePlatform>
88

‎build/Stride.Launcher.sln‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Packages", "..\
3333
EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stride.Core.Presentation", "..\sources\presentation\Stride.Core.Presentation\Stride.Core.Presentation.csproj", "{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}"
3535
EndProject
36+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stride.Editor.CrashReport", "..\sources\editor\Stride.Editor.CrashReport\Stride.Editor.CrashReport.csproj", "{2880C313-2483-416D-A902-DC2259EDFF64}"
37+
EndProject
3638
Global
3739
GlobalSection(SharedMSBuildProjectFiles) = preSolution
3840
..\sources\assets\Stride.Core.Assets.Yaml\Stride.Core.Assets.Yaml.projitems*{0f8be30e-c41f-4747-b52b-d2d4e13ec6a2}*SharedItemsImports = 5
3941
..\sources\editor\Stride.Core.MostRecentlyUsedFiles\Stride.Core.MostRecentlyUsedFiles.projitems*{0f8be30e-c41f-4747-b52b-d2d4e13ec6a2}*SharedItemsImports = 5
40-
..\sources\editor\Stride.Editor.CrashReport\Stride.Editor.CrashReport.projitems*{0f8be30e-c41f-4747-b52b-d2d4e13ec6a2}*SharedItemsImports = 5
4142
..\sources\editor\Stride.PrivacyPolicy\Stride.PrivacyPolicy.projitems*{0f8be30e-c41f-4747-b52b-d2d4e13ec6a2}*SharedItemsImports = 5
4243
EndGlobalSection
4344
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -105,6 +106,10 @@ Global
105106
{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
106107
{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
107108
{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Release|Any CPU.Build.0 = Release|Any CPU
109+
{2880C313-2483-416D-A902-DC2259EDFF64}.Debug|Any CPU.ActiveCfg = Debug|iPhone
110+
{2880C313-2483-416D-A902-DC2259EDFF64}.Debug|Any CPU.Build.0 = Debug|iPhone
111+
{2880C313-2483-416D-A902-DC2259EDFF64}.Release|Any CPU.ActiveCfg = Release|iPhone
112+
{2880C313-2483-416D-A902-DC2259EDFF64}.Release|Any CPU.Build.0 = Release|iPhone
108113
EndGlobalSection
109114
GlobalSection(SolutionProperties) = preSolution
110115
HideSolutionNode = FALSE

‎build/Stride.iOS.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 17
3-
VisualStudioVersion = 17.0.31612.314
4-
MinimumVisualStudioVersion = 16.0
2+
# Visual Studio Version 18
3+
VisualStudioVersion = 18.0.11205.157
4+
MinimumVisualStudioVersion = 18.0
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
66
EndProject
77
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-StrideRuntime", "20-StrideRuntime", "{4C142567-C42B-40F5-B092-798882190209}"

‎build/Stride.sln‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 18
33
VisualStudioVersion = 18.0.11205.157 d18.0
4-
MinimumVisualStudioVersion = 16.0
4+
MinimumVisualStudioVersion = 18.0
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "90-Tools", "90-Tools", "{1AE1AC60-5D2F-4CA7-AE20-888F44551185}"
66
EndProject
77
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
@@ -278,8 +278,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ja", "ja", "{B4EABB0D-E495-
278278
EndProject
279279
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Video", "..\sources\engine\Stride.Video\Stride.Video.csproj", "{DA355C86-866F-4843-9B4D-63A173C750FB}"
280280
EndProject
281-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Stride.Editor.CrashReport", "..\sources\editor\Stride.Editor.CrashReport\Stride.Editor.CrashReport.shproj", "{AB574F65-1402-4476-9314-74DCDAF19097}"
282-
EndProject
283281
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "72-StrideSamples", "72-StrideSamples", "{75608B5C-1C03-4B38-810E-14EED5165E59}"
284282
EndProject
285283
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Samples.Tests", "..\samples\Tests\Stride.Samples.Tests.csproj", "{2FC40214-A4AA-45DC-9C93-72ED800C40B0}"
@@ -336,6 +334,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.BepuPhysics.Tests",
336334
EndProject
337335
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.FreeImage", "..\sources\tools\Stride.FreeImage\Stride.FreeImage.csproj", "{03695F9B-10E9-4A10-93AE-6402E46F10B5}"
338336
EndProject
337+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stride.Editor.CrashReport", "..\sources\editor\Stride.Editor.CrashReport\Stride.Editor.CrashReport.csproj", "{35EC42D8-0A09-41AE-A918-B8C2796061B3}"
338+
EndProject
339339
Global
340340
GlobalSection(SolutionConfigurationPlatforms) = preSolution
341341
Debug|Any CPU = Debug|Any CPU
@@ -1511,6 +1511,18 @@ Global
15111511
{03695F9B-10E9-4A10-93AE-6402E46F10B5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
15121512
{03695F9B-10E9-4A10-93AE-6402E46F10B5}.Release|Win32.ActiveCfg = Release|Any CPU
15131513
{03695F9B-10E9-4A10-93AE-6402E46F10B5}.Release|Win32.Build.0 = Release|Any CPU
1514+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Debug|Any CPU.ActiveCfg = Debug|iPhone
1515+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Debug|Any CPU.Build.0 = Debug|iPhone
1516+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Debug|Mixed Platforms.ActiveCfg = Debug|iPhone
1517+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Debug|Mixed Platforms.Build.0 = Debug|iPhone
1518+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Debug|Win32.ActiveCfg = Debug|iPhone
1519+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Debug|Win32.Build.0 = Debug|iPhone
1520+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Release|Any CPU.ActiveCfg = Release|iPhone
1521+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Release|Any CPU.Build.0 = Release|iPhone
1522+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Release|Mixed Platforms.ActiveCfg = Release|iPhone
1523+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Release|Mixed Platforms.Build.0 = Release|iPhone
1524+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Release|Win32.ActiveCfg = Release|iPhone
1525+
{35EC42D8-0A09-41AE-A918-B8C2796061B3}.Release|Win32.Build.0 = Release|iPhone
15141526
EndGlobalSection
15151527
GlobalSection(SolutionProperties) = preSolution
15161528
HideSolutionNode = FALSE
@@ -1613,7 +1625,6 @@ Global
16131625
{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
16141626
{B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
16151627
{DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209}
1616-
{AB574F65-1402-4476-9314-74DCDAF19097} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
16171628
{2FC40214-A4AA-45DC-9C93-72ED800C40B0} = {75608B5C-1C03-4B38-810E-14EED5165E59}
16181629
{00B72ED7-00E9-47F7-868D-8162027CD068} = {158087CF-AF74-44E9-AA20-A6AEB1E398A9}
16191630
{040F754C-17F4-4B5F-B974-93F1E39D107F} = {75608B5C-1C03-4B38-810E-14EED5165E59}
@@ -1638,6 +1649,7 @@ Global
16381649
{66EFFDE4-24F0-4E57-9618-0F5577E20A1E} = {6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}
16391650
{7B70C783-4085-4702-B3C6-6570FD85CB8F} = {DE048114-9AE4-467E-A879-188DC0D88A59}
16401651
{03695F9B-10E9-4A10-93AE-6402E46F10B5} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
1652+
{35EC42D8-0A09-41AE-A918-B8C2796061B3} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
16411653
EndGlobalSection
16421654
GlobalSection(ExtensibilityGlobals) = postSolution
16431655
SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
@@ -1646,7 +1658,6 @@ Global
16461658
..\sources\assets\Stride.Core.Assets.Yaml\Stride.Core.Assets.Yaml.projitems*{1e54a9a2-4439-4444-ae57-6d2ed3c0dc47}*SharedItemsImports = 5
16471659
..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{1e54a9a2-4439-4444-ae57-6d2ed3c0dc47}*SharedItemsImports = 5
16481660
..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems*{2fc40214-a4aa-45dc-9c93-72ed800c40b0}*SharedItemsImports = 5
1649-
..\sources\editor\Stride.Editor.CrashReport\Stride.Editor.CrashReport.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
16501661
..\sources\editor\Stride.PrivacyPolicy\Stride.PrivacyPolicy.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
16511662
..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
16521663
..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
@@ -1664,7 +1675,6 @@ Global
16641675
..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{a5dc820b-9554-45b6-9677-6a2f902e7787}*SharedItemsImports = 5
16651676
..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems*{a5dc820b-9554-45b6-9677-6a2f902e7787}*SharedItemsImports = 5
16661677
..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems*{a7fc60ae-bb54-47d3-8787-788eec65ad45}*SharedItemsImports = 5
1667-
..\sources\editor\Stride.Editor.CrashReport\Stride.Editor.CrashReport.projitems*{ab574f65-1402-4476-9314-74dcdaf19097}*SharedItemsImports = 13
16681678
..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5
16691679
..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems*{e25e7778-0b2f-4a0b-bcd6-1de95320b531}*SharedItemsImports = 5
16701680
..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5

‎samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
<PackageReference Include="Stride.Particles" Version="4.3.0.1" PrivateAssets="contentfiles;analyzers" />
1111
<PackageReference Include="Stride.UI" Version="4.3.0.1" PrivateAssets="contentfiles;analyzers" />
1212
</ItemGroup>
13-
</Project>
13+
</Project>

‎samples/Audio/SimpleAudio/SimpleAudio.Windows/SimpleAudio.Windows.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\SimpleAudio.Game\SimpleAudio.Game.csproj" />
1818
</ItemGroup>
19-
</Project>
19+
</Project>

‎samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<PackageReference Include="Stride.Physics" Version="4.3.0.1" PrivateAssets="contentfiles;analyzers" />
1212
<PackageReference Include="Stride.UI" Version="4.3.0.1" PrivateAssets="contentfiles;analyzers" />
1313
</ItemGroup>
14-
</Project>
14+
</Project>

‎samples/Games/JumpyJet/JumpyJet.Windows/JumpyJet.Windows.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\JumpyJet.Game\JumpyJet.Game.csproj" />
1818
</ItemGroup>
19-
</Project>
19+
</Project>

‎samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<PackageReference Include="Stride.Particles" Version="4.3.0.1" PrivateAssets="contentfiles;analyzers" />
1212
<PackageReference Include="Stride.UI" Version="4.3.0.1" PrivateAssets="contentfiles;analyzers" />
1313
</ItemGroup>
14-
</Project>
14+
</Project>

0 commit comments

Comments
 (0)