Skip to content

Commit a737570

Browse files
vasily-kirichenkovasily-kirichenko
committed
fix projects
1 parent 43c2960 commit a737570

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<RoslynVSBinariesVersion>14.0</RoslynVSBinariesVersion>
126126
<RoslynVSBinariesVersion15>15.0</RoslynVSBinariesVersion15>
127127
<RoslynVSPackagesVersion>14.3.25407</RoslynVSPackagesVersion>
128-
<RoslynVSPackagesVersion15>15.0.25929-RC2</RoslynVSPackagesVersion15>
128+
<RoslynVSPackagesVersion15>15.0.25901-RC</RoslynVSPackagesVersion15>
129129

130130
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
131131
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->

‎vsintegration/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="15.0.25901-RC" targetFramework="net46" />
2121
<package id="Microsoft.VisualStudio.Text.Data" version="15.0.25901-RC" targetFramework="net46" />
2222
<package id="Microsoft.VisualStudio.Text.Logic" version="15.0.25901-RC" targetFramework="net46" />
23-
<package id="Microsoft.VisualStudio.Settings.15.0" version="15.0.25824-RC" targetFramework="net46" />
2423
<package id="Microsoft.VisualStudio.CoreUtility" version="15.0.25901-RC" targetFramework="net46" />
2524
<package id="Microsoft.VisualStudio.Utilities" version="15.0.25901-RC" targetFramework="net46" />
2625
<package id="Microsoft.VisualStudio.Imaging" version="15.0.25901-RC" targetFramework="net46" />
2726

27+
<package id="Microsoft.VisualStudio.Settings.15.0" version="15.0.25824-RC" targetFramework="net46" />
28+
2829
<package id="Microsoft.VSSDK.BuildTools" version="15.0.25929-RC2" />
2930
<package id="Roslyn.Microsoft.VisualStudio.ComponentModelHost" version="0.0.2" targetFramework="net46" />
3031
<package id="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal" version="14.0.25420" targetFramework="net46" />

‎vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@
8181
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
8282
<Private>True</Private>
8383
</Reference>
84-
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
85-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
84+
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion15).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
85+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion15)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
88-
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
89-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
88+
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(RoslynVSBinariesVersion15).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
89+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.$(RoslynVSPackagesVersion15)\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
9090
<Private>True</Private>
9191
</Reference>
92-
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
93-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
92+
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(RoslynVSBinariesVersion15).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
93+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.$(RoslynVSPackagesVersion15)\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
9494
<Private>True</Private>
9595
</Reference>
9696
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

‎vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@
168168
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
169169
<Private>True</Private>
170170
</Reference>
171-
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
172-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
171+
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=$(RoslynVSBinariesVersion15).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
172+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.$(RoslynVSPackagesVersion15)\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
173173
<Private>True</Private>
174174
</Reference>
175-
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
176-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
175+
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion15).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
176+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion15)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
177177
<Private>True</Private>
178178
</Reference>
179-
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
180-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
179+
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(RoslynVSBinariesVersion15).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
180+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.$(RoslynVSPackagesVersion15)\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
181181
<Private>True</Private>
182182
</Reference>
183183
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -196,8 +196,8 @@
196196
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
197197
<Private>True</Private>
198198
</Reference>
199-
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
200-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
199+
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(RoslynVSBinariesVersion15).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
200+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.$(RoslynVSPackagesVersion15)\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
201201
<Private>True</Private>
202202
</Reference>
203203
<Reference Include="Microsoft.VisualStudio.Editor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

0 commit comments

Comments
 (0)