IIntersectableWithRay

build/Stride.build

@@ -48,6 +48,7 @@ Example of use:
  <Target Name="PrerequisitesInstaller">
  <Delete Files="$(StrideRoot)Bin\Prerequisites\install-prerequisites.exe"/>
  <Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(StrideRoot)sources\prerequisites\prerequisites.aip"'/>
+ <!-- Note: this exe will be signed as part of GameStudio.nupkg -->
  </Target>
 
  <!--
@@ -72,7 +73,7 @@ Example of use:
  <!-- Remove Samples.Templates (we use -SkipDuplicate since version is rarely bumped) -->
  <NuGetPackage Remove="@(NuGetPackage)" Condition="$([System.String]::Copy('%(Filename)').Contains('Stride.Samples.Templates'))"/>
  </ItemGroup>
- <Exec Command='"$(NuGetPath)" push %(NuGetPackage.Identity) -ApiKey $(StrideStoreApiKey) -Source $(StrideStoreUrl) -Timeout 1800 -NoSymbols'/>
+ <Exec Command='"$(NuGetPath)" push %(NuGetPackage.Identity) -ApiKey $(StrideStoreApiKey) -Source $(StrideStoreUrl) -Timeout 1800 -NoSymbols -SkipDuplicate'/>
  <Exec Command='"$(NuGetPath)" push ..\bin\packages\Stride.Samples.Templates*.nupkg -ApiKey $(StrideStoreApiKey) -Source $(StrideStoreUrl) -Timeout 1800 -NoSymbols -SkipDuplicate'/>
  <!-- Push GameStudio so that dependencies are already uploaded -->
  <Exec Command='"$(NuGetPath)" push ..\bin\packages\Stride.GameStudio*.nupkg -ApiKey $(StrideStoreApiKey) -Source $(StrideStoreUrl) -Timeout 1800 -NoSymbols'/>
@@ -117,12 +118,12 @@ Example of use:
  </GenerateVersionFile>
 
  <Message Text="Done preparing build for version $(StridePackageVersion)"/>
- <TeamCitySetBuildNumber BuildNumber="$(StridePackageVersion)" Condition="'$(TEAMCITY_BUILD_PROPERTIES_FILE)' != '' " />
+ <Message Text="##teamcity[buildNumber '$(StridePackageVersion)']" Importance="High" Condition="'$(TEAMCITY_BUILD_PROPERTIES_FILE)' != '' " />
  </Target>
  <PropertyGroup>
  <_StridePackageTargetPrerequisitesInstaller Condition="'$(StrideBuildPrerequisitesInstaller)' == 'true'">PrerequisitesInstaller</_StridePackageTargetPrerequisitesInstaller>
  </PropertyGroup>
- <Target Name="Package" DependsOnTargets="PreparePackageBuild;$(_StridePackageTargetPrerequisitesInstaller);Build;VSIXPlugin"/>
+ <Target Name="Package" DependsOnTargets="PreparePackageBuild;$(_StridePackageTargetPrerequisitesInstaller);Build;SignPackage;VSIXPlugin"/>
 
  <Target Name="RestoreInternal">
  <MSBuild Targets="Restore" Projects="$(StrideSolution).sln" Properties="StrideGraphicsApiDependentBuildAll=$(StrideGraphicsApiDependentBuildAll);StrideGraphicsApis=$(StrideGraphicsApis);StridePlatforms=$(StridePlatforms)" />
@@ -438,15 +439,21 @@ Example of use:
 
  <!-- Generate the nuget package for the launcher application -->
  <Exec Command='"$(NuGetPath)" pack "$(StrideRoot)sources\launcher\Stride.Launcher\Stride.Launcher.nuspec" -BasePath "$(StrideRoot)sources\launcher\Stride.Launcher\bin\Release\publish" -OutputDirectory "$(StrideRoot)bin\launcher"' />
+
+ <Exec Condition="'$(StrideSign)' == 'true'" Command='sign\SignClient sign -c "sign\appsettings.json" --input "..\bin\launcher\*.nupkg" --name "Stride" --user "$(StrideSignUser)" --secret "$(StrideSignSecret)"' EchoOff="true" />
  </Target>
 
  <!--
  Package Installer: StrideSetup.exe
  -->
- <Target Name="PackageInstallerSimple" DependsOnTargets="PackageLauncher">
+ <Target Name="PackageInstallerSimple" DependsOnTargets="PackageLauncher;DownloadSignClient;SignCredentialsCheck">
  <Delete Files="$(StrideRoot)bin\launcher\StrideSetup.exe"/>
  <!-- Run advanced installer -->
  <Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(StrideRoot)sources\launcher\Setup\setup.aip"'/>
