Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit135d99c

Browse files
committed
integrate visualfsharp master
1 parent3bc41f9 commit135d99c

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

‎FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<filesrc="..\Release\net40\bin\FSharp.Build.xml"target="tools\FSharp.Build.xml" />
4646
<filesrc="..\Release\net40\bin\System.Collections.Immutable.dll"target="tools\System.Collections.Immutable.dll" />
4747
<filesrc="..\Release\net40\bin\System.Reflection.Metadata.dll"target="tools\System.Reflection.Metadata.dll" />
48+
<filesrc="..\Release\net40\bin\System.IO.Compression.dll"target="tools\System.IO.Compression.dll" />
4849
<filesrc="..\Release\net40\bin\System.ValueTuple.dll"target="tools\System.ValueTuple.dll" />
4950
<filesrc="..\Release\net40\bin\Microsoft.DiaSymReader.dll"target="tools\Microsoft.DiaSymReader.dll" />
5051
<filesrc="..\Release\net40\bin\Microsoft.DiaSymReader.PortablePdb.dll"target="tools\Microsoft.DiaSymReader.PortablePdb.dll" />

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -674,26 +674,22 @@
674674
<ReferenceInclude="System.Core" />
675675
<ReferenceInclude="System.Numerics" />
676676
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
677-
<ReferenceInclude="Microsoft.DiaSymReader.PortablePdb">
678-
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.$(MicrosoftDiaSymReaderPortablePdbPackageVersion)\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
679-
<Private>true</Private>
680-
</Reference>
681-
<ReferenceInclude="Microsoft.DiaSymReader">
682-
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.$(MicrosoftDiaSymReaderPackageVersion)\lib\netstandard1.1\Microsoft.DiaSymReader.dll</HintPath>
683-
<Private>true</Private>
684-
</Reference>
685677
<ReferenceInclude="System.Reflection.Metadata">
686-
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
678+
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath>
687679
<Private>true</Private>
688680
</Reference>
689681
<ReferenceInclude="System.Collections.Immutable">
690-
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>
682+
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutablePackageVersion)\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>
691683
<Private>true</Private>
692684
</Reference>
693685
<ReferenceInclude="System.ValueTuple">
694686
<HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
695687
<Private>true</Private>
696688
</Reference>
689+
<ReferenceInclude="System.IO.Compression">
690+
<HintPath>..\..\..\packages\System.IO.Compression.$(SystemIoCompressionPackageVersion)\lib\net46\System.IO.Compression.dll</HintPath>
691+
<Private>true</Private>
692+
</Reference>
697693
</ItemGroup>
698694
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' != 'true'">
699695
<ReferenceInclude="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp