pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Prepare separation of AddIn for VS 2019 and VS 2022 

- Move most code to a shared project/shared folder
pull/2525/head
Andreas Weizel 4 years ago
parent
7710b428c4
commit
6e06ee407b
31 changed files with 103 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      ILSpy.AddIn.Shared/AssemblyFileFinder.cs
  2. 0
      ILSpy.AddIn.Shared/Commands/AssemblyReferenceForILSpy.cs
  3. 0
      ILSpy.AddIn.Shared/Commands/NuGetReferenceForILSpy.cs
  4. 0
      ILSpy.AddIn.Shared/Commands/OpenCodeItemCommand.cs
  5. 0
      ILSpy.AddIn.Shared/Commands/OpenILSpyCommand.cs
  6. 0
      ILSpy.AddIn.Shared/Commands/OpenProjectOutputCommand.cs
  7. 0
      ILSpy.AddIn.Shared/Commands/OpenReferenceCommand.cs
  8. 0
      ILSpy.AddIn.Shared/Commands/ProjectItemForILSpy.cs
  9. 0
      ILSpy.AddIn.Shared/Commands/ProjectReferenceForILSpy.cs
  10. 0
      ILSpy.AddIn.Shared/GlobalSuppressions.cs
  11. 0
      ILSpy.AddIn.Shared/Guids.cs
  12. 55
      ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.projitems
  13. 13
      ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.shproj
  14. 0
      ILSpy.AddIn.Shared/ILSpyAddInPackage.cs
  15. 0
      ILSpy.AddIn.Shared/ILSpyInstance.cs
  16. 0
      ILSpy.AddIn.Shared/PkgCmdID.cs
  17. 2
      ILSpy.AddIn.Shared/Resources.Designer.cs
  18. 0
      ILSpy.AddIn.Shared/Resources.resx
  19. 0
      ILSpy.AddIn.Shared/SyntaxNodeExtensions.cs
  20. 0
      ILSpy.AddIn.Shared/Utils.cs
  21. 0
      ILSpy.AddIn.Shared/VSPackage.en-US.resx
  22. 2
      ILSpy.AddIn.Shared/VSPackage.resx
  23. 0
      ILSpy.AddIn.Shared/VSPackage.zh-Hans.resx
  24. 0
      ILSpy.AddIn.SharedFiles/ILSpy-Large.ico
  25. 0
      ILSpy.AddIn.SharedFiles/ILSpyAddIn.en-US.vsct
  26. 0
      ILSpy.AddIn.SharedFiles/ILSpyAddIn.vsct
  27. 0
      ILSpy.AddIn.SharedFiles/ILSpyAddIn.zh-Hans.vsct
  28. 0
      ILSpy.AddIn.SharedFiles/Resources/Images.png
  29. 0
      ILSpy.AddIn.SharedFiles/Resources/Package.ico
  30. 85
      ILSpy.AddIn/ILSpy.AddIn.csproj
  31. 6
      ILSpy.sln

0
ILSpy.AddIn/AssemblyFileFinder.cs → ILSpy.AddIn.Shared/AssemblyFileFinder.cs
Unescape View File

0
ILSpy.AddIn/Commands/AssemblyReferenceForILSpy.cs → ILSpy.AddIn.Shared/Commands/AssemblyReferenceForILSpy.cs
Unescape View File

0
ILSpy.AddIn/Commands/NuGetReferenceForILSpy.cs → ILSpy.AddIn.Shared/Commands/NuGetReferenceForILSpy.cs
Unescape View File

0
ILSpy.AddIn/Commands/OpenCodeItemCommand.cs → ILSpy.AddIn.Shared/Commands/OpenCodeItemCommand.cs
Unescape View File

0
ILSpy.AddIn/Commands/OpenILSpyCommand.cs → ILSpy.AddIn.Shared/Commands/OpenILSpyCommand.cs
Unescape View File

0
ILSpy.AddIn/Commands/OpenProjectOutputCommand.cs → ILSpy.AddIn.Shared/Commands/OpenProjectOutputCommand.cs
Unescape View File

0
ILSpy.AddIn/Commands/OpenReferenceCommand.cs → ILSpy.AddIn.Shared/Commands/OpenReferenceCommand.cs
Unescape View File

0
ILSpy.AddIn/Commands/ProjectItemForILSpy.cs → ILSpy.AddIn.Shared/Commands/ProjectItemForILSpy.cs
Unescape View File

0
ILSpy.AddIn/Commands/ProjectReferenceForILSpy.cs → ILSpy.AddIn.Shared/Commands/ProjectReferenceForILSpy.cs
Unescape View File

0
ILSpy.AddIn/GlobalSuppressions.cs → ILSpy.AddIn.Shared/GlobalSuppressions.cs
Unescape View File

0
ILSpy.AddIn/Guids.cs → ILSpy.AddIn.Shared/Guids.cs
Unescape View File

55
ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.projitems
Unescape View File

