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

Jump to bottom

Sync with the ultimate 242 #199

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Sync with the ultimate 242 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a267f65
[dotnet] Fix RIDER-114084: Move debugger to a separate subplatform an…
denis417 Jul 5, 2024
2cca26d
[dotnet] Fix RIDER-114084: Remove godot debugger reference from gradl…
denis417 Jul 8, 2024
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
3 changes: 3 additions & 0 deletions debugger/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="..\resharper\Directory.Build.props" />
</Project>
Empty file added debugger/SubplatformsCollection.Root
View file
Open in desktop
Empty file.
7 changes: 7 additions & 0 deletions debugger/debugger-worker/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="$(ImportGuard-DirectoryBuildProps) == ''"/>
<PropertyGroup>
<PackageLockFilePath>$(MSBuildThisFileDirectory)PackagesLock.targets</PackageLockFilePath>
<ImportGuard-DirectoryBuildProps>True</ImportGuard-DirectoryBuildProps>
</PropertyGroup>
</Project>
6 changes: 6 additions & 0 deletions debugger/debugger-worker/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<Sdk Name="JetBrains.Build.VersionLockFileTargets" Version="0.0.4" />
<PropertyGroup>
<ImportGuard-DeirectoryBuildTargets>True</ImportGuard-DeirectoryBuildTargets>
</PropertyGroup>
</Project>
7 changes: 7 additions & 0 deletions debugger/debugger-worker/PackagesLock.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageLock Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" IsDevelopmentDependency="True" />
<PackageLock Include="System.Collections.Immutable" Version="7.0.0" />
</ItemGroup>
</Project>
7 changes: 7 additions & 0 deletions debugger/debugger-worker/Subplatform.Root
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<SubplatformInfo xmlns="urn:schemas-jetbrains-com:build-subplatform-info" CompanyNameHuman="JetBrains" IsGitSubplatform="true">
<SubplatformInfo.SubplatformReferences>
<SubplatformReference Name="Rider\Rider.Backend" />
<SubplatformReference Name="Plugins\_GodotSupport.Pregenerated\BackendModel" />
</SubplatformInfo.SubplatformReferences>
</SubplatformInfo>
Binary file added debugger/debugger-worker/Subplatform.Snk
View file
Open in desktop
Binary file not shown.
0 resharper/debugger/AssemblyInfo.cs → debugger/debugger-worker/src/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 resharper/debugger/DebuggerOptions.cs → ...er/debugger-worker/src/DebuggerOptions.cs
View file
Open in desktop
File renamed without changes.
0 resharper/debugger/DebuggerWorkerHost.cs → ...debugger-worker/src/DebuggerWorkerHost.cs
View file
Open in desktop
File renamed without changes.
0 ...tion/MonoGodotAdditionalValuesProvider.cs → ...tion/MonoGodotAdditionalValuesProvider.cs
View file
Open in desktop
File renamed without changes.
0 resharper/debugger/LoggerHelper.cs → debugger/debugger-worker/src/LoggerHelper.cs
View file
Open in desktop
File renamed without changes.
0 resharper/debugger/MetadataTypeEx.cs → ...ger/debugger-worker/src/MetadataTypeEx.cs
View file
Open in desktop
File renamed without changes.
0 resharper/debugger/Values/MethodSelectors.cs → ...gger-worker/src/Values/MethodSelectors.cs
View file
Open in desktop
File renamed without changes.
0 ...enRenderers/NodeObjectChildrenRenderer.cs → ...enRenderers/NodeObjectChildrenRenderer.cs
View file
Open in desktop
File renamed without changes.
0 resharper/debugger/Values/Util.cs → debugger/debugger-worker/src/Values/Util.cs
View file
Open in desktop
File renamed without changes.
0 resharper/debugger/Values/ValueGroupBase.cs → ...ugger-worker/src/Values/ValueGroupBase.cs
View file
Open in desktop
File renamed without changes.
0 ...nces/CalculatedValueReferenceDecorator.cs → ...nces/CalculatedValueReferenceDecorator.cs
View file
Open in desktop
File renamed without changes.
0 ...References/ValueReferenceDecoratorBase.cs → ...References/ValueReferenceDecoratorBase.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion resharper/debugger/debugger.csproj → debugger/debugger-worker/src/debugger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\resharper\build\generated\Model\DebuggerWorker\**\*" LinkBase="Model" />
<Compile Include="..\..\..\resharper\build\generated\Model\DebuggerWorker\**\*" LinkBase="Model" />
</ItemGroup>
<Target Name="DropObjFromIndependentBuild" Condition="$(InternalBuild)" BeforeTargets="Build">
<RemoveDir Directories="obj" />
Expand Down
2 changes: 1 addition & 1 deletion resharper/godot-support.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RiderHost", "RiderHost", "{
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "debugger", "debugger", "{C27CD440-D760-4346-B528-531010AE3597}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "debugger", "debugger\debugger.csproj", "{0D331B4B-9B49-41A6-8322-0CFE82FA238E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "debugger", "..\debugger\debugger-worker\src\debugger.csproj", "{0D331B4B-9B49-41A6-8322-0CFE82FA238E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
1 change: 0 additions & 1 deletion resharper/gradle-launcher/gradle-launcher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<AssemblyName>JetBrains.ReSharper.Plugins.Godot.Gradle.Launcher</AssemblyName>
</PropertyGroup>
<ItemGroup Label="ProjectReference">
<ProjectReference Include="..\debugger\debugger.csproj" />
<ProjectReference Include="..\src\rider-godot.csproj" />
</ItemGroup>
<Target Name="DropObjFromIndependentBuild" Condition="$(InternalBuild)" BeforeTargets="Build">
Expand Down
32 changes: 32 additions & 0 deletions resharper/src/BuildScript/GodotInRiderProduct.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
[BuildStep]
public static SubplatformComponentForPackagingFast[] ProductMetaDependency(AllAssembliesOnSources allassSrc)
{
if (!allassSrc.Has(ThisSubplatformName))

Check warning on line 25 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'

Check warning on line 25 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'

Check warning on line 25 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'

Check warning on line 25 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'
return Array.Empty<SubplatformComponentForPackagingFast>();

return new[]
Expand All @@ -41,4 +41,36 @@
};
}
}

