diff --git a/build/Stride.VisualStudio.sln b/build/Stride.VisualStudio.sln index 4f78c67c13..29536c5078 100644 --- a/build/Stride.VisualStudio.sln +++ b/build/Stride.VisualStudio.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.Package EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.PackageInstall", "..\sources\tools\Stride.VisualStudio.PackageInstall\Stride.VisualStudio.PackageInstall.csproj", "{5A19D2C0-EA79-437A-AE19-8D82D6B93A34}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.Commands", "..\sources\tools\Stride.VisualStudio.Commands\Stride.VisualStudio.Commands.csproj", "{42D8A705-3C78-44BC-95F3-00047BAF8837}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,8 +35,15 @@ Global {5A19D2C0-EA79-437A-AE19-8D82D6B93A34}.Debug|Any CPU.Build.0 = Debug|Any CPU {5A19D2C0-EA79-437A-AE19-8D82D6B93A34}.Release|Any CPU.ActiveCfg = Release|Any CPU {5A19D2C0-EA79-437A-AE19-8D82D6B93A34}.Release|Any CPU.Build.0 = Release|Any CPU + {42D8A705-3C78-44BC-95F3-00047BAF8837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42D8A705-3C78-44BC-95F3-00047BAF8837}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42D8A705-3C78-44BC-95F3-00047BAF8837}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42D8A705-3C78-44BC-95F3-00047BAF8837}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\sources\shared\Stride.NuGetResolver.Targets\Stride.NuGetResolver.Targets.projitems*{42d8a705-3c78-44bc-95f3-00047baf8837}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs b/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs index ac0e7b8af6..9f07e1e769 100644 --- a/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs +++ b/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs @@ -173,7 +173,7 @@ internal static async Task FindStrideSdkDir(string solution, string { // Try both net8.0 and net472 var success = false; - foreach (var folder in new[] { "net8.0-windows7.0", "net472" }) + foreach (var folder in new[] { "net8.0" }) { var logger = new Logger(); var solutionRoot = Path.GetDirectoryName(solution); @@ -188,7 +188,7 @@ internal static async Task FindStrideSdkDir(string solution, string } if (!success) { - throw new InvalidOperationException($"Could not restore {packageName} {packageInfo.ExpectedVersion}, this visual studio extension may fail to work properly without it. To fix this you can either build {packageName} or pull the right version from nugget manually"); + throw new InvalidOperationException($"Could not restore {packageName} {packageInfo.ExpectedVersion}, this visual studio extension may fail to work properly without it. To fix this you can either build {packageName} or pull the right version from nuget manually path {Path.GetDirectoryName(solution)}"); } } diff --git a/sources/tools/Stride.VisualStudio.Package/Properties/launchSettings.json b/sources/tools/Stride.VisualStudio.Package/Properties/launchSettings.json index b3371d5c64..ba33bad78e 100644 --- a/sources/tools/Stride.VisualStudio.Package/Properties/launchSettings.json +++ b/sources/tools/Stride.VisualStudio.Package/Properties/launchSettings.json @@ -3,7 +3,7 @@ "Stride.VisualStudio.Package": { "commandName": "Executable", "executablePath": "$(DevEnvDir)\\devenv.exe", - "commandLineArgs": "/RootSuffix Stride" + "commandLineArgs": "/RootSuffix Stride /updateconfiguration" } } } \ No newline at end of file diff --git a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj index 01599b618d..3c31bc8e3e 100644 --- a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj +++ b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj @@ -160,4 +160,6 @@ + +