Browse Source

Use specific versions for Diasymreader from nuget.org to allow VS2022 addin to restore properly

pull/3124/head
Christoph Wille 2 years ago
parent
commit
3b2c6c9ef0
  1. 2
      Directory.Packages.props
  2. 2
      ILSpy/ILSpy.csproj
  3. 6
      NuGet.config

2
Directory.Packages.props

@ -17,6 +17,8 @@
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.final" /> <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.final" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0-3.final" /> <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0-3.final" />
<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" /> <PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" />
<PackageVersion Include="Microsoft.DiaSymReader" Version="1.4.0" />
<PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="8.0.0" /> <PackageVersion Include="Microsoft.NETCore.ILAsm" Version="8.0.0" />

2
ILSpy/ILSpy.csproj

@ -90,6 +90,8 @@
<ItemGroup Condition="'$(Configuration)' == 'Debug'"> <ItemGroup Condition="'$(Configuration)' == 'Debug'">
<PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" /> <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" />
<PackageReference Include="Microsoft.DiaSymReader" />
<PackageReference Include="Microsoft.DiaSymReader.Native" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

6
NuGet.config

@ -6,10 +6,11 @@
<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="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" /> <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
</packageSources> </packageSources>
<packageSourceMapping> <packageSourceMapping>
<packageSource key="nuget.org"> <packageSource key="nuget.org">
<package pattern="*" /> <package pattern="*" />
<package pattern="Microsoft.DiaSymReader.Native" /> <package pattern="Microsoft.DiaSymReader.Native" />
<package pattern="Microsoft.DiaSymReader" />
</packageSource> </packageSource>
<packageSource key="dotnet8-transport"> <packageSource key="dotnet8-transport">
<package pattern="ILCompiler.Reflection.ReadyToRun.Experimental" /> <package pattern="ILCompiler.Reflection.ReadyToRun.Experimental" />
@ -17,7 +18,6 @@
<packageSource key="dotnet-tools"> <packageSource key="dotnet-tools">
<package pattern="Microsoft.DiaSymReader.Converter.Xml" /> <package pattern="Microsoft.DiaSymReader.Converter.Xml" />
<package pattern="Microsoft.DiaSymReader.PortablePdb" /> <package pattern="Microsoft.DiaSymReader.PortablePdb" />
<package pattern="Microsoft.DiaSymReader" />
</packageSource> </packageSource>
</packageSourceMapping> </packageSourceMapping> -->
</configuration> </configuration>

Loading…
Cancel
Save