@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>acab1e5d-b3df-4092-aa72-692f8341e520</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>ILSpy.AddIn.Shared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)AssemblyFileFinder.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\AssemblyReferenceForILSpy.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\NuGetReferenceForILSpy.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\OpenCodeItemCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\OpenILSpyCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\OpenProjectOutputCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\OpenReferenceCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\ProjectItemForILSpy.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Commands\ProjectReferenceForILSpy.cs" />
<Compile Include="$(MSBuildThisFileDirectory)GlobalSuppressions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Guids.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ILSpyAddInPackage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ILSpyInstance.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PkgCmdID.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SyntaxNodeExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utils.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources.resx">
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)VSPackage.en-US.resx">
<DependentUpon>VSPackage.resx</DependentUpon>
<LogicalName>VSPackage.en-US.resources</LogicalName>
<MergeWithCTO>true</MergeWithCTO>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)VSPackage.zh-Hans.resx">
<DependentUpon>VSPackage.resx</DependentUpon>
<LogicalName>VSPackage.zh-Hans.resources</LogicalName>
<MergeWithCTO>true</MergeWithCTO>
</EmbeddedResource>
</ItemGroup>
</Project>

13
ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.shproj
Unescape View File

@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>acab1e5d-b3df-4092-aa72-692f8341e520</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<PropertyGroup />
<Import Project="ILSpy.AddIn.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>

0
ILSpy.AddIn/ILSpyAddInPackage.cs → ILSpy.AddIn.Shared/ILSpyAddInPackage.cs
Unescape View File

0
ILSpy.AddIn/ILSpyInstance.cs → ILSpy.AddIn.Shared/ILSpyInstance.cs
Unescape View File

0
ILSpy.AddIn/PkgCmdID.cs → ILSpy.AddIn.Shared/PkgCmdID.cs
Unescape View File

2
ILSpy.AddIn/Resources.Designer.cs → ILSpy.AddIn.Shared/Resources.Designer.cs generated
Unescape View File

