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

Fix extension #2064

Merged
merged 10 commits into from
Dec 12, 2023
Merged

Fix extension #2064

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
633fbff
update to .NET 8
Doprez Nov 23, 2023
0239ad6
removed missing method
Doprez Nov 23, 2023
38fa1cb
wip
Doprez Nov 23, 2023
8bf024a
fixed nuget resolver
Doprez Nov 23, 2023
6b3cbf4
typo and clean up
Doprez Nov 24, 2023
4554c67
removed template files
Doprez Nov 24, 2023
64025c5
uneeded change
Doprez Nov 24, 2023
45ae52c
Bump package version
Eideren Dec 9, 2023
99ba207
Kill extension 'Stride.VisualStudio.Commands' if nuget failed to rest…
Eideren Dec 9, 2023
c757350
Merge pull request #8 from Eideren/fix-extension
Doprez Dec 9, 2023
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
9 changes: 9 additions & 0 deletions build/Stride.VisualStudio.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion ...ls/Stride.VisualStudio.Commands.Interfaces/Stride.VisualStudio.Commands.Interfaces.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions sources/tools/Stride.VisualStudio.Package.Tests/Stride.VisualStudio.Package.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion sources/tools/Stride.VisualStudio.Package/Commands/StrideCommandsProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 path {Path.GetDirectoryName(solution)}");
Doprez marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
2 changes: 1 addition & 1 deletion sources/tools/Stride.VisualStudio.Package/MyControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public partial class MyControl : UserControl
{
public MyControl()
{
InitializeComponent();
//InitializeComponent();
Doprez marked this conversation as resolved.
Show resolved Hide resolved
}

[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions")]
Expand Down
6 changes: 2 additions & 4 deletions sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Update="VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<MergeWithCTO>false</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
Expand Down Expand Up @@ -146,9 +146,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>
Expand Down