Browse Source

Doesn't work:

* plugin loading in App.xaml.cs (#if NET472)
* OSVersionHelper bombs with PlatformNotSupportedException (#if NET472)
* ILSpyTraceListener - this needs something different in net5
pull/2346/head
Christoph Wille 5 years ago
parent
commit
a0aeac5628
  1. 2
      ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
  2. 2
      ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
  3. 2
      ILSpy.Tests/ILSpy.Tests.csproj
  4. 6
      ILSpy/AboutPage.cs
  5. 3
      ILSpy/Analyzers/AnalyzerScope.cs
  6. 3
      ILSpy/Analyzers/Builtin/TypeExposedByAnalyzer.cs
  7. 3
      ILSpy/Analyzers/TreeNodes/AnalyzedEventTreeNode.cs
  8. 2
      ILSpy/App.xaml.cs
  9. 3
      ILSpy/Commands/CheckForUpdatesCommand.cs
  10. 3
      ILSpy/Commands/SearchMsdnContextMenuEntry.cs
  11. 2
      ILSpy/ILSpy.csproj
  12. 2
      ILSpy/ILSpyTraceListener.cs
  13. 3
      ILSpy/MainWindow.xaml.cs
  14. 3
      ILSpy/Search/AbstractEntitySearchStrategy.cs
  15. 3
      ILSpy/TreeNodes/DerivedTypesEntryNode.cs
  16. 3
      ILSpy/TreeNodes/EventTreeNode.cs
  17. 3
      ILSpy/TreeNodes/FieldTreeNode.cs
  18. 3
      ILSpy/TreeNodes/MethodTreeNode.cs
  19. 3
      ILSpy/TreeNodes/PropertyTreeNode.cs
  20. 2
      ILSpy/TreeNodes/TypeTreeNode.cs
  21. 2
      SharpTreeView/ICSharpCode.TreeView.csproj
  22. 2
      TestPlugin/TestPlugin.csproj
  23. 4
      global.json

2
ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj

@ -3,7 +3,7 @@
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" /> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net472</TargetFramework> <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
<AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName> <AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>

2
ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net472</TargetFramework> <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
<AssemblyName>ILSpy.ReadyToRun.Plugin</AssemblyName> <AssemblyName>ILSpy.ReadyToRun.Plugin</AssemblyName>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>

2
ILSpy.Tests/ILSpy.Tests.csproj

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net472</TargetFramework> <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

6
ILSpy/AboutPage.cs

@ -62,7 +62,11 @@ namespace ICSharpCode.ILSpy
EnableHyperlinks = true EnableHyperlinks = true
}; };
output.WriteLine(Resources.ILSpyVersion + RevisionClass.FullVersion); output.WriteLine(Resources.ILSpyVersion + RevisionClass.FullVersion);
if (WindowsVersionHelper.HasPackageIdentity) bool hasPackageIdentity = false;
#if NET472
hasPackageIdentity = WindowsVersionHelper.HasPackageIdentity;
#endif
if (hasPackageIdentity)
{ {
output.WriteLine($"Package Name: {WindowsVersionHelper.GetPackageFamilyName()}"); output.WriteLine($"Package Name: {WindowsVersionHelper.GetPackageFamilyName()}");
} }

3
ILSpy/Analyzers/AnalyzerScope.cs

