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

Merge pull request #2774 from cshung/public/refresh-readytorun 

Refresh ready to run for .NET 7
pull/2766/head
Christoph Wille 3 years ago committed by GitHub
parent
571ae3b5fd 6985624d58
commit
fa5f58b313
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
  2. 2
      ILSpy.ReadyToRun/ReadyToRunLanguage.cs
  3. 2
      NuGet.config
  4. 2
      packages.props

2
ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
Unescape View File

@ -38,7 +38,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Iced" Version="1.13.0" /> <PackageReference Include="Iced" Version="1.13.0" />
<PackageReference Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="6.0.0-rc.2.21424.11" /> <PackageReference Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="7.0.0-rc.2.22451.11" />
<!-- ILCompiler.Reflection.ReadyToRun has dependencies on System.Reflection.Metadata and <!-- ILCompiler.Reflection.ReadyToRun has dependencies on System.Reflection.Metadata and
System.Runtime.CompilerServices.Unsafe. Because the AddIn compiles into ILSpy's output System.Runtime.CompilerServices.Unsafe. Because the AddIn compiles into ILSpy's output
directory, we're at risk of overwriting our dependencies with different versions. directory, we're at risk of overwriting our dependencies with different versions.

2
ILSpy.ReadyToRun/ReadyToRunLanguage.cs
Unescape View File

@ -52,7 +52,7 @@ namespace ICSharpCode.ILSpy.ReadyToRun
{ {
} }
public void MarkFoldStart(string collapsedText = "...", bool defaultCollapsed = false) public void MarkFoldStart(string collapsedText = "...", bool defaultCollapsed = false, bool isDefinition = false)
{ {
} }

2
NuGet.config
Unescape View File

@ -3,6 +3,6 @@
<packageSources> <packageSources>
<add key="Nuget Official" value="https://api.nuget.org/v3/index.json" /> <add key="Nuget Official" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" /> <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

2
packages.props
Unescape View File

@ -6,7 +6,7 @@
--> -->
<PropertyGroup> <PropertyGroup>
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion> <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion> <SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion>
<SystemCompilerServicesUnsafeVersion>6.0.0</SystemCompilerServicesUnsafeVersion> <SystemCompilerServicesUnsafeVersion>6.0.0</SystemCompilerServicesUnsafeVersion>
<SystemCompositionVersion>6.0.0</SystemCompositionVersion> <SystemCompositionVersion>6.0.0</SystemCompositionVersion>
<!-- Microsoft.NETCore.ILAsm --> <!-- Microsoft.NETCore.ILAsm -->

Write Preview
Loading…
Cancel
Save