Merge pull request stride3d#2064 from Doprez/fix-extension

Fix extension
recore67 · Dec 12, 2023 · c4965c3 · c4965c3
2 parents 35bb959 + c757350
commit c4965c3
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 123 deletions.
diff --git 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/shared/Stride.NuGetResolver/RestoreHelper.cs b/sources/shared/Stride.NuGetResolver/RestoreHelper.cs
@@ -223,12 +223,13 @@ public static (RestoreRequest, RestoreResult) Restore(ILogger logger, NuGetFrame
                         if (tryCount == 1)
                             throw;
 
-                        foreach (var process in new[] { "Stride.ConnectionRouter" }.SelectMany(Process.GetProcessesByName))
+                        foreach (var process in new[] { "Stride.ConnectionRouter", "Stride.VisualStudio.Commands" }.SelectMany(Process.GetProcessesByName))
                         {
                             try
                             {
                                 if (process.Id != Process.GetCurrentProcess().Id)
                                 {
+                                    logger.LogWarning($"Failed to restore NuGet, killing '{process.ProcessName}' to hopefully release locks held by it - VS extension will break");
                                     process.Kill();
                                     process.WaitForExit();
                                 }

diff --git a/...ls/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj b/...ls/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\targets\Stride.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows7.0;net472</TargetFrameworks>
     <RootNamespace>Stride.VisualStudio.Commands</RootNamespace>
   </PropertyGroup>
 

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
@@ -1,9 +1,9 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Stride.props" />
   <PropertyGroup>
     <StrideAssemblyProcessor>false</StrideAssemblyProcessor>
     <TargetFramework>net472</TargetFramework>
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <StrideBuildTags>WindowsTools</StrideBuildTags>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>

diff --git 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<PackageInfo> 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");
                 }
             }
 

diff --git 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
diff --git a/sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs b/sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs
diff --git a/sources/tools/Stride.VisualStudio.Package/MyToolWindow.cs b/sources/tools/Stride.VisualStudio.Package/MyToolWindow.cs
diff --git a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj
@@ -77,9 +77,6 @@
     <Compile Include="..\..\shared\LoaderToolLocator\LoaderToolLocator.cs" Link="Core\LoaderToolLocator.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="MyControl.xaml.cs">
-      <DependentUpon>MyControl.xaml</DependentUpon>
-    </Compile>
     <Compile Update="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -130,12 +127,6 @@
     <EmbeddedResource Include="NShader\Common\HLSLKeywords.map" />
     <EmbeddedResource Include="NShader\Common\StrideShaderKeywords.map" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="MyControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
@@ -146,9 +137,7 @@
     <Folder Include="NuGet\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Stride.VisualStudio.Commands.Interfaces\Stride.VisualStudio.Commands.Interfaces.csproj">
-      <AdditionalProperties>TargetFramework=net472</AdditionalProperties>
-    </ProjectReference>
+    <ProjectReference Include="..\Stride.VisualStudio.Commands.Interfaces\Stride.VisualStudio.Commands.Interfaces.csproj" />
   </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>

diff --git a/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.nuspec b/sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Stride.VisualStudio.Package</id>
-    <version>4.1.0</version>
+    <version>4.2.0</version>
     <authors>Stride</authors>
     <owners>Stride</owners>
     <license type="expression">MIT</license>

diff --git a/sources/tools/Stride.VisualStudio.Package/source.extension.vsixmanifest b/sources/tools/Stride.VisualStudio.Package/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="Stride.VisualStudio.Package.2022" Version="4.1.0" Language="en-US" Publisher="Stride" />
+    <Identity Id="Stride.VisualStudio.Package.2022" Version="4.2.0" Language="en-US" Publisher="Stride" />
     <DisplayName>Stride Tools</DisplayName>
     <Description>Stride Tools for VS2022</Description>
     <Icon>Resources\VSPackage.ico</Icon>
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     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");
                     }
                 }
@@ Expand Down @@