@ -19,7 +19,7 @@ namespace ICSharpCode.ILSpy.AddIn { @@ -19,7 +19,7 @@ namespace ICSharpCode.ILSpy.AddIn {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {

0
ILSpy.AddIn/Resources.resx → ILSpy.AddIn.Shared/Resources.resx
Unescape View File

0
ILSpy.AddIn/SyntaxNodeExtensions.cs → ILSpy.AddIn.Shared/SyntaxNodeExtensions.cs
Unescape View File

0
ILSpy.AddIn/Utils.cs → ILSpy.AddIn.Shared/Utils.cs
Unescape View File

0
ILSpy.AddIn/VSPackage.en-US.resx → ILSpy.AddIn.Shared/VSPackage.en-US.resx
Unescape View File

2
ILSpy.AddIn/VSPackage.resx → ILSpy.AddIn.Shared/VSPackage.resx
Unescape View File

@ -135,6 +135,6 @@ @@ -135,6 +135,6 @@
<value>Integration of the ILSpy Decompiler into Visual Studio.</value>
</data>
<data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>..\ILSpy.AddIn.SharedFiles\Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

0
ILSpy.AddIn/VSPackage.zh-Hans.resx → ILSpy.AddIn.Shared/VSPackage.zh-Hans.resx
Unescape View File

0
ILSpy.AddIn/ILSpy-Large.ico → ILSpy.AddIn.SharedFiles/ILSpy-Large.ico
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

0
ILSpy.AddIn/ILSpyAddIn.en-US.vsct → ILSpy.AddIn.SharedFiles/ILSpyAddIn.en-US.vsct
Unescape View File

0
ILSpy.AddIn/ILSpyAddIn.vsct → ILSpy.AddIn.SharedFiles/ILSpyAddIn.vsct
Unescape View File

0
ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct → ILSpy.AddIn.SharedFiles/ILSpyAddIn.zh-Hans.vsct
Unescape View File

0
ILSpy.AddIn/Resources/Images.png → ILSpy.AddIn.SharedFiles/Resources/Images.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
ILSpy.AddIn/Resources/Package.ico → ILSpy.AddIn.SharedFiles/Resources/Package.ico
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

85
ILSpy.AddIn/ILSpy.AddIn.csproj
Unescape View File

@ -77,51 +77,8 @@ @@ -77,51 +77,8 @@
<Compile Include="..\ICSharpCode.Decompiler\Util\EmptyList.cs" Link="Decompiler\EmptyList.cs" />
<Compile Include="..\ICSharpCode.Decompiler\Util\NullAttributes.cs" Link="NullAttributes.cs" />
<Compile Include="..\ILSpy\NativeMethods.cs" Link="NativeMethods.cs" />
<Compile Include="Commands\AssemblyReferenceForILSpy.cs" />
<Compile Include="Commands\NuGetReferenceForILSpy.cs" />
<Compile Include="Commands\ProjectItemForILSpy.cs" />
<Compile Include="Commands\ProjectReferenceForILSpy.cs" />
<Compile Include="Commands\OpenCodeItemCommand.cs" />
<Compile Include="Commands\OpenILSpyCommand.cs" />
<Compile Include="Commands\OpenProjectOutputCommand.cs" />
<Compile Include="Commands\OpenReferenceCommand.cs" />
<Compile Include="Decompiler\Dummy.cs" />
<Compile Include="Guids.cs" />
<Compile Include="ILSpyInstance.cs" />
<Compile Include="Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="ILSpyAddInPackage.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PkgCmdID.cs" />
<Compile Include="SyntaxNodeExtensions.cs" />
<Compile Include="AssemblyFileFinder.cs" />
<Compile Include="Utils.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="VSPackage.en-US.resx">
<MergeWithCTO>true</MergeWithCTO>
<LogicalName>VSPackage.en-US.resources</LogicalName>
<DependentUpon>VSPackage.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="VSPackage.zh-Hans.resx">
<MergeWithCTO>true</MergeWithCTO>
<LogicalName>VSPackage.zh-Hans.resources</LogicalName>
<DependentUpon>VSPackage.resx</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<!--
@ -153,34 +110,40 @@ @@ -153,34 +110,40 @@
<IncludeInVSIX>true</IncludeInVSIX>
<VSIXSubPath>\ILSpy\zh-Hans\</VSIXSubPath>
</Content>
<Content Include="..\ILSpy.AddIn.SharedFiles\ILSpy-Large.ico" Link="ILSpy-Large.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\ILSpy.AddIn.SharedFiles\Resources\Images.png" Link="Resources\Images.png" />
<Content Include="..\ILSpy.AddIn.SharedFiles\Resources\Package.ico" Link="Resources\Package.ico" />
</ItemGroup>
<ItemGroup>
<None Include="source.extension.vsixmanifest.template" />
<None Include="source.extension.vsixmanifest">
<None Include="..\ILSpy.AddIn.SharedFiles\ILSpyAddIn.en-US.vsct" Link="ILSpyAddIn.en-US.vsct">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<None Include="ILSpyAddIn.vsct">
<None Include="..\ILSpy.AddIn.SharedFiles\ILSpyAddIn.vsct" Link="ILSpyAddIn.vsct">
<SubType>Designer</SubType>
</None>
<None Include="ILSpyAddIn.en-US.vsct">
<None Include="..\ILSpy.AddIn.SharedFiles\ILSpyAddIn.zh-Hans.vsct" Link="ILSpyAddIn.zh-Hans.vsct">
<SubType>Designer</SubType>
</None>
<None Include="ILSpyAddIn.zh-Hans.vsct">
<None Include="source.extension.vsixmanifest.template" />
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="zh-Hans\extension.vsixlangpack">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<VSCTCompile Include="ILSpyAddIn.en-US.vsct">
<VSCTCompile Include="..\ILSpy.AddIn.SharedFiles\ILSpyAddIn.en-US.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
<DependentUpon>ILSpyAddIn.vsct</DependentUpon>
</VSCTCompile>
<VSCTCompile Include="ILSpyAddIn.zh-Hans.vsct">
<VSCTCompile Include="..\ILSpy.AddIn.SharedFiles\ILSpyAddIn.zh-Hans.vsct">
<ResourceName>Menus.ctmenu</ResourceName>
<SubType>Designer</SubType>
<DependentUpon>ILSpyAddIn.vsct</DependentUpon>
@ -192,19 +155,13 @@ @@ -192,19 +155,13 @@
<ItemGroup>
<None Include="Properties\launchSettings.json" />
<None Include="Resources\Images.png" />
</ItemGroup>
<ItemGroup>
<Content Include="ILSpy-Large.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\doc\license.txt" Link="license.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Resources\Package.ico" />
</ItemGroup>
<PropertyGroup>
@ -213,8 +170,20 @@ @@ -213,8 +170,20 @@
<RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
</PropertyGroup>
<Import Project="..\ILSpy.AddIn.Shared\ILSpy.AddIn.Shared.projitems" Label="Shared" />
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
<ItemGroup>
<Compile Update="C:\Andreas\projects\ILSpy\ILSpy.AddIn.Shared\Resources.Designer.cs">
<DesignTime>True</DesignTime>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
</Project>

6
ILSpy.sln
Unescape View File

@ -43,7 +43,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Cons @@ -43,7 +43,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Cons
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.PowerShell", "ICSharpCode.Decompiler.PowerShell\ICSharpCode.Decompiler.PowerShell.csproj", "{50060E0C-FA25-41F4-B72F-8490324EC9F0}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ILSpy.AddIn.Shared", "ILSpy.AddIn.Shared\ILSpy.AddIn.Shared.shproj", "{ACAB1E5D-B3DF-4092-AA72-692F8341E520}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
ILSpy.AddIn.Shared\ILSpy.AddIn.Shared.projitems*{9d7be6c0-b7b3-4a50-a54e-18a2d84a3384}*SharedItemsImports = 5
ILSpy.AddIn.Shared\ILSpy.AddIn.Shared.projitems*{acab1e5d-b3df-4092-aa72-692f8341e520}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU

Write Preview
Loading…
Cancel
Save