Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basic F# support #1078

Closed
wants to merge 1 commit into from
Closed

Add basic F# support #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sources/assets/Stride.Core.Assets/Package.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ internal static Package LoadRaw(ILogger log, string filePath)

public static PackageContainer LoadProject(ILogger log, string filePath)
{
if (Path.GetExtension(filePath).ToLowerInvariant() == ".csproj")
if (Path.GetExtension(filePath).ToLowerInvariant() == ".csproj" || Path.GetExtension(filePath).ToLowerInvariant() == ".fsproj")
{
var projectPath = filePath;
var packagePath = Path.ChangeExtension(filePath, Package.PackageFileExtension);
Expand Down
3 changes: 2 additions & 1 deletion sources/assets/Stride.Core.Assets/PackageSession.Dependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ private async Task PreLoadPackageDependencies(ILogger log, SolutionProject proje
switch (projectDependency.Type)
{
case DependencyType.Project:
if (Path.GetExtension(projectDependency.MSBuildProject).ToLowerInvariant() == ".csproj")
var fileExtension = Path.GetExtension(projectDependency.MSBuildProject).ToLowerInvariant();
if (fileExtension == ".csproj" || fileExtension == ".fsproj")
file = UPath.Combine(project.FullPath.GetFullDirectory(), (UFile)projectDependency.MSBuildProject);
break;
case DependencyType.Package:
Expand Down
2 changes: 1 addition & 1 deletion sources/assets/Stride.Core.Assets/PackageSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ public static void Load(string filePath, PackageSessionResult sessionResult, Pac
// Note: using ToList() because upgrade from old package system might change Projects list
foreach (var vsProject in solution.Projects.ToList())
{
if (vsProject.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharp || vsProject.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharpNewSystem)
if (vsProject.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharp || vsProject.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharpNewSystem || vsProject.TypeGuid == VisualStudio.KnownProjectTypeGuid.FSharpNewSystem)
{
var project = (SolutionProject)session.LoadProject(sessionResult, vsProject.FullPath, loadParameters);
project.VSProject = vsProject;
Expand Down
4 changes: 3 additions & 1 deletion sources/assets/Stride.Core.Assets/PackageSessionPublicHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,14 @@ private static void ApplyDotNetSdkEnvironmentVariables(string dotNetSdkPath)
const string MSBUILD_EXE_PATH = nameof(MSBUILD_EXE_PATH);
const string MSBuildExtensionsPath = nameof(MSBuildExtensionsPath);
const string MSBuildSDKsPath = nameof(MSBuildSDKsPath);
const string DOTNET_HOST_PATH = nameof(DOTNET_HOST_PATH);

var variables = new Dictionary<string, string>
{
[MSBUILD_EXE_PATH] = dotNetSdkPath + "MSBuild.dll",
[MSBuildExtensionsPath] = dotNetSdkPath,
[MSBuildSDKsPath] = dotNetSdkPath + "Sdks"
[MSBuildSDKsPath] = dotNetSdkPath + "Sdks",
[DOTNET_HOST_PATH] = dotNetSdkPath + "../../dotnet.exe"
};

foreach (var kvp in variables)
Expand Down
1 change: 1 addition & 0 deletions sources/core/Stride.Core.Design/VisualStudio/KnownProjectTypeGuid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ public static class KnownProjectTypeGuid
public static readonly Guid Setup = new Guid("54435603-DBB4-11D2-8724-00A0C9A8B90C");
public static readonly Guid WebProject = new Guid("E24C65DC-7377-472B-9ABA-BC803B73C61A");
public static readonly Guid CSharpNewSystem = new Guid("9A19103F-16F7-4668-BE54-9A1E7A4F7556");
public static readonly Guid FSharpNewSystem = new Guid("6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705");
}
}
10 changes: 7 additions & 3 deletions sources/editor/Stride.Assets.Presentation/AssetEditors/ProjectWatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ private async Task<AssemblyChangedEvent> FileChangeTransformation(FileEvent e)
if (string.Equals(trackedAssembly.LoadedAssembly.Path, changedFile, StringComparison.OrdinalIgnoreCase))
return new AssemblyChangedEvent(trackedAssembly.LoadedAssembly, AssemblyChangeType.Binary, changedFile, trackedAssembly.Project);

if (trackedAssembly.Project == null)
continue;

var needProjectReload = string.Equals(trackedAssembly.Project.FilePath, changedFile, StringComparison.OrdinalIgnoreCase);

// Also check for .cs file changes (DefaultItems auto import *.cs, with some excludes such as obj subfolder)
Expand Down Expand Up @@ -311,10 +314,11 @@ private async Task TrackPackage(PackageViewModel package)
directoryWatcher.Track(loadedAssembly.ProjectReference.Location);

var trackedAssembly = new TrackedAssembly { Package = package, LoadedAssembly = loadedAssembly };

// Track project source code
if (await UpdateProject(trackedAssembly))
trackedAssemblies.Add(trackedAssembly);
if (trackedAssembly.LoadedAssembly.ProjectReference.Location.GetFileExtension().Equals("csproj", StringComparison.InvariantCultureIgnoreCase))
await UpdateProject(trackedAssembly);
trackedAssemblies.Add(trackedAssembly);
}

// TODO: Detect changes to loaded assemblies?
Expand Down
4 changes: 2 additions & 2 deletions sources/editor/Stride.GameStudio/DebuggingViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ private async void PullAssemblyChanges([NotNull] ProjectWatcher projectWatcher)
if (!trackAssemblyChanges || assemblyChange == null)
continue;

// Ignore Binary changes
if (assemblyChange.ChangeType == AssemblyChangeType.Binary)
if (assemblyChange.Project != null && assemblyChange.ChangeType == AssemblyChangeType.Binary)
continue;

var shouldNotify = !assemblyChangesPending;
modifiedAssemblies[assemblyChange.Assembly] = new ModifiedAssembly
{
LoadedAssembly = assemblyChange.Assembly,
LoadedAssemblyPath = assemblyChange.Assembly.Path,
ChangeType = assemblyChange.ChangeType,
Project = assemblyChange.Project
};
Expand Down
1 change: 1 addition & 0 deletions sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer</StrideAssemblyProcessorOptions>
<StrideLocalized>true</StrideLocalized>
<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
<StrideNuGetResolverUX>true</StrideNuGetResolverUX>
<StrideSTAThreadOnMain>true</StrideSTAThreadOnMain>
<UseWPF>true</UseWPF>
Expand Down