+
+ <Message Importance="high" Text="Signing installer"/> 
+ <Exec Condition="'$(StrideSign)' == 'true'" Command='sign\SignClient sign -c "sign\appsettings.json" --input "..\sources\launcher\Setup\setup-SetupFiles\StrideSetup.exe" --name "Stride" --user "$(StrideSignUser)" --secret "$(StrideSignSecret)"' EchoOff="true" />
+
  <Copy SourceFiles="$(StrideRoot)sources\launcher\Setup\setup-SetupFiles\StrideSetup.exe" DestinationFolder="$(StrideRoot)bin\launcher"/>
  </Target>
  <Target Name="PackageInstallerCustom" DependsOnTargets="PackageLauncher">
@@ -490,8 +497,11 @@ Example of use:
  <!--
  Package Installer: launcher-prerequisites.exe
  -->
- <Target Name="LauncherPrerequisitesInstaller">
+ <Target Name="LauncherPrerequisitesInstaller" DependsOnTargets="DownloadSignClient;SignCredentialsCheck">
  <Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(StrideRoot)sources\launcher\Prerequisites\launcher-prerequisites.aip"'/>
+
+ <Message Importance="high" Text="Signing launcher prerequisites"/> 
+ <Exec Condition="'$(StrideSign)' == 'true'" Command='sign\SignClient sign -c "sign\appsettings.json" --input "..\sources\launcher\Prerequisites\*.exe" --name "Stride" --user "$(StrideSignUser)" --secret "$(StrideSignSecret)"' EchoOff="true" />
  </Target>
 
  <!--
@@ -510,12 +520,30 @@ Example of use:
  <Exec Command='"$(NuGetPath)" push ..\bin\launcher\*.nupkg -ApiKey $(StrideStoreApiKey) -Source $(StrideStoreUrl) -NoSymbols'/>
  </Target>
 
- <Target Name="BuildLauncher">
+ <Target Name="BuildLauncher" DependsOnTargets="DownloadSignClient;SignCredentialsCheck">
  <PropertyGroup>
  <StrideSolution>Stride.Launcher</StrideSolution>
  </PropertyGroup>
  <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="StridePlatforms=Windows;StrideSolution=$(StrideSolution)"/>
  <MSBuild Projects="..\sources\launcher\Stride.Launcher\Stride.Launcher.csproj" Targets="Publish" Properties="$(BuildProperties);PublishProfile=FolderProfile;SolutionName=Stride.Launcher" />
+
+ <Message Importance="high" Text="Signing launcher"/> 
+ <Exec Condition="'$(StrideSign)' == 'true'" Command='sign\SignClient sign -c "sign\appsettings.json" --input "..\sources\launcher\Stride.Launcher\bin\Release\publish\*.exe" --name "Stride" --user "$(StrideSignUser)" --secret "$(StrideSignSecret)"' EchoOff="true" />
+ </Target>
+
+ <Target Name="DownloadSignClient" Condition="'$(StrideSign)' == 'true'">
+ <Exec Command="dotnet tool install SignClient --tool-path sign" Condition="!Exists('sign\SignClient.exe')" />
+ </Target>
+
+ <Target Name="SignCredentialsCheck" Condition="'$(StrideSign)' == 'true'">
+ <Error Condition="'$(StrideSignUser)' == ''" Text="StrideSignUser is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
+ <Error Condition="'$(StrideSignSecret)' == ''" Text="StrideSignSecret is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
+ </Target>
+
+ <Target Name="SignPackage" DependsOnTargets="DownloadSignClient;SignCredentialsCheck" Condition="'$(StrideSign)' == 'true'">
+ <!-- nupkg containing executables to sign -->
+ <Message Importance="high" Text="Signing packages"/> 
+ <Exec Command='sign\SignClient sign -c "sign\appsettings.json" --input "..\bin\packages\*.nupkg" --name "Stride" --user "$(StrideSignUser)" --secret "$(StrideSignSecret)" -f "sign\nupkgfilter.txt"' EchoOff="true" />
  </Target>
 
 </Project>

build/sign/.gitignore

@@ -0,0 +1,2 @@
+/.store/
+/SignClient.exe

build/sign/appsettings.json