public class GodotDebuggerProduct
{
public static readonly SubplatformName SubplatformName = new((RelativePath)"Plugins" / "godot-support" / "debugger" / "debugger-worker");

public static readonly RelativePath PluginFolder = @"plugins\rider-godot\dotnetDebuggerWorker";

public const string ProductTechnicalName = "Godot.Debugger";

[BuildStep]
public static SubplatformComponentForPackagingFast[] ProductMetaDependency(AllAssembliesOnSources allassSrc)
{
if (!allassSrc.Has(SubplatformName))

Check warning on line 56 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'

Check warning on line 56 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'

Check warning on line 56 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'

Check warning on line 56 in resharper/src/BuildScript/GodotInRiderProduct.cs

View workflow job for this annotation

GitHub Actions / linux 

'AllAssembilesEx.Has(AllAssemblies, SubplatformName)' is obsolete: 'On AllAssembliesOnEverything, call FindSubplatformByClass on some class from that subplatform, and then check if it's a SubplatformOnSources.'
return Array.Empty<SubplatformComponentForPackagingFast>();

return new[]
{
new SubplatformComponentForPackagingFast
(
SubplatformName,
new JetPackageMetadata
{
Spec = new JetSubplatformSpec
{
ComplementedProductName = RiderConstants.ProductTechnicalName
}
}
)
};
}
}

}
5 changes: 5 additions & 0 deletions resharper/src/Install/AdvertiseRiderBundledPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ public static RiderBundledProductArtifact[] ShipGodotWithRider()
GodotInRiderProduct.ThisSubplatformName,
GodotInRiderProduct.DotFilesFolder,
allowCommonPluginFiles: false),
new RiderBundledProductArtifact(
GodotDebuggerProduct.ProductTechnicalName,
GodotDebuggerProduct.SubplatformName,
GodotDebuggerProduct.PluginFolder,
allowCommonPluginFiles: false),
};
}
}
Expand Down
Loading