diff --git a/build/Stride.sln b/build/Stride.sln
index dddc3f90d5..6dcc0a3a22 100644
--- a/build/Stride.sln
+++ b/build/Stride.sln
@@ -332,7 +332,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.NuGetResolver", "..\
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGetResolver", "NuGetResolver", "{158087CF-AF74-44E9-AA20-A6AEB1E398A9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stride.Core.Presentation", "..\sources\presentation\Stride.Core.Presentation\Stride.Core.Presentation.csproj", "{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Core.Presentation", "..\sources\presentation\Stride.Core.Presentation\Stride.Core.Presentation.csproj", "{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.RestoreHelper", "..\sources\editor\Stride.RestoreHelper\Stride.RestoreHelper.csproj", "{B2AE0143-AAB5-42F3-9214-E678E6393C53}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1493,6 +1495,18 @@ Global
{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Release|Win32.ActiveCfg = Release|Any CPU
{0C63EF8B-26F9-4511-9FC5-7431DE9657D6}.Release|Win32.Build.0 = Release|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Debug|Win32.Build.0 = Debug|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Release|Win32.ActiveCfg = Release|Any CPU
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53}.Release|Win32.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1619,6 +1633,7 @@ Global
{02FD0BDE-4293-414F-97E6-69FF71105420} = {158087CF-AF74-44E9-AA20-A6AEB1E398A9}
{158087CF-AF74-44E9-AA20-A6AEB1E398A9} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
{0C63EF8B-26F9-4511-9FC5-7431DE9657D6} = {75A820AB-0F21-40F2-9448-5D7F495B97A0}
+ {B2AE0143-AAB5-42F3-9214-E678E6393C53} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
diff --git a/sources/Directory.Packages.props b/sources/Directory.Packages.props
index c7acf09e24..6d7c5f9004 100644
--- a/sources/Directory.Packages.props
+++ b/sources/Directory.Packages.props
@@ -2,6 +2,9 @@
true
+
+ 4.8.0-7.23558.1
+
@@ -34,14 +37,15 @@
+
-
-
-
-
+
+
+
+
@@ -122,14 +126,14 @@
-
-
-
+
+
+
-
+
-
\ No newline at end of file
+
diff --git a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs
index 2121d804ce..84cc3efeb4 100644
--- a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs
+++ b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs
@@ -48,7 +48,7 @@ public RoslynHost()
// Create default workspace
workspace = new RoslynWorkspace(this);
- workspace.EnableDiagnostics(DiagnosticOptions.Semantic | DiagnosticOptions.Syntax);
+ workspace.EnableDiagnostics();
GetService().DiagnosticsUpdated += OnDiagnosticsUpdated;
@@ -64,6 +64,7 @@ private static CompositionHost CreateCompositionContext()
Assembly.Load("Microsoft.CodeAnalysis.Features"),
Assembly.Load("Microsoft.CodeAnalysis.CSharp.Features"),
Assembly.Load("Microsoft.CodeAnalysis.Workspaces.MSBuild"),
+ Assembly.Load("Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost"), // because the file extension '.csproj' is not associated with a language.
typeof(IRoslynHost).Assembly, // RoslynPad.Roslyn
typeof(SymbolDisplayPartExtensions).Assembly, // RoslynPad.Roslyn.Windows
typeof(AvalonEditTextContainer).Assembly, // RoslynPad.Editor.Windows
@@ -71,7 +72,9 @@ private static CompositionHost CreateCompositionContext()
var partTypes = assemblies
.SelectMany(x => x.DefinedTypes)
- .Select(x => x.AsType());
+ .Select(x => x.AsType())
+ .Where(x => x != typeof(DocumentTrackingServiceFactory))
+ .Concat(MetadataUtil.LoadTypesByNamespaces(typeof(Microsoft.CodeAnalysis.Diagnostics.IDiagnosticService).Assembly, "Microsoft.CodeAnalysis.Diagnostics", "Microsoft.CodeAnalysis.CodeFixes"));
return new ContainerConfiguration()
.WithParts(partTypes)
diff --git a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
index 4387db2b2e..d0289c908e 100644
--- a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
+++ b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
@@ -148,6 +148,12 @@ private void ProcessDiagnosticsOnUiThread(DiagnosticsUpdatedArgs args)
return;
}
+ var document = workspace.Host.GetDocument(documentId);
+ if (document == null || !document.TryGetText(out var text))
+ {
+ return;
+ }
+
foreach (var diagnosticData in args.Diagnostics)
{
if (diagnosticData.Severity == DiagnosticSeverity.Hidden || diagnosticData.IsSuppressed)
@@ -155,7 +161,7 @@ private void ProcessDiagnosticsOnUiThread(DiagnosticsUpdatedArgs args)
continue;
}
- if (diagnosticData.GetTextSpan() is Microsoft.CodeAnalysis.Text.TextSpan diag == false)
+ if (diagnosticData.GetTextSpan(text) is Microsoft.CodeAnalysis.Text.TextSpan diag == false)
{
continue;
}
diff --git a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
index a594b6993f..f67021eb97 100644
--- a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
+++ b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
@@ -13,17 +13,29 @@
true
false
+
+
+ $(NoWarn);CS0436
+
+
+
+
+
+
+
+
+
Properties\SharedAssemblyInfo.cs
diff --git a/sources/editor/Stride.RestoreHelper/Stride.RestoreHelper.csproj b/sources/editor/Stride.RestoreHelper/Stride.RestoreHelper.csproj
new file mode 100644
index 0000000000..7740cd1773
--- /dev/null
+++ b/sources/editor/Stride.RestoreHelper/Stride.RestoreHelper.csproj
@@ -0,0 +1,24 @@
+
+
+
+ $(StrideFramework)
+ false
+
+ https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json;
+ https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json;
+ https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
+ https://api.nuget.org/v3/index.json
+
+ $(NoWarn);NU1603;NU1605
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj b/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj
index e8e8ca83fd..9c5695ad04 100644
--- a/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj
+++ b/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj
@@ -9,6 +9,16 @@
STRIDE_NUGET_RESOLVER_UI;$(DefineConstants)
+
+
+
+
+
+
+
+
+
+
diff --git a/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj b/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj
index 819588de8f..a2fe79d82e 100644
--- a/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj
+++ b/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.csproj
@@ -13,4 +13,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/sources/targets/Stride.Core.props b/sources/targets/Stride.Core.props
index 5f4d691374..441aa19bdb 100644
--- a/sources/targets/Stride.Core.props
+++ b/sources/targets/Stride.Core.props
@@ -239,6 +239,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/sources/targets/Stride.props b/sources/targets/Stride.props
index 26b9a578aa..0d6e10944b 100644
--- a/sources/targets/Stride.props
+++ b/sources/targets/Stride.props
@@ -122,4 +122,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/sources/tools/Stride.PackageInstall/Stride.PackageInstall.csproj b/sources/tools/Stride.PackageInstall/Stride.PackageInstall.csproj
index 516c88c3c2..d60c25f71d 100644
--- a/sources/tools/Stride.PackageInstall/Stride.PackageInstall.csproj
+++ b/sources/tools/Stride.PackageInstall/Stride.PackageInstall.csproj
@@ -32,4 +32,15 @@
PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file