@@ -0,0 +1,13 @@
+{
+ "SignClient": {
+ "AzureAd": {
+ "AADInstance": "https://login.microsoftonline.com/",
+ "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8",
+ "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e"
+ },
+ "Service": {
+ "Url": "https://codesign.dotnetfoundation.org/",
+ "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001"
+ }
+ }
+ }

build/sign/nupkgfilter.txt

@@ -0,0 +1,3 @@
+**/Stride*.exe
+**/packageinstall.exe
+**/*-prerequisites.exe

sources/assets/Stride.Core.Assets.CompilerApp/global.json

@@ -1,7 +1,7 @@
 {
  "sdk": {
  "version": "5.0.100",
- "rollForward": "latestFeature",
+ "rollForward": "latestPatch",
  "allowPrerelease": false
  }
 }

sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj

@@ -13,7 +13,7 @@
  </PropertyGroup>
  <ItemGroup>
  <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
- <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
+ <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
  <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
  <!-- Needed by MSBuild to function properly with .NET Core (when creating CreateAppHost task) -->
  <PackageReference Include="Microsoft.NET.HostModel" Version="3.1.5" />

sources/core/Stride.Core.Design/Reflection/AssemblyContainer.cs

@@ -141,19 +141,8 @@ private Assembly LoadAssemblyByName([NotNull] AssemblyName assemblyName, [NotNul
  return matchingAssembly.Assembly;
  }
 
- // Look in search paths
- var assemblyPartialPathList = new List<string>();
- assemblyPartialPathList.AddRange(KnownAssemblyExtensions.Select(knownExtension => assemblyName.Name + knownExtension));
- foreach (var assemblyPartialPath in assemblyPartialPathList)
- {
- var assemblyFullPath = Path.Combine(searchDirectory, assemblyPartialPath);
- if (File.Exists(assemblyFullPath))
- {
- return LoadAssemblyFromPathInternal(assemblyFullPath);
- }
- }
-
- // Use .deps.json files
+ // Second, use .deps.json files (generated by MSBuild when PreserveCompilationContext == true)
+ // It ensures that we load the same assemblies as were used while compiling
  foreach (var loadedAssembly in loadedAssemblies)
  {
  var dependencies = loadedAssembly.Dependencies;
@@ -166,6 +155,18 @@ private Assembly LoadAssemblyByName([NotNull] AssemblyName assemblyName, [NotNul
  }
  }
 
+ // Look in search paths
+ var assemblyPartialPathList = new List<string>();
+ assemblyPartialPathList.AddRange(KnownAssemblyExtensions.Select(knownExtension => assemblyName.Name + knownExtension));
+ foreach (var assemblyPartialPath in assemblyPartialPathList)
+ {
+ var assemblyFullPath = Path.Combine(searchDirectory, assemblyPartialPath);
+ if (File.Exists(assemblyFullPath))
+ {
+ return LoadAssemblyFromPathInternal(assemblyFullPath);
+ }
+ }
+
  // See if it was registered
  lock (dependencies)
  {
@@ -299,7 +300,17 @@ private Assembly LoadAssemblyFromPathInternal([NotNull] string assemblyFullPath)
  }
 
  // TODO: Is using AppDomain would provide more opportunities for unloading?
- assembly = pdbBytes != null ? Assembly.Load(assemblyBytes, pdbBytes) : Assembly.Load(assemblyBytes);
+ const uint unverifiableExecutableWithFixups = 0x80131019;
+ try
+ {
+ assembly = pdbBytes != null ? Assembly.Load(assemblyBytes, pdbBytes) : Assembly.Load(assemblyBytes);
+ }
+ catch (FileLoadException fileLoadException)
+ when ((uint)fileLoadException.HResult == unverifiableExecutableWithFixups)
+ {
+ // No way to load from byte array (see https://stackoverflow.com/questions/5005409/exception-with-resolving-assemblies-attempt-to-load-an-unverifiable-executable)
+ assembly = Assembly.LoadFrom(assemblyFullPath);
+ }
  loadedAssembly = new LoadedAssembly(this, assemblyFullPath, assembly, dependenciesMapping);
  loadedAssemblies.Add(loadedAssembly);
  loadedAssembliesByName.Add(assemblyFullPath, loadedAssembly);

sources/core/Stride.Core.Design/VisualStudio/VisualStudioVersions.cs

@@ -78,7 +78,8 @@ public IDEInfo(Version version, string displayName, string installationPath, boo
  public enum VSIXInstallerVersion
  {
  None,
- VS2019AndFutureVersions,
+ VS2019,
+ VS2022AndFutureVersions,
  }
 
  public static class VisualStudioVersions
@@ -110,7 +111,7 @@ private static List<IDEInfo> BuildIDEInfos()
  {
  var ideInfos = new List<IDEInfo>();
 
- // Visual Studio 15.0 (2017) and later
+ // Visual Studio 16.0 (2019) and later
  try
  {
  var configuration = new SetupConfiguration();
@@ -133,7 +134,7 @@ private static List<IDEInfo> BuildIDEInfos()
 
  // Only deal with VS2019+
  if (!Version.TryParse(inst2.GetInstallationVersion(), out var version)
- || version.Major < 15)
+ || version.Major < 16)
  continue;
 
  var installationPath = inst2.GetInstallationPath();
@@ -186,7 +187,7 @@ private static List<IDEInfo> BuildIDEInfos()
  {
  BuildToolsPath = buildToolsPath,
  DevenvPath = devenvPath,
- VsixInstallerVersion = VSIXInstallerVersion.VS2019AndFutureVersions,
+ VsixInstallerVersion = version.Major == 16 ? VSIXInstallerVersion.VS2019 : VSIXInstallerVersion.VS2022AndFutureVersions,
  VsixInstallerPath = vsixInstallerPath,
  };
 

sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj

@@ -22,7 +22,7 @@
  <HintPath>..\..\..\deps\libgit2\LibGit2Sharp.dll</HintPath>
  </Reference>
  <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
- <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
+ <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
  <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
  <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e">
  <EmbedInteropTypes>True</EmbedInteropTypes>

sources/core/Stride.Core/PlatformFolders.cs

@@ -56,9 +56,9 @@ public static string ApplicationDataSubDirectory
 
  set
  {
- if (virtualFileSystemInitialized) 
- throw new InvalidOperationException("ApplicationDataSubDirectory cannot be modified after the VirtualFileSystem has been initialized."); 
- 
+ if (virtualFileSystemInitialized)
+ throw new InvalidOperationException("ApplicationDataSubDirectory cannot be modified after the VirtualFileSystem has been initialized.");
+
  applicationDataSubDirectory = value;
  }
  }
@@ -152,7 +152,9 @@ private static string GetApplicationCacheDirectory()
 
  private static string GetApplicationExecutablePath()
  {
-#if STRIDE_PLATFORM_WINDOWS_DESKTOP || STRIDE_PLATFORM_MONO_MOBILE || STRIDE_PLATFORM_UNIX
+#if STRIDE_PLATFORM_ANDROID
+ return PlatformAndroid.Context.PackageCodePath;
+#elif STRIDE_PLATFORM_DESKTOP || STRIDE_PLATFORM_MONO_MOBILE || STRIDE_PLATFORM_UNIX
  return Assembly.GetEntryAssembly()?.Location;
 #else
  return null;
@@ -182,22 +184,27 @@ private static string GetApplicationTemporaryDirectory()
  [NotNull]
  private static string GetApplicationBinaryDirectory()
  {
- return FindCoreAssemblyDirectory(GetApplicationExecutableDiretory());
+ var executablePath = GetApplicationExecutableDirectory();
+#if STRIDE_PLATFORM_ANDROID
+ return executablePath;
+#else
+ return FindCoreAssemblyDirectory(executablePath);
+#endif
  }
 
- private static string GetApplicationExecutableDiretory()
+ private static string GetApplicationExecutableDirectory()
  {
 #if STRIDE_PLATFORM_WINDOWS_DESKTOP || STRIDE_PLATFORM_MONO_MOBILE || STRIDE_PLATFORM_UNIX
  var executableName = GetApplicationExecutablePath();
  if (!string.IsNullOrEmpty(executableName))
  {
  return Path.GetDirectoryName(executableName);
  }
- #if STRIDE_RUNTIME_CORECLR
+#if STRIDE_RUNTIME_CORECLR
  return AppContext.BaseDirectory;
- #else
+#else
  return AppDomain.CurrentDomain.BaseDirectory;
- #endif
+#endif
 #elif STRIDE_PLATFORM_UWP
  return Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
 #else

sources/editor/Stride.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameCameraPreviewService.cs

@@ -313,7 +313,12 @@ protected override void DrawCore(RenderContext context, RenderDrawContext drawCo
 
  // Allocate a RT for the incrust
  GeneratedIncrust = drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(TextureDescription.New2D((int)Viewport.Width, (int)Viewport.Height, 1, drawContext.CommandList.RenderTarget.Format, TextureFlags.ShaderResource | TextureFlags.RenderTarget));
- var depthBuffer = drawContext.CommandList.DepthStencilBuffer != null ? drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(TextureDescription.New2D((int)Viewport.Width, (int)Viewport.Height, 1, drawContext.CommandList.DepthStencilBuffer.Format, TextureFlags.DepthStencil)) : null;
+
+ var depthBufferTextureFlags = TextureFlags.DepthStencil;
+ if (context.GraphicsDevice.Features.HasDepthAsSRV)
+ depthBufferTextureFlags |= TextureFlags.ShaderResource;
+
+ var depthBuffer = drawContext.CommandList.DepthStencilBuffer != null ? drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(TextureDescription.New2D((int)Viewport.Width, (int)Viewport.Height, 1, drawContext.CommandList.DepthStencilBuffer.Format, depthBufferTextureFlags)) : null;
 
  // Push and set render target
  using (drawContext.PushRenderTargetsAndRestore())

sources/editor/Stride.Assets.Presentation/EditorPackage/Assets/HDRGamePack.sdeffectlog

@@ -1,4 +1,4 @@
----
+---
 !EffectCompileRequest
 EffectName: StrideForwardShadingEffect.ShadowMapCaster
 UsedParameters:
@@ -1268,6 +1268,7 @@ UsedParameters:
 EffectName: AmbientOcclusionRawAOEffect
 UsedParameters:
  AmbientOcclusionRawAO.Count: 13
+ AmbientOcclusionRawAO.IsOrthographic: false
 ---
 !EffectCompileRequest
 EffectName: AmbientOcclusionBlurEffect
@@ -1276,6 +1277,7 @@ UsedParameters:
  AmbientOcclusionBlur.Count: 5
  AmbientOcclusionBlur.BlurScale: 1.85
  AmbientOcclusionBlur.EdgeSharpness: 3.0
+ AmbientOcclusionBlur.IsOrthographic: false
 ---
 !EffectCompileRequest
 EffectName: AmbientOcclusionBlurEffect
@@ -1284,6 +1286,7 @@ UsedParameters:
  AmbientOcclusionBlur.Count: 5
  AmbientOcclusionBlur.BlurScale: 1.85
  AmbientOcclusionBlur.EdgeSharpness: 3.0
+ AmbientOcclusionBlur.IsOrthographic: false
 ---
 !EffectCompileRequest
 EffectName: ApplyAmbientOcclusionShader

sources/editor/Stride.Assets.Presentation/EditorPackage/Assets/PostEffects.sdeffectlog

@@ -979,6 +979,7 @@ UsedParameters:
 EffectName: AmbientOcclusionRawAOEffect
 UsedParameters:
  AmbientOcclusionRawAO.Count: 13
+ AmbientOcclusionRawAO.IsOrthographic: false
 ---
 !EffectCompileRequest
 EffectName: AmbientOcclusionBlurEffect
@@ -987,6 +988,7 @@ UsedParameters:
  AmbientOcclusionBlur.Count: 5
  AmbientOcclusionBlur.BlurScale: 1.85
  AmbientOcclusionBlur.EdgeSharpness: 3.0
+ AmbientOcclusionBlur.IsOrthographic: false
 ---
 !EffectCompileRequest
 EffectName: AmbientOcclusionBlurEffect
@@ -995,6 +997,7 @@ UsedParameters:
  AmbientOcclusionBlur.Count: 5
  AmbientOcclusionBlur.BlurScale: 1.85
  AmbientOcclusionBlur.EdgeSharpness: 3.0
+ AmbientOcclusionBlur.IsOrthographic: false
 ---
 !EffectCompileRequest
 EffectName: ApplyAmbientOcclusionShader

sources/editor/Stride.Assets.Presentation/Templates/Core/ProjectExecutable.Android/ProjectExecutable.Android.ttproj

@@ -5,3 +5,4 @@ Files:
  - {Source: Properties\AssemblyInfo.cs.t4, Target: Properties\AssemblyInfo.cs, IsTemplate: true}
  - {Source: Properties\AndroidManifest.xml.t4, Target: Properties\AndroidManifest.xml, IsTemplate: true}
  - {Source: Resources\drawable\GameIcon120.png, Target: Resources\drawable\Icon.png }
+ - {Source: Resources\Resource.Designer.cs.t4, Target: Resources\Resource.Designer.cs, IsTemplate: true }