@ -23,11 +23,12 @@ using System.Threading;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util; using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.ILSpy.Analyzers namespace ICSharpCode.ILSpy.Analyzers
{ {
using ICSharpCode.Decompiler.TypeSystem;
public class AnalyzerScope public class AnalyzerScope
{ {
readonly ITypeDefinition typeScope; readonly ITypeDefinition typeScope;

3
ILSpy/Analyzers/Builtin/TypeExposedByAnalyzer.cs

@ -24,10 +24,11 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.Analyzers.Builtin namespace ICSharpCode.ILSpy.Analyzers.Builtin
{ {
using ICSharpCode.Decompiler.TypeSystem;
/// <summary> /// <summary>
/// Finds all entities that expose a type. /// Finds all entities that expose a type.
/// </summary> /// </summary>

3
ILSpy/Analyzers/TreeNodes/AnalyzedEventTreeNode.cs

@ -19,11 +19,12 @@
using System; using System;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.ILSpy.TreeNodes;
namespace ICSharpCode.ILSpy.Analyzers.TreeNodes namespace ICSharpCode.ILSpy.Analyzers.TreeNodes
{ {
using ICSharpCode.Decompiler.TypeSystem;
internal sealed class AnalyzedEventTreeNode : AnalyzerEntityTreeNode internal sealed class AnalyzedEventTreeNode : AnalyzerEntityTreeNode
{ {
readonly IEvent analyzedEvent; readonly IEvent analyzedEvent;

2
ILSpy/App.xaml.cs

@ -94,6 +94,7 @@ namespace ICSharpCode.ILSpy
var discovery = new AttributedPartDiscoveryV1(Resolver.DefaultInstance); var discovery = new AttributedPartDiscoveryV1(Resolver.DefaultInstance);
var catalog = ComposableCatalog.Create(Resolver.DefaultInstance); var catalog = ComposableCatalog.Create(Resolver.DefaultInstance);
var pluginDir = Path.GetDirectoryName(typeof(App).Module.FullyQualifiedName); var pluginDir = Path.GetDirectoryName(typeof(App).Module.FullyQualifiedName);
#if NET472
if (pluginDir != null) if (pluginDir != null)
{ {
foreach (var plugin in Directory.GetFiles(pluginDir, "*.Plugin.dll")) foreach (var plugin in Directory.GetFiles(pluginDir, "*.Plugin.dll"))
@ -111,6 +112,7 @@ namespace ICSharpCode.ILSpy
} }
} }
} }
#endif
// Add the built-in parts // Add the built-in parts
var createdParts = await discovery.CreatePartsAsync(Assembly.GetExecutingAssembly()); var createdParts = await discovery.CreatePartsAsync(Assembly.GetExecutingAssembly());
catalog = catalog.AddParts(createdParts); catalog = catalog.AddParts(createdParts);

3
ILSpy/Commands/CheckForUpdatesCommand.cs

@ -28,11 +28,12 @@ namespace ICSharpCode.ILSpy
{ {
public override bool CanExecute(object parameter) public override bool CanExecute(object parameter)
{ {
#if NET472
if (WindowsVersionHelper.HasPackageIdentity) if (WindowsVersionHelper.HasPackageIdentity)
{ {
return false; return false;
} }
#endif
return base.CanExecute(parameter); return base.CanExecute(parameter);
} }

3
ILSpy/Commands/SearchMsdnContextMenuEntry.cs

@ -19,11 +19,12 @@
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.ILSpy.TreeNodes;
namespace ICSharpCode.ILSpy namespace ICSharpCode.ILSpy
{ {
using ICSharpCode.Decompiler.TypeSystem;
[ExportContextMenuEntry(Header = nameof(Resources.SearchMSDN), Icon = "images/SearchMsdn", Order = 9999)] [ExportContextMenuEntry(Header = nameof(Resources.SearchMSDN), Icon = "images/SearchMsdn", Order = 9999)]
internal sealed class SearchMsdnContextMenuEntry : IContextMenuEntry internal sealed class SearchMsdnContextMenuEntry : IContextMenuEntry
{ {

2
ILSpy/ILSpy.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net472</TargetFramework> <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<LangVersion>9.0</LangVersion> <LangVersion>9.0</LangVersion>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

2
ILSpy/ILSpyTraceListener.cs

@ -31,8 +31,10 @@ namespace ICSharpCode.ILSpy
[Conditional("DEBUG")] [Conditional("DEBUG")]
public static void Install() public static void Install()
{ {
#if NET472
Debug.Listeners.Clear(); Debug.Listeners.Clear();
Debug.Listeners.Add(new ILSpyTraceListener()); Debug.Listeners.Add(new ILSpyTraceListener());
#endif
} }
public ILSpyTraceListener() public ILSpyTraceListener()

3
ILSpy/MainWindow.xaml.cs

@ -678,12 +678,13 @@ namespace ICSharpCode.ILSpy
public async Task ShowMessageIfUpdatesAvailableAsync(ILSpySettings spySettings, bool forceCheck = false) public async Task ShowMessageIfUpdatesAvailableAsync(ILSpySettings spySettings, bool forceCheck = false)
{ {
#if NET472
// Don't check for updates if we're in an MSIX since they work differently // Don't check for updates if we're in an MSIX since they work differently
if (WindowsVersionHelper.HasPackageIdentity) if (WindowsVersionHelper.HasPackageIdentity)
{ {
return; return;
} }
#endif
string downloadUrl; string downloadUrl;
if (forceCheck) if (forceCheck)
{ {

3
ILSpy/Search/AbstractEntitySearchStrategy.cs

@ -5,11 +5,12 @@ using System.Threading;
using System.Windows.Media; using System.Windows.Media;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.ILSpy.TreeNodes;
namespace ICSharpCode.ILSpy.Search namespace ICSharpCode.ILSpy.Search
{ {
using ICSharpCode.Decompiler.TypeSystem;
abstract class AbstractEntitySearchStrategy : AbstractSearchStrategy abstract class AbstractEntitySearchStrategy : AbstractSearchStrategy
{ {
protected readonly Language language; protected readonly Language language;

3
ILSpy/TreeNodes/DerivedTypesEntryNode.cs

@ -21,10 +21,11 @@ using System.Linq;
using System.Threading; using System.Threading;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
using ICSharpCode.Decompiler.TypeSystem;
class DerivedTypesEntryNode : ILSpyTreeNode, IMemberTreeNode class DerivedTypesEntryNode : ILSpyTreeNode, IMemberTreeNode
{ {
readonly AssemblyList list; readonly AssemblyList list;

3
ILSpy/TreeNodes/EventTreeNode.cs

@ -20,10 +20,11 @@ using System;
using System.Windows.Media; using System.Windows.Media;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
using ICSharpCode.Decompiler.TypeSystem;
/// <summary> /// <summary>
/// Represents an event in the TreeView. /// Represents an event in the TreeView.
/// </summary> /// </summary>

3
ILSpy/TreeNodes/FieldTreeNode.cs

@ -20,10 +20,11 @@ using System;
using System.Windows.Media; using System.Windows.Media;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
using ICSharpCode.Decompiler.TypeSystem;
/// <summary> /// <summary>
/// Represents a field in the TreeView. /// Represents a field in the TreeView.
/// </summary> /// </summary>

3
ILSpy/TreeNodes/MethodTreeNode.cs

@ -20,10 +20,11 @@ using System;
using System.Windows.Media; using System.Windows.Media;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
using ICSharpCode.Decompiler.TypeSystem;
/// <summary> /// <summary>
/// Tree Node representing a field, method, property, or event. /// Tree Node representing a field, method, property, or event.
/// </summary> /// </summary>

3
ILSpy/TreeNodes/PropertyTreeNode.cs

@ -23,12 +23,13 @@ using System.Windows.Media;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
using SRM = System.Reflection.Metadata; using SRM = System.Reflection.Metadata;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
using ICSharpCode.Decompiler.TypeSystem;
/// <summary> /// <summary>
/// Represents a property in the TreeView. /// Represents a property in the TreeView.
/// </summary> /// </summary>

2
ILSpy/TreeNodes/TypeTreeNode.cs

@ -22,12 +22,12 @@ using System.Reflection;
using System.Windows.Media; using System.Windows.Media;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.TypeSystem;
using SRM = System.Reflection.Metadata; using SRM = System.Reflection.Metadata;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
using ICSharpCode.Decompiler.TypeSystem;
public sealed class TypeTreeNode : ILSpyTreeNode, IMemberTreeNode public sealed class TypeTreeNode : ILSpyTreeNode, IMemberTreeNode
{ {
public TypeTreeNode(ITypeDefinition typeDefinition, AssemblyTreeNode parentAssemblyNode) public TypeTreeNode(ITypeDefinition typeDefinition, AssemblyTreeNode parentAssemblyNode)

2
SharpTreeView/ICSharpCode.TreeView.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net472</TargetFramework> <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

2
TestPlugin/TestPlugin.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net472</TargetFramework> <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
<AssemblyName>Test.Plugin</AssemblyName> <AssemblyName>Test.Plugin</AssemblyName>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

4
global.json

@ -1,9 +1,9 @@
{ {
"msbuild-sdks": { "msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.54" "MSBuild.Sdk.Extras": "3.0.23"
}, },
"sdk": { "sdk": {
"version": "3.1.100", "version": "5.0.100",
"rollForward": "latestFeature" "rollForward": "latestFeature"
} }
} }

Loading…
Cancel
Save