From 633fbffe9a3a8b6ebeeac04eb8c90508fc64f89d Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:41:41 -0700 Subject: [PATCH 1/9] update to .NET 8 --- .../Stride.VisualStudio.Commands.Interfaces.csproj | 2 +- .../Stride.VisualStudio.Package.Tests.csproj | 6 +++--- .../Stride.VisualStudio.Package.csproj | 10 +++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj index 21c6ec9a81..200cc08521 100644 --- a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj +++ b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj @@ -2,7 +2,7 @@ - net8.0;net472 + net8.0 Stride.VisualStudio.Commands diff --git a/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj b/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj index 039d989bbb..f4bccedcee 100644 --- a/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj +++ b/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj @@ -1,9 +1,9 @@ - + false - net472 - win7-x64 + net8.0-windows + win-x64 false WindowsTools true diff --git a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj index 67445381cb..01599b618d 100644 --- a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj +++ b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj @@ -11,7 +11,7 @@ Stride.VisualStudio false Key.snk - net472 + net8.0-windows false WindowsTools true @@ -93,7 +93,7 @@ Designer - true + false VSPackage @@ -146,9 +146,7 @@ - - TargetFramework=net472 - + true @@ -162,6 +160,4 @@ - - From 0239ad62cbec10c689c824ffa55b01e513943c36 Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:41:59 -0700 Subject: [PATCH 2/9] removed missing method --- sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs b/sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs index e3dc9610ec..b25b656f13 100644 --- a/sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs +++ b/sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs @@ -23,7 +23,7 @@ public partial class MyControl : UserControl { public MyControl() { - InitializeComponent(); + //InitializeComponent(); } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions")] From 38fa1cbd8cbff054cf134dc1dfdcea2b085656db Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Thu, 23 Nov 2023 12:31:53 -0700 Subject: [PATCH 3/9] wip --- build/Stride.VisualStudio.sln | 9 +++++++++ .../Commands/StrideCommandsProxy.cs | 4 ++-- .../Properties/launchSettings.json | 2 +- .../Stride.VisualStudio.Package.csproj | 2 ++ 4 files changed, 14 insertions(+), 3 deletions(-) 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 @@ + + From 8bf024ac6d4f00b5b916a01f4c004f1408ba2409 Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Thu, 23 Nov 2023 14:29:31 -0700 Subject: [PATCH 4/9] fixed nuget resolver --- .../Stride.VisualStudio.Commands.Interfaces.csproj | 2 +- .../Stride.VisualStudio.Package.Tests.csproj | 2 +- .../Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs | 2 +- .../Stride.VisualStudio.Package/Properties/launchSettings.json | 2 +- .../Stride.VisualStudio.Package.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj index 200cc08521..57d1ef139d 100644 --- a/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj +++ b/sources/tools/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj @@ -2,7 +2,7 @@ - net8.0 + net8.0-windows7.0;net472 Stride.VisualStudio.Commands diff --git a/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj b/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj index f4bccedcee..a5d6984a80 100644 --- a/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj +++ b/sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj @@ -2,7 +2,7 @@ false - net8.0-windows + net472 win-x64 false WindowsTools diff --git a/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs b/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs index 9f07e1e769..3343448910 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" }) + foreach (var folder in new[] { "net8.0-windows7.0", "net472" }) { var logger = new Logger(); var solutionRoot = Path.GetDirectoryName(solution); diff --git a/sources/tools/Stride.VisualStudio.Package/Properties/launchSettings.json b/sources/tools/Stride.VisualStudio.Package/Properties/launchSettings.json index ba33bad78e..b3371d5c64 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 /updateconfiguration" + "commandLineArgs": "/RootSuffix Stride" } } } \ 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 3c31bc8e3e..896c5a42e7 100644 --- a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj +++ b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj @@ -11,7 +11,7 @@ Stride.VisualStudio false Key.snk - net8.0-windows + net472 false WindowsTools true From 6b3cbf4626fa6cdaf95b331df25aaf785d8c5b8a Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Fri, 24 Nov 2023 09:18:32 -0700 Subject: [PATCH 5/9] typo and clean up --- .../Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs b/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs index 3343448910..d9bf12fb17 100644 --- a/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs +++ b/sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs @@ -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 nuget manually path {Path.GetDirectoryName(solution)}"); + 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"); } } From 4554c671e3c050ef84446ece95bd3dc83a2752cf Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Fri, 24 Nov 2023 09:23:26 -0700 Subject: [PATCH 6/9] removed template files --- .../Stride.VisualStudio.Package/Guids.cs | 1 - .../MyControl.xaml | 17 ------- .../MyControl.xaml.cs | 37 -------------- .../MyToolWindow.cs | 49 ------------------- .../Stride.VisualStudio.Package.csproj | 11 +---- 5 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 sources/tools/Stride.VisualStudio.Package/MyControl.xaml delete mode 100644 sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs delete mode 100644 sources/tools/Stride.VisualStudio.Package/MyToolWindow.cs diff --git a/sources/tools/Stride.VisualStudio.Package/Guids.cs b/sources/tools/Stride.VisualStudio.Package/Guids.cs index 9cd9e6f670..420be04815 100644 --- a/sources/tools/Stride.VisualStudio.Package/Guids.cs +++ b/sources/tools/Stride.VisualStudio.Package/Guids.cs @@ -8,7 +8,6 @@ internal static class GuidList { public const string guidStride_VisualStudio_PackagePkgString = "248ff1ce-dacd-4404-947a-85e999d3c3ea"; public const string guidStride_VisualStudio_PackageCmdSetString = "9428db93-bfea-4115-8d4a-40b047166e61"; - public const string guidToolWindowPersistanceString = "ddd10155-9f63-4694-95ce-c7ba2d74ad46"; public const string guidStride_VisualStudio_ShaderKeyFileGenerator = "b50e6ece-b11f-477b-a8e1-1e60e0531a53"; public const string guidStride_VisualStudio_EffectCodeFileGenerator = "e6259cfb-c775-426e-b499-f57d0a3ba2c1"; diff --git a/sources/tools/Stride.VisualStudio.Package/MyControl.xaml b/sources/tools/Stride.VisualStudio.Package/MyControl.xaml deleted file mode 100644 index 6f2f97bd4a..0000000000 --- a/sources/tools/Stride.VisualStudio.Package/MyControl.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